fix build errors

OpenICGC · May 6, 2024 · 7e02462 · 7e02462
1 parent ab93304
commit 7e02462
Show file tree

Hide file tree

Showing 32 changed files with 79,829 additions and 142 deletions.
diff --git a/dist/html2canvas.esm-DbilGY6A-DB3xAFLF.mjs b/dist/html2canvas.esm-DbilGY6A-DB3xAFLF.mjs
diff --git a/dist/index-7vA8gJhT.mjs b/dist/index-7vA8gJhT.mjs
diff --git a/dist/index.es-BR8y8uSW-DmctbIix.mjs b/dist/index.es-BR8y8uSW-DmctbIix.mjs
diff --git a/dist/mapicgc-gl.js b/dist/mapicgc-gl.js
diff --git a/dist/mapicgc-gl.mjs b/dist/mapicgc-gl.mjs
@@ -0,0 +1,6 @@
+import { C as p, a as s, M as r } from "./index-7vA8gJhT.mjs";
+export {
+  p as CompareMaps,
+  s as Config,
+  r as Map
+};
diff --git a/dist/mapicgc-gl.umd.js b/dist/mapicgc-gl.umd.js
diff --git a/dist/purify.es-C-d0AVPf-BZqXIm-R.mjs b/dist/purify.es-C-d0AVPf-BZqXIm-R.mjs
diff --git a/nodeDeploy.js b/nodeDeploy.js
@@ -13,7 +13,7 @@ const renamedFilePath = `${process.env.FTP_LOCA_PATH}${process.env.FILE_JS}`;
       console.error('Error copying file:', err);
     } else {
       console.log('File copied and renamed successfully.');
-      deploy(process.env.FTP_HOST1)
+     deploy(process.env.FTP_HOST1)
       deploy(process.env.FTP_HOST2)
     }
   });

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,10 +1,11 @@
 {
   "name": "mapicgc-gl-js",
-  "homepage": "https://autogitlab.icgc.local/geostarters/icgc/mapicgc/mapicgc-gl-js",
-  "version": "0.0.65",
+  "homepage": "https://openicgc.github.io/mapicgc-doc/",
+  "version": "0.0.76",
   "description": "mapicgc-gl-js library",
   "author": "Institut Cartogràfic i Geològic de Catalunya",
   "license": "BSD-3-Clause",
+  "type": "commonjs",
   "keywords": [
     "map",
     "js",
@@ -23,12 +24,12 @@
       "email": "geostart@icgc.cat"
     }
   ],
