npm - @mapcomponents/react-maplibre - Versions diffs - 0.1.34 → 0.1.35 - Mend

@mapcomponents/react-maplibre 0.1.34 → 0.1.35

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

package/coverage/lcov-report/src/{components/MlGeoJsonLayer/MlGeoJsonLayer.js.html → hooks/useLayer.ts.html} RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for src/components/MlGeoJsonLayer/MlGeoJsonLayer.js</title>
+    <title>Code coverage report for src/hooks/useLayer.ts</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">src/components/MlGeoJsonLayer</a> MlGeoJsonLayer.js</h1>
+        <h1><a href="../../index.html">All files</a> / <a href="index.html">src/hooks</a> useLayer.ts</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">73.8% </span>
+                <span class="strong">74.57% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>31/42</span>
+                <span class='fraction'>44/59</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">59.09% </span>
+                <span class="strong">70.17% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>26/44</span>
+                <span class='fraction'>40/57</span>
             </div>
             <div class='fl pad1y space-right2'>
                 <span class="strong">100% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>6/6</span>
+                <span class='fraction'>8/8</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">71.05% </span>
+                <span class="strong">75.43% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>27/38</span>
+                <span class='fraction'>43/57</span>
             </div>
@@ -236,7 +236,55 @@
 <a name='L171'></a><a href='#L171'>171</a>
 <a name='L172'></a><a href='#L172'>172</a>
 <a name='L173'></a><a href='#L173'>173</a>
-<a name='L174'></a><a href='#L174'>174</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L174'></a><a href='#L174'>174</a>
+<a name='L175'></a><a href='#L175'>175</a>
+<a name='L176'></a><a href='#L176'>176</a>
+<a name='L177'></a><a href='#L177'>177</a>
+<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>
+<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>
+<a name='L189'></a><a href='#L189'>189</a>
+<a name='L190'></a><a href='#L190'>190</a>
+<a name='L191'></a><a href='#L191'>191</a>
+<a name='L192'></a><a href='#L192'>192</a>
+<a name='L193'></a><a href='#L193'>193</a>
+<a name='L194'></a><a href='#L194'>194</a>
+<a name='L195'></a><a href='#L195'>195</a>
+<a name='L196'></a><a href='#L196'>196</a>
+<a name='L197'></a><a href='#L197'>197</a>
+<a name='L198'></a><a href='#L198'>198</a>
+<a name='L199'></a><a href='#L199'>199</a>
+<a name='L200'></a><a href='#L200'>200</a>
+<a name='L201'></a><a href='#L201'>201</a>
+<a name='L202'></a><a href='#L202'>202</a>
+<a name='L203'></a><a href='#L203'>203</a>
+<a name='L204'></a><a href='#L204'>204</a>
+<a name='L205'></a><a href='#L205'>205</a>
+<a name='L206'></a><a href='#L206'>206</a>
+<a name='L207'></a><a href='#L207'>207</a>
+<a name='L208'></a><a href='#L208'>208</a>
+<a name='L209'></a><a href='#L209'>209</a>
+<a name='L210'></a><a href='#L210'>210</a>
+<a name='L211'></a><a href='#L211'>211</a>
+<a name='L212'></a><a href='#L212'>212</a>
+<a name='L213'></a><a href='#L213'>213</a>
+<a name='L214'></a><a href='#L214'>214</a>
+<a name='L215'></a><a href='#L215'>215</a>
+<a name='L216'></a><a href='#L216'>216</a>
+<a name='L217'></a><a href='#L217'>217</a>
+<a name='L218'></a><a href='#L218'>218</a>
+<a name='L219'></a><a href='#L219'>219</a>
+<a name='L220'></a><a href='#L220'>220</a>
+<a name='L221'></a><a href='#L221'>221</a>
+<a name='L222'></a><a href='#L222'>222</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>
@@ -244,51 +292,30 @@
 <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">3x</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">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">24x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">16x</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-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24x</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-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>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">24x</span>
-<span class="cline-any cline-yes">16x</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">24x</span>
-<span class="cline-any cline-yes">8x</span>
+<span class="cline-any cline-yes">5x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</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>
@@ -299,54 +326,70 @@
 <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">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-yes">60x</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-yes">60x</span>
