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

@mapcomponents/react-maplibre 0.1.12 → 0.1.16

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 (133) hide show

package/coverage/lcov-report/{components/MlLayer/MlLayer.js.html → src/components/MlImageMarkerLayer/MlImageMarkerLayer.js.html} RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for components/MlLayer/MlLayer.js</title>
+    <title>Code coverage report for src/components/MlImageMarkerLayer/MlImageMarkerLayer.js</title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../prettify.css" />
-    <link rel="stylesheet" href="../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
+    <link rel="stylesheet" href="../../../prettify.css" />
+    <link rel="stylesheet" href="../../../base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="../../../favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type='text/css'>
         .coverage-summary .sorter {
-            background-image: url(../../sort-arrow-sprite.png);
+            background-image: url(../../../sort-arrow-sprite.png);
         }
     </style>
 </head>
@@ -19,34 +19,34 @@
 <body>
 <div class='wrapper'>
     <div class='pad1'>
-        <h1><a href="../../index.html">All files</a> / <a href="index.html">components/MlLayer</a> MlLayer.js</h1>
+        <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/components/MlImageMarkerLayer</a> MlImageMarkerLayer.js</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">86.48% </span>
+                <span class="strong">69.69% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>32/37</span>
+                <span class='fraction'>23/33</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">75% </span>
+                <span class="strong">48.27% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>21/28</span>
+                <span class='fraction'>14/29</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
+                <span class="strong">83.33% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>5/5</span>
+                <span class='fraction'>5/6</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">86.11% </span>
+                <span class="strong">70.96% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>31/36</span>
+                <span class='fraction'>22/31</span>
             </div>
@@ -61,7 +61,7 @@
             </div>
         </template>
     </div>
-    <div class='status-line high'></div>
+    <div class='status-line medium'></div>
     <pre><table class="coverage">
 <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
 <a name='L2'></a><a href='#L2'>2</a>
@@ -138,31 +138,13 @@
 <a name='L73'></a><a href='#L73'>73</a>
 <a name='L74'></a><a href='#L74'>74</a>
 <a name='L75'></a><a href='#L75'>75</a>
-<a name='L76'></a><a href='#L76'>76</a>
-<a name='L77'></a><a href='#L77'>77</a>
-<a name='L78'></a><a href='#L78'>78</a>
-<a name='L79'></a><a href='#L79'>79</a>
-<a name='L80'></a><a href='#L80'>80</a>
-<a name='L81'></a><a href='#L81'>81</a>
-<a name='L82'></a><a href='#L82'>82</a>
-<a name='L83'></a><a href='#L83'>83</a>
-<a name='L84'></a><a href='#L84'>84</a>
-<a name='L85'></a><a href='#L85'>85</a>
-<a name='L86'></a><a href='#L86'>86</a>
-<a name='L87'></a><a href='#L87'>87</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L76'></a><a href='#L76'>76</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>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</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">2x</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>
@@ -170,36 +152,20 @@
 <span class="cline-any cline-yes">12x</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-yes">2x</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-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">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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</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-yes">4x</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-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-yes">4x</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>
@@ -207,120 +173,121 @@
 <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">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-yes">4x</span>
-<span class="cline-any cline-yes">4x</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-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-yes">4x</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-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-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-yes">4x</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-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">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-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import React, { useRef, useEffect, useContext } from "react";
-&nbsp;
-import { v4 as uuidv4 } from "uuid";
-import { MapContext } from "@mapcomponents/react-core";
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import React, { useRef, useCallback, useEffect } from "react";
 &nbsp;
