wip

geoadmin · Sep 28, 2023 · 82e37d1 · 82e37d1
1 parent f9086a9
commit 82e37d1
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 29 deletions.
diff --git a/web-ui/src/main/resources/WEB-INF/classes/web-ui-wro-sources.xml b/web-ui/src/main/resources/WEB-INF/classes/web-ui-wro-sources.xml
@@ -64,6 +64,8 @@
     <jsSource webappPath="/catalog/lib/style/bootstrap/dist/js/bootstrap.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/proj4js-compressed.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/openlayers/ol.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/openlayers/olms.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/openlayers/" minimize="false"/>
     <jsSource webappPath="/catalog/lib/d3.v3.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/nv.d3.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/jsonix/jsonix/Jsonix-min.js" minimize="false"/>
@@ -136,6 +138,7 @@
     <!-- FIXME in non debug mode, 3D mode does not work when WMS layer is displayed.
          No errors, only block tile loading-->
     <jsSource webappPath="/catalog/lib/openlayers/ol.js" minimize="false"/>
+    <jsSource webappPath="/catalog/lib/openlayers/olms.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/olcesium/olcesium.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/d3.v3.min.js" minimize="false"/>
     <jsSource webappPath="/catalog/lib/nv.d3.min.js" minimize="false"/>

diff --git a/web-ui/src/main/resources/catalog/components/common/map/mapService.js b/web-ui/src/main/resources/catalog/components/common/map/mapService.js
@@ -1811,33 +1811,45 @@
               });
           },
 
+          buildMapGeoAdminBaseLayerWorld: function (layer) {
+            layer = new ol.layer.VectorTile({
+              opacity: 1,
+              declutter: true
+            });
+            olms.applyStyle(
+              layer,
+              "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte_world.vt/style.json",
+              "openmaptiles"
+            );
+            return layer;
+          },
+
           buildMapGeoAdminBaseLayerRelief: function (layer) {
-            var defaultUrl =
-              "https://world.vectortiles.geo.admin.ch/mbtiles/org.openmaptiles-relief.vt/{z}/{x}/{y}.jpg";
-            return new ol.layer.Tile({
-              source: new ol.source.XYZ({
-                url: defaultUrl,
-                projection: "EPSG:3857"
-              })
+            layer = new ol.layer.VectorTile({
+              opacity: 1
             });
+            olms.applyStyle(
+              layer,
+              "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte_world.vt/style.json",
+              "terrain_v1.0.0"
+            );
+            return layer;
           },
 
           buildMapGeoAdminBaseLayer: function (layer) {
             var defaultUrl =
               "https://world.vectortiles.geo.admin.ch/mbtiles/org.openstreetmap-openmaptiles.vt/{z}/{x}/{y}.pbf";
 
-            return new ol.layer.VectorTile({
-              source: new ol.source.VectorTile({
-                url: defaultUrl,
-                format: new ol.format.MVT(),
-                projection: "EPSG:3857",
-                extent: [
-                  -20037508.342789244, -20037471.205137063, 20037508.342789244,
-                  20037471.205137063
-                ]
-              }),
+            layer = new ol.layer.VectorTile({
+              declutter: true,
               opacity: 0.5
             });
+            olms.applyStyle(
+              layer,
+              "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte_world.vt/style.json",
+              "leichtebasiskarte_v3.0.0"
+            );
+            return layer;
           },
 
           /**
@@ -2333,6 +2345,8 @@
                 return this.buildMapGeoAdminBaseLayer(opt.name);
               case "relief":
                 return this.buildMapGeoAdminBaseLayerRelief(opt.name);
+              case "world":
+                return this.buildMapGeoAdminBaseLayerWorld(opt.name);
             }
           },
 

diff --git a/web-ui/src/main/resources/catalog/lib/openlayers/ol.css b/web-ui/src/main/resources/catalog/lib/openlayers/ol.css
diff --git a/web-ui/src/main/resources/catalog/lib/openlayers/ol.css.map b/web-ui/src/main/resources/catalog/lib/openlayers/ol.css.map
diff --git a/web-ui/src/main/resources/catalog/lib/openlayers/ol.js b/web-ui/src/main/resources/catalog/lib/openlayers/ol.js
diff --git a/web-ui/src/main/resources/catalog/lib/openlayers/ol.js.map b/web-ui/src/main/resources/catalog/lib/openlayers/ol.js.map
diff --git a/web-ui/src/main/resources/catalog/lib/openlayers/olms.js b/web-ui/src/main/resources/catalog/lib/openlayers/olms.js
diff --git a/web-ui/src/main/resources/catalog/lib/openlayers/olms.js.map b/web-ui/src/main/resources/catalog/lib/openlayers/olms.js.map
diff --git a/web-ui/src/main/resources/catalog/views/api/index_debug.html b/web-ui/src/main/resources/catalog/views/api/index_debug.html
@@ -46,6 +46,7 @@
 
     <!-- No 3D. -->
     <script src="/geonetwork/catalog/lib/openlayers/ol.js"></script>
+    <script src="/geonetwork/catalog/lib/openlayers/olms.js"></script>
 
     <script src="/geonetwork/catalog/lib/FileSaver/FileSaver.min.js"></script>
     <script src="/geonetwork/catalog/lib/tableExport/tableExport.min.js"></script>

diff --git a/web/src/main/webapp/WEB-INF/data/data/resources/map/config-viewer.xml b/web/src/main/webapp/WEB-INF/data/data/resources/map/config-viewer.xml
@@ -14,12 +14,19 @@
                        opacity="1">
       <ows:Title>map.geo.admin.ch</ows:Title>
     </ows-context:Layer>
-
+    <ows-context:Layer name="{type=world,name=world}"
+                       group="Background layers"
+                       hidden="false"
+                       opacity="0.5">
+    <ows:Title>map.geo.admin.ch</ows:Title>
+    </ows-context:Layer>
     <ows-context:Layer name="{type=contour,name=contour}"
                        group="Background layers"
                        hidden="false"
                        opacity="0.5">
       <ows:Title>map.geo.admin.ch</ows:Title>
+
+
     </ows-context:Layer>
 
 

diff --git a/web/src/main/webapp/xslt/base-layout-cssjs-loader.xsl b/web/src/main/webapp/xslt/base-layout-cssjs-loader.xsl
@@ -153,6 +153,7 @@
           </xsl:when>
           <xsl:otherwise>
             <script src="{$uiResourcesPath}lib/openlayers/ol.js?v={$buildNumber}"></script>
+            <script src="{$uiResourcesPath}lib/openlayers/olms.js?v={$buildNumber}"></script>
           </xsl:otherwise>
         </xsl:choose>