+<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-yes">60x</span>
+<span class="cline-any cline-yes">14x</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-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">8x</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">8x</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">8x</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">24x</span>
-<span class="cline-any cline-yes">24x</span>
 <span class="cline-any cline-neutral">&nbsp;</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-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">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-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-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">14x</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">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</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-yes">24x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3x</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-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -354,234 +397,335 @@
 <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">14x</span>
+<span class="cline-any cline-yes">14x</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-yes">60x</span>
+<span class="cline-any cline-yes">60x</span>
 <span class="cline-any cline-neutral">&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-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>
+<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-yes">60x</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>
 <span class="cline-any cline-neutral">&nbsp;</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>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <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-yes">28x</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">32x</span>
+<span class="cline-any cline-yes">32x</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>
 <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-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-yes">32x</span>
+<span class="cline-any cline-yes">32x</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-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-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">60x</span>
+<span class="cline-any cline-yes">7x</span>
+<span class="cline-any cline-yes">7x</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 useMap from "../../hooks/useMap";
+<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-yes">7x</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">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-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></td><td class="text"><pre class="prettyprint lang-js">import { useState, useEffect, useCallback, useRef } from "react";
 &nbsp;
-import getDefaultPaintPropsByType from "./util/getDefaultPaintPropsByType";
-import getDefaulLayerTypeByGeometry from "./util/getDefaultLayerTypeByGeometry";
+import useMap, { useMapType } from "./useMap";
 &nbsp;
-const legalLayerTypes = ["circle", "fill", "line"];
+import { LayerSpecification } from "maplibre-gl";
 &nbsp;
-/**
- * Adds source and layer of types "line", "fill" or "circle" to display GeoJSON data on the map.
- *
- * @component
- */
-const MlGeoJsonLayer = (props) =&gt; {
-  // Use a useRef hook to reference the layer object to be able to access it later inside useEffect hooks
-  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);
+import MapLibreGlWrapper from "../components/MapLibreMap/lib/MapLibreGlWrapper";
 &nbsp;
-  useEffect(() =&gt; {
-    if (!mapHook.map || !initializedRef.current) return;
+type useLayerType = {
+  map: MapLibreGlWrapper | undefined;
+  layer: LayerSpecification;
+  layerId: string;
+  componentId: string;
+  mapHook: useMapType;
+};
 &nbsp;
-<span class="cstat-no" title="statement not covered" >    for (var key in props.layout) {</span>
-<span class="cstat-no" title="statement not covered" >      mapHook.map.setLayoutProperty(layerId.current, key, props.layout[key]);</span>
-    }
-  }, [props.layout, mapHook.map, props.mapId]);
+interface useLayerProps {
+  mapId?: string;
+  layerId?: string;
+  idPrefix?: string;
+  insertBeforeLayer?: string;
+  insertBeforeFirstSymbolLayer?: boolean;
+  geojson?: object;
+  options: LayerSpecification;
+  onHover?: Function;
+  onClick?: Function;
+  onLeave?: Function;
+}
 &nbsp;
