Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for OGC:3DTILES protocol #6950

Merged
merged 6 commits into from
Oct 9, 2023
Merged

Add support for OGC:3DTILES protocol #6950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fce440
add OGC:3DTILES to possible values for gmd:protocol
landryb Mar 24, 2023
1f54e47
support OGC:3DTILES protocol, set type to 3dtiles in buildAddToMapConfig
landryb Mar 24, 2023
20094f4
add OGC:3DTILES to gnSearchSettings.mapProtocols.layers
landryb Mar 24, 2023
5e9b708
add badge support for 3dtiles
landryb Mar 27, 2023
60d7dfd
Add 3DTILES support to gn_relatedresources_service module
landryb Mar 27, 2023
53eda2f
please prettier-java
landryb Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/eng/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3926,6 +3926,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web
</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6325,6 +6325,7 @@ la non-évaluation</b>, dans le cadre de métadonnées INSPIRE
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/ara/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2192,6 +2192,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option show="-" value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option show="-" value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option show="-" value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/cat/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,6 +1874,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Servei de catàleg per a la Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Llenguatge de Marcat Geogràfic</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/chi/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2188,6 +2188,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option show="-" value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option show="-" value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option show="-" value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/dut/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,6 +1836,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option show="-" value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option show="-" value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option show="-" value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/eng/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,6 +2273,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/fin/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2157,6 +2157,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web
</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/fre/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4356,6 +4356,7 @@ la non-évaluation</b>, dans le cadre de métadonnées INSPIRE
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/ger/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2583,6 +2583,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:WMS-http-get-map">OGC-WMS Web Map Service</option>
<option value="OGC:WFS-http-get-capabilities">OGC-WFS Web Feature Service</option>
<option value="OGC:WCS-http-get-capabilities">OGC-WCS Web Coverage Service</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/ita/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2040,6 +2040,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option show="-" value="OGC:CSW">OGC-CSW Catalogue Service for the Web
</option>
<option show="-" value="OGC:KML">OGC-KML Keyhole Markup Language
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/nor/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1972,6 +1972,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option show="-" value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option show="-" value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option show="-" value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/pol/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,6 +1644,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/por/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2128,6 +2128,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option show="-" value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option show="-" value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option show="-" value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/rus/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,6 +2222,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option show="-" value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option show="-" value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option show="-" value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/slo/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,6 +1753,7 @@ presnosť / vertikálna -</option>
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/spa/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1944,6 +1944,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Servicio de catálogo para la Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Lenguaje de Marcado Geográfico</option>
Expand Down
1 change: 1 addition & 0 deletions schemas/iso19139/src/main/plugin/iso19139/loc/tur/labels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1784,6 +1784,7 @@
<option value="OGC API - Features">OGC API - Features</option>
<option value="OGC API - Maps">OGC API - Maps</option>
<option value="OGC API - Records">OGC API - Records</option>
<option value="OGC:3DTILES">OGC-3DTiles Dataset</option>
<option value="OGC:CSW">OGC-CSW Catalogue Service for the Web</option>
<option value="OGC:KML">OGC-KML Keyhole Markup Language</option>
<option value="OGC:GML">OGC-GML Geography Markup Language</option>
Expand Down
11 changes: 10 additions & 1 deletion web-ui/src/main/resources/catalog/components/metadataactions/RelatedResourcesService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
return r.mimeType;
} else if (r.protocol && r.protocol.indexOf("WWW:DOWNLOAD:") >= 0) {
return r.protocol.replace("WWW:DOWNLOAD:", "");
} else if (mainType.match(/W([MCF]|MT)S.*|ESRI:REST/) != null) {
} else if (mainType.match(/W([MCF]|MT)S.*|3DTILES|ESRI:REST/) != null) {
return mainType.replace("SERVICE", "");
} else if (mainType.match(/KML|GPX/) != null) {
return mainType;
Expand Down Expand Up @@ -126,6 +126,8 @@

var addWMSToMap =
gnViewerSettings.resultviewFns && gnViewerSettings.resultviewFns.addMdLayerToMap;
var add3dTilesToMap =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it work in GN map viewer ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i have no idea since i never really used/tried the internal GN viewer

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and to be fully honest, since i dont know the internals of the GN viewer at all, i added 3dtiles everywhere i saw wms/wmts until opening 3dtiles in external viewer worked, so maybe its not needed for my usecase.

gnViewerSettings.resultviewFns && gnViewerSettings.resultviewFns.addMdLayerToMap;
var addEsriRestToMap =
gnViewerSettings.resultviewFns && gnViewerSettings.resultviewFns.addMdLayerToMap;

Expand Down Expand Up @@ -279,6 +281,11 @@
label: "addToMap",
action: addWMTSToMap
},
"3DTILES": {
iconClass: "fa-globe",
label: "addToMap",
action: add3dTilesToMap
},
TMS: {
iconClass: "fa-globe",
label: "addToMap",
Expand Down Expand Up @@ -508,6 +515,8 @@
return "ESRI:REST";
} else if (protocolOrType.match(/wmts/i)) {
return "WMTS";
} else if (protocolOrType.match(/3dtiles/i)) {
return "3DTILES";
} else if (protocolOrType.match(/tms/i)) {
return "TMS";
} else if (protocolOrType.match(/wfs/i)) {
Expand Down
1 change: 1 addition & 0 deletions web-ui/src/main/resources/catalog/js/CatController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,6 +1310,7 @@
gnSearchSettings.mapProtocols = {
layers: [
"OGC:WMS",
"OGC:3DTILES",
"OGC:WMTS",
"OGC:WMS-1.1.1-http-get-map",
"OGC:WMS-1.3.0-http-get-map",
Expand Down
1 change: 1 addition & 0 deletions web-ui/src/main/resources/catalog/style/gn_icons.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@
.gn-icontype-wps,
.gn-icontype-wcs,
.gn-icontype-atom,
.gn-icontype-3dtiles,
.gn-icontype-esri-rest,
.gn-icontype-wfs {
background-color: @btn-success-bg !important;
Expand Down
2 changes: 2 additions & 0 deletions web-ui/src/main/resources/catalog/views/default/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,8 @@
? "wmts"
: link.protocol == "ESRI:REST" || link.protocol.startsWith("ESRI REST")
? "esrirest"
: link.protocol == "OGC:3DTILES"
? "3dtiles"
: "wms",
url: $filter("gnLocalized")(link.url) || link.url
};
Expand Down