@mapcomponents/react-maplibre 0.1.40 → 0.1.43

package/coverage/lcov-report/src/components/MlWmsFeatureInfoPopup/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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/components/MlWmsLayer/MlWmsLayer.tsx.html

@@ -610,7 +610,7 @@ export default MlWmsLayer;
             <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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/components/MlWmsLayer/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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/components/MlWmsLoader/MlWmsLoader.tsx.html

@@ -368,7 +368,19 @@
 <a name='L303'></a><a href='#L303'>303</a>
 <a name='L304'></a><a href='#L304'>304</a>
 <a name='L305'></a><a href='#L305'>305</a>
-<a name='L306'></a><a href='#L306'>306</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L306'></a><a href='#L306'>306</a>
+<a name='L307'></a><a href='#L307'>307</a>
+<a name='L308'></a><a href='#L308'>308</a>
+<a name='L309'></a><a href='#L309'>309</a>
+<a name='L310'></a><a href='#L310'>310</a>
+<a name='L311'></a><a href='#L311'>311</a>
+<a name='L312'></a><a href='#L312'>312</a>
+<a name='L313'></a><a href='#L313'>313</a>
+<a name='L314'></a><a href='#L314'>314</a>
+<a name='L315'></a><a href='#L315'>315</a>
+<a name='L316'></a><a href='#L316'>316</a>
+<a name='L317'></a><a href='#L317'>317</a>
+<a name='L318'></a><a href='#L318'>318</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>
@@ -444,6 +456,13 @@
 <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-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-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -496,10 +515,14 @@
 <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-no">&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-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -526,6 +549,7 @@
 <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-no">&nbsp;</span>
@@ -689,11 +713,11 @@ import List from "@mui/material/List";
 import ListItem from "@mui/material/ListItem";
 import ListItemText from "@mui/material/ListItemText";
 import IconButton from "@mui/material/IconButton";
-import {LngLat} from "maplibre-gl";
+import { LngLat } from "maplibre-gl";
 import MapLibreGlWrapper from "../MapLibreMap/lib/MapLibreGlWrapper";
 &nbsp;
 var originShift = <span class="cstat-no" title="statement not covered" >(2 * Math.PI * 6378137) / 2.0;</span>