-  useEffect(() =&gt; {
-    if (!mapHook.map || !initializedRef.current) return;
+const legalLayerTypes = [
+  "fill",
+  "line",
+  "symbol",
+  "circle",
+  "heatmap",
+  "fill-extrusion",
+  "raster",
+  "hillshade",
+  "background",
+];
 &nbsp;
-    let _paint =
-<span class="cstat-no" title="statement not covered" >      props.paint || getDefaultPaintPropsByType(layerTypeRef.current, props.defaultPaintOverrides);</span>
+function useLayer(props: useLayerProps): useLayerType {
+  const mapHook = useMap({
+    mapId: props.mapId,
+    waitForLayer: props.insertBeforeLayer,
+  });
 &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, mapHook.map, props.mapId, props.defaultPaintOverrides]);
+  const layerTypeRef = useRef&lt;string&gt;("");
+  const layerPaintConfRef = useRef&lt;string&gt;("");
+  const layerLayoutConfRef = useRef&lt;string&gt;("");
 &nbsp;
-  useEffect(() =&gt; {
-    if (!mapHook?.map?.getSource(layerId.current) || <span class="branch-1 cbranch-no" title="branch not covered" >!initializedRef.current)</span> return;
+  const [layer, setLayer] = useState&lt;any&gt;();
 &nbsp;
-<span class="cstat-no" title="statement not covered" >    mapHook.map.getSource(layerId.current).setData(props.geojson);</span>
-  }, [props.geojson, mapHook.map, props.type]);
+  const initializedRef = useRef&lt;boolean&gt;(false);
+  const layerId = useRef(
+    props.layerId ||
+      (props.idPrefix ? props.idPrefix : <span class="branch-1 cbranch-no" title="branch not covered" >"Layer-")</span> + mapHook.componentId
+  );
 &nbsp;
   const createLayer = useCallback(() =&gt; {
-    let geojson = props.geojson;
-&nbsp;
-    layerTypeRef.current = props.type || <span class="branch-1 cbranch-no" title="branch not covered" >getDefaulLayerTypeByGeometry(props.geojson);</span>
+    <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;
     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.geojson
+          ? {
+              source: {
+                type: "geojson",
+                data: props.geojson,
+              },
+            }
+          : {}),
+        id: layerId.current,
       },
-      props.insertBeforeLayer,
+      props.insertBeforeLayer
+        ? <span class="branch-0 cbranch-no" title="branch not covered" >props.insertBeforeLayer</span>
+        : props.insertBeforeFirstSymbolLayer
+        ? mapHook.map.firstSymbolLayer
+        : undefined,
       mapHook.componentId
     );
+&nbsp;
+    setLayer(mapHook.map.map.getLayer(layerId.current));
 &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" >      mapHook.map.on("mousemove", layerId.current, props.onHover, mapHook.componentId);</span>
+<span class="cstat-no" title="statement not covered" >      mapHook.map.on(</span>
+        "mousemove",
+        layerId.current,
+        props.onHover,
+        mapHook.componentId
+      );
     }
 &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" >      mapHook.map.on("click", layerId.current, props.onClick, mapHook.componentId);</span>
+<span class="cstat-no" title="statement not covered" >      mapHook.map.on(</span>
+        "click",
+        layerId.current,
+        props.onClick,
+        mapHook.componentId
+      );
     }
 &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" >      mapHook.map.on("mouseleave", layerId.current, props.onLeave, mapHook.componentId);</span>
+<span class="cstat-no" title="statement not covered" >      mapHook.map.on(</span>
+        "mouseleave",
+        layerId.current,
+        props.onLeave,
+        mapHook.componentId
+      );
     }
-  }, [mapHook, props]);
+&nbsp;
+    layerPaintConfRef.current = JSON.stringify(props.options?.paint);
+    layerLayoutConfRef.current = JSON.stringify(props.options?.layout);
+    layerTypeRef.current = props.options.type;
+  }, [props, mapHook.map]);
 &nbsp;
   useEffect(() =&gt; {
-    if (!mapHook.map || !props.geojson) return;
+    if (!mapHook.map) return;
 &nbsp;
     <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>
+      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" >      mapHook.map.cleanup(mapHook.componentId);</span>
-    } else <span class="missing-if-branch" title="if path not taken" >I</span>if (
+<span class="cstat-no" title="statement not covered" >      cleanup();</span>
+    } else 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>)
+      (legalLayerTypes.indexOf(props.options.type) === -1 ||
+        (legalLayerTypes.indexOf(props.options.type) !== -1 &amp;&amp;
+          props.options.type === layerTypeRef.current))
     ) {
-<span class="cstat-no" title="statement not covered" >      return;</span>
+      return;
     }
-&nbsp;
-    initializedRef.current = true;
 &nbsp;
     createLayer();
-  }, [mapHook, createLayer, props]);
+  }, [mapHook.map, props.options, createLayer]);
 &nbsp;
