@performant-software/geospatial 3.1.18-beta.1 → 3.1.18-beta.10

package/dist/index.es83.js

@@ -1,5 +1,13 @@
-var e = { exports: {} };
+import e from "react";
+var t = {
+  color: void 0,
+  size: void 0,
+  className: void 0,
+  style: void 0,
+  attr: void 0
+}, d = e.createContext && /* @__PURE__ */ e.createContext(t);
 export {
-  e as __module
+  t as DefaultContext,
+  d as IconContext
 };
 //# sourceMappingURL=index.es83.js.map

package/dist/index.es83.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es83.js","sources":[],"sourcesContent":[],"names":[],"mappings":";"}
+{"version":3,"file":"index.es83.js","sources":["../../../node_modules/react-icons/lib/iconContext.mjs"],"sourcesContent":["import React from \"react\";\nexport var DefaultContext = {\n  color: undefined,\n  size: undefined,\n  className: undefined,\n  style: undefined,\n  attr: undefined\n};\nexport var IconContext = React.createContext && /*#__PURE__*/React.createContext(DefaultContext);"],"names":["DefaultContext","IconContext","React"],"mappings":";AACU,IAACA,IAAiB;AAAA,EAC1B,OAAO;AAAA,EACP,MAAM;AAAA,EACN,WAAW;AAAA,EACX,OAAO;AAAA,EACP,MAAM;AACR,GACWC,IAAcC,EAAM,iBAA8BA,gBAAAA,EAAM,cAAcF,CAAc;","x_google_ignoreList":[0]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/geospatial",
-  "version": "3.1.18-beta.1",
+  "version": "3.1.18-beta.10",
   "description": "A package of components for all things map-related.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",

package/src/components/CertaintyLayer.js

@@ -1,6 +1,6 @@
 // @flow
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Layer, Source } from 'react-map-gl/maplibre';
 import MapStyles from '../utils/MapStyles';
 import MapUtils from '../utils/Map';
