npm - @mapcomponents/react-maplibre - Versions diffs - 0.1.16 → 0.1.20 - Mend

@mapcomponents/react-maplibre 0.1.16 → 0.1.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (92) hide show

package/coverage/lcov-report/src/components/MlGeoJsonLayer/MlGeoJsonLayer.js.html CHANGED Viewed

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">63.51% </span>
+                <span class="strong">64.7% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>47/74</span>
+                <span class='fraction'>44/68</span>
             </div>
@@ -37,16 +37,16 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.77% </span>
+                <span class="strong">88.88% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>7/9</span>
+                <span class='fraction'>8/9</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">61.42% </span>
+                <span class="strong">62.5% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>43/70</span>
+                <span class='fraction'>40/64</span>
             </div>
@@ -320,12 +320,7 @@
 <a name='L255'></a><a href='#L255'>255</a>
 <a name='L256'></a><a href='#L256'>256</a>
 <a name='L257'></a><a href='#L257'>257</a>
-<a name='L258'></a><a href='#L258'>258</a>
-<a name='L259'></a><a href='#L259'>259</a>
-<a name='L260'></a><a href='#L260'>260</a>
-<a name='L261'></a><a href='#L261'>261</a>
-<a name='L262'></a><a href='#L262'>262</a>
-<a name='L263'></a><a href='#L263'>263</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L258'></a><a href='#L258'>258</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -335,49 +330,36 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -392,6 +374,9 @@
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -419,8 +404,6 @@
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -445,18 +428,12 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-yes">12x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -464,7 +441,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -472,13 +448,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -488,36 +460,51 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">12x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -587,17 +574,22 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import React, { useRef, useEffect, useContext, useCallback } from "react";
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import React, { useRef, useEffect, useCallback } from "react";
 import PropTypes from "prop-types";
 &nbsp;
-import { v4 as uuidv4 } from "uuid";
 import * as turf from "@turf/turf";
-import { MapContext } from "@mapcomponents/react-core";
-import useMapState from "../../hooks/useMapState";
+&nbsp;
+import useMap from "../../hooks/useMap";
 &nbsp;
 import { _transitionToGeojson } from "./util/transitionFunctions";
+import getDefaultPaintPropsByType from "./util/getDefaultPaintPropsByType";
+import getDefaulLayerTypeByGeometry from "./util/getDefaultLayerTypeByGeometry";
 &nbsp;
 const msPerStep = 50;