-  return &lt;&gt;&lt;/&gt;;
-};
+  useEffect(() =&gt; {
+    if (
+      !initializedRef.current ||
+      !mapHook?.map?.map.getSource(layerId.current)
+    )
+      return;
 &nbsp;
-MlGeoJsonLayer.propTypes = {
-  /**
-   * Id of the target MapLibre instance in mapContext
-   */
-  mapId: PropTypes.string,
-  /**
-   * Type of the layer that will be added to the MapLibre instance.
-   * Possible values: "line", "circle", "fill"
-   */
-  type: PropTypes.string,
-  /**
-   * Layout property object, that is passed to the addLayer call.
-   * Possible props depend on the layer type.
-   * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#line
-   * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#circle
-   * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#fill
-   */
-  layout: PropTypes.object,
-  /**
-   * Paint property object, that is passed to the addLayer call.
-   * Possible props depend on the layer type.
-   * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#line
-   * https://maplibre.org/maplibre-gl-js-docs/style-spec/layers/#circle
-   * 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.
-   */
-  geojson: PropTypes.object,
-  /**
-   * Id of an existing layer in the mapLibre instance to help specify the layer order
-   * This layer will be visually beneath the layer with the "insertBeforeLayer" id.
-   */
-  insertBeforeLayer: PropTypes.string,
-  /**
-   * Id of the new layer and source that are added to the MapLibre instance
-   */
-  layerId: PropTypes.string,
-  /**
-   * Click event handler that is executed whenever a geometry rendered by this component is clicked.
-   */
-  onClick: PropTypes.func,
-  /**
-   * Hover event handler that is executed whenever a geometry rendered by this component is hovered.
-   */
-  onHover: PropTypes.func,
-  /**
-   * Leave event handler that is executed whenever a geometry rendered by this component is
-   * left/unhovered.
-   */
-  onLeave: PropTypes.func,
-};
+    // @ts-ignore
+    mapHook.map.map.getSource(layerId.current).setData(props.geojson);
+  }, [props.geojson, mapHook.map, props.options.type]);
+&nbsp;
+  useEffect(() =&gt; {
+    if (
+      !mapHook.map ||
+      !mapHook.map?.map?.getLayer?.(layerId.current) ||
+      !initializedRef.current
+    )
+      return;
+&nbsp;
+    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; layoutString !== layerLayoutConfRef.current) {
+      let oldLayout = <span class="cstat-no" title="statement not covered" >JSON.parse(layerLayoutConfRef.current);</span>
+&nbsp;
+<span class="cstat-no" title="statement not covered" >      for (key in props.options.layout) {</span>
+<span class="cstat-no" title="statement not covered" >        if (</span>
+          props.options.layout?.[key] &amp;&amp;
+          props.options.layout[key] !== oldLayout[key]
+        ) {
+<span class="cstat-no" title="statement not covered" >          mapHook.map.map.setLayoutProperty(</span>
+            layerId.current,
+            key,
+            props.options.layout[key]
+          );
+        }
+      }
+<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 (paintString !== layerPaintConfRef.current) {
+      let oldPaint = <span class="cstat-no" title="statement not covered" >JSON.parse(layerPaintConfRef.current);</span>
+<span class="cstat-no" title="statement not covered" >      for (key in props.options.paint) {</span>
+<span class="cstat-no" title="statement not covered" >        if (</span>
+          props.options.paint?.[key] &amp;&amp;
+          props.options.paint[key] !== oldPaint[key]
+        ) {
+<span class="cstat-no" title="statement not covered" >          mapHook.map.map.setPaintProperty(</span>
+            layerId.current,
+            key,
+            props.options.paint[key]
+          );
+        }
+      }
+<span class="cstat-no" title="statement not covered" >      layerPaintConfRef.current = paintString;</span>
+    }
+  }, [props.options, mapHook.map]);
+&nbsp;
+  const cleanup = () =&gt; {
+    initializedRef.current = false;
+    mapHook.cleanup();
+  };
+&nbsp;
+  useEffect(() =&gt; {
+    return () =&gt; {
+      cleanup();
+    };
+  }, []);
+&nbsp;
+  return {
+    map: mapHook.map,
+    layer: layer,
+    layerId: layerId.current,
+    componentId: mapHook.componentId,
+    mapHook: mapHook,
+  };
+}
 &nbsp;
-export default MlGeoJsonLayer;
+export default useLayer;
 &nbsp;</pre></td></tr></table></pre>
                 <div class='push'></div><!-- for sticky footer -->
@@ -589,16 +733,16 @@ export default MlGeoJsonLayer;
             <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 Mar 24 2022 19:39:33 GMT+0000 (Coordinated Universal Time)
+                at Wed Apr 20 2022 07:57:24 GMT+0000 (Coordinated Universal Time)
             </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>