@yappkit/front-module-map 0.1.1 → 0.1.3

package/lib/yappkit-map.js

@@ -1,4 +1,4 @@
-import { defineComponent as h, ref as w, toRefs as u, shallowRef as f, provide as m, h as L, inject as v, onMounted as M, onUnmounted as k, watch as g, nextTick as G, computed as S } from "vue";
+import { defineComponent as u, ref as w, toRefs as h, shallowRef as f, provide as m, h as L, inject as g, onMounted as M, onUnmounted as k, watch as v, nextTick as G, computed as S } from "vue";
 import { lineString as K, length as P, along as E, point as D } from "@turf/turf";
 class j {
   constructor() {
@@ -11,7 +11,7 @@ class j {
       console.warn("No need to call MapboxDeckGLOverlay.watchLayers(). layers are already being watched");
       return;
     }
-    this.watching.layers = !0, g(e, () => {
+    this.watching.layers = !0, v(e, () => {
       this.overlay.setProps({ layers: e.value });
     }, a);
   }
@@ -27,15 +27,15 @@ class T {
       console.warn("No need to call MapboxMap.watchSources(). sources are already being watched");
       return;
     }
-    this.watching.sources = !0, g(e, (t, s) => {
-      const r = [...s || []], o = [...t || []], i = o.map((n) => n.id), c = r.map((n) => n.id), p = o.filter((n) => !c.includes(n.id)), y = r.filter((n) => !i.includes(n.id));
-      for (const n of y)
+    this.watching.sources = !0, v(e, (t, s) => {
+      const r = [...s || []], o = [...t || []], n = o.map((i) => i.id), c = r.map((i) => i.id), p = o.filter((i) => !c.includes(i.id)), y = r.filter((i) => !n.includes(i.id));
+      for (const i of y)
         G(() => {
-          this.map.removeSource(n.id);
+          this.map.removeSource(i.id);
         });
-      for (const n of p) {
-        const d = { ...n };
-        delete d.id, this.map.addSource(n.id, d);
+      for (const i of p) {
+        const d = { ...i };
+        delete d.id, this.map.addSource(i.id, d);
       }
     }, a);
   }
@@ -46,13 +46,13 @@ class T {
       console.warn("No need to call MapboxMap.watchLayers(). layers are already being watched");
       return;
     }
-    this.watching.layers = !0, g(e, (t, s) => {
-      const r = [...s || []], o = [...t || []], i = o.map((n) => n.id), c = r.map((n) => n.id), p = o.filter((n) => !c.includes(n.id)), y = r.filter((n) => !i.includes(n.id));
-      for (const n of y)
-        this.map.removeLayer(n.id);
-      for (const n of p)
+    this.watching.layers = !0, v(e, (t, s) => {
+      const r = [...s || []], o = [...t || []], n = o.map((i) => i.id), c = r.map((i) => i.id), p = o.filter((i) => !c.includes(i.id)), y = r.filter((i) => !n.includes(i.id));
+      for (const i of y)
+        this.map.removeLayer(i.id);
+      for (const i of p)
         G(() => {
-          this.map.addLayer(n);
+          this.map.addLayer(i);
         });
     }, a);
   }
@@ -70,11 +70,11 @@ class A {
     this.services = e.services || [], this.sdk = {}, this.mapboxgl = null, this.services.length && this.loadMapboxSDK();
   }
   get Map() {
-    return h(
+    return u(
       (e, { emit: a, slots: t }) => {
-        const s = w(null), { options: r, layers: o, sources: i } = u(e), c = f(null);
+        const s = w(null), { options: r, layers: o, sources: n } = h(e), c = f(null);
         return m("mapboxMap", c), this.createMap(s, r.value).then((p) => {
-          c.value = p, p.watchSources(i, r.value.watchSourcesOptions || { immediate: !0 }), p.watchLayers(o, r.value.watchLayersOptions || { immediate: !0 }), a("loaded", p);
+          c.value = p, p.watchSources(n, r.value.watchSourcesOptions || { immediate: !0 }), p.watchLayers(o, r.value.watchLayersOptions || { immediate: !0 }), a("loaded", p);
         }), () => L("div", { ref: s }, c.value ? t : []);
       },
       {
@@ -96,13 +96,13 @@ class A {
     );
   }
   get DeckGLOverlay() {
-    return h(
+    return u(
       (e, { emit: a, slots: t }) => {
-        const { options: s, layers: r } = u(e), o = v("mapboxMap");
+        const { options: s, layers: r } = h(e), o = g("mapboxMap");
         if (!o || !o.value)
           throw new Error("map should exist");
-        return o.value.setDeckGLOverlay(s.value).then((i) => {
-          i.watchLayers(r, s.value.watchLayersOptions || { immediate: !0 }), a("loaded", i);
+        return o.value.setDeckGLOverlay(s.value).then((n) => {
+          n.watchLayers(r, s.value.watchLayersOptions || { immediate: !0 }), a("loaded", n);
         }), () => {
         };
       },
@@ -126,24 +126,24 @@ class A {
   }
   get servicesLoader() {
     return {
-      datasets: () => import("./mapbox-sdk/datasets.js").then((e) => e.datasets),
-      directions: () => import("./mapbox-sdk/directions.js").then((e) => e.directions),
-      geocoding: () => import("./mapbox-sdk/geocoding.js").then((e) => e.geocoding),
-      geocodingV6: () => import("./mapbox-sdk/geocoding-v6.js").then((e) => e.geocodingV6),
-      mapMatching: () => import("./mapbox-sdk/map-matching.js").then((e) => e.mapMatching),
-      matrix: () => import("./mapbox-sdk/matrix.js").then((e) => e.matrix),
-      optimization: () => import("./mapbox-sdk/optimization.js").then((e) => e.optimization),
-      static: () => import("./mapbox-sdk/static.js").then((e) => e._static),
-      styles: () => import("./mapbox-sdk/styles.js").then((e) => e.styles),
-      tilequery: () => import("./mapbox-sdk/tilequery.js").then((e) => e.tilequery),
-      tilesets: () => import("./mapbox-sdk/tilesets.js").then((e) => e.tilesets),
-      tokens: () => import("./mapbox-sdk/tokens.js").then((e) => e.tokens),
-      uploads: () => import("./mapbox-sdk/uploads.js").then((e) => e.uploads),
-      isochrone: () => import("./mapbox-sdk/isochrone.js").then((e) => e.isochrone)
+      datasets: () => import("@mapbox/mapbox-sdk/services/datasets.js"),
+      directions: () => import("@mapbox/mapbox-sdk/services/directions.js"),
+      geocoding: () => import("@mapbox/mapbox-sdk/services/geocoding.js"),
+      geocodingV6: () => import("@mapbox/mapbox-sdk/services/geocoding-v6.js"),
+      mapMatching: () => import("@mapbox/mapbox-sdk/services/map-matching.js"),
+      matrix: () => import("@mapbox/mapbox-sdk/services/matrix.js"),
+      optimization: () => import("@mapbox/mapbox-sdk/services/optimization.js"),
+      static: () => import("@mapbox/mapbox-sdk/services/static.js"),
+      styles: () => import("@mapbox/mapbox-sdk/services/styles.js"),
+      tilequery: () => import("@mapbox/mapbox-sdk/services/tilequery.js"),
+      tilesets: () => import("@mapbox/mapbox-sdk/services/tilesets.js"),
+      tokens: () => import("@mapbox/mapbox-sdk/services/tokens.js"),
+      uploads: () => import("@mapbox/mapbox-sdk/services/uploads.js"),
+      isochrone: () => import("@mapbox/mapbox-sdk/services/isochrone.js")
     };
   }
   async loadMapboxSDK() {
-    const a = (await import("./mapbox-sdk.js").then((s) => s.index)).default({ accessToken: this.apiKey }), t = await Promise.all(this.services.map((s) => this.servicesLoader[s]().then((r) => r.default(a))));
+    const a = (await import("@mapbox/mapbox-sdk")).default({ accessToken: this.apiKey }), t = await Promise.all(this.services.map((s) => this.servicesLoader[s]().then((r) => r.default(a))));
     for (const [s, r] of this.services.entries())
       this.sdk[r] = t[s];
   }
@@ -184,7 +184,7 @@ class N {
       console.warn("No need to call GoogleMapsDeckGLOverlay.watchLayers(). layers are already being watched");
       return;
     }
-    this.watching.layers = !0, g(e, () => {
+    this.watching.layers = !0, v(e, () => {
       this.overlay.setProps({ layers: e.value });
     }, a);
   }
@@ -207,11 +207,11 @@ class x {
     this.libraries = e.libraries || ["maps"], this.version = e.version || "weekly", this.loader = null, this.sdk = {}, this.deckgl = null;
   }
   get Map() {
-    return h(
+    return u(
       (e, { emit: a, slots: t }) => {
-        const s = w(null), { options: r } = u(e), o = f(null);
-        return m("googleMapsMap", o), this.createMap(s, r.value).then((i) => {
-          o.value = i, a("loaded", i);
+        const s = w(null), { options: r } = h(e), o = f(null);
+        return m("googleMapsMap", o), this.createMap(s, r.value).then((n) => {
+          o.value = n, a("loaded", n);
         }), () => L("div", { ref: s }, o.value ? t : []);
       },
       {
@@ -225,13 +225,13 @@ class x {
     );
   }
   get DeckGLOverlay() {
-    return h(
+    return u(
       (e, { emit: a, slots: t }) => {
-        const { options: s, layers: r } = u(e), o = v("googleMapsMap");
+        const { options: s, layers: r } = h(e), o = g("googleMapsMap");
         if (!o || !o.value)
           throw new Error("map should exist");
-        return o.value.setDeckGLOverlay(s.value).then((i) => {
-          i.watchLayers(r, s.value.watchLayersOptions || { immediate: !0 }), a("loaded", i);
+        return o.value.setDeckGLOverlay(s.value).then((n) => {
+          n.watchLayers(r, s.value.watchLayersOptions || { immediate: !0 }), a("loaded", n);
         }), () => {
         };
       },
@@ -250,9 +250,9 @@ class x {
     );
   }
   get DeckGL3DTileLayer() {
-    return h(
+    return u(
       (e, { emit: a, slots: t }) => {
-        const { options: s } = u(e), r = v("deckGLPrependLayers");
+        const { options: s } = h(e), r = g("deckGLPrependLayers");
         if (!r || !r.value)
           throw new Error("deckGLPrependLayers should exist");
         const o = w("");
@@ -262,10 +262,10 @@ class x {
             c
           ];
         });
-        const i = v("deckGLAppendVNodeFn");
-        if (!i)
+        const n = g("deckGLAppendVNodeFn");
+        if (!n)
           throw new Error("deckGLAppendVNodeFn should exist");
-        return t.appendMap && i.value.push(() => t.appendMap({ credits: o.value })), () => {
+        return t.appendMap && n.value.push(() => t.appendMap({ credits: o.value })), () => {
         };
       },
       {
@@ -329,8 +329,8 @@ class x {
         e && (t.options.onTraversalComplete = (s) => {
           const r = /* @__PURE__ */ new Set();
           return s.forEach((o) => {
-            const { copyright: i } = o.content.gltf.asset;
-            i.split(";").forEach(r.add, r), e.value = [...r].join("; ");
+            const { copyright: n } = o.content.gltf.asset;
+            n.split(";").forEach(r.add, r), e.value = [...r].join("; ");
           }), s;
         });
       },
@@ -350,7 +350,7 @@ class V {
       console.warn("No need to call DeckGLMap.watchLayers(). layers are already being watched");
       return;
     }
-    this.watching.layers = !0, g(e, () => {
+    this.watching.layers = !0, v(e, () => {
       this.map.setProps({ layers: e.value });
     }, a);
   }
@@ -360,21 +360,21 @@ class O {
     this.deckgl = null;
   }
   get Map() {
-    return h(
+    return u(
       (e, { emit: a, attrs: t, slots: s }) => {
-        const r = w(null), { options: o, layers: i } = u(e), c = f(null);
+        const r = w(null), { options: o, layers: n } = h(e), c = f(null);
         m("deckGLMap", c);
         const p = f([]);
         m("deckGLPrependLayers", p);
         const y = S(() => [
           ...p.value,
-          ...i.value
+          ...n.value
         ]);
         this.createMap(r, o.value).then((d) => {
           c.value = d, d.watchLayers(y, o.value.watchLayersOptions || { immediate: !0 }), a("loaded", d);
         });
-        const n = w([]);
-        return m("deckGLAppendVNodeFn", n), () => [L("div", { ...t, ref: r }, c.value ? s : []), n.value.map((d) => d())];
+        const i = w([]);
+        return m("deckGLAppendVNodeFn", i), () => [L("div", { ...t, ref: r }, c.value ? s : []), i.value.map((d) => d())];
       },
       {
         props: {
@@ -424,8 +424,8 @@ function b(l) {
 function F({ origin: l, destination: e, step: a = 100 }) {
   const t = K([l, e]), s = P(t), r = [];
   for (let o = 0; o < s; o += s / a) {
-    const i = E(t, o);
-    r.push(i.geometry.coordinates);
+    const n = E(t, o);
+    r.push(n.geometry.coordinates);
   }
   return r.push(e), t.geometry.coordinates = b(r), t;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yappkit/front-module-map",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "@yappkit/front module for map",
   "module": "./lib/yappkit-map.js",
   "main": "./lib/yappkit-map.js",
@@ -15,9 +15,6 @@
     "./mapboxgl.css": {
       "import": "./lib/mapbox-gl.css"
     },
-    "./mapboxsdk": {
-      "import": "./lib/mapbox-sdk.js"
-    },
     "./searoute": {
       "import": "./lib/searoute.js"
     },
@@ -39,10 +36,11 @@
     "@deck.gl/google-maps": "^8.9.34",
     "@deck.gl/mapbox": "^8.9.34",
     "@googlemaps/js-api-loader": "^1.16.2",
+    "@mapbox/mapbox-sdk": "^0.15.3",
     "@turf/turf": "^6.5.0",
     "deck.gl": "^8.9.34",
     "geojson-path-finder": "2.0.2",
     "maplibre-gl": "^4.0.0",
-    "vue": "^3.4.15"
+    "vue": "^3.4.18"
   }
 }

package/lib/_commonjsHelpers.js

@@ -1,8 +0,0 @@
-var o = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
-function l(e) {
-  return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
-}
-export {
-  o as commonjsGlobal,
-  l as getDefaultExportFromCjs
-};