mapicgc-gl-js 1.0.6 → 1.0.7

package/src/constants/Layers.js

@@ -2,6 +2,8 @@
 const Orto = {
 ortofotoColorProvisional: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_provisional",
 ortofotoColorVigent: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_vigent",
+ortofotoColor2025: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_2025",
+ortofotoColor2024: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_2024",
 ortofotoColor2023: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_2023",
 ortofotoColor2022: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_2022",
 ortofotoColor2021: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_2021",
@@ -31,6 +33,8 @@ ortofotoBlancINegre1945: "https://geoserveis.icgc.cat/servei/catalunya/orto-terr
 ortofotoColorSerieAnual: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_color_serie_anual",
 ortofotoInfraroigProvisional: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_provisional",
 ortofotoInfraroigVigent: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_vigent",
+ortofotoInfraroig2025: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2025",
+ortofotoInfraroig2024: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2024",
 ortofotoInfraroig2023: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2023",
 ortofotoInfraroig2022: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2022",
 ortofotoInfraroig2021: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2021",
@@ -47,7 +51,7 @@ ortofotoInfraroig2011: "https://geoserveis.icgc.cat/servei/catalunya/orto-territ
 ortofotoInfraroig2010: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2010",
 ortofotoInfraroig2009: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2009",
 ortofotoInfraroig2008: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2008",
-ortofotoInfraroig20062007: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2006-2007",
+ortofotoInfraroig2007: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_2007",
 ortofotoInfraroig19961997: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_1996-1997",
 ortofotoInfraroigSerieAnual: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_infraroig_serie_anual",
 ortofotoGrisVigent: "https://geoserveis.icgc.cat/servei/catalunya/orto-territorial/wms?&bbox={bbox-epsg-3857}&format=image/png&service=WMS&version=1.1.1&request=GetMap&STYLES=&srs=EPSG:3857&transparent=true&width=256&height=256&layers=ortofoto_gris_vigent",
@@ -60,6 +64,10 @@ agrupacionsCensals2018: "agrupacions_censals_2018",
 agrupacionsCensals2019: "agrupacions_censals_2019",
 agrupacionsCensals2020: "agrupacions_censals_2020",
 agrupacionsCensals2021: "agrupacions_censals_2021",
+agrupacionsCensals2022: "agrupacions_censals_2022",
+agrupacionsCensals2023: "agrupacions_censals_2023",
+agrupacionsCensals2024: "agrupacions_censals_2024",
+agrupacionsCensals2025: "agrupacions_censals_2025",
 agrupacionsCensalsVigent: "agrupacions_censals_vigent",
 agrupacionsCensalsVigentText: "agrupacions_censals_vigent_text",
 areesBasiquesPolicials2019: "arees_basiques_policials_2019",
@@ -70,15 +78,20 @@ areesBasiquesPolicials2023Text: "arees_basiques_policials_2023_text",
 areesBasiquesPolicialsVigent: "arees_basiques_policials_vigent",
 areesBasiquesPolicialsVigent2023: "arees_basiques_policials_vigent_2023",
 areesBasiquesPolicialsVigent2023Text: "arees_basiques_policials_vigent_2023_text",
+areesBasiquesPolicialsVigent2024: "arees_basiques_policials_vigent_2024",
+areesBasiquesPolicialsVigent2024Text: "arees_basiques_policials_vigent_2024_text",
 areesBasiquesPolicialsVigentText: "arees_basiques_policials_vigent_text",
 areesBasiquesSalutVigent: "arees_basiques_salut_vigent",
 areesBasiquesServeisSocialsVigent: "arees_basiques_serveis_socials_vigent",
 areesBasiquesServeisSocialsVigentText: "arees_basiques_serveis_socials_vigent_text",
 areesGestioAssistencialVigent: "arees_gestio_assistencial_vigent",
 areesHidrogeologiquesAquifersVigent: "arees_hidrogeologiques_aquifers_vigent",
+catalunya2025: "catalunya_2025",
 catalunyaVigent: "catalunya_vigent",
 catalunyaVigentText: "catalunya_vigent_text",
 comarques2022: "comarques_2022",
+comarques2025: "comarques_2025",
+comarques2026: "comarques_2026",
 comarquesVigent: "comarques_vigent",
 comarquesVigentText: "comarques_vigent_text",
 comarquesVigents: "comarques_vigents",
@@ -92,6 +105,8 @@ districtesCensals2020: "districtes_censals_2020",
 districtesCensals2021: "districtes_censals_2021",
 districtesCensals2022: "districtes_censals_2022",
 districtesCensals2023: "districtes_censals_2023",
+districtesCensals2024: "districtes_censals_2024",
+districtesCensals2025: "districtes_censals_2025",
 districtesCensalsVigent: "districtes_censals_vigent",
 districtesCensalsVigentText: "districtes_censals_vigent_text",
 espaisNaturalsEnpeVigent: "espais_naturals_enpe_vigent",
@@ -102,13 +117,23 @@ incendisForestalsVigent: "incendis_forestals_vigent",
 incendisForestalsVigentText: "incendis_forestals_vigent_text",
 municipis2022: "municipis_2022",
 municipis2022Text: "municipis_2022_text",
+municipis2025: "municipis_2025",
+municipis2026: "municipis_2026",
 municipisVigent: "municipis_vigent",
 municipisVigentText: "municipis_vigent_text",
 partitsJudicialsVigent: "partits_judicials_vigent",
 partitsJudicialsVigentText: "partits_judicials_vigent_text",
 plaTerritorial2015: "pla_territorial_2015",
+plaTerritorial2019: "pla_territorial_2019",
+plaTerritorial2020: "pla_territorial_2020",
+plaTerritorial2021: "pla_territorial_2021",
+plaTerritorial2022: "pla_territorial_2022",
+plaTerritorial2023: "pla_territorial_2023",
+plaTerritorial2024: "pla_territorial_2024",
+plaTerritorial2025: "pla_territorial_2025",
 plaTerritorialVigent: "pla_territorial_vigent",
 plaTerritorialVigentText: "pla_territorial_vigent_text",
+provincies2025: "provincies_2025",
 provinciesVigent: "provincies_vigent",
 provinciesVigentText: "provincies_vigent_text",
 provinciesVigents: "provincies_vigents",
@@ -126,9 +151,12 @@ seccionsCensals2020: "seccions_censals_2020",
 seccionsCensals2021: "seccions_censals_2021",
 seccionsCensals2022: "seccions_censals_2022",
 seccionsCensals2023: "seccions_censals_2023",
+seccionsCensals2024: "seccions_censals_2024",
+seccionsCensals2025: "seccions_censals_2025",
 seccionsCensalsVigent: "seccions_censals_vigent",
 seccionsCensalsVigentText: "seccions_censals_vigent_text",
 sectorsSanitarisVigent: "sectors_sanitaris_vigent",
+vegueries2025: "vegueries_2025",
 vegueriesVigent: "vegueries_vigent",
 vegueriesVigentText: "vegueries_vigent_text",
 };
