add map.SetSky() when ORTO3D

OpenICGC · Jul 8, 2024 · e6de1da · e6de1da
1 parent 32e3d27
commit e6de1da
Show file tree

Hide file tree

Showing 12 changed files with 2,775 additions and 21 deletions.
diff --git a/dist/index-BFMDzCuG.mjs → dist/index-DScdZFZm.mjs b/dist/index-BFMDzCuG.mjs → dist/index-DScdZFZm.mjs
@@ -58966,7 +58966,7 @@ function(n) {
 */
 function(n) {
   function e() {
-    return (Rn.canvg ? Promise.resolve(Rn.canvg) : import("./index.es-BWyxJuJN-C4muY-Eb.mjs")).catch(function(t) {
+    return (Rn.canvg ? Promise.resolve(Rn.canvg) : import("./index.es-BWyxJuJN-B8aWB3kW.mjs")).catch(function(t) {
       return Promise.reject(new Error("Could not load canvg: " + t));
     }).then(function(t) {
       return t.default ? t.default : t;
@@ -62308,6 +62308,7 @@ const xq = /* @__PURE__ */ Ap(bq), wq = {
   TOPO: "https://geoserveis.icgc.cat/contextmaps/icgc_mapa_estandard_general.json",
   ORTO: "https://geoserveis.icgc.cat/contextmaps/icgc_orto_estandard.json",
   ORTO3D: "https://tilemaps.icgc.cat/cdn/styles/icgc_orto_3d.json",
+  ORTOHYBRID: "https://geoserveis.icgc.cat/contextmaps/icgc_orto_hibrida.json",
   ADMIN: "https://geoserveis.icgc.cat/contextmaps/icgc_delimitacio_limits_administratius.json",
   DARK: "https://geoserveis.icgc.cat/contextmaps/icgc_mapa_base_fosc.json",
   LIGHT: "https://geoserveis.icgc.cat/contextmaps/icgc_mapa_base_gris.json",
@@ -62318,6 +62319,7 @@ const xq = /* @__PURE__ */ Ap(bq), wq = {
 }, Sq = {
   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",
+    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",
     ortofotoColor2020: "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_2020",
@@ -62345,6 +62347,7 @@ const xq = /* @__PURE__ */ Ap(bq), wq = {
     ortofotoBlancINegre1945: "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_blanc_i_negre_1945",
     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",
+    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",
     ortofotoInfraroig2020: "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_2020",
@@ -64778,11 +64781,11 @@ let Ah, $f, Sr, gi, oW = class {
   setSky(e) {
     try {
       e === void 0 && (this.map.options.style.includes("orto") && (e = {
-        "sky-color": "#37709e",
+        "sky-color": "#86bbd5",
         "sky-horizon-blend": 0.3,
-        "horizon-color": "#e1e3e3",
-        "horizon-fog-blend": 0.9,
-        "fog-ground-blend": 0.85,
+        "horizon-color": "#ffffff33",
+        "horizon-fog-blend": 0.1,
+        "fog-ground-blend": 0.75,
         "fog-color": "#c5d6d6"
       }), this.map.options.style.includes("mapa_estandard_general") && (e = {
         "sky-color": "#a5f0f0",
@@ -66624,7 +66627,14 @@ let Ah, $f, Sr, gi, oW = class {
         const r = this._createCitiesMapboxLayer();
         this.map.getLayer(gi.map3dOptions.layerId3d) || (this.map.addLayer(r, gi.map3dOptions.layerIdOrder), this.map.setLayerZoomRange(gi.map3dOptions.layerId3d, gi.map3dOptions.minZoomRange, gi.map3dOptions.maxZoomRange), r.deck.setProps({
           effects: [i]
-        }), this._raiseText3DStyle());
+        }), this._raiseText3DStyle()), this.map.setSky({
+          "sky-color": "#86bbd5",
+          "sky-horizon-blend": 0.3,
+          "horizon-color": "#ffffff33",
+          "horizon-fog-blend": 0.1,
+          "fog-ground-blend": 0.75,
+          "fog-color": "#c5d6d6"
+        });
       } else
         this.map.getLayer(gi.map3dOptions.layerId3d) && (this.map.removeLayer(gi.map3dOptions.layerId3d), this.map.setTerrain(null));
     } catch (t) {

diff --git a/dist/index.es-BWyxJuJN-C4muY-Eb.mjs → dist/index.es-BWyxJuJN-B8aWB3kW.mjs b/dist/index.es-BWyxJuJN-C4muY-Eb.mjs → dist/index.es-BWyxJuJN-B8aWB3kW.mjs
@@ -1,4 +1,4 @@
-import { p as Ui } from "./index-BFMDzCuG.mjs";
+import { p as Ui } from "./index-DScdZFZm.mjs";
 var Zt = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
 function No(i) {
   return i && i.__esModule && Object.prototype.hasOwnProperty.call(i, "default") ? i.default : i;

diff --git a/dist/mapicgc-gl.css b/dist/mapicgc-gl.css
@@ -685,6 +685,48 @@ a.maplibregl-ctrl-logo.maplibregl-compact {
   width: 100% !important;
   z-index: 99999;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* CUSTOM */
+
 .basemap-group {
   font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif;
   font-weight: 600;

diff --git a/dist/mapicgc-gl.js b/dist/mapicgc-gl.js
diff --git a/dist/mapicgc-gl.mjs b/dist/mapicgc-gl.mjs
@@ -1,4 +1,4 @@
-import { C as p, a as s, M as r } from "./index-BFMDzCuG.mjs";
+import { C as p, a as s, M as r } from "./index-DScdZFZm.mjs";
 export {
   p as CompareMaps,
   s as Config,

diff --git a/dist/mapicgc-gl.umd.js b/dist/mapicgc-gl.umd.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mapicgc-gl-js",
   "homepage": "https://openicgc.github.io/mapicgc-doc/",
-  "version": "0.0.84",
+  "version": "0.0.85",
   "description": "mapicgc-gl-js library",
   "author": "Institut Cartogràfic i Geològic de Catalunya",
   "license": "BSD-3-Clause",

diff --git a/public/mapicgc-gl.css b/public/mapicgc-gl.css
@@ -685,6 +685,48 @@ a.maplibregl-ctrl-logo.maplibregl-compact {
   width: 100% !important;
   z-index: 99999;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/* CUSTOM */
+
 .basemap-group {
   font: 12px/20px 'Helvetica Neue', Arial, Helvetica, sans-serif;
   font-weight: 600;

diff --git a/src/constants/ConfigICGC.js b/src/constants/ConfigICGC.js
@@ -9,7 +9,7 @@ class Config {
     try {
       const response = await axios.get(urlConfigICGC, { timeout: timeOut });
       if (response.data) {
-      
+
         return response.data;
       } else {
         console.log("Resposta sense dades:", response);

diff --git a/src/map/Map.js b/src/map/Map.js
@@ -934,12 +934,12 @@ setSky(options) {
     if (options === undefined) {
       if (this.map.options.style.includes("orto")) {
         options = {
-          "sky-color": "#37709e",
-          "sky-horizon-blend": 0.3,
-          "horizon-color": "#e1e3e3",
-          "horizon-fog-blend": 0.9,
-          "fog-ground-blend": 0.85,
-          "fog-color": "#c5d6d6",
+          'sky-color': '#86bbd5',
+          'sky-horizon-blend': 0.3,
+          'horizon-color': '#ffffff33',
+          'horizon-fog-blend': 0.1,
+          'fog-ground-blend': 0.75,
+          'fog-color': '#c5d6d6'
         };
       }
       if (this.map.options.style.includes("mapa_estandard_general")) {
@@ -3217,6 +3217,14 @@ setSky(options) {
           });
           this._raiseText3DStyle();
         }
+        this.map.setSky({
+          'sky-color': '#86bbd5',
+          'sky-horizon-blend': 0.3,
+          'horizon-color': '#ffffff33',
+          'horizon-fog-blend': 0.1,
+          'fog-ground-blend': 0.75,
+          'fog-color': '#c5d6d6'
+        });
       } else {
         if (this.map.getLayer(defaultOptions.map3dOptions.layerId3d)) {
           this.map.removeLayer(defaultOptions.map3dOptions.layerId3d);

diff --git a/src/mapicgc-config.json b/src/mapicgc-config.json
@@ -830,6 +830,7 @@
     "TOPO": "https://geoserveis.icgc.cat/contextmaps/icgc_mapa_estandard_general.json",
     "ORTO": "https://geoserveis.icgc.cat/contextmaps/icgc_orto_estandard.json",
     "ORTO3D": "https://tilemaps.icgc.cat/cdn/styles/icgc_orto_3d.json",
+    "ORTOHYBRID": "https://geoserveis.icgc.cat/contextmaps/icgc_orto_hibrida.json",
     "ADMIN": "https://geoserveis.icgc.cat/contextmaps/icgc_delimitacio_limits_administratius.json",
     "DARK": "https://geoserveis.icgc.cat/contextmaps/icgc_mapa_base_fosc.json",
     "LIGHT": "https://geoserveis.icgc.cat/contextmaps/icgc_mapa_base_gris.json",
@@ -842,6 +843,7 @@
   "Layers": {
     "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",
+     "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",
       "ortofotoColor2020": "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_2020",
@@ -869,6 +871,7 @@
       "ortofotoBlancINegre1945": "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_blanc_i_negre_1945",
       "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",
+      "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",
       "ortofotoInfraroig2020": "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_2020",

diff --git a/test/exemples/addMapStyle.html b/test/exemples/addMapStyle.html
@@ -27,10 +27,10 @@
     <script>
         async function initMap() {
             const data = await mapicgcgl.Config.getConfigICGC();
-            console.log('d', data)
+
             const map = new mapicgcgl.Map({
                 container: 'map',
-                style: data.Styles.ORTO,
+                style: data.Styles.ORTO3D,
                 center: [1.1464, 41.706],
                 zoom: 7.4,
                 hash: true,