update mapa base info

OpenICGC · Nov 21, 2024 · eebd1bd · eebd1bd
1 parent 2e399b7
commit eebd1bd
Show file tree

Hide file tree

Showing 8 changed files with 358 additions and 877 deletions.
diff --git a/exemples/cesium/icgc-terrain-cesium-code.html b/exemples/cesium/icgc-terrain-cesium-code.html
@@ -138,7 +138,7 @@
         url: 'https://api.maptiler.com/tiles/terrain-quantized-mesh/?key=QLOqi8gs14T1s1yjnRMO'
       });
       const terrain5M = new Cesium.CesiumTerrainProvider({
-        url: 'https://tilemaps.icgc.cat/terrenys/demextes/'
+        url: 'https://geoserveis.icgc.cat/servei/catalunya/icgc2m/terrenys/'
       });
       map = new Cesium.Viewer('map', {
         imageryProvider: new Cesium.OpenStreetMapImageryProvider({

diff --git a/exemples/cesium/icgc-terrain-cesium-map.html b/exemples/cesium/icgc-terrain-cesium-map.html
@@ -50,7 +50,7 @@
         url: 'https://api.maptiler.com/tiles/terrain-quantized-mesh/?key=QLOqi8gs14T1s1yjnRMO'
       });
       const terrain5M = new Cesium.CesiumTerrainProvider({
-        url: 'https://tilemaps.icgc.cat/terrenys/demextes/'
+        url: 'https://geoserveis.icgc.cat/servei/catalunya/icgc2m/terrenys/'
       });
       map = new Cesium.Viewer('map', {
         imageryProvider: new Cesium.OpenStreetMapImageryProvider({

diff --git a/exemples/leaflet/icgc-raster-leaflet-code.html b/exemples/leaflet/icgc-raster-leaflet-code.html
@@ -66,75 +66,76 @@
 <hr>
   <div class="soft">
     <pre><code class="prettyprint linenums">
-&#x3C;html lang="ca"&#x3E;
-&#x3C;head&#x3E;
-  &#x3C;title&#x3E;Exemple Leaflet i piràmides ràster ICGC &#x3C;/title&#x3E;
-  &#x3C;meta charset="utf-8" /&#x3E;
-  &#x3C;meta name="viewport" content="width=device-width, initial-scale=1.0"&#x3E;
-  &#x3C;meta name="author" content="ICGC" /&#x3E;
-  &#x3C;meta name="description" content="Tile rasters Catalunya"&#x3E;
-  &#x3C;meta name="robots" content="index,follow"&#x3E;
-  &#x3C;link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
-    integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-    crossorigin="" /&#x3E;
-  &#x3C;script src="https://unpkg.com/[email protected]/dist/leaflet.js"
-    integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-    crossorigin=""&#x3E;&#x3C;/script&#x3E;
-  &#x3C;style&#x3E;
-    body {
-      margin: 0;
-    }
-    #map {
-      height: 500px;
-      width: 100%;
-      background-color: #ffffff
-    }
-  &#x3C;/style&#x3E;
-  &#x3C;script&#x3E;
-  function init() {
-    const map = L.map('map', {
-        center: [41.6863, 2.4382],
-        zoom: 10,
-        attribution: ''
-    });
-    const topoMonICGCCache = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic/MON3857NW/{z}/{x}/{y}.png', {
-        maxZoom: 19,
-        attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.&#x3C;br&#x3E; Resta del món: &#x3C;a href="https://openmaptiles.org/" target="_blank"&#x3E;© OpenMapTiles  &#x3C;/a&#x3E;; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.&#x3C;a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank"&#x3E;...Més detall&#x3C;/a&#x3E;'
-    }).addTo(map);
-    const topoMonICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic/MON3857NW/{z}/{x}/{y}.png', {
-        maxZoom: 19,
-        attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.&#x3C;br&#x3E; Resta del món: &#x3C;a href="https://openmaptiles.org/" target="_blank"&#x3E;© OpenMapTiles  &#x3C;/a&#x3E;; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.&#x3C;a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank"&#x3E;...Més detall&#x3C;/a&#x3E;'
-    });
-    const topoGrisMonICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic-gris/MON3857NW/{z}/{x}/{y}.png', {
-        maxZoom: 19,
-        attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.&#x3C;br&#x3E; Resta del món: &#x3C;a href="https://openmaptiles.org/" target="_blank"&#x3E;© OpenMapTiles  &#x3C;/a&#x3E;; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.&#x3C;a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank"&#x3E;...Més detall&#x3C;/a&#x3E;'
-    });
-    const topoGrisSimMonICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/simplificat/MON3857NW/{z}/{x}/{y}.png', {
-        maxZoom: 19,
-        attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.&#x3C;br&#x3E; Resta del món: &#x3C;a href="https://openmaptiles.org/" target="_blank"&#x3E;© OpenMapTiles  &#x3C;/a&#x3E;; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.&#x3C;a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank"&#x3E;...Més detall&#x3C;/a&#x3E;'
-    });
-    const ortoHibridaICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto/MON3857NW/{z}/{x}/{y}.png', {
-        maxZoom: 19,
-        attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.&#x3C;br&#x3E; Resta del món: &#x3C;a href="https://openmaptiles.org/" target="_blank"&#x3E;© OpenMapTiles  &#x3C;/a&#x3E;; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.&#x3C;a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank"&#x3E;...Més detall&#x3C;/a&#x3E;'
-    });
-    const mapaBase = {
-        'Mapa base estandard': topoMonICGCCache,
-        'Mapa base orto': ortoHibridaICGC,
-        'Mapa base topografic gris': topoGrisMonICGC,
-        'Mapa base simplificat': topoGrisSimMonICGC
-
-    };
-    controlCapas = L.control.layers(mapaBase, null, {
-        collapsed: false
-    });
-    controlCapas.addTo(map)
-}
-  &#x3C;/script&#x3E;
-&#x3C;/head&#x3E;
-&#x3C;body onLoad="init()"&#x3E;
-  &#x3C;div id="map"&#x3E; &#x3C;/div&#x3E;
-&#x3C;/body&#x3E;
-&#x3C;/html&#x3E;
+      &#x3C;html lang="ca"&#x3E;
+      &#x3C;head&#x3E;
+          &#x3C;meta charset="utf-8"&#x3E;
+          &#x3C;meta name="viewport" content="width=device-width, initial-scale=1"&#x3E;
+          &#x3C;title&#x3E;ICGC - Mapes Base&#x3C;/title&#x3E;
+          &#x3C;link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
+              integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" /&#x3E;
+          &#x3C;script src="https://unpkg.com/[email protected]/dist/leaflet.js"
+              integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""&#x3E;&#x3C;/script&#x3E;
+          &#x3C;style&#x3E;
+              html,
+              body {
+                  height: 100%;
+                  margin: 0;
+              }
+              #map {
+                  width: 100%;
+                  height: 100%;
+              }
+          &#x3C;/style&#x3E;
+      &#x3C;/head&#x3E;
+      &#x3C;body&#x3E;
+          &#x3C;div id="map"&#x3E;&#x3C;/div&#x3E;
+          &#x3C;script&#x3E;
+              const topo = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20,
+                  attribution: '&copy;'
+              });
+              const topogris = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic-gris/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20
+              });
+              const simplificat = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/simplificat/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20
+              });
+              const admin = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/administratiu/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20
+              });
+              const estandard = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/estandard/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20
+              });
+              const orto = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20
+              });
+              const ortogris = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto-gris/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20
+              });
+              const hibrid = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto-hibrida/MON3857NW/{z}/{x}/{y}.png', {
+                  maxZoom: 20
+              });
+              const map = L.map('map', {
+                  attributionControl: false,
+                  minZoom: 6,
+                  center: [41.8, 1.7],
+                  zoom: 8,
+                  layers: [topo]
+              });
+              const baseLayers = {
+                  'Topogràfic': topo,
+                  'Topogràfic gris': topogris,
+                  'Simplificat': simplificat,
+                  'Administratiu': admin,
+                  'Estàndard': estandard,
+                  'Orto': orto,
+                  'Orto gris': ortogris,
+                  'Orto híbrida': hibrid
+              };
+              const layerControl = L.control.layers(baseLayers, null, { collapsed: false }).addTo(map);
+          &#x3C;/script&#x3E;
+      &#x3C;/body&#x3E;
+      &#x3C;/html&#x3E;
     </code></pre>
   </div>
 </div>

