@mapcomponents/react-maplibre 0.1.14 → 0.1.15

package/src/hooks/useMap.js

@@ -1,23 +1,28 @@
 import { useContext, useState, useEffect, useRef } from "react";
 import { v4 as uuidv4 } from "uuid";
 import { MapContext } from "@mapcomponents/react-core";
+import useMapState from "./useMapState";
 
 function useMap(props) {
   // Use a useRef hook to reference the layer object to be able to access it later inside useEffect hooks
   const mapContext = useContext(MapContext);
 
+  const mapState = useMapState({
+    mapId: props.mapId,
+    watch: {
+      viewport: false,
+      layers: true,
+      sources: false,
+    },
+  });
+
   const initializedRef = useRef(false);
   const mapRef = useRef(undefined);
 
-  const [center, setCenter] = useState(undefined);
-  const [layerIds, setLayerIds] = useState(undefined);
-  const layerIdsRef = useRef(undefined);
-
-  const [layers, setLayers] = useState(undefined);
-  const layersRef = useRef(undefined);
-  //const mapRef = useRef(props.map);
   const componentId = useRef(uuidv4());
 
+  const [mapIsReady, setMapIsReady] = useState(undefined);
+
   useEffect(() => {
     let _componentId = componentId.current;
 
@@ -27,72 +32,41 @@ function useMap(props) {
         mapRef.current = undefined;
       }
       initializedRef.current = false;
+      setMapIsReady(false);
     };
   }, []);
 
-  const buildLayerObjects = (layers) => {
-    let res = {};
-    Object.keys(layers).forEach((layerId) => {
-      if (mapRef.current.baseLayers.indexOf(layerId) === -1) {
-        res[layerId] = {
-          //filter: layers[layerId].filter,
-          id: layers[layerId].id,
-          //layout: layers[layerId].layout,
-          //maxzoom: layers[layerId].maxzoom,
-          //metadata: layers[layerId].metadata,
-          //minzoom: layers[layerId].minzoom,
-          paint: layers[layerId].paint,
-          //source: layers[layerId].source,
-          //sourceLayer: layers[layerId].sourceLayer,
-          type: layers[layerId].type,
-          visibility: layers[layerId].visibility,
-        };
-      }
-    });
-    return res;
-  };
-
   useEffect(() => {
     if (!mapContext.mapExists(props.mapId) || initializedRef.current) return;
+
+    console.log("initialize useMap hook");
+    //check if insertBeforeLayer exists
+    if (props.waitForLayer) {
+      let layerFound = false;
+
+      mapState?.layers?.forEach((layer) => {
+        console.log(layer.id + " " + props.waitForLayer);
+        if (layer.id === props.waitForLayer) {
+          layerFound = true;
+        }
+      });
+      if (!layerFound) {
+        return;
+      }
+    }
+    console.log("done initialize useMap hook");
     // the MapLibre-gl instance (mapContext.getMap(props.mapId)) is accessible here
     // initialize the layer and add it to the MapLibre-gl instance or do something else with it
     initializedRef.current = true;
     mapRef.current = mapContext.getMap(props.mapId);
-
-    setLayerIds([...mapRef.current.style._order]);
-    mapRef.current.on(
-      "idle",
-      () => {
-        if (JSON.stringify(mapRef.current.style._order) !== layerIdsRef.current) {
-          let layerIds = [...mapRef.current.style._order];
-          layerIdsRef.current = JSON.stringify(layerIds);
-          setLayerIds(layerIds);
-        }
-
-        let layerStates = buildLayerObjects(mapRef.current.style._layers);
-        let layerStatesString = JSON.stringify(layerStates);
-        if (layerStatesString !== layersRef.current) {
-          layersRef.current = layerStatesString;
-          setLayers(layerStates);
-        }
-      },
-      componentId.current
-    );
-
-    setCenter(mapRef.current.getCenter());
-    mapRef.current.on(
-      "move",
-      () => {
-        setCenter(mapRef.current.getCenter());
-      },
-      componentId.current
-    );
-  }, [mapContext.mapIds, mapContext, props.mapId]);
+    setMapIsReady(true);
+  }, [mapContext.mapIds, mapState.layers, mapContext, props.mapId]);
 
   return {
-    layers,
-    layerIds,
-    center,
+    map: mapRef.current,
+    mapIsReady,
+    componentId: componentId.current,
+    layers: mapState.layers,
   };
 }
 

package/src/hooks/useMapState.js

@@ -34,11 +34,11 @@ function useMapState(props) {
    */
   const layerIdFilter = useCallback(
     (layer) => {
-      if (!props.filter.includeBaseLayers && layer.baseLayer) {
+      if (!props?.filter?.includeBaseLayers && layer.baseLayer) {
         return false;
       }
 
-      if (typeof props.filter.matchLayerIds !== "undefined") {
+      if (typeof props.filter?.matchLayerIds !== "undefined") {
         if (props.filter.matchLayerIds instanceof RegExp) {
           return props.filter.matchLayerIds.test(layer.id);
         } else {
@@ -58,7 +58,7 @@ function useMapState(props) {
       layersRef.current = _layerStateString;
       setLayers(_layerState);
     }
-  },[layerIdFilter]);
+  }, [layerIdFilter]);
 
   useEffect(() => {
     let _componentId = componentId.current;

package/src/index.js

@@ -1,6 +1,7 @@
 export { default as MapLibreMap } from "./components/MapLibreMap/MapLibreMap";
 export { default as MlComponentTemplate } from "./components/MlComponentTemplate/MlComponentTemplate";
 export { default as MlFillExtrusionLayer } from "./components/MlFillExtrusionLayer/MlFillExtrusionLayer";
+export { default as MlFollowGps } from "./components/MlFollowGps/MlFollowGps";
 export { default as MlCreatePdfButton } from "./components/MlCreatePdfButton/MlCreatePdfButton";
 export { default as MlGeoJsonLayer } from "./components/MlGeoJsonLayer/MlGeoJsonLayer";
 export { default as MlImageMarkerLayer } from "./components/MlImageMarkerLayer/MlImageMarkerLayer";
@@ -20,3 +21,4 @@ export { default as GeoJsonContext } from "./components/MlGPXViewer/util/GeoJson
 export { default as MlSpatialElevationProfile } from "./components/MlSpatialElevationProfile/MlSpatialElevationProfile";
 
 export { default as useMapState } from "./hooks/useMapState";
+export { default as useMap } from "./hooks/useMap";