@mapcomponents/react-maplibre 0.1.42 → 0.1.45

package/coverage/lcov-report/src/hooks/useLayer.ts.html

@@ -23,16 +23,16 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">74.57% </span>
+                <span class="strong">73.77% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>44/59</span>
+                <span class='fraction'>45/61</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">69.49% </span>
+                <span class="strong">66.66% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>41/59</span>
+                <span class='fraction'>36/54</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">75% </span>
+                <span class="strong">74.13% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>42/56</span>
+                <span class='fraction'>43/58</span>
             </div>
         
             
@@ -247,7 +247,10 @@
 <a name='L182'></a><a href='#L182'>182</a>
 <a name='L183'></a><a href='#L183'>183</a>
 <a name='L184'></a><a href='#L184'>184</a>
-<a name='L185'></a><a href='#L185'>185</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L185'></a><a href='#L185'>185</a>
+<a name='L186'></a><a href='#L186'>186</a>
+<a name='L187'></a><a href='#L187'>187</a>
+<a name='L188'></a><a href='#L188'>188</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>
@@ -307,6 +310,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">60x</span>
 <span class="cline-any cline-yes">14x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">14x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">14x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">14x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">14x</span>
@@ -358,15 +368,6 @@
 <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">32x</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">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -382,6 +383,11 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">60x</span>
 <span class="cline-any cline-yes">60x</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">28x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -490,7 +496,14 @@ function useLayer(props: useLayerProps): useLayerType {
   );
 &nbsp;
   const createLayer = useCallback(() =&gt; {
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (initializedRef.current || !mapHook.map) <span class="cstat-no" title="statement not covered" >return;</span>
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (!mapHook.map) <span class="cstat-no" title="statement not covered" >return;</span>
+&nbsp;
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (mapHook.map.map.getLayer(layerId.current)) {
+<span class="cstat-no" title="statement not covered" >      mapHook.map.map.removeLayer(layerId.current);</span>
+    }
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (mapHook.map.map.getSource(layerId.current)) {
+<span class="cstat-no" title="statement not covered" >      mapHook.map.map.removeSource(layerId.current);</span>
+    }
     initializedRef.current = true;
 &nbsp;
     mapHook.map.addLayer(
@@ -536,16 +549,7 @@ function useLayer(props: useLayerProps): useLayerType {
   useEffect(() =&gt; {
     if (!mapHook.map) return;
 &nbsp;
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (
-      initializedRef.current &amp;&amp;
-      ((props.options.type &amp;&amp; legalLayerTypes.indexOf(props.options.type) !== -1) ||
-<span class="branch-3 cbranch-no" title="branch not covered" >        !props.options.type)</span> &amp;&amp;
-      layerTypeRef.current &amp;&amp;
-      props.options.type !== layerTypeRef.current
-    ) {
-      // remove (cleanup) &amp; reinitialize the layer if type has changed
-<span class="cstat-no" title="statement not covered" >      cleanup();</span>
-    } else if (
+    if (
       initializedRef.current &amp;&amp;
       (legalLayerTypes.indexOf(props.options.type) === -1 ||
         (legalLayerTypes.indexOf(props.options.type) !== -1 &amp;&amp;
@@ -565,7 +569,12 @@ function useLayer(props: useLayerProps): useLayerType {
   }, [props.geojson, mapHook.map, props.options.type]);
 &nbsp;
   useEffect(() =&gt; {
-    if (!mapHook.map || !mapHook.map?.map?.getLayer?.(layerId.current) || !initializedRef.current)
+    if (
+      !mapHook.map ||
+      !mapHook.map?.map?.getLayer?.(layerId.current) ||
+      !initializedRef.current ||
+      props.options.type !== layerTypeRef.current
+    )
       return;
 &nbsp;
     var key;
@@ -622,7 +631,7 @@ export default useLayer;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue May 10 2022 14:30:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 16:37:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/hooks/useMap.ts.html

@@ -340,7 +340,7 @@ export type { useMapType };
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue May 10 2022 14:30:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 16:37:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/hooks/useMapState.ts.html

@@ -637,7 +637,7 @@ export default useMapState;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue May 10 2022 14:30:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 16:37:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/hooks/useWms.js.html

@@ -343,7 +343,7 @@ export default useWms;
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue May 10 2022 14:30:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 16:37:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/index.html

@@ -101,7 +101,7 @@
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue May 10 2022 14:30:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 16:37:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/index.ts.html

@@ -181,7 +181,7 @@ export { default as SimpleDataContext } from './contexts/SimpleDataContext';</pr
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue May 10 2022 14:30:51 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 16:37:34 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

package/coverage/lcov.info

@@ -3003,12 +3003,12 @@ TN:
 SF:src/hooks/useLayer.ts
 FN:42,useLayer
 FN:59,(anonymous_1)
-FN:103,(anonymous_2)
-FN:127,(anonymous_3)
-FN:134,(anonymous_4)
-FN:164,(anonymous_5)
-FN:169,(anonymous_6)
-FN:170,(anonymous_7)
+FN:110,(anonymous_2)
+FN:125,(anonymous_3)
+FN:132,(anonymous_4)
+FN:167,(anonymous_5)
+FN:172,(anonymous_6)
+FN:173,(anonymous_7)
 FNF:8
 FNH:8
 FNDA:60,useLayer
@@ -3029,115 +3029,112 @@ DA:54,60
 DA:55,60
 DA:59,60
 DA:60,14
-DA:61,14
-DA:63,14
-DA:84,14
-DA:86,14
-DA:87,0
-DA:90,14
-DA:91,0
-DA:94,14
-DA:95,0
-DA:98,14
-DA:99,14
-DA:100,14
-DA:103,60
-DA:104,60
-DA:106,32
-DA:114,0
-DA:115,32
-DA:121,18
-DA:124,14
-DA:127,60
-DA:128,28
-DA:131,12
-DA:134,60
-DA:135,60
-DA:136,28
-DA:140,32
-DA:141,32
-DA:142,0
-DA:144,0
+DA:62,14
+DA:63,0
+DA:65,14
+DA:66,0
+DA:68,14
+DA:70,14
+DA:91,14
+DA:93,14
+DA:94,0
+DA:97,14
+DA:98,0
+DA:101,14
+DA:102,0
+DA:105,14
+DA:106,14
+DA:107,14
+DA:110,60
+DA:111,60
+DA:113,32
+DA:119,18
+DA:122,14
+DA:125,60
+DA:126,28
+DA:129,12
+DA:132,60
+DA:133,60
+DA:139,28
+DA:143,32
+DA:144,32
 DA:145,0
-DA:146,0
+DA:147,0
+DA:148,0
 DA:149,0
-DA:152,32
-DA:153,32
-DA:154,0
-DA:155,0
-DA:156,0
+DA:152,0
+DA:155,32
+DA:156,32
 DA:157,0
+DA:158,0
+DA:159,0
 DA:160,0
-DA:164,60
-DA:165,7
-DA:166,7
-DA:169,60
-DA:170,14
-DA:171,7
-DA:175,60
-LF:56
-LH:42
+DA:163,0
+DA:167,60
+DA:168,7
+DA:169,7
+DA:172,60
+DA:173,14
+DA:174,7
+DA:178,60
+LF:58
+LH:43
 BRDA:56,0,0,60
 BRDA:56,0,1,20
 BRDA:56,1,0,20
 BRDA:56,1,1,0
 BRDA:60,2,0,0
 BRDA:60,2,1,14
-BRDA:60,3,0,14
-BRDA:60,3,1,14
-BRDA:66,4,0,8
-BRDA:66,4,1,6
-BRDA:76,5,0,0
-BRDA:76,5,1,14
-BRDA:78,6,0,2
-BRDA:78,6,1,12
-BRDA:86,7,0,0
-BRDA:86,7,1,14
-BRDA:90,8,0,0
-BRDA:90,8,1,14
-BRDA:94,9,0,0
-BRDA:94,9,1,14
-BRDA:104,10,0,28
-BRDA:104,10,1,32
-BRDA:106,11,0,0
-BRDA:106,11,1,32
-BRDA:107,12,0,32
-BRDA:107,12,1,18
-BRDA:107,12,2,18
-BRDA:107,12,3,0
-BRDA:107,12,4,18
-BRDA:107,12,5,18
-BRDA:115,13,0,18
-BRDA:115,13,1,14
-BRDA:116,14,0,32
-BRDA:116,14,1,18
-BRDA:116,14,2,18
-BRDA:116,14,3,18
-BRDA:128,15,0,16
-BRDA:128,15,1,12
-BRDA:128,16,0,28
-BRDA:128,16,1,14
-BRDA:135,17,0,28
-BRDA:135,17,1,32
-BRDA:135,18,0,60
-BRDA:135,18,1,32
-BRDA:135,18,2,32
-BRDA:141,19,0,0
-BRDA:141,19,1,32
-BRDA:141,20,0,32
-BRDA:141,20,1,16
-BRDA:145,21,0,0
-BRDA:145,21,1,0
-BRDA:145,22,0,0
-BRDA:145,22,1,0
-BRDA:153,23,0,0
-BRDA:153,23,1,32
-BRDA:156,24,0,0
-BRDA:156,24,1,0
-BRDA:156,25,0,0
-BRDA:156,25,1,0
-BRF:59
-BRH:41
+BRDA:62,3,0,0
+BRDA:62,3,1,14
+BRDA:65,4,0,0
+BRDA:65,4,1,14
+BRDA:73,5,0,8
+BRDA:73,5,1,6
+BRDA:83,6,0,0
+BRDA:83,6,1,14
+BRDA:85,7,0,2
+BRDA:85,7,1,12
+BRDA:93,8,0,0
+BRDA:93,8,1,14
+BRDA:97,9,0,0
+BRDA:97,9,1,14
+BRDA:101,10,0,0
+BRDA:101,10,1,14
+BRDA:111,11,0,28
+BRDA:111,11,1,32
+BRDA:113,12,0,18
+BRDA:113,12,1,14
+BRDA:114,13,0,32
+BRDA:114,13,1,18
+BRDA:114,13,2,18
+BRDA:114,13,3,18
+BRDA:126,14,0,16
+BRDA:126,14,1,12
+BRDA:126,15,0,28
+BRDA:126,15,1,14
+BRDA:133,16,0,28
+BRDA:133,16,1,32
+BRDA:134,17,0,60
+BRDA:134,17,1,32
+BRDA:134,17,2,32
+BRDA:134,17,3,32
+BRDA:144,18,0,0
+BRDA:144,18,1,32
+BRDA:144,19,0,32
+BRDA:144,19,1,16
+BRDA:148,20,0,0
+BRDA:148,20,1,0
+BRDA:148,21,0,0
+BRDA:148,21,1,0
+BRDA:156,22,0,0
+BRDA:156,22,1,32
+BRDA:159,23,0,0
+BRDA:159,23,1,0
+BRDA:159,24,0,0
+BRDA:159,24,1,0
+BRF:54
+BRH:36
 end_of_record
 TN:
 SF:src/hooks/useMap.ts

package/dist/index.esm.js

@@ -12220,8 +12220,14 @@ function useLayer(props) {
     var layerId = useRef(props.layerId || (props.idPrefix ? props.idPrefix : "Layer-") + mapHook.componentId);
     var createLayer = useCallback(function () {
         var _a, _b;
-        if (initializedRef.current || !mapHook.map)
+        if (!mapHook.map)
             return;
+        if (mapHook.map.map.getLayer(layerId.current)) {
+            mapHook.map.map.removeLayer(layerId.current);
+        }
+        if (mapHook.map.map.getSource(layerId.current)) {
+            mapHook.map.map.removeSource(layerId.current);
+        }
         initializedRef.current = true;
         mapHook.map.addLayer(__assign(__assign(__assign({}, props.options), (props.geojson
             ? {
@@ -12253,14 +12259,6 @@ function useLayer(props) {
         if (!mapHook.map)
             return;
         if (initializedRef.current &&
-            ((props.options.type && legalLayerTypes.indexOf(props.options.type) !== -1) ||
-                !props.options.type) &&
-            layerTypeRef.current &&
-            props.options.type !== layerTypeRef.current) {
-            // remove (cleanup) & reinitialize the layer if type has changed
-            cleanup();
-        }
-        else if (initializedRef.current &&
             (legalLayerTypes.indexOf(props.options.type) === -1 ||
                 (legalLayerTypes.indexOf(props.options.type) !== -1 &&
                     props.options.type === layerTypeRef.current))) {
@@ -12277,7 +12275,10 @@ function useLayer(props) {
     }, [props.geojson, mapHook.map, props.options.type]);
     useEffect(function () {
         var _a, _b, _c, _d, _e;
-        if (!mapHook.map || !((_c = (_b = (_a = mapHook.map) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.getLayer) === null || _c === void 0 ? void 0 : _c.call(_b, layerId.current)) || !initializedRef.current)
+        if (!mapHook.map ||
+            !((_c = (_b = (_a = mapHook.map) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.getLayer) === null || _c === void 0 ? void 0 : _c.call(_b, layerId.current)) ||
+            !initializedRef.current ||
+            props.options.type !== layerTypeRef.current)
             return;
         var key;
         var layoutString = JSON.stringify(props.options.layout);