diff --git a/exemples/leaflet/icgc-raster-leaflet-map.html b/exemples/leaflet/icgc-raster-leaflet-map.html
@@ -1,69 +1,71 @@
 <html lang="ca">
 <head>
-    <title>Exemple Leaflet i piràmides ràster ICGC </title>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="author" content="ICGC" />
-    <meta name="description" content="Contextmaps rasters Catalunya">
-    <meta name="robots" content="index,follow">
-    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
-        integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
-        crossorigin="" />
-    <script src="https://unpkg.com/[email protected]/dist/leaflet.js"
-        integrity="sha512-XQoYMqMTK8LvdxXYG3nZ448hOEQiglfqkJs1NOQV44cWnUrBc8PkAOcXy20w0vlaXaVUearIOBhiXZ5V3ynxwA=="
-        crossorigin=""></script>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>ICGC - Mapes Base</title>
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css"
+        integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" />
+    <script src="https://unpkg.com/[email protected]/dist/leaflet.js"
+        integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
     <style>
+        html,
         body {
+            height: 100%;
             margin: 0;
         }
         #map {
-            height: 500px;
             width: 100%;
-            background-color: #ffffff
+            height: 100%;
         }
     </style>
+</head>
+<body>
+    <div id="map"></div>
     <script>