-const lngLatToMeters = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >fu</span>nction (lnglat:LngLat, accuracy = <span class="branch-0 cbranch-no" title="branch not covered" >{ enable: true, decimal: 1 })</span> {</span>
+const lngLatToMeters = <span class="cstat-no" title="statement not covered" ><span class="fstat-no" title="function not covered" >fu</span>nction (lnglat: LngLat, accuracy = <span class="branch-0 cbranch-no" title="branch not covered" >{ enable: true, decimal: 1 })</span> {</span>
   var lng = <span class="cstat-no" title="statement not covered" >lnglat.lng;</span>
   var lat = <span class="cstat-no" title="statement not covered" >lnglat.lat;</span>
   var x = <span class="cstat-no" title="statement not covered" >(lng * originShift) / 180.0;</span>
@@ -729,7 +753,7 @@ interface MlWmsLoaderProps {
   layerUrlParameters: object;
   lngLat: LngLat;
   idPrefix: string;
-};
+}
 &nbsp;
 /**
  * Loads a WMS getCapabilities xml document and adds a MlWmsLayer component for each layer that is
@@ -746,16 +770,23 @@ const MlWmsLoader = <span class="cstat-no" title="statement not covered" ><span
     url: undefined,
     urlParameters: props.urlParameters,
   });
-  let layerType : { visible: boolean, queryable: boolean, Name: string, Title: string, LatLonBoundingBox: Array&lt;number&gt;,
-    EX_GeographicBoundingBox: Array&lt;number&gt;, Abstract: any}
+  let layerType: {
+    visible: boolean;
+    queryable: boolean;
+    Name: string;
+    Title: string;
+    LatLonBoundingBox: Array&lt;number&gt;;
+    EX_GeographicBoundingBox: Array&lt;number&gt;;
+    Abstract: any;
+  };
 &nbsp;
   const initializedRef = <span class="cstat-no" title="statement not covered" >useRef(false);</span>
   const mapRef = <span class="cstat-no" title="statement not covered" >useRef&lt;MapLibreGlWrapper&gt;();</span>
   const componentId = <span class="cstat-no" title="statement not covered" >useRef((props.idPrefix ? props.idPrefix : "MlWmsLoader-") + uuidv4());</span>
   const [layers, setLayers] = <span class="cstat-no" title="statement not covered" >useState&lt;Array&lt;typeof layerType&gt;&gt;([]);</span>
 &nbsp;
-  const [featureInfoLngLat, setFeatureInfoLngLat] = <span class="cstat-no" title="statement not covered" >useState(undefined);</span>
-  const [featureInfoContent, setFeatureInfoContent] = <span class="cstat-no" title="statement not covered" >useState&lt;string|undefined&gt;(undefined);</span>
+  const [featureInfoLngLat, setFeatureInfoLngLat] = <span class="cstat-no" title="statement not covered" >useState&lt;{lng:number,lat:number} | undefined&gt;();</span>
+  const [featureInfoContent, setFeatureInfoContent] = <span class="cstat-no" title="statement not covered" >useState&lt;string | undefined&gt;(undefined);</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >  useEffect(<span class="fstat-no" title="function not covered" >()</span> =&gt; {</span>
     let _componentId = <span class="cstat-no" title="statement not covered" >componentId.current;</span>
@@ -783,7 +814,7 @@ const MlWmsLoader = <span class="cstat-no" title="statement not covered" ><span
 &nbsp;
   const getFeatureInfo = <span class="cstat-no" title="statement not covered" >useCallback(</span>
 <span class="fstat-no" title="function not covered" >    (e</span>v) =&gt; {
-<span class="cstat-no" title="statement not covered" >      if(!mapRef.current) <span class="cstat-no" title="statement not covered" >return;</span></span>
+<span class="cstat-no" title="statement not covered" >      if (!mapRef.current) <span class="cstat-no" title="statement not covered" >return;</span></span>
 <span class="cstat-no" title="statement not covered" >      setFeatureInfoLngLat(undefined);</span>
 <span class="cstat-no" title="statement not covered" >      setFeatureInfoContent(undefined);</span>
       let _bounds = <span class="cstat-no" title="statement not covered" >mapRef.current.map.getBounds();</span>
@@ -801,10 +832,14 @@ const MlWmsLoader = <span class="cstat-no" title="statement not covered" ><span
             : "text/plain",
         FEATURE_COUNT: "10",
         LAYERS: layers
-          .map(<span class="fstat-no" title="function not covered" >(l</span>ayer: typeof layerType) =&gt; (<span class="cstat-no" title="statement not covered" >layer.visible &amp;&amp; layer.queryable ? layer.Name : undefined)</span>)
+          .map(<span class="fstat-no" title="function not covered" >(l</span>ayer: typeof layerType) =&gt;
+<span class="cstat-no" title="statement not covered" >            layer.visible &amp;&amp; layer.queryable ? layer.Name : undefined</span>
+          )
           .filter(<span class="fstat-no" title="function not covered" >(n</span>) =&gt; <span class="cstat-no" title="statement not covered" >n)</span>,
         QUERY_LAYERS: layers
-          .map(<span class="fstat-no" title="function not covered" >(l</span>ayer: typeof layerType) =&gt; (<span class="cstat-no" title="statement not covered" >layer.visible &amp;&amp; layer.queryable ? layer.Name : undefined)</span>)
+          .map(<span class="fstat-no" title="function not covered" >(l</span>ayer: typeof layerType) =&gt;
+<span class="cstat-no" title="statement not covered" >            layer.visible &amp;&amp; layer.queryable ? layer.Name : undefined</span>
+          )
           .filter(<span class="fstat-no" title="function not covered" >(n</span>) =&gt; <span class="cstat-no" title="statement not covered" >n)</span>,
         WIDTH: mapRef.current?.map._container.clientWidth,
         HEIGHT: mapRef.current?.map._container.clientHeight,
@@ -818,7 +853,7 @@ const MlWmsLoader = <span class="cstat-no" title="statement not covered" ><span
         buffer: "50",
       };
 &nbsp;
-      let _gfiUrl : string | undefined = <span class="cstat-no" title="statement not covered" >getFeatureInfoUrl;</span>
+      let _gfiUrl: string | undefined = <span class="cstat-no" title="statement not covered" >getFeatureInfoUrl;</span>
       let _gfiUrlParts;
 <span class="cstat-no" title="statement not covered" >      if (_gfiUrl?.indexOf?.("?") !== -1) {</span>
 <span class="cstat-no" title="statement not covered" >        _gfiUrlParts = props.url.split("?");</span>
@@ -831,7 +866,8 @@ const MlWmsLoader = <span class="cstat-no" title="statement not covered" ><span
         ..._getFeatureInfoUrlParams,
       };
       // create URLSearchParams object to assemble the URL Parameters
-      let urlParams = <span class="cstat-no" title="statement not covered" >new URLSearchParams(urlParamsObj.toString());</span>
+      // "as any" can be removed once the URLSearchParams ts spec is fixed
+      let urlParams = <span class="cstat-no" title="statement not covered" >new URLSearchParams(urlParamsObj as any);</span>
 &nbsp;
 <span class="cstat-no" title="statement not covered" >      fetch(props.url + "?" + urlParams.toString())</span>
         .then(<span class="fstat-no" title="function not covered" >(r</span>es) =&gt; {
@@ -911,7 +947,7 @@ const MlWmsLoader = <span class="cstat-no" title="statement not covered" ><span
       {error &amp;&amp; &lt;p&gt;{error}&lt;/p&gt;}
       &lt;h3 key="title"&gt;{capabilities?.Service?.Title}&lt;/h3&gt;
       {console.log(componentId.current)}
-      {capabilities?.Capability?.Layer?.Layer.map(<span class="fstat-no" title="function not covered" >(i</span>dx: number) =&gt; (
+      {capabilities?.Capability?.Layer?.Layer.map(<span class="fstat-no" title="function not covered" >(l</span>ayer: any, idx: number) =&gt; (
 <span class="cstat-no" title="statement not covered" >        &lt;MlLayer</span>
           layerId={"Order-" + componentId.current + "-" + idx}
           key={componentId.current + "-" + idx}
@@ -985,7 +1021,7 @@ export default MlWmsLoader;
             <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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/components/MlWmsLoader/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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/contexts/MapContext.tsx.html

@@ -343,7 +343,7 @@ export default MapContext;</pre></td></tr></table></pre>
             <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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/contexts/SimpleDataContext.js.html

@@ -88,7 +88,7 @@ export default SimpleDataContext;
             <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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

package/coverage/lcov-report/src/contexts/SimpleDataProvider.js.html

@@ -262,7 +262,7 @@ export default SimpleDataProvider;
             <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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -131,7 +131,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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -23,23 +23,23 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">55.11% </span>
+                <span class="strong">55.36% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>97/176</span>
+                <span class='fraction'>98/177</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">53.33% </span>
+                <span class="strong">51.48% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>56/105</span>
+                <span class='fraction'>52/101</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">59.25% </span>
+                <span class="strong">60.71% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>16/27</span>
+                <span class='fraction'>17/28</span>
             </div>
         
             
@@ -85,27 +85,27 @@
 	</td>
 	<td data-value="74.57" class="pct medium">74.57%</td>
 	<td data-value="59" class="abs medium">44/59</td>
-	<td data-value="70.17" class="pct medium">70.17%</td>
-	<td data-value="57" class="abs medium">40/57</td>
+	<td data-value="67.92" class="pct medium">67.92%</td>
+	<td data-value="53" class="abs medium">36/53</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="8" class="abs high">8/8</td>
-	<td data-value="75.43" class="pct medium">75.43%</td>
-	<td data-value="57" class="abs medium">43/57</td>
+	<td data-value="75" class="pct medium">75%</td>
+	<td data-value="56" class="abs medium">42/56</td>
 	</tr>
 
 <tr>
 	<td class="file high" data-value="useMap.ts"><a href="useMap.ts.html">useMap.ts</a></td>
-	<td data-value="80" class="pic high">
+	<td data-value="80.64" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 80%"></div><div class="cover-empty" style="width: 20%"></div></div>
 	</td>
-	<td data-value="80" class="pct high">80%</td>
-	<td data-value="30" class="abs high">24/30</td>
+	<td data-value="80.64" class="pct high">80.64%</td>
+	<td data-value="31" class="abs high">25/31</td>
 	<td data-value="57.14" class="pct medium">57.14%</td>
 	<td data-value="14" class="abs medium">8/14</td>
+	<td data-value="83.33" class="pct high">83.33%</td>
+	<td data-value="6" class="abs high">5/6</td>
 	<td data-value="80" class="pct high">80%</td>
-	<td data-value="5" class="abs high">4/5</td>
-	<td data-value="79.31" class="pct medium">79.31%</td>
-	<td data-value="29" class="abs medium">23/29</td>
+	<td data-value="30" class="abs high">24/30</td>
 	</tr>
 
 <tr>
@@ -146,7 +146,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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -30,9 +30,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">70.17% </span>
+                <span class="strong">67.92% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>40/57</span>
+                <span class='fraction'>36/53</span>
             </div>
         
             
@@ -44,9 +44,9 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">75.43% </span>
+                <span class="strong">75% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>43/57</span>
+                <span class='fraction'>42/56</span>
             </div>
         
             
@@ -243,11 +243,7 @@
 <a name='L178'></a><a href='#L178'>178</a>
 <a name='L179'></a><a href='#L179'>179</a>
 <a name='L180'></a><a href='#L180'>180</a>
-<a name='L181'></a><a href='#L181'>181</a>
-<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='L181'></a><a href='#L181'>181</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>
@@ -311,6 +307,11 @@
 <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-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">14x</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>
@@ -358,14 +359,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-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>
@@ -374,7 +367,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">60x</span>
 <span class="cline-any cline-yes">28x</span>
-<span class="cline-any cline-yes">16x</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>
@@ -492,6 +484,11 @@ function useLayer(props: useLayerProps): useLayerType {
   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>
     initializedRef.current = true;
+&nbsp;
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (mapHook.map.map.getLayer(layerId.current)) {
+      // remove (cleanup) &amp; reinitialize the layer if type has changed
+<span class="cstat-no" title="statement not covered" >      cleanup();</span>
+    }
 &nbsp;
     mapHook.map.addLayer(
       {
@@ -536,15 +533,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;
-      legalLayerTypes.indexOf(props.options.type) !== -1 &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;
@@ -557,10 +546,9 @@ function useLayer(props: useLayerProps): useLayerType {
   }, [mapHook.map, props.options, createLayer]);
 &nbsp;
   useEffect(() =&gt; {
-    if (!initializedRef.current || !mapHook.map?.map?.getSource(layerId.current))
-      return;
+    if (!initializedRef.current || !mapHook.map?.map?.getSource(layerId.current)) return;
 &nbsp;
-      //@ts-ignore setData only exists on GeoJsonSource
+    //@ts-ignore setData only exists on GeoJsonSource
     mapHook.map.map.getSource(layerId.current)?.setData?.(props.geojson);
   }, [props.geojson, mapHook.map, props.options.type]);
 &nbsp;
@@ -622,7 +610,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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

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

@@ -23,9 +23,9 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
+                <span class="strong">80.64% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>24/30</span>
+                <span class='fraction'>25/31</span>
             </div>
         
             
@@ -37,16 +37,16 @@
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">80% </span>
+                <span class="strong">83.33% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>4/5</span>
+                <span class='fraction'>5/6</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">79.31% </span>
+                <span class="strong">80% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>23/29</span>
+                <span class='fraction'>24/30</span>
             </div>
         
             
@@ -151,7 +151,9 @@
 <a name='L86'></a><a href='#L86'>86</a>
 <a name='L87'></a><a href='#L87'>87</a>
 <a name='L88'></a><a href='#L88'>88</a>
-<a name='L89'></a><a href='#L89'>89</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L89'></a><a href='#L89'>89</a>
+<a name='L90'></a><a href='#L90'>90</a>
+<a name='L91'></a><a href='#L91'>91</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>
@@ -195,11 +197,13 @@
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">30x</span>
-<span class="cline-any cline-yes">30x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">169x</span>
 <span class="cline-any cline-yes">48x</span>
+<span class="cline-any cline-yes">23x</span>
+<span class="cline-any cline-yes">23x</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">169x</span>
@@ -283,11 +287,13 @@ function useMap(props: { mapId?: string; waitForLayer?: string }): useMapType {
       mapRef.current = undefined;
     }
     initializedRef.current = false;
-    setMapIsReady(false);
   };
 &nbsp;
   useEffect(() =&gt; {
-    return cleanup;
+    return () =&gt; {
+      cleanup();
+      setMapIsReady(false);
+    }
   }, []);
 &nbsp;
   useEffect(() =&gt; {
@@ -334,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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 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 Thu Apr 21 2022 12:21:57 GMT+0000 (Coordinated Universal Time)
+                at Tue May 10 2022 14:40:14 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../prettify.js"></script>
         <script>