-const MlLayer = (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 layerInitializedRef = useRef(false);
-  const mapRef = useRef(null);
-  const componentId = useRef(
-    (props.layerId ? <span class="branch-0 cbranch-no" title="branch not covered" >props.layerId </span>: "MlLayer-") + uuidv4()
-  );
-  const idSuffixRef = useRef(props.idSuffix || new Date().getTime());
-  const layerId = (props.layerId || "MlLayer-") + idSuffixRef.current;
-  const layerPaintConfRef = useRef(undefined);
-  const layerLayoutConfRef = useRef(undefined);
+import useMap from "../../hooks/useMap";
 &nbsp;
-  useEffect(() =&gt; {
-    let _componentId = componentId.current;
+const MlImageMarkerLayer = (props) =&gt; {
+  const mapHook = useMap({ mapId: props.mapId, waitForLayer: props.insertBeforeLayer });
 &nbsp;
-    return () =&gt; {
-      if (mapRef.current) {
-        mapRef.current.cleanup(_componentId);
-        mapRef.current = null;
-      }
-    };
-  }, []);
+  const layerInitializedRef = useRef(false);
+  const imageIdRef = useRef(props.imageId || "img_" + new Date().getTime());
+  const layerId = useRef(props.layerId || "MlImageMarkerLayer-" + mapHook.componentId);
 &nbsp;
   useEffect(() =&gt; {
     if (
-      !mapContext.mapExists(props.mapId) ||
-      !mapContext.getMap(props.mapId)?.getLayer?.(layerId) ||
-      !layerInitializedRef.current ||
-      !props.options
+      !mapHook.mapIsReady ||
+      (<span class="branch-1 cbranch-no" title="branch not covered" >mapHook.map </span>&amp;&amp; <span class="branch-2 cbranch-no" title="branch not covered" >!mapHook.map.getLayer(layerId.current))</span> ||
+<span class="branch-3 cbranch-no" title="branch not covered" >      !props.options</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
     var key;
 &nbsp;
-    let layoutString = JSON.stringify(props.options.layout);
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (props.options.layout &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >layoutString !== layerLayoutConfRef.current)</span> {
+<span class="cstat-no" title="statement not covered" >    if (props.options.layout) {</span>
 <span class="cstat-no" title="statement not covered" >      for (key in props.options.layout) {</span>
-<span class="cstat-no" title="statement not covered" >        mapRef.current.setLayoutProperty(layerId, key, props.options.layout[key]);</span>
+<span class="cstat-no" title="statement not covered" >        mapHook.map.setLayoutProperty(layerId.current, key, props.options.layout[key]);</span>
       }
-<span class="cstat-no" title="statement not covered" >      layerLayoutConfRef.current = layoutString;</span>
     }
-&nbsp;
-    let paintString = JSON.stringify(props.options.paint);
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (props.options.paint &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >paintString === layerPaintConfRef.current)</span> {
+<span class="cstat-no" title="statement not covered" >    if (props.options.paint) {</span>
 <span class="cstat-no" title="statement not covered" >      for (key in props.options.paint) {</span>
-<span class="cstat-no" title="statement not covered" >        mapRef.current.setPaintProperty(layerId, key, props.options.paint[key]);</span>
+<span class="cstat-no" title="statement not covered" >        mapHook.map.setPaintProperty(layerId.current, key, props.options.paint[key]);</span>
       }
     }
-  }, [props.options, layerId, mapContext, props]);
+  }, [props.options, layerId.current, props.mapId]);
+&nbsp;
+  const addLayer = useCallback(() =&gt; {
+    let tmpOptions = {
+      id: layerId.current,
+      layout: {},
+      ...props.options,
+    };
+    tmpOptions.layout["icon-image"] = imageIdRef.current;
+    mapHook.map.addLayer(tmpOptions, props.insertBeforeLayer, mapHook.componentId);
+  }, [props, mapHook.mapIsReady, mapHook.map]);
 &nbsp;
   useEffect(() =&gt; {
-    if (!mapContext.mapExists(props.mapId) || layerInitializedRef.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
+    if (!props.options || !mapHook.mapIsReady || layerInitializedRef.current) return;
 &nbsp;
-    mapRef.current = mapContext.getMap(props.mapId);
-    if (mapRef.current) {
-      layerInitializedRef.current = true;
-      mapRef.current.addLayer(
-        {
-          id: layerId,
-          type: "background",
-          paint: {
-            "background-color": "rgba(0,0,0,0)",
-          },
-          ...props.options,
-        },
-        props.insertBeforeLayer,
-        componentId.current
-      );
-      layerPaintConfRef.current = JSON.stringify(props.options?.paint);
-      layerLayoutConfRef.current = JSON.stringify(props.options?.layout);
+    layerInitializedRef.current = true;
+&nbsp;
+    if (props.imgSrc) {
+      mapHook.map.loadImage(props.imgSrc, <span class="fstat-no" title="function not covered" >fu</span>nction (error, image) {
+<span class="cstat-no" title="statement not covered" >        if (error) <span class="cstat-no" title="statement not covered" >throw error;</span></span>
+<span class="cstat-no" title="statement not covered" >        mapHook.map.addImage(imageIdRef.current, image, mapHook.componentId);</span>
+      });
+    }
+&nbsp;
+    addLayer();
+  }, [mapHook.mapIsReady, mapHook.map, addLayer, props]);
+&nbsp;
+  useEffect(() =&gt; {
+    if (
+      !mapHook.mapIsReady ||
+      (<span class="branch-1 cbranch-no" title="branch not covered" >mapHook.map </span>&amp;&amp; <span class="branch-2 cbranch-no" title="branch not covered" >!mapHook.map.getLayer(layerId.current))</span> ||
+<span class="branch-3 cbranch-no" title="branch not covered" >      !props.options</span>
+    ) {
+      return;
     }
-  }, [mapContext.mapIds, mapContext, props, layerId]);
+&nbsp;
+<span class="cstat-no" title="statement not covered" >    mapHook.map.getSource(layerId.current).setData(props.options.source.data);</span>
+  }, [props.options.source.data, props]);
 &nbsp;
   return &lt;&gt;&lt;/&gt;;
 };
 &nbsp;
-export default MlLayer;
+export default MlImageMarkerLayer;
 &nbsp;</pre></td></tr></table></pre>
                 <div class='push'></div><!-- for sticky footer -->
@@ -328,17 +295,17 @@ export default MlLayer;
             <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 Sat Dec 04 2021 10:55:55 GMT+0000 (Coordinated Universal Time)
+                at Thu Dec 23 2021 12:19:00 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
-        <script src="../../prettify.js"></script>
+        <script src="../../../prettify.js"></script>
         <script>
             window.onload = function () {
                 prettyPrint();
             };
         </script>
-        <script src="../../sorter.js"></script>
-        <script src="../../block-navigation.js"></script>
+        <script src="../../../sorter.js"></script>
+        <script src="../../../block-navigation.js"></script>
     </body>
 </html>

package/coverage/lcov-report/{components → src/components}/MlImageMarkerLayer/index.html RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for components/MlImageMarkerLayer</title>
+    <title>Code coverage report for src/components/MlImageMarkerLayer</title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../prettify.css" />
-    <link rel="stylesheet" href="../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
+    <link rel="stylesheet" href="../../../prettify.css" />
+    <link rel="stylesheet" href="../../../base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="../../../favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type='text/css'>
         .coverage-summary .sorter {
-            background-image: url(../../sort-arrow-sprite.png);
+            background-image: url(../../../sort-arrow-sprite.png);
         }
     </style>
 </head>
@@ -19,34 +19,34 @@
 <body>
 <div class='wrapper'>
     <div class='pad1'>
-        <h1><a href="../../index.html">All files</a> components/MlImageMarkerLayer</h1>
+        <h1><a href="../../../index.html">All files</a> src/components/MlImageMarkerLayer</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">79.06% </span>
+                <span class="strong">69.69% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>34/43</span>
+                <span class='fraction'>23/33</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">62.85% </span>
+                <span class="strong">48.27% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>22/35</span>
+                <span class='fraction'>14/29</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">87.5% </span>
+                <span class="strong">83.33% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>7/8</span>
+                <span class='fraction'>5/6</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">80.95% </span>
+                <span class="strong">70.96% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>34/42</span>
+                <span class='fraction'>22/31</span>
             </div>
@@ -80,17 +80,17 @@
 </thead>
 <tbody><tr>
 	<td class="file medium" data-value="MlImageMarkerLayer.js"><a href="MlImageMarkerLayer.js.html">MlImageMarkerLayer.js</a></td>
-	<td data-value="79.06" class="pic medium">
-	<div class="chart"><div class="cover-fill" style="width: 79%"></div><div class="cover-empty" style="width: 21%"></div></div>
+	<td data-value="69.69" class="pic medium">
+	<div class="chart"><div class="cover-fill" style="width: 69%"></div><div class="cover-empty" style="width: 31%"></div></div>
 	</td>
-	<td data-value="79.06" class="pct medium">79.06%</td>
-	<td data-value="43" class="abs medium">34/43</td>
-	<td data-value="62.85" class="pct medium">62.85%</td>
-	<td data-value="35" class="abs medium">22/35</td>
-	<td data-value="87.5" class="pct high">87.5%</td>
-	<td data-value="8" class="abs high">7/8</td>
-	<td data-value="80.95" class="pct high">80.95%</td>
-	<td data-value="42" class="abs high">34/42</td>
+	<td data-value="69.69" class="pct medium">69.69%</td>
+	<td data-value="33" class="abs medium">23/33</td>
+	<td data-value="48.27" class="pct low">48.27%</td>
+	<td data-value="29" class="abs low">14/29</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="70.96" class="pct medium">70.96%</td>
+	<td data-value="31" class="abs medium">22/31</td>
 	</tr>
 </tbody>
@@ -101,17 +101,17 @@
             <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 Sat Dec 04 2021 10:55:55 GMT+0000 (Coordinated Universal Time)
+                at Thu Dec 23 2021 12:19:00 GMT+0000 (Coordinated Universal Time)
             </div>
         </div>
-        <script src="../../prettify.js"></script>
+        <script src="../../../prettify.js"></script>
         <script>
             window.onload = function () {
                 prettyPrint();
             };
         </script>
-        <script src="../../sorter.js"></script>
-        <script src="../../block-navigation.js"></script>
+        <script src="../../../sorter.js"></script>
+        <script src="../../../block-navigation.js"></script>
     </body>
 </html>