+const legalLayerTypes = ["circle", "fill", "line"];
 &nbsp;
 /**
  * Adds source and layer of types "line", "fill" or "circle" to display GeoJSON data on the map.
@@ -606,58 +598,46 @@ const msPerStep = 50;
  */
 const MlGeoJsonLayer = (props) =&gt; {
   // 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 oldGeojsonRef = useRef(null);
-  const mapRef = useRef(null);
+  const mapHook = useMap({ mapId: props.mapId, waitForLayer: props.insertBeforeLayer });
   const initializedRef = useRef(false);
+  const layerId = useRef(props.layerId || "MlGeoJsonLayer-" + mapHook.componentId);
+  const layerTypeRef = useRef(undefined);
+&nbsp;
+  // transition effect variables
+  const oldGeojsonRef = useRef(null);
   const transitionInProgressRef = useRef(false);
   const transitionTimeoutRef = useRef(undefined);
   const currentTransitionStepRef = useRef(false);
   const transitionGeojsonDataRef = useRef([]);
   const transitionGeojsonCommonDataRef = useRef([]);
-  const componentId = useRef(
-    (props.layerId ? <span class="branch-0 cbranch-no" title="branch not covered" >props.layerId </span>: "MlGeoJsonLayer-") + (props.idSuffix || uuidv4())
-  );
-  const layerId = useRef(props.layerId || componentId.current);
 &nbsp;
   useEffect(() =&gt; {
-    let _componentId = componentId.current;
     return () =&gt; {
       // This is the cleanup function, it is called when this react component is removed from react-dom
       <span class="missing-if-branch" title="if path not taken" >I</span>if (transitionTimeoutRef.current) {
 <span class="cstat-no" title="statement not covered" >        clearTimeout(transitionTimeoutRef.current);</span>
       }
-      if (mapRef.current) {
-        mapRef.current.cleanup(_componentId);
-&nbsp;
-        mapRef.current = null;
-      }
     };
   }, []);
 &nbsp;
   useEffect(() =&gt; {
-    if (!mapRef.current || <span class="branch-1 cbranch-no" title="branch not covered" >!initializedRef.current)</span> return;
+    if (!mapHook.map || !initializedRef.current) return;
 &nbsp;
 <span class="cstat-no" title="statement not covered" >    for (var key in props.layout) {</span>
-<span class="cstat-no" title="statement not covered" >      mapContext.getMap(props.mapId).setLayoutProperty(layerId.current, key, props.layout[key]);</span>
+<span class="cstat-no" title="statement not covered" >      mapHook.map.setLayoutProperty(layerId.current, key, props.layout[key]);</span>
     }
-  }, [props.layout, mapContext, props.mapId]);
+  }, [props.layout, mapHook.map, props.mapId]);
 &nbsp;
   useEffect(() =&gt; {
-    if (!mapRef.current || <span class="branch-1 cbranch-no" title="branch not covered" >!initializedRef.current)</span> return;
+    if (!mapHook.map || !initializedRef.current) return;
 &nbsp;
-<span class="cstat-no" title="statement not covered" >    for (var key in props.paint) {</span>
-<span class="cstat-no" title="statement not covered" >      mapContext.getMap(props.mapId).setPaintProperty(layerId.current, key, props.paint[key]);</span>
+    let _paint =
+<span class="cstat-no" title="statement not covered" >      props.paint || getDefaultPaintPropsByType(layerTypeRef.current, props.defaultPaintOverrides);</span>
+&nbsp;
+<span class="cstat-no" title="statement not covered" >    for (var key in _paint) {</span>
+<span class="cstat-no" title="statement not covered" >      mapHook.map.setPaintProperty(layerId.current, key, _paint[key]);</span>
     }
-  }, [props.paint, mapContext, props.mapId]);
+  }, [props.paint, mapHook.map, props.mapId, props.defaultPaintOverrides]);
 &nbsp;
   const transitionToGeojson = useCallback(
 <span class="fstat-no" title="function not covered" >    (n</span>ewGeojson) =&gt; {
@@ -670,18 +650,16 @@ const MlGeoJsonLayer = (props) =&gt; {
         oldGeojsonRef,
         msPerStep,
         currentTransitionStepRef,
-        mapRef.current,
-        componentId.current,
+        mapHook.map,
+        layerId.current,
         transitionTimeoutRef
       );
     },
-    [props]
+    [props, mapHook.map]
   );
 &nbsp;
   useEffect(() =&gt; {
-    if (!mapRef.current?.getSource?.(componentId.current) || <span class="branch-1 cbranch-no" title="branch not covered" >!initializedRef.current)</span> return;
-    // the MapLibre-gl instance (mapContext.map) is accessible here
-    // initialize the layer and add it to the MapLibre-gl instance or do something else with it
+    if (!mapHook?.map?.getSource(layerId.current) || <span class="branch-1 cbranch-no" title="branch not covered" >!initializedRef.current)</span> return;
 &nbsp;
 <span class="cstat-no" title="statement not covered" >    if (</span>
       typeof props.transitionTime !== "undefined" &amp;&amp;
@@ -694,92 +672,96 @@ const MlGeoJsonLayer = (props) =&gt; {
 <span class="cstat-no" title="statement not covered" >      transitionGeojsonCommonDataRef.current = [];</span>
 <span class="cstat-no" title="statement not covered" >      transitionToGeojson(props.geojson);</span>
     } else {
-<span class="cstat-no" title="statement not covered" >      mapRef.current.getSource(componentId.current).setData(props.geojson);</span>
+<span class="cstat-no" title="statement not covered" >      mapHook.map.getSource(layerId.current).setData(props.geojson);</span>
     }
 <span class="cstat-no" title="statement not covered" >    oldGeojsonRef.current = props.geojson;</span>
   }, [
     props.geojson,
     props.mapId,
-    mapContext,
+    mapHook.map,
     props.type,
     transitionToGeojson,
     props.transitionTime,
   ]);
 &nbsp;
-  useEffect(() =&gt; {
-    if (!mapContext.mapExists(props.mapId) || initializedRef.current) return;
-    // the MapLibre-gl instance (mapContext.map) is accessible here
-    // initialize the layer and add it to the MapLibre-gl instance or do something else with it
+  const createLayer = useCallback(() =&gt; {
+    let geojson = props.geojson;
 &nbsp;
-    if (props.geojson) {
-      //check if insertBeforeLayer exists
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (props.insertBeforeLayer) {
-        let layerFound = <span class="cstat-no" title="statement not covered" >false;</span>
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (
+      props.type === "line" &amp;&amp;
+      typeof props.transitionTime !== "undefined" &amp;&amp;
+<span class="branch-2 cbranch-no" title="branch not covered" >      props.transitionTime </span>&amp;&amp;
+<span class="branch-3 cbranch-no" title="branch not covered" >      typeof props.geojson.geometry !== "undefined"</span>
+    ) {
+      var tmpChunks = <span class="cstat-no" title="statement not covered" >turf.lineChunk(props.geojson, 0.01);</span>
+<span class="cstat-no" title="statement not covered" >      geojson = tmpChunks.features[0];</span>
+    }
 &nbsp;
-<span class="cstat-no" title="statement not covered" >        mapState?.layers?.forEach(<span class="fstat-no" title="function not covered" >(l</span>ayer) =&gt; {</span>
-<span class="cstat-no" title="statement not covered" >          if (layer.id === props.insertBeforeLayer) {</span>
-<span class="cstat-no" title="statement not covered" >            layerFound = true;</span>
-          }
-        });
-<span class="cstat-no" title="statement not covered" >        if (!layerFound) {</span>
-<span class="cstat-no" title="statement not covered" >          return;</span>
-        }
-      }
-      initializedRef.current = true;
-      let geojson = props.geojson;
+    layerTypeRef.current = props.type || <span class="branch-1 cbranch-no" title="branch not covered" >getDefaulLayerTypeByGeometry(props.geojson);</span>
 &nbsp;
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (
-        props.type === "line" &amp;&amp;
-        typeof props.transitionTime !== "undefined" &amp;&amp;
-<span class="branch-2 cbranch-no" title="branch not covered" >        props.transitionTime </span>&amp;&amp;
-<span class="branch-3 cbranch-no" title="branch not covered" >        typeof props.geojson.geometry !== "undefined"</span>
-      ) {
-        var tmpChunks = <span class="cstat-no" title="statement not covered" >turf.lineChunk(props.geojson, 0.01);</span>
-<span class="cstat-no" title="statement not covered" >        geojson = tmpChunks.features[0];</span>
-      }
+    mapHook.map.addLayer(
+      {
+        id: layerId.current,
+        source: {
+          type: "geojson",
+          data: geojson,
+        },
+        type: layerTypeRef.current,
+        paint:
+          props.paint ||
+          getDefaultPaintPropsByType(layerTypeRef.current, props.defaultPaintOverrides),
+        layout: props.layout || {},
+        ...props.options,
+      },
+      props.insertBeforeLayer,
+      mapHook.componentId
+    );
 &nbsp;
-      mapRef.current = mapContext.getMap(props.mapId);
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof props.onHover !== "undefined") {
+<span class="cstat-no" title="statement not covered" >      mapHook.map.on("mousemove", mapHook.componentId, props.onHover, mapHook.componentId);</span>
+    }
 &nbsp;
-      mapRef.current.addLayer(
-        {
-          id: layerId.current,
-          source: {
-            type: "geojson",
-            data: geojson,
-          },
-          type: props.type || <span class="branch-1 cbranch-no" title="branch not covered" >"line",</span>
-          paint: props.paint || {
-            "line-color": "rgb(100,200,100)",
-            "line-width": 10,
-          },
-          layout: props.layout || {},
-        },
-        props.insertBeforeLayer,
-        componentId.current
-      );
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof props.onClick !== "undefined") {
+<span class="cstat-no" title="statement not covered" >      mapHook.map.on("click", mapHook.componentId, props.onClick, mapHook.componentId);</span>
+    }
 &nbsp;
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof props.onHover !== "undefined") {
-<span class="cstat-no" title="statement not covered" >        mapRef.current.on("mousemove", componentId.current, props.onHover, componentId.current);</span>
-      }
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof props.onLeave !== "undefined") {
+<span class="cstat-no" title="statement not covered" >      mapHook.map.on("mouseleave", mapHook.componentId, props.onLeave, mapHook.componentId);</span>
+    }
 &nbsp;
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof props.onClick !== "undefined") {
-<span class="cstat-no" title="statement not covered" >        mapRef.current.on("click", componentId.current, props.onClick, componentId.current);</span>
-      }
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (
+      props.type === "line" &amp;&amp;
+      typeof props.transitionTime !== "undefined" &amp;&amp;
+<span class="branch-2 cbranch-no" title="branch not covered" >      typeof props.geojson.geometry !== "undefined"</span>
+    ) {
+<span class="cstat-no" title="statement not covered" >      transitionToGeojson(props.geojson);</span>
+<span class="cstat-no" title="statement not covered" >      oldGeojsonRef.current = props.geojson;</span>
+    }
+  }, [mapHook.map, props, transitionToGeojson]);
 &nbsp;
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (typeof props.onLeave !== "undefined") {
-<span class="cstat-no" title="statement not covered" >        mapRef.current.on("mouseleave", componentId.current, props.onLeave, componentId.current);</span>
-      }
+  useEffect(() =&gt; {
+    if (!mapHook.mapIsReady || !props.geojson) return;
 &nbsp;
-      <span class="missing-if-branch" title="if path not taken" >I</span>if (
-        props.type === "line" &amp;&amp;
-        typeof props.transitionTime !== "undefined" &amp;&amp;
-<span class="branch-2 cbranch-no" title="branch not covered" >        typeof props.geojson.geometry !== "undefined"</span>
-      ) {
-<span class="cstat-no" title="statement not covered" >        transitionToGeojson(props.geojson);</span>
-<span class="cstat-no" title="statement not covered" >        oldGeojsonRef.current = props.geojson;</span>
-      }
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (
+      initializedRef.current &amp;&amp;
+<span class="branch-1 cbranch-no" title="branch not covered" >      legalLayerTypes.indexOf(props.type) !== -1 </span>&amp;&amp;
+<span class="branch-2 cbranch-no" title="branch not covered" >      layerTypeRef.current </span>&amp;&amp;
+<span class="branch-3 cbranch-no" title="branch not covered" >      props.type !== layerTypeRef.current</span>
+    ) {
+<span class="cstat-no" title="statement not covered" >      mapHook.map.cleanup(mapHook.componentId);</span>
+    } else <span class="missing-if-branch" title="if path not taken" >I</span>if (
+      initializedRef.current &amp;&amp;
+      (<span class="branch-1 cbranch-no" title="branch not covered" >legalLayerTypes.indexOf(props.type) === -1 </span>||
+        (<span class="branch-2 cbranch-no" title="branch not covered" >legalLayerTypes.indexOf(props.type) !== -1 </span>&amp;&amp; <span class="branch-3 cbranch-no" title="branch not covered" >props.type === layerTypeRef.current)</span>)
+    ) {
+<span class="cstat-no" title="statement not covered" >      return;</span>
     }
-  }, [mapContext.mapIds, mapContext, props, transitionToGeojson, mapState.layers]);
+&nbsp;
+    // initialize the layer and add it to the MapLibre-gl instance or do something else with it
+    initializedRef.current = true;
+&nbsp;
+    createLayer();
+  }, [mapHook.mapIsReady, createLayer, props]);
 &nbsp;
   return &lt;&gt;&lt;/&gt;;
 };
