@geowiki/map 0.16.9-dev.2 → 0.16.9-dev.3

package/dist/index.js

@@ -16681,11 +16681,11 @@ var import_react63 = require("react");
 var import_maplibre_gl = __toESM(require("maplibre-gl"));
 var import_MapPinIcon4 = __toESM(require("@heroicons/react/24/solid/MapPinIcon"));
 var import_server8 = require("react-dom/server");
-var import_design_system = require("@geowiki/design-system");
 var import_jsx_runtime79 = require("react/jsx-runtime");
 var MapLibre = (0, import_react63.forwardRef)(({ baseLayers, customLayers, mapControls, sourceData }, ref) => {
   const mapContainer = ref;
   const mapRef = (0, import_react62.useRef)(null);
+  console.log(customLayers);
   const changeMapProjection = () => {
     var _a;
     if (!mapRef.current)
@@ -16697,110 +16697,6 @@ var MapLibre = (0, import_react63.forwardRef)(({ baseLayers, customLayers, mapCo
       type: newProjection
     });
   };
-  const zoomIn = () => {
-    if (!mapRef.current)
-      return;
-    const map = mapRef.current;
-    map.zoomIn();
-  };
-  const zoomOut = () => {
-    if (!mapRef.current)
-      return;
-    const map = mapRef.current;
-    map.zoomOut();
-  };
-  function getLayersByPattern(map, pattern) {
-    return map.getStyle().layers.filter((layer) => pattern.test(layer.id)).map((layer) => layer.id);
-  }
-  const handleToggle = (layerId) => {
-    if (!mapRef.current)
-      return;
-    const map = mapRef.current;
-    const layers = getLayersByPattern(map, new RegExp(layerId));
-    layers.forEach((id) => {
-      const visibility = map.getLayoutProperty(id, "visibility");
-      const newVisibility = visibility === "none" ? "visible" : "none";
-      map.setLayoutProperty(id, "visibility", newVisibility);
-    });
-  };
-  const buildControls = (controls) => {
-    return controls.map((c) => {
-      switch (c.type) {
-        case "projection":
-          return {
-            id: "projection",
-            title: "Change Projection",
-            icon: import_design_system.GlobeIcon,
-            onClick: changeMapProjection,
-            position: "topright",
-            isOpen: true,
-            isDisplayOnly: false,
-            popoverDirection: "right",
-            isMobileFilter: true
-          };
-        case "zoom":
-          return [
-            {
-              id: "zoomIn",
-              icon: import_design_system.PlusIcon,
-              onClick: zoomIn,
-              position: "topright",
-              isOpen: true,
-              isDisplayOnly: false,
-              popoverDirection: "right",
-              isMobileFilter: true
-            },
-            {
-              id: "zoomOut",
-              icon: import_design_system.MinusIcon,
-              onClick: zoomOut,
-              position: "topright",
-              isOpen: true,
-              isDisplayOnly: false,
-              popoverDirection: "right",
-              isMobileFilter: true
-            }
-          ];
-        case "toggle_layers":
-          let custom_layers = customLayers == null ? void 0 : customLayers.map((l) => __spreadProps(__spreadValues({}, l), {
-            ontoggle: () => handleToggle(l.id)
-          }));
-          return {
-            id: "overlay",
-            icon: import_design_system.LayerGroupIcon,
-            panel: /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(
-              import_design_system.LayerSwitcher,
-              {
-                mapMenuItems: [
-                  {
-                    MapMenuItem: {},
-                    Layers: [],
-                    Title: ""
-                  }
-                ],
-                customLayers: custom_layers
-              }
-            ),
-            position: "topleft",
-            isOpen: false,
-            isDisplayOnly: false,
-            popoverDirection: "right",
-            isMobileFilter: true
-          };
-        default:
-          return null;
-      }
-    }).flat();
-  };
-  const [mapControl, setMapControl] = (0, import_react62.useState)(() => buildControls(mapControls));
-  const toggleControl = (id) => {
-    setMapControl((prevControls) => prevControls.map((control) => {
-      if (control.id === id) {
-        return __spreadProps(__spreadValues({}, control), { isOpen: !control.isOpen });
-      }
-      return control;
-    }));
-  };
   (0, import_react62.useEffect)(() => {
     if (typeof mapContainer === "function")
       return;
@@ -16939,10 +16835,7 @@ var MapLibre = (0, import_react63.forwardRef)(({ baseLayers, customLayers, mapCo
   }, [sourceData, mapControls]);
   if (!sourceData)
     return;
-  return /* @__PURE__ */ (0, import_jsx_runtime79.jsxs)("div", { className: "relative", style: { width: "100%", height: "100vh" }, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("div", { ref: mapContainer, className: "w-full h-full" }),
-    /* @__PURE__ */ (0, import_jsx_runtime79.jsx)(import_design_system.MapControlToolbar, { controls: mapControl, onToggleControl: (id) => toggleControl(id) })
-  ] });
+  return /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("div", { className: "relative", style: { width: "100%", height: "100vh" }, children: /* @__PURE__ */ (0, import_jsx_runtime79.jsx)("div", { ref: mapContainer, className: "w-full h-full" }) });
 });
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -16869,16 +16869,16 @@ var WaybackTimelineMap = (props) => {
 };
 
 // src/Components/Map/MapLibre.tsx
-import { useEffect as useEffect34, useRef as useRef16, useState as useState36 } from "react";
+import { useEffect as useEffect34, useRef as useRef16 } from "react";
 import { forwardRef as forwardRef5 } from "react";
 import maplibregl from "maplibre-gl";
 import MapPinIcon5 from "@heroicons/react/24/solid/MapPinIcon";
 import { renderToStaticMarkup } from "react-dom/server";
-import { MapControlToolbar, GlobeIcon as GlobeIcon2, PlusIcon as PlusIcon3, MinusIcon as MinusIcon3, LayerGroupIcon as LayerGroupIcon5, LayerSwitcher as LayerSwitcher2 } from "@geowiki/design-system";
-import { jsx as jsx79, jsxs as jsxs57 } from "react/jsx-runtime";
+import { jsx as jsx79 } from "react/jsx-runtime";
 var MapLibre = forwardRef5(({ baseLayers, customLayers, mapControls, sourceData }, ref) => {
   const mapContainer = ref;
   const mapRef = useRef16(null);
+  console.log(customLayers);
   const changeMapProjection = () => {
     var _a;
     if (!mapRef.current)
@@ -16890,110 +16890,6 @@ var MapLibre = forwardRef5(({ baseLayers, customLayers, mapControls, sourceData
       type: newProjection
     });
   };
-  const zoomIn = () => {
-    if (!mapRef.current)
-      return;
-    const map = mapRef.current;
-    map.zoomIn();
-  };
-  const zoomOut = () => {
-    if (!mapRef.current)
-      return;
-    const map = mapRef.current;
-    map.zoomOut();
-  };
-  function getLayersByPattern(map, pattern) {
-    return map.getStyle().layers.filter((layer) => pattern.test(layer.id)).map((layer) => layer.id);
-  }
-  const handleToggle = (layerId) => {
-    if (!mapRef.current)
-      return;
-    const map = mapRef.current;
-    const layers = getLayersByPattern(map, new RegExp(layerId));
-    layers.forEach((id) => {
-      const visibility = map.getLayoutProperty(id, "visibility");
-      const newVisibility = visibility === "none" ? "visible" : "none";
-      map.setLayoutProperty(id, "visibility", newVisibility);
-    });
-  };
-  const buildControls = (controls) => {
-    return controls.map((c) => {
-      switch (c.type) {
-        case "projection":
-          return {
-            id: "projection",
-            title: "Change Projection",
-            icon: GlobeIcon2,
-            onClick: changeMapProjection,
-            position: "topright",
-            isOpen: true,
-            isDisplayOnly: false,
-            popoverDirection: "right",
-            isMobileFilter: true
-          };
-        case "zoom":
-          return [
-            {
-              id: "zoomIn",
-              icon: PlusIcon3,
-              onClick: zoomIn,
-              position: "topright",
-              isOpen: true,
-              isDisplayOnly: false,
-              popoverDirection: "right",
-              isMobileFilter: true
-            },
-            {
-              id: "zoomOut",
-              icon: MinusIcon3,
-              onClick: zoomOut,
-              position: "topright",
-              isOpen: true,
-              isDisplayOnly: false,
-              popoverDirection: "right",
-              isMobileFilter: true
-            }
-          ];
-        case "toggle_layers":
-          let custom_layers = customLayers == null ? void 0 : customLayers.map((l) => __spreadProps(__spreadValues({}, l), {
-            ontoggle: () => handleToggle(l.id)
-          }));
-          return {
-            id: "overlay",
-            icon: LayerGroupIcon5,
-            panel: /* @__PURE__ */ jsx79(
-              LayerSwitcher2,
-              {
-                mapMenuItems: [
-                  {
-                    MapMenuItem: {},
-                    Layers: [],
-                    Title: ""
-                  }
-                ],
-                customLayers: custom_layers
-              }
-            ),
-            position: "topleft",
-            isOpen: false,
-            isDisplayOnly: false,
-            popoverDirection: "right",
-            isMobileFilter: true
-          };
-        default:
-          return null;
-      }
-    }).flat();
-  };
-  const [mapControl, setMapControl] = useState36(() => buildControls(mapControls));
-  const toggleControl = (id) => {
-    setMapControl((prevControls) => prevControls.map((control) => {
-      if (control.id === id) {
-        return __spreadProps(__spreadValues({}, control), { isOpen: !control.isOpen });
-      }
-      return control;
-    }));
-  };
   useEffect34(() => {
     if (typeof mapContainer === "function")
       return;
@@ -17132,10 +17028,7 @@ var MapLibre = forwardRef5(({ baseLayers, customLayers, mapControls, sourceData
   }, [sourceData, mapControls]);
   if (!sourceData)
     return;
-  return /* @__PURE__ */ jsxs57("div", { className: "relative", style: { width: "100%", height: "100vh" }, children: [
-    /* @__PURE__ */ jsx79("div", { ref: mapContainer, className: "w-full h-full" }),
-    /* @__PURE__ */ jsx79(MapControlToolbar, { controls: mapControl, onToggleControl: (id) => toggleControl(id) })
-  ] });
+  return /* @__PURE__ */ jsx79("div", { className: "relative", style: { width: "100%", height: "100vh" }, children: /* @__PURE__ */ jsx79("div", { ref: mapContainer, className: "w-full h-full" }) });
 });
 export {
   Annotation,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geowiki/map",
-  "version": "0.16.9-dev.2",
+  "version": "0.16.9-dev.3",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
@@ -25,11 +25,10 @@
     "react-hotkeys-hook": "^4.5.0",
     "react-leaflet": "^4.2.1",
     "zod": "^3.25.7",
-    "@geowiki/core": "0.16.9-dev.2",
-    "@geowiki/cms-proxy": "0.16.9-dev.2",
-    "@geowiki/ui": "0.16.9-dev.2",
-    "@geowiki/evoland-api-proxy": "0.16.9-dev.2",
-    "@geowiki/design-system": "0.16.9-dev.2"
+    "@geowiki/core": "0.16.9-dev.3",
+    "@geowiki/cms-proxy": "0.16.9-dev.3",
+    "@geowiki/evoland-api-proxy": "0.16.9-dev.3",
+    "@geowiki/ui": "0.16.9-dev.3"
   },
   "dependencies": {
     "@dnd-kit/core": "^6.3.1",
@@ -88,8 +87,8 @@
     "tailwindcss-animate": "^1.0.7",
     "tsup": "^8.0.2",
     "typescript": "5.4.2",
-    "eslint-config-custom": "0.0.0",
     "tailwind-config": "0.0.0",
+    "eslint-config-custom": "0.0.0",
     "tsconfig": "0.0.0"
   },
   "scripts": {