@@ -14,18 +14,24 @@ type Props = {
  * Renders circles with the given certainty_radius circumference around all points in a new layer.
  */
 const CertaintyLayer = (props: Props) => {
-  const circles = MapUtils.getCertaintyCircles([props.geometry], () => props.certaintyRadius);
+  const data = useMemo(() => {
+    if (props.geometry) {
+      return MapUtils.toCertaintyCircle(props.geometry, props.certaintyRadius);
+    } else {
+      return {};
+    }
+  }, [props.geometry, props.certaintyRadius]);
 
   return (
     <Source
-      data={circles}
+      data={data}
       type='geojson'
     >
       <Layer
         {...MapStyles.fill}
         id='certainty-layer'
         paint={{
-          ...MapStyles.fill.paint,
+          ...MapStyles.fill.paint
         }}
       />
     </Source>

package/src/utils/Map.js

@@ -26,45 +26,45 @@ const buildCircle = (point, radius) => (
   circle(point.coordinates, radius, { units: 'kilometers', steps: 32 })
 );
 
-const getCertaintyCircle = (item, getCertaintyRadius: (item: any) => number | undefined) => {
-  const certaintyRadius = getCertaintyRadius(item);
-
-  if (certaintyRadius) {
-    if (item.geometry?.type === 'FeatureCollection') {
-      for (const childFeature of item.geometry.features) {
-        if (childFeature.geometry?.type === 'Point') {
-          return buildCircle(childFeature.geometry, certaintyRadius);
-        }
+const toCertaintyCircle = (item, radius: number) => {
+  if (item.geometry?.type === 'FeatureCollection') {
+    let children = [];
+
+    for (const childFeature of item.geometry.features) {
+      if (childFeature.geometry?.type === 'Point') {
+        const { geometry, type } = buildCircle(childFeature.geometry, radius);
+        children.push({
+          ...childFeature,
+          geometry,
+          type
+        });
       }
-    } else if (item.geometry?.type === 'GeometryCollection') {
-      for (const geometry of item.geometry.geometries) {
-        if (geometry.type === 'Point') {
-          return buildCircle(geometry, certaintyRadius);
-        }
-      }
-    } else if (item.geometry?.type === 'Point') {
-      return buildCircle(item.geometry, certaintyRadius);
     }
-  }
-};
 
-/**
- * Returns a GeoJSON feature collection containing circles for each item in the given array.
- */
-const getCertaintyCircleFeatureCollection = (
-  items,
-  getCertaintyRadius: (item: any) => number | undefined
-) => {
-  const features = [];
-
-  for (const item of items) {
-    const circle = getCertaintyCircle(item, getCertaintyRadius);
-    if (circle) {
-      features.push(circle);
-    }
+    return {
+      ...item,
+      geometry: {
+        type: 'GeometryCollection',
+        geometries: children
+      }
+    };
+  } else if (item?.type === 'GeometryCollection') {
+    return {
+      ...item,
+      geometries: item.geometries.map((geometry) => geometry.type === 'Point'
+        ? buildCircle(geometry, radius)
+        : geometry)
+    };
+  } else if (item.geometry?.type === 'Point') {
+    const { geometry, type } = buildCircle(item.geometry, radius);
+    return {
+      ...item,
+      geometry,
+      type
+    };
   }
 
-  return featureCollection(features);
+  return item;
 };
 
 /**
@@ -213,8 +213,7 @@ const validateCoordinates = (coordinates) => {
 
 export default {
   addGeoreferenceLayer,
-  getCertaintyCircle,
-  getCertaintyCircleFeatureCollection,
+  toCertaintyCircle,
   getBoundingBox,
   removeLayer,
   toFeature,

package/types/components/CertaintyLayer.js.flow

@@ -1,6 +1,6 @@
 // @flow
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { Layer, Source } from 'react-map-gl/maplibre';
 import MapStyles from '../utils/MapStyles';
 import MapUtils from '../utils/Map';
@@ -14,18 +14,24 @@ type Props = {
  * Renders circles with the given certainty_radius circumference around all points in a new layer.
  */
 const CertaintyLayer = (props: Props) => {
-  const circles = MapUtils.getCertaintyCircles([props.geometry], () => props.certaintyRadius);
+  const data = useMemo(() => {
+    if (props.geometry) {
+      return MapUtils.toCertaintyCircle(props.geometry, props.certaintyRadius);
+    } else {
+      return {};
+    }
+  }, [props.geometry, props.certaintyRadius]);
 
   return (
     <Source
-      data={circles}
+      data={data}
       type='geojson'
     >
       <Layer
         {...MapStyles.fill}
         id='certainty-layer'
         paint={{
-          ...MapStyles.fill.paint,
+          ...MapStyles.fill.paint
         }}
       />
     </Source>

package/types/utils/Map.js.flow

@@ -26,45 +26,45 @@ const buildCircle = (point, radius) => (
   circle(point.coordinates, radius, { units: 'kilometers', steps: 32 })
 );
 
-const getCertaintyCircle = (item, getCertaintyRadius: (item: any) => number | undefined) => {
-  const certaintyRadius = getCertaintyRadius(item);
-
-  if (certaintyRadius) {
-    if (item.geometry?.type === 'FeatureCollection') {
-      for (const childFeature of item.geometry.features) {
-        if (childFeature.geometry?.type === 'Point') {
-          return buildCircle(childFeature.geometry, certaintyRadius);
-        }
+const toCertaintyCircle = (item, radius: number) => {
+  if (item.geometry?.type === 'FeatureCollection') {
+    let children = [];
+
+    for (const childFeature of item.geometry.features) {
+      if (childFeature.geometry?.type === 'Point') {
+        const { geometry, type } = buildCircle(childFeature.geometry, radius);
+        children.push({
+          ...childFeature,
+          geometry,
+          type
+        });
       }
-    } else if (item.geometry?.type === 'GeometryCollection') {
-      for (const geometry of item.geometry.geometries) {
-        if (geometry.type === 'Point') {
-          return buildCircle(geometry, certaintyRadius);
-        }
-      }
-    } else if (item.geometry?.type === 'Point') {
-      return buildCircle(item.geometry, certaintyRadius);
     }
-  }
-};
 
-/**
- * Returns a GeoJSON feature collection containing circles for each item in the given array.
- */
-const getCertaintyCircleFeatureCollection = (
-  items,
-  getCertaintyRadius: (item: any) => number | undefined
-) => {
-  const features = [];
-
-  for (const item of items) {
-    const circle = getCertaintyCircle(item, getCertaintyRadius);
-    if (circle) {
-      features.push(circle);
-    }
+    return {
+      ...item,
+      geometry: {
+        type: 'GeometryCollection',
+        geometries: children
+      }
+    };
+  } else if (item?.type === 'GeometryCollection') {
+    return {
+      ...item,
+      geometries: item.geometries.map((geometry) => geometry.type === 'Point'
+        ? buildCircle(geometry, radius)
+        : geometry)
+    };
+  } else if (item.geometry?.type === 'Point') {
+    const { geometry, type } = buildCircle(item.geometry, radius);
+    return {
+      ...item,
+      geometry,
+      type
+    };
   }
 
-  return featureCollection(features);
+  return item;
 };
 
 /**
@@ -213,8 +213,7 @@ const validateCoordinates = (coordinates) => {
 
 export default {
   addGeoreferenceLayer,
-  getCertaintyCircle,
-  getCertaintyCircleFeatureCollection,
+  toCertaintyCircle,
   getBoundingBox,
   removeLayer,
   toFeature,