@mapka/maplibre-gl-sdk 0.10.0 → 0.12.0

package/lib/map.d.ts

@@ -26,9 +26,10 @@ export declare class MapkaMap extends maplibregl.Map {
     setStyle(style: string | StyleSpecification, options?: StyleSwapOptions & StyleOptions): this;
     addMarkers(markers: MapkaMarkerOptions[]): void;
     updateMarkers(markers: MapkaMarkerOptions[]): void;
-    clearMarkers(): void;
+    removeMarkers(): void;
     openPopup(popup: MapkaPopupOptions, id?: string): string;
     closePopup(id: string): void;
     updatePopup(popup: MapkaPopupOptions, id?: string): void;
+    removePopups(): void;
 }
 //# sourceMappingURL=map.d.ts.map

package/lib/map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../src/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAgB1C,OAAO,KAAK,EACV,MAAM,EACN,KAAK,EAGL,UAAU,EAEV,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC;CAChC;AA0BD,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qBAAa,QAAS,SAAQ,UAAU,CAAC,GAAG;IAC1C,MAAM,CAAC,GAAG,EAAE,MAAM,CAAU;IAErB,OAAO,EAAE,cAAc,EAAE,CAAM;IAE/B,SAAS,EAAE,MAAM,CAAK;IACtB,MAAM,EAAE,aAAa,EAAE,CAAM;gBAEjB,EAAE,gBAAgB,EAAE,MAAM,EAAE,SAAa,EAAE,GAAG,OAAO,EAAE,EAAE,eAAe;IAoBpF,QAAQ,CACb,KAAK,EAAE,MAAM,GAAG,kBAAkB,EAClC,OAAO,GAAE,gBAAgB,GAAG,YAAiB;IAexC,UAAU,CAAC,OAAO,EAAE,kBAAkB,EAAE;IAIxC,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE;IAI3C,YAAY;IAIZ,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAE,MAA0B;IAIlE,UAAU,CAAC,EAAE,EAAE,MAAM;IAIrB,WAAW,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAE,MAA0B;CAG5E"}
+{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../src/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAiB1C,OAAO,KAAK,EACV,MAAM,EACN,KAAK,EAGL,UAAU,EAEV,gBAAgB,EAChB,YAAY,EACZ,kBAAkB,EACnB,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,MAAM,WAAW,eAAgB,SAAQ,UAAU;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC;CAChC;AA0BD,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,WAAW,CAAC;IACvB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qBAAa,QAAS,SAAQ,UAAU,CAAC,GAAG;IAC1C,MAAM,CAAC,GAAG,EAAE,MAAM,CAAU;IAErB,OAAO,EAAE,cAAc,EAAE,CAAM;IAE/B,SAAS,EAAE,MAAM,CAAK;IACtB,MAAM,EAAE,aAAa,EAAE,CAAM;gBAEjB,EAAE,gBAAgB,EAAE,MAAM,EAAE,SAAa,EAAE,GAAG,OAAO,EAAE,EAAE,eAAe;IAoBpF,QAAQ,CACb,KAAK,EAAE,MAAM,GAAG,kBAAkB,EAClC,OAAO,GAAE,gBAAgB,GAAG,YAAiB;IAexC,UAAU,CAAC,OAAO,EAAE,kBAAkB,EAAE;IAIxC,aAAa,CAAC,OAAO,EAAE,kBAAkB,EAAE;IAI3C,aAAa;IAIb,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAE,MAA0B;IAIlE,UAAU,CAAC,EAAE,EAAE,MAAM;IAIrB,WAAW,CAAC,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAE,MAA0B;IAIpE,YAAY;CAGpB"}

package/lib/map.js

@@ -1,7 +1,7 @@
 import * as maplibregl from "maplibre-gl";
 import { loadLayersIcons } from "./modules/icons.js";
-import { closeOnMapClickPopups, closePopupsById, getPopupId, openPopup, updatePopup, } from "./modules/popup.js";
-import { addMarkers, addStyleDiffMarkers, addStyleMarkers, clearMarkers, updateMarkers, } from "./modules/markers.js";
+import { closeOnMapClickPopups, closePopupsById, getPopupId, openPopup, removePopups, updatePopup, } from "./modules/popup.js";
+import { addMarkers, addStyleDiffMarkers, addStyleMarkers, removeMarkers, updateMarkers, } from "./modules/markers.js";
 const noopTransformRequest = (url) => {
     return {
         url,
@@ -59,8 +59,8 @@ export class MapkaMap extends maplibregl.Map {
     updateMarkers(markers) {
         updateMarkers(this, markers);
     }
-    clearMarkers() {
-        clearMarkers(this);
+    removeMarkers() {
+        removeMarkers(this);
     }
     openPopup(popup, id = getPopupId(popup)) {
         return openPopup(this, popup, id);
@@ -71,4 +71,7 @@ export class MapkaMap extends maplibregl.Map {
     updatePopup(popup, id = getPopupId(popup)) {
         return updatePopup(this, popup, id);
     }
+    removePopups() {
+        removePopups(this);
+    }
 }

package/lib/modules/markers.d.ts

@@ -7,7 +7,7 @@ export declare function getMarkerId(marker: {
 export declare function addMarkers(currentMap: MapkaMap, markersOptions: MapkaMarkerOptions[]): void;
 export declare function removeMarkersByIds(map: MapkaMap, ids: string[]): void;
 export declare function updateMarkers(map: MapkaMap, markersOptions: MapkaMarkerOptions[]): void;
-export declare function clearMarkers(map: MapkaMap): void;
+export declare function removeMarkers(map: MapkaMap): void;
 export declare function addStyleMarkers(map: MapkaMap): void;
 export declare function addStyleDiffMarkers(map: MapkaMap, next: StyleSpecification): void;
 //# sourceMappingURL=markers.d.ts.map

package/lib/modules/markers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../../src/modules/markers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,WAAW,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAqB,MAAM,oBAAoB,CAAC;AAkBhF,wBAAgB,WAAW,CAAC,MAAM,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,UAElD;AA4ED,wBAAgB,UAAU,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAiBpF;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,QAK9D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAKhF;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,QAKzC;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,QAK5C;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,kBAAkB,QAG1E"}
+{"version":3,"file":"markers.d.ts","sourceRoot":"","sources":["../../src/modules/markers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAU,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAqB,MAAM,oBAAoB,CAAC;AAkBhF,wBAAgB,WAAW,CAAC,MAAM,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,UAElD;AA4ED,wBAAgB,UAAU,CAAC,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAcpF;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE,QAK9D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,QAKhF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,QAK1C;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,QAK5C;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,kBAAkB,QAG1E"}

package/lib/modules/markers.js

@@ -86,11 +86,10 @@ function setupMarkerPopupListeners(map, marker, popup, options) {
     }
 }
 export function addMarkers(currentMap, markersOptions) {
-    const markers = [];
     for (const markerOptions of markersOptions) {
         const { lngLat, popup, ...options } = markerOptions;
         const newMarker = new Marker(options).setLngLat(lngLat).addTo(currentMap);
-        markers.push({
+        currentMap.markers.push({
             id: getMarkerId(markerOptions),
             options: markerOptions,
             marker: newMarker,
@@ -99,7 +98,6 @@ export function addMarkers(currentMap, markersOptions) {
             continue;
         setupMarkerPopupListeners(currentMap, newMarker, popup, markerOptions);
     }
-    currentMap.markers.push(...markers);
 }
 export function removeMarkersByIds(map, ids) {
     const removedMarkers = remove(map.markers, (marker) => ids.includes(marker.id));
@@ -112,7 +110,7 @@ export function updateMarkers(map, markersOptions) {
     removeMarkersByIds(map, markersIds);
     addMarkers(map, markersOptions);
 }
-export function clearMarkers(map) {
+export function removeMarkers(map) {
     for (const marker of map.markers) {
         marker.marker.remove();
     }
@@ -121,9 +119,9 @@ export function clearMarkers(map) {
 export function addStyleMarkers(map) {
     const style = map.getStyle();
     const markers = get(style, "metadata.mapka.markers", []);
-    return addMarkers(map, markers);
+    addMarkers(map, markers);
 }
 export function addStyleDiffMarkers(map, next) {
     const markers = get(next, "metadata.mapka.markers", []);
-    return addMarkers(map, markers);
+    addMarkers(map, markers);
 }

package/lib/modules/popup.d.ts

@@ -11,4 +11,5 @@ export declare function updatePopupBaseOptions(popup: Popup, options: MapkaPopup
 export declare function updatePopup(map: MapkaMap, { content, ...newOptions }: MapkaPopupOptions, id: string): void;
 export declare function closeOnMapClickPopups(map: MapkaMap): void;
 export declare function closePopupsById(map: MapkaMap, id: string): void;
+export declare function removePopups(map: MapkaMap): void;
 //# sourceMappingURL=popup.d.ts.map

package/lib/modules/popup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"popup.d.ts","sourceRoot":"","sources":["../../src/modules/popup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAG1C,wBAAgB,UAAU,CAAC,KAAK,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,UAEhD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,cAEnD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,QAM7C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,UAyD9E;AAID,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,SAY/C;AAED,wBAAgB,WAAW,CACzB,GAAG,EAAE,QAAQ,EACb,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,EAAE,iBAAiB,EAC7C,EAAE,EAAE,MAAM,QA6BX;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,QAAQ,QAQlD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,QAMxD"}
+{"version":3,"file":"popup.d.ts","sourceRoot":"","sources":["../../src/modules/popup.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIpC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAG1C,wBAAgB,UAAU,CAAC,KAAK,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,UAEhD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,cAEnD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,QAAQ,QAM7C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,UAyD9E;AAID,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,iBAAiB,EAC1B,UAAU,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,SAY/C;AAED,wBAAgB,WAAW,CACzB,GAAG,EAAE,QAAQ,EACb,EAAE,OAAO,EAAE,GAAG,UAAU,EAAE,EAAE,iBAAiB,EAC7C,EAAE,EAAE,MAAM,QA6BX;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,QAAQ,QAQlD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,QAMxD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,QAAQ,QAMzC"}

package/lib/modules/popup.js

@@ -122,3 +122,10 @@ export function closePopupsById(map, id) {
         popup.container.remove();
     }
 }
+export function removePopups(map) {
+    for (const popup of map.popups) {
+        popup.popup.remove();
+        popup.container.remove();
+    }
+    map.popups = [];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapka/maplibre-gl-sdk",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "type": "module",
   "description": "Mapka JS SDK",
   "sideEffects": false,
@@ -34,5 +34,5 @@
     "!**/__tests__/",
     "!lib/buildInfo.json"
   ],
-  "gitHead": "7b546e7df880f9e9c0ee676888913ec4601a46d7"
+  "gitHead": "b69a4f7130ea4d7d9d6c3a16ef26308cb39e1555"
 }

package/src/map.ts

@@ -5,13 +5,14 @@ import {
   closePopupsById,
   getPopupId,
   openPopup,
+  removePopups,
   updatePopup,
 } from "./modules/popup.js";
 import {
   addMarkers,
   addStyleDiffMarkers,
   addStyleMarkers,
-  clearMarkers,
+  removeMarkers,
   updateMarkers,
 } from "./modules/markers.js";
 import type {
@@ -124,8 +125,8 @@ export class MapkaMap extends maplibregl.Map {
     updateMarkers(this, markers);
   }
 
-  public clearMarkers() {
-    clearMarkers(this);
+  public removeMarkers() {
+    removeMarkers(this);
   }
 
   public openPopup(popup: MapkaPopupOptions, id: string = getPopupId(popup)) {
@@ -139,4 +140,8 @@ export class MapkaMap extends maplibregl.Map {
   public updatePopup(popup: MapkaPopupOptions, id: string = getPopupId(popup)) {
     return updatePopup(this, popup, id);
   }
+
+  public removePopups() {
+    removePopups(this);
+  }
 }

package/src/modules/markers.ts

@@ -2,7 +2,7 @@ import { Marker } from "maplibre-gl";
 import { get } from "es-toolkit/compat";
 import { getPopupId } from "./popup.js";
 import type { Offset, StyleSpecification } from "maplibre-gl";
-import type { MapkaMap, MapMapkaMarker } from "../map.js";
+import type { MapkaMap } from "../map.js";
 import type { MapkaMarkerOptions, MapkaPopupOptions } from "../types/marker.js";
 import { remove } from "es-toolkit";
 
@@ -100,13 +100,11 @@ function setupMarkerPopupListeners(
 }
 
 export function addMarkers(currentMap: MapkaMap, markersOptions: MapkaMarkerOptions[]) {
-  const markers: MapMapkaMarker[] = [];
-
   for (const markerOptions of markersOptions) {
     const { lngLat, popup, ...options } = markerOptions;
     const newMarker = new Marker(options).setLngLat(lngLat).addTo(currentMap);
 
-    markers.push({
+    currentMap.markers.push({
       id: getMarkerId(markerOptions),
       options: markerOptions,
       marker: newMarker,
@@ -115,7 +113,6 @@ export function addMarkers(currentMap: MapkaMap, markersOptions: MapkaMarkerOpti
 
     setupMarkerPopupListeners(currentMap, newMarker, popup, markerOptions);
   }
-  currentMap.markers.push(...markers);
 }
 
 export function removeMarkersByIds(map: MapkaMap, ids: string[]) {
@@ -132,7 +129,7 @@ export function updateMarkers(map: MapkaMap, markersOptions: MapkaMarkerOptions[
   addMarkers(map, markersOptions);
 }
 
-export function clearMarkers(map: MapkaMap) {
+export function removeMarkers(map: MapkaMap) {
   for (const marker of map.markers) {
     marker.marker.remove();
   }
@@ -143,10 +140,10 @@ export function addStyleMarkers(map: MapkaMap) {
   const style = map.getStyle();
 
   const markers = get(style, "metadata.mapka.markers", []) as MapkaMarkerOptions[];
-  return addMarkers(map, markers);
+  addMarkers(map, markers);
 }
 
 export function addStyleDiffMarkers(map: MapkaMap, next: StyleSpecification) {
   const markers = get(next, "metadata.mapka.markers", []) as MapkaMarkerOptions[];
-  return addMarkers(map, markers);
+  addMarkers(map, markers);
 }

package/src/modules/popup.tsx

@@ -153,3 +153,11 @@ export function closePopupsById(map: MapkaMap, id: string) {
     popup.container.remove();
   }
 }
+
+export function removePopups(map: MapkaMap) {
+  for (const popup of map.popups) {
+    popup.popup.remove();
+    popup.container.remove();
+  }
+  map.popups = [];
+}