-        function init() {
-            const map = L.map('map', {
-                center: [41.6863, 2.4382],
-                zoom: 10,
-                attribution: ''
-            });
-            const topoMonICGCCache = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic/MON3857NW/{z}/{x}/{y}.png', {
-                maxZoom: 19,
-                attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.<br> Resta del món: <a href="https://openmaptiles.org/" target="_blank">© OpenMapTiles  </a>; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.<a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank">...Més detall</a>'
-            }).addTo(map);
-            const topoMonICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic/MON3857NW/{z}/{x}/{y}.png', {
-                maxZoom: 19,
-                attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.<br> Resta del món: <a href="https://openmaptiles.org/" target="_blank">© OpenMapTiles  </a>; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.<a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank">...Més detall</a>'
-            });
-            const topoGrisMonICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic-gris/MON3857NW/{z}/{x}/{y}.png', {
-                maxZoom: 19,
-                attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.<br> Resta del món: <a href="https://openmaptiles.org/" target="_blank">© OpenMapTiles  </a>; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.<a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank">...Més detall</a>'
-            });
-            const topoGrisSimMonICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/simplificat/MON3857NW/{z}/{x}/{y}.png', {
-                maxZoom: 19,
-                attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.<br> Resta del món: <a href="https://openmaptiles.org/" target="_blank">© OpenMapTiles  </a>; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.<a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank">...Més detall</a>'
-            });
-            const ortoHibridaICGC = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto/MON3857NW/{z}/{x}/{y}.png', {
-                maxZoom: 19,
-                attribution: 'Catalunya: Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3, Gencat i altres.<br> Resta del món: <a href="https://openmaptiles.org/" target="_blank">© OpenMapTiles  </a>; © OpenStreetMap contributors; © Mapzen, OpenStreetMap, and others; World Imagery ©ESRI.<a href="https://www.icgc.cat/Aplicacions/Visors/ContextMaps#credits" target="_blank">...Més detall</a>'
-            });
-            const mapaBase = {
-                'Mapa base estandard': topoMonICGCCache,
-                'Mapa base orto': ortoHibridaICGC,
-                'Mapa base topografic gris': topoGrisMonICGC,
-                'Mapa base simplificat': topoGrisSimMonICGC
-
-            };
-            controlCapas = L.control.layers(mapaBase, null, {
-                collapsed: false
-            });
-            controlCapas.addTo(map)
-        }
+        const topo = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20,
+            attribution: '&copy;'
+        });
+        const topogris = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic-gris/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20
+        });
+        const simplificat = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/simplificat/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20
+        });
+        const admin = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/administratiu/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20
+        });
+        const estandard = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/estandard/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20
+        });
+        const orto = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20
+        });
+        const ortogris = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto-gris/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20
+        });
+        const hibrid = L.tileLayer('https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/orto-hibrida/MON3857NW/{z}/{x}/{y}.png', {
+            maxZoom: 20
+        });
+        const map = L.map('map', {
+            attributionControl: false,
+            attribution: 'Institut Cartogràfic i Geològic de Catalunya CC-BY-SA-3',
+            minZoom: 6,
+            center: [41.8, 1.7],
+            zoom: 8,
+            layers: [topo]
+        });
+        const baseLayers = {
+            'Topogràfic': topo,
+            'Topogràfic gris': topogris,
+            'Simplificat': simplificat,
+            'Administratiu': admin,
+            'Estàndard': estandard,
+            'Orto': orto,
+            'Orto gris': ortogris,
+            'Orto híbrida': hibrid
+        };
+        const layerControl = L.control.layers(baseLayers, null, { collapsed: false }).addTo(map);
     </script>
-</head>
-<body onLoad="init()">
-    <div id="map"> </div>
 </body>
 </html>
diff --git a/exemples/mapboxgl/icgc-terrain-rgb-mapbox-code.html b/exemples/mapboxgl/icgc-terrain-rgb-mapbox-code.html
@@ -158,7 +158,7 @@
                     map.addSource('icgc-dem', {
                         'type': 'raster-dem',
                         "tiles": [
-                            "https://tilemaps.icgc.cat/tileserver/tileserver.php/terreny_icgc_2m_rgb/{z}/{x}/{y}.png"
+                            "https://geoserveis.icgc.cat/servei/catalunya/contextmaps-terreny-5m-rgb/wmts/{z}/{x}/{y}.png"
                         ],
                         'tileSize': 512,
                         'maxzoom': 14

diff --git a/exemples/mapboxgl/icgc-terrain-rgb-mapbox-map.html b/exemples/mapboxgl/icgc-terrain-rgb-mapbox-map.html
@@ -62,7 +62,7 @@
             map.addSource('icgc-dem', {
                 'type': 'raster-dem',
                 "tiles": [
-                    "https://tilemaps.icgc.cat/tileserver/tileserver.php/terreny_icgc_2m_rgb/{z}/{x}/{y}.png"
+                    "https://geoserveis.icgc.cat/servei/catalunya/contextmaps-terreny-5m-rgb/wmts/{z}/{x}/{y}.png"
                 ],
                 'tileSize': 512,
                 'maxzoom': 16