@@ -810,6 +792,14 @@ MlGeoJsonLayer.propTypes = {
    * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#fill
    */
   paint: PropTypes.object,
+  /**
+   * Javascript object with optional properties "fill", "line", "circle" to override implicit layer type default paint properties.
+   */
+  defaultPaintOverrides: PropTypes.object,
+  /**
+   * Javascript object that is spread into the addLayer commands first parameter.
+   */
+  options: PropTypes.object,
   /**
    * GeoJSON data that is supposed to be rendered by this component.
    */
@@ -841,11 +831,6 @@ MlGeoJsonLayer.propTypes = {
    * Only works with layer type "line" and LineString GeoJSON data.
    */
   transitionTime: PropTypes.number,
-  /**
-   * Id suffix string that is appended to the componentId.
-   * Probably removed soon.
-   */
-  idSuffix: PropTypes.string,
 };
 &nbsp;
 export default MlGeoJsonLayer;
@@ -855,10 +840,9 @@ export default MlGeoJsonLayer;
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Thu Dec 23 2021 12:19:00 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Mon Jan 17 2022 10:02:27 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="../../../prettify.js"></script>
         <script>
             window.onload = function () {

package/coverage/lcov-report/src/components/MlGeoJsonLayer/index.html CHANGED Viewed

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">63.51% </span>
+                <span class="strong">64.7% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>47/74</span>
+                <span class='fraction'>44/68</span>
             </div>
@@ -37,16 +37,16 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.77% </span>
+                <span class="strong">88.88% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>7/9</span>
+                <span class='fraction'>8/9</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">61.42% </span>
+                <span class="strong">62.5% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>43/70</span>
+                <span class='fraction'>40/64</span>
             </div>
@@ -80,17 +80,17 @@
 </thead>
 <tbody><tr>
 	<td class="file medium" data-value="MlGeoJsonLayer.js"><a href="MlGeoJsonLayer.js.html">MlGeoJsonLayer.js</a></td>
-	<td data-value="63.51" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 63%"></div><div class="cover-empty" style="width: 37%"></div></div>
+	<td data-value="64.7" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 64%"></div><div class="cover-empty" style="width: 36%"></div></div>
 	</td>
-	<td data-value="63.51" class="pct medium">63.51%</td>
-	<td data-value="74" class="abs medium">47/74</td>
+	<td data-value="64.7" class="pct medium">64.7%</td>
+	<td data-value="68" class="abs medium">44/68</td>
 	<td data-value="53.22" class="pct medium">53.22%</td>
 	<td data-value="62" class="abs medium">33/62</td>
-	<td data-value="77.77" class="pct medium">77.77%</td>
-	<td data-value="9" class="abs medium">7/9</td>
-	<td data-value="61.42" class="pct medium">61.42%</td>
-	<td data-value="70" class="abs medium">43/70</td>
+	<td data-value="88.88" class="pct high">88.88%</td>
+	<td data-value="9" class="abs high">8/9</td>
+	<td data-value="62.5" class="pct medium">62.5%</td>
+	<td data-value="64" class="abs medium">40/64</td>
 	</tr>
 </tbody>
@@ -100,10 +100,9 @@
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Thu Dec 23 2021 12:19:00 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Mon Jan 17 2022 10:02:27 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="../../../prettify.js"></script>
         <script>
             window.onload = function () {

package/coverage/lcov-report/src/components/MlImageMarkerLayer/MlImageMarkerLayer.js.html CHANGED Viewed

@@ -294,10 +294,9 @@ export default MlImageMarkerLayer;
             </div><!-- /wrapper -->
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
-                <a href="https://istanbul.js.org/" target="_blank" rel="noopener">istanbul</a>
-                at Thu Dec 23 2021 12:19:00 GMT+0000 (Coordinated Universal Time)
+                <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
+                at Mon Jan 17 2022 10:02:27 GMT+0000 (Coordinated Universal Time)
             </div>
-        </div>
         <script src="../../../prettify.js"></script>
         <script>
             window.onload = function () {