-  "main": "dist/mapicgc-gl.js",
+  "main": "dist/mapicgc-gl.mjs",
   "module": "dist/mapicgc-gl.js",
   "exports": {
     ".": {
-      "import": "./dist/mapicgc-gl.js",
-      "require": "./dist/mapicgc-gl.js"
+      "import": "./dist/mapicgc-gl.mjs",
+      "require": "./dist/mapicgc-gl.mjs"
     }
   },
   "scripts": {

diff --git a/src/constants/ConfigICGC.js b/src/constants/ConfigICGC.js
@@ -4,26 +4,28 @@ import mapicgcConfig from "../mapicgc-config.json";
 const urlConfigICGC = "https://tilemaps.icgc.cat/cdn/configs/mapicgc-config.json";
 const timeOut = 5000;
 
-async function Config() {
-  try {
-    const response = await axios.get(urlConfigICGC, { timeout: timeOut });
-    if (response.data) {
-      return response.data;
-    } else {
-      console.log("Resposta sense dades:", response);
+class Config {
+  static async getConfigICGC() {
+    try {
+      const response = await axios.get(urlConfigICGC, { timeout: timeOut });
+      if (response.data) {
+        return response.data;
+      } else {
+        console.log("Resposta sense dades:", response);
+        return mapicgcConfig;
+      }
+    } catch (error) {
+      if (error.response) {
+        console.error("Error de resposta:", error.response.data);
+        console.error("Codi d'estat:", error.response.status);
+      } else if (error.request) {
+        console.error("No s'ha rebut resposta del servidor:", error.request);
+      } else {
+        console.error("Error:", error.message);
+      }
       return mapicgcConfig;
     }
-  } catch (error) {
-    if (error.response) {
-      console.error("Error de resposta:", error.response.data);
-      console.error("Codi d'estat:", error.response.status);
-    } else if (error.request) {
-      console.error("No s'ha rebut resposta del servidor:", error.request);
-    } else {
-      console.error("Error:", error.message);
-    }
-    return mapicgcConfig;
   }
 }
 
-export default Config();
+export default Config;
diff --git a/src/index.js b/src/index.js
@@ -1,9 +1,5 @@
 import Map from "./map/Map";
 import CompareMaps from "./plugins/CompareMaps";
-import ConfigICGC from "./constants/ConfigICGC";
+import Config from "./constants/ConfigICGC";
 
-
-
-
-
-export { Map, CompareMaps,ConfigICGC };
+export { Map, CompareMaps,Config };
diff --git a/src/map/Map.js b/src/map/Map.js
@@ -1,5 +1,6 @@
 import maplibregl from "maplibre-gl";
 import "../../public/mapicgc-gl.css";
+import "@watergis/maplibre-gl-export/dist/maplibre-gl-export.css";
 import { deserialize } from "flatgeobuf/lib/mjs/geojson.js";
 import Pitch3DToggleControl from "../controls/Toggle3DControl.js";
 import { MapboxLayer } from "@deck.gl/mapbox";
@@ -13,13 +14,13 @@ import {
   Format,
   DPI,
 } from "@watergis/maplibre-gl-export";
-import "@watergis/maplibre-gl-export/dist/maplibre-gl-export.css";
 import MaplibreGeocoder from "@maplibre/maplibre-gl-geocoder";
 import LogoControl from "../controls/LogoControl.js";
 import LegendControl from "../controls/LegendControl.js";
 import MouseCoordinatesControl from "../controls/MouseCoordinatesControl.js";
-import ConfigICGC from "../constants/ConfigICGC.js";
+import Config from "../constants/ConfigICGC.js";
 import Legends from "../constants/Legends.js";
+import mapicgcConfig from "../mapicgc-config.json";
 
 const ORDER_LAYER_TOP = "top";
 const ORDER_LAYER_LINE = "lines";
@@ -31,7 +32,8 @@ export default class Map {
    * @param {Object} options - Options to initialize the map.
    */
   constructor(options) {
-    ConfigICGC.then((data) => {
+
+    Config.getConfigICGC().then((data) => {
       Styles = { ...data.Styles };
       Layers = { ...data.Layers };
       Terrains = { ...data.Terrains };

diff --git a/test/exemples/addBasemap.html b/test/exemples/addBasemap.html
@@ -60,10 +60,9 @@
     <div id="map"></div>
     <!-- <div id="basemap-group" class="basemap-group"></div> -->
     <script>
-      // add basemap
 
       async function initMap() {
-        const data = await mapicgcgl.ConfigICGC;
+        const data = await  mapicgcgl.Config.getConfigICGC();
         const map = new mapicgcgl.Map({
           container: "map",
           style: data.Styles.TOPO, // <-- add style basemap here

diff --git a/test/exemples/addCompare.html b/test/exemples/addCompare.html
@@ -39,7 +39,7 @@
 
   <script>
     async function initMap() {
-      const data = await mapicgcgl.ConfigICGC;
+      const data = await mapicgcgl.Config.getConfigICGC();;
       const map1 = new mapicgcgl.Map({
         container: "before",
         style: data.Styles.ORTO,

diff --git a/test/exemples/addControl.html b/test/exemples/addControl.html
@@ -30,7 +30,7 @@
 
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/addFeatureQuery.html b/test/exemples/addFeatureQuery.html
@@ -31,7 +31,7 @@
 
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/addGeocoderICGC.html b/test/exemples/addGeocoderICGC.html
@@ -23,7 +23,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/addICGCTerrain.html b/test/exemples/addICGCTerrain.html
@@ -24,7 +24,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.ORTO,

diff --git a/test/exemples/addImageLayerICGC.html b/test/exemples/addImageLayerICGC.html
@@ -26,7 +26,7 @@
   <div id="map" class="map"></div>
   <script>
     async function initMap() {
-      const data = await mapicgcgl.ConfigICGC;
+      const data = await mapicgcgl.Config.getConfigICGC();;
       const map = new mapicgcgl.Map({
         container: "map",
         style: data.Styles.TOPO,

diff --git a/test/exemples/addLayerGeojson.html b/test/exemples/addLayerGeojson.html
@@ -26,7 +26,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/addLayerTree.html b/test/exemples/addLayerTree.html
@@ -27,7 +27,7 @@
     <nav id="filter-group" class="filter-group"></nav>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/addLogo.html b/test/exemples/addLogo.html
@@ -31,7 +31,7 @@
   <div id="logos"></div>
   <script>
     async function initMap() {
-      const data = await mapicgcgl.ConfigICGC;
+      const data = await mapicgcgl.Config.getConfigICGC();;
       const map = new mapicgcgl.Map({
         container: "map",
         style: data.Styles.TOPO,

diff --git a/test/exemples/addMapStyle.html b/test/exemples/addMapStyle.html
@@ -26,7 +26,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: 'map',
                 style: data.Styles.ORTO,

diff --git a/test/exemples/addMarker.html b/test/exemples/addMarker.html
@@ -26,7 +26,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/addMouseCoordinateControl.html b/test/exemples/addMouseCoordinateControl.html
@@ -23,7 +23,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/addVectorLayerICGC.html b/test/exemples/addVectorLayerICGC.html
@@ -27,7 +27,7 @@
     <div id="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.TOPO,

diff --git a/test/exemples/advancedExemple.html b/test/exemples/advancedExemple.html
@@ -47,7 +47,7 @@
     <nav id="menu-group" class="filter-group"></nav>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.ORTO,

diff --git a/test/exemples/fetchData.html b/test/exemples/fetchData.html
@@ -28,7 +28,7 @@
     <div id="basemap-group" class="basemap-group"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: "map",
                 style: data.Styles.LIGHT,

diff --git a/test/exemples/fetchDataAndMenu.html b/test/exemples/fetchDataAndMenu.html
@@ -38,7 +38,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
- const data = await mapicgcgl.ConfigICGC;
+ const data = await mapicgcgl.Config.getConfigICGC();;
         const map = new mapicgcgl.Map({
             container: "map",
             style: data.Styles.TOPO,

diff --git a/test/exemples/styleOrto3D.html b/test/exemples/styleOrto3D.html
@@ -54,7 +54,7 @@
     <div id="map" class="map"></div>
     <script>
         async function initMap() {
-            const data = await mapicgcgl.ConfigICGC;
+            const data = await mapicgcgl.Config.getConfigICGC();;
             const map = new mapicgcgl.Map({
                 container: 'map',
                 style: data.Styles.ORTO3D,

diff --git a/vite.config.mjs b/vite.config.mjs
@@ -11,7 +11,7 @@ export default defineConfig({
     lib: {
       entry: 'src/index.js',
       fileName: 'mapicgc-gl',
-      formats:['umd'],
+      formats: ['es','umd'],
       name: 'mapicgcgl',
     },
     rollupOptions: {