@@ -138,6 +166,8 @@ agrupacionsCensalsVigentText: "https://tilemaps.icgc.cat/vector/fgb/agrupacions_
 areesBasiquesPolicialsVigent: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_policials_vigent.fgb",
 areesBasiquesPolicialsVigent2023: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_policials_vigent_2023.fgb",
 areesBasiquesPolicialsVigent2023Text: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_policials_vigent_2023_text.fgb",
+areesBasiquesPolicialsVigent2024: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_policials_vigent_2024.fgb",
+areesBasiquesPolicialsVigent2024Text: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_policials_vigent_2024_text.fgb",
 areesBasiquesPolicialsVigentText: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_policials_vigent_text.fgb",
 areesBasiquesSalutVigent: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_salut_vigent.fgb",
 areesBasiquesServeisSocialsVigent: "https://tilemaps.icgc.cat/vector/fgb/arees_basiques_serveis_socials_vigent.fgb",

package/src/constants/Styles.js

@@ -1,13 +1,13 @@
 
 const Styles = {
-  TOPO: "https://geoserveis.icgc.cat/styles/icgc_mapa_base_topografic.json",
-  ORTO: "https://geoserveis.icgc.cat/styles/icgc_orto_estandard.json",
+  TOPO: "https://geoserveis.icgc.cat/styles/mapa-base-topografic.json",
+  ORTO: "https://geoserveis.icgc.cat/styles/mapa-base-orto.json",
   ORTO3D: "https://eines.icgc.cat/recursos//styles/icgc_orto_3d.json",
-  ORTOHYBRID: "https://geoserveis.icgc.cat/styles/icgc_orto_hibrida.json",
-  ADMIN: "https://geoserveis.icgc.cat/styles/icgc_limits_administratius_gris.json",
+  ORTOHYBRID: "https://geoserveis.icgc.cat/styles/mapa-base-orto-hibrida.json",
+  ADMIN: "https://geoserveis.icgc.cat/styles/mapa-base-administratiu.json",
   DARK: "https://geoserveis.icgc.cat/styles/icgc_mapa_base_fosc.json",
-  LIGHT: "https://geoserveis.icgc.cat/styles/icgc_mapa_base_gris.json",
-  GEOLOGY: "https://geoserveis.icgc.cat/styles/icgc_geologic_informacio.json",
+  LIGHT: "https://geoserveis.icgc.cat/styles/mapa-base-estandard-gris.json",
+  GEOLOGY: "https://geoserveis.icgc.cat/styles/mapa-base-geologic.json",
   RASTER: {
     TOPO: {
       url: "https://geoserveis.icgc.cat/servei/catalunya/mapa-base/wmts/topografic/MON3857NW/{z}/{x}/{y}.png",

package/src/map/Map.js

@@ -3149,16 +3149,40 @@ export default class Map {
    */
   addTerrainICGC(url, controlPosition) {
     try {
-      let op;
-      for (const key in Terrains) {
-        if (Terrains.hasOwnProperty(key)) {
-          const objeto = Terrains[key];
-          if (objeto === url) {
-            op = objeto;
-          }
-        }
+      const terrainConfigsRaw = defaultOptions?.urlTerrainICGC || [];
+      const terrainConfigs = Array.isArray(terrainConfigsRaw)
+        ? terrainConfigsRaw
+        : Object.values(terrainConfigsRaw);
+      let terrainConfig = null;
+      const requestedTerrain = typeof url === "string" ? url.trim() : "";
+      const requestedTerrainLower = requestedTerrain.toLowerCase();
+
+      // Accept both terrain key (e.g. "WORLD30M") and full URL.
+      if (requestedTerrain) {
+        terrainConfig =
+          terrainConfigs.find(
+            (terrain) => terrain?.name?.toLowerCase?.() === requestedTerrainLower
+          ) ||
+          terrainConfigs.find((terrain) => terrain?.url === requestedTerrain);
+      }
+
+      let urlTerrainICGC = terrainConfig?.url;
+      if (!urlTerrainICGC && requestedTerrain) {
+        // Backward compatibility with Terrains dictionary values/keys.
+        const terrainEntryByKey = Object.entries(Terrains || {}).find(
+          ([key]) => key.toLowerCase() === requestedTerrainLower
+        );
+        const terrainEntryByUrl = Object.entries(Terrains || {}).find(
+          ([, value]) => value === requestedTerrain
+        );
+        urlTerrainICGC =
+          terrainEntryByKey?.[1] || terrainEntryByUrl?.[1] || requestedTerrain;
+      }
+
+      if (!urlTerrainICGC) {
+        throw new Error("Terrain URL not found in configuration");
       }
-      let urlTerrainICGC = op;
+
       if (this.getSource("terrainICGC") !== undefined) {
         let lyrs = this.getStyle().layers;
         lyrs.forEach((element) => {
@@ -3169,23 +3193,55 @@ export default class Map {
         this.removeSource("terrainICGC");
       }
       if (this.getSource("terrainICGC") === undefined) {
-        if (url.includes("terrarium")) {
-          this.map.addSource("terrainICGC", {
-            type: "raster-dem",
-            tiles: [urlTerrainICGC],
-            tileSize: 512,
-            encoding: "terrarium",
-            maxzoom: 16,
-          });
-        } else {
-          this.map.addSource("terrainICGC", {
-            type: "raster-dem",
-            tiles: [urlTerrainICGC],
-            tileSize: 256,
-            maxzoom: 14,
-            minzoom: 7,
-          });
+        const terrainName =
+          terrainConfig?.name?.toLowerCase?.() || requestedTerrainLower;
+        const sourceConfig = {
+          type: "raster-dem",
+          tiles: [urlTerrainICGC],
+        };
+
+        if (terrainConfig?.encoding) {
+          sourceConfig.encoding = terrainConfig.encoding;
         }
+        if (terrainConfig?.attribution) {
+          sourceConfig.attribution = terrainConfig.attribution;
+        }
+        if (typeof terrainConfig?.tileSize === "number") {
+          sourceConfig.tileSize = terrainConfig.tileSize;
+        }
+        if (typeof terrainConfig?.maxzoom === "number") {
+          sourceConfig.maxzoom = terrainConfig.maxzoom;
+        }
+        if (typeof terrainConfig?.minzoom === "number") {
+          sourceConfig.minzoom = terrainConfig.minzoom;
+        }
+
+        if (!sourceConfig.tileSize) {
+          if (terrainName === "world30m") {
+            sourceConfig.tileSize = 512;
+          } else if (terrainName === "icgc5m") {
+            sourceConfig.tileSize = 256;
+          } else {
+            sourceConfig.tileSize =
+              sourceConfig.encoding === "terrarium" ? 512 : 256;
+          }
+        }
+        if (typeof sourceConfig.maxzoom !== "number") {
+          if (terrainName === "world30m") {
+            sourceConfig.maxzoom = 16;
+          } else {
+            sourceConfig.maxzoom =
+              sourceConfig.encoding === "terrarium" ? 16 : 14;
+          }
+        }
+        if (
+          sourceConfig.encoding !== "terrarium" &&
+          typeof sourceConfig.minzoom !== "number"
+        ) {
+          sourceConfig.minzoom = 7;
+        }
+
+        this.map.addSource("terrainICGC", sourceConfig);
       }
       this.map.setTerrain({
         source: "terrainICGC",