@performant-software/geospatial 2.1.0-beta.10 → 2.1.0-beta.12

package/dist/index.es7.js

@@ -1,12 +1,9 @@
-import { j as s } from "./index.es13.js";
-import m from "./index.es10.js";
+import { j as s } from "./index.es14.js";
+import m from "./index.es11.js";
 import C from "./index.es46.js";
 import { useState as b, useRef as p, useCallback as L, useMemo as h, useEffect as x } from "react";
-import { Map as D } from "./index.es11.js";
-import i from "./index.es14.js";
-import "./index.es15.js";
-import "./index.es16.js";
-import "./index.es17.js";
+import { Map as D } from "./index.es12.js";
+import i from "./index.es17.js";
 import "./index.es18.js";
 import "./index.es19.js";
 import "./index.es20.js";
@@ -31,6 +28,9 @@ import "./index.es38.js";
 import "./index.es39.js";
 import "./index.es40.js";
 import "./index.es41.js";
+import "./index.es42.js";
+import "./index.es43.js";
+import "./index.es44.js";
 import R from "./index.es2.js";
 import O from "./index.es9.js";
 import "./index.es47.js";

package/dist/index.es70.js

@@ -1,8 +1,8 @@
 import * as u from "react";
 import { useContext as f, useRef as y, useState as m, useMemo as g, useEffect as S, cloneElement as h } from "react";
 import { MapContext as C } from "./index.es61.js";
-import s from "./index.es182.js";
-import { deepEqual as v } from "./index.es181.js";
+import s from "./index.es197.js";
+import { deepEqual as v } from "./index.es196.js";
 let x = 0;
 function U(t, e, a) {
   if (t.style && t.style._loaded) {

package/dist/index.es74.js

@@ -1,4 +1,4 @@
-import { VERSION as r } from "./index.es15.js";
+import { VERSION as r } from "./index.es18.js";
 import { default as o } from "./index.es76.js";
 import { default as l } from "./index.es77.js";
 import { default as u } from "./index.es78.js";
@@ -14,17 +14,17 @@ import { default as S } from "./index.es87.js";
 import { default as N } from "./index.es88.js";
 import { default as v } from "./index.es89.js";
 import { default as M } from "./index.es90.js";
-import { default as W } from "./index.es16.js";
-import { default as F } from "./index.es18.js";
+import { default as W } from "./index.es19.js";
+import { default as F } from "./index.es21.js";
 import { default as V } from "./index.es91.js";
 import { default as P } from "./index.es92.js";
 import { default as U } from "./index.es93.js";
 import { default as G } from "./index.es94.js";
 import { default as J } from "./index.es95.js";
 import { default as X } from "./index.es96.js";
-import { default as Z } from "./index.es20.js";
-import { default as $ } from "./index.es21.js";
-import { default as te } from "./index.es22.js";
+import { default as Z } from "./index.es23.js";
+import { default as $ } from "./index.es24.js";
+import { default as te } from "./index.es25.js";
 import { default as re } from "./index.es97.js";
 import { default as oe } from "./index.es98.js";
 import { default as le } from "./index.es99.js";
@@ -44,27 +44,27 @@ import { default as We } from "./index.es112.js";
 import { default as Fe } from "./index.es113.js";
 import { default as Ve } from "./index.es114.js";
 import { default as Pe } from "./index.es115.js";
-import { default as Ue } from "./index.es23.js";
+import { default as Ue } from "./index.es26.js";
 import { default as Ge } from "./index.es116.js";
 import { default as Je } from "./index.es117.js";
 import { default as Xe, default as Ye } from "./index.es118.js";
 import { default as _e } from "./index.es119.js";
 import { default as et } from "./index.es120.js";
 import { default as at } from "./index.es121.js";
-import { default as ft } from "./index.es25.js";
-import { default as st } from "./index.es26.js";
-import { default as dt } from "./index.es27.js";
+import { default as ft } from "./index.es28.js";
+import { default as st } from "./index.es29.js";
+import { default as dt } from "./index.es30.js";
 import { default as pt } from "./index.es122.js";
 import { default as xt } from "./index.es123.js";
 import { default as nt } from "./index.es124.js";
 import { default as yt } from "./index.es125.js";
-import { default as gt } from "./index.es24.js";
-import { default as kt } from "./index.es28.js";
-import { default as Et } from "./index.es29.js";
-import { default as wt } from "./index.es30.js";
+import { default as gt } from "./index.es27.js";
+import { default as kt } from "./index.es31.js";
+import { default as Et } from "./index.es32.js";
+import { default as wt } from "./index.es33.js";
 import { default as It } from "./index.es126.js";
-import { default as jt } from "./index.es31.js";
-import { default as qt } from "./index.es32.js";
+import { default as jt } from "./index.es34.js";
+import { default as qt } from "./index.es35.js";
 import { default as zt } from "./index.es127.js";
 import { default as Rt } from "./index.es128.js";
 import { default as Dt } from "./index.es129.js";
@@ -72,7 +72,7 @@ import { default as Kt } from "./index.es130.js";
 import { default as Lt } from "./index.es131.js";
 import { default as Tt } from "./index.es132.js";
 import { default as Ct } from "./index.es133.js";
-import { default as Ht } from "./index.es33.js";
+import { default as Ht } from "./index.es36.js";
 import { default as Qt } from "./index.es134.js";
 import { default as Yt } from "./index.es135.js";
 import { default as _t } from "./index.es136.js";
@@ -90,7 +90,7 @@ import { default as Sa } from "./index.es147.js";
 import { default as Na, default as qa } from "./index.es148.js";
 import { default as za, default as Ma } from "./index.es149.js";
 import { default as Wa, default as Da, default as Fa } from "./index.es150.js";
-import { default as Va } from "./index.es34.js";
+import { default as Va } from "./index.es37.js";
 import { default as Pa } from "./index.es151.js";
 import { default as Ua } from "./index.es152.js";
 import { default as Ga } from "./index.es153.js";
@@ -104,27 +104,27 @@ import { default as or } from "./index.es160.js";
 import { default as lr } from "./index.es161.js";
 import { default as ur } from "./index.es162.js";
 import { default as mr } from "./index.es163.js";
-import { default as ir } from "./index.es35.js";
-import { default as cr } from "./index.es36.js";
+import { default as ir } from "./index.es38.js";
+import { default as cr } from "./index.es39.js";
 import { default as hr, default as gr, default as br } from "./index.es164.js";
 import { default as Ar } from "./index.es165.js";
 import { default as Or } from "./index.es166.js";
 import { default as Br, default as Ir, default as Sr } from "./index.es167.js";
 import { default as Nr } from "./index.es168.js";
 import { default as vr } from "./index.es169.js";
-import { default as Mr } from "./index.es37.js";
+import { default as Mr } from "./index.es40.js";
 import { default as Wr, default as Dr } from "./index.es170.js";
-import { default as Kr } from "./index.es38.js";
+import { default as Kr } from "./index.es41.js";
 import { default as Lr } from "./index.es171.js";
-import { default as Tr } from "./index.es39.js";
+import { default as Tr } from "./index.es42.js";
 import { default as Cr, default as Gr } from "./index.es172.js";
-import { default as Jr } from "./index.es40.js";
+import { default as Jr } from "./index.es43.js";
 import { default as Xr } from "./index.es173.js";
 import { default as Zr } from "./index.es174.js";
 import { default as $r } from "./index.es175.js";
 import { default as tf } from "./index.es75.js";
-import "./index.es41.js";
-import { default as rf } from "./index.es19.js";
+import "./index.es44.js";
+import { default as rf } from "./index.es22.js";
 export {
   r as VERSION,
   Tt as after,

package/dist/index.es75.js

@@ -1,7 +1,7 @@
-import r from "./index.es19.js";
+import r from "./index.es22.js";
 import n from "./index.es142.js";
 import f from "./index.es103.js";
-import { push as u } from "./index.es15.js";
+import { push as u } from "./index.es18.js";
 import m from "./index.es225.js";
 function l(o) {
   return n(f(o), function(t) {

package/dist/index.es8.js

@@ -1,6 +1,6 @@
-import { j as e } from "./index.es13.js";
+import { j as e } from "./index.es14.js";
 import "react";
-import { Source as o, Layer as i } from "./index.es11.js";
+import { Source as o, Layer as i } from "./index.es12.js";
 const m = (t) => /* @__PURE__ */ e.jsx(
   o,
   {

package/dist/index.es80.js

@@ -1,4 +1,4 @@
-import { toString as e } from "./index.es15.js";
+import { toString as e } from "./index.es18.js";
 function r(t) {
   return t === !0 || t === !1 || e.call(t) === "[object Boolean]";
 }

package/dist/index.es89.js

@@ -1,7 +1,7 @@
 import r from "./index.es199.js";
-import i from "./index.es16.js";
+import i from "./index.es19.js";
 import a from "./index.es88.js";
-import { hasStringTagBug as e } from "./index.es17.js";
+import { hasStringTagBug as e } from "./index.es20.js";
 var f = r("DataView");
 function o(t) {
   return t != null && i(t.getInt8) && a(t.buffer);

package/dist/index.es90.js

@@ -1,4 +1,4 @@
-import { nativeIsArray as r } from "./index.es15.js";
+import { nativeIsArray as r } from "./index.es18.js";
 import t from "./index.es199.js";
 const e = r || t("Array");
 export {

package/dist/index.es91.js

@@ -1,4 +1,4 @@
-import { _isFinite as t } from "./index.es15.js";
+import { _isFinite as t } from "./index.es18.js";
 import r from "./index.es87.js";
 function s(i) {
   return !r(i) && t(i) && !isNaN(parseFloat(i));

package/dist/index.es92.js

@@ -1,4 +1,4 @@
-import { _isNaN as i } from "./index.es15.js";
+import { _isNaN as i } from "./index.es18.js";
 import t from "./index.es83.js";
 function N(r) {
   return t(r) && i(r);

package/dist/index.es93.js

@@ -1,4 +1,4 @@
-import { supportsArrayBuffer as i, nativeIsView as t, toString as a } from "./index.es15.js";
+import { supportsArrayBuffer as i, nativeIsView as t, toString as a } from "./index.es18.js";
 import e from "./index.es89.js";
 import o from "./index.es114.js";
 import n from "./index.es201.js";

package/dist/index.es94.js

@@ -1,7 +1,7 @@
 import e from "./index.es202.js";
 import i from "./index.es90.js";
 import m from "./index.es82.js";
-import n from "./index.es18.js";
+import n from "./index.es21.js";
 import f from "./index.es98.js";
 function a(r) {
   if (r == null)

package/dist/index.es96.js

@@ -1,9 +1,9 @@
-import m from "./index.es19.js";
-import { toString as g, SymbolProto as h } from "./index.es15.js";
+import m from "./index.es22.js";
+import { toString as g, SymbolProto as h } from "./index.es18.js";
 import j from "./index.es203.js";
 import D from "./index.es93.js";
-import y from "./index.es16.js";
-import { hasStringTagBug as V } from "./index.es17.js";
+import y from "./index.es19.js";
+import { hasStringTagBug as V } from "./index.es20.js";
 import v from "./index.es89.js";
 import w from "./index.es98.js";
 import q from "./index.es200.js";

package/dist/index.es98.js

@@ -1,5 +1,5 @@
 import e from "./index.es77.js";
-import { nativeKeys as f, hasEnumBug as m } from "./index.es15.js";
+import { nativeKeys as f, hasEnumBug as m } from "./index.es18.js";
 import n from "./index.es200.js";
 import o from "./index.es206.js";
 function c(r) {

package/dist/index.es99.js

@@ -1,5 +1,5 @@
 import e from "./index.es77.js";
-import { hasEnumBug as f } from "./index.es15.js";
+import { hasEnumBug as f } from "./index.es18.js";
 import i from "./index.es206.js";
 function s(r) {
   if (!e(r))

package/package.json

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

package/src/components/GeoJsonLayer.js

@@ -1,13 +1,11 @@
 // @flow
 
 import React, {
-  useCallback,
   useEffect,
-  useMemo,
   useState
 } from 'react';
 import { Layer, Source } from 'react-map-gl';
-import _ from 'underscore';
+import MapStyles from '../utils/MapStyles';
 
 type Props = {
   data?: { [key: string]: any },
@@ -17,69 +15,9 @@ type Props = {
   url?: string
 };
 
-const DEFAULT_COLOR = '#CC3333';
-const HIGHLIGHT_COLOR = '#990000';
-
-const DEFAULT_FILL_STYLES = {
-  'fill-color': DEFAULT_COLOR,
-  'fill-opacity': 0.2
-};
-
-const DEFAULT_LINE_STYLES = {
-  'line-color': HIGHLIGHT_COLOR,
-  'line-opacity': 0.6
-};
-
-const DEFAULT_POINT_STYLES = {
-  'circle-radius': [
-    'interpolate',
-    ['linear'],
-    ['number', ['get', 'point_count'], 1],
-    0, 4,
-    10, 14
-  ],
-  'circle-stroke-width': 1,
-  'circle-color': DEFAULT_COLOR,
-  'circle-stroke-color': HIGHLIGHT_COLOR
-};
-
 const GeoJsonLayer = (props: Props) => {
   const [data, setData] = useState(props.data);
 
-  /**
-   * Returns the layer style for the passed style and default.
-   *
-   * @type {function(*, *): *}
-   */
-  const getLayerStyles = useCallback((style, defaultStyle) => _.defaults(style, defaultStyle), []);
-
-  /**
-   * Sets the fill layer style.
-   *
-   * @type {*}
-   */
-  const fillStyle = useMemo(() => (
-    getLayerStyles(props.fillStyle, DEFAULT_FILL_STYLES)
-  ), [getLayerStyles, props.fillStyle]);
-
-  /**
-   * Sets the line layer style.
-   *
-   * @type {*}
-   */
-  const lineStyle = useMemo(() => (
-    getLayerStyles(props.lineStyle, DEFAULT_LINE_STYLES)
-  ), [getLayerStyles, props.lineStyle]);
-
-  /**
-   * Sets the point layer style.
-   *
-   * @type {*}
-   */
-  const pointStyle = useMemo(() => (
-    getLayerStyles(props.pointStyle, DEFAULT_POINT_STYLES)
-  ), [getLayerStyles, props.pointStyle]);
-
   /**
    * If the data is passed as a URL, fetches the passed URL and sets the response on the state.
    */
@@ -98,21 +36,27 @@ const GeoJsonLayer = (props: Props) => {
     >
       <Layer
         filter={['!=', '$type', 'Point']}
-        paint={fillStyle}
+        paint={props.fillStyle}
         type='fill'
       />
       <Layer
         filter={['!=', '$type', 'Point']}
-        paint={lineStyle}
+        paint={props.lineStyle}
         type='line'
       />
       <Layer
         filter={['==', '$type', 'Point']}
-        paint={pointStyle}
+        paint={props.pointStyle}
         type='circle'
       />
     </Source>
   );
 };
 
+GeoJsonLayer.defaultProps = {
+  fillStyle: MapStyles.fill,
+  pointStyle: MapStyles.point,
+  strokeStyle: MapStyles.stroke
+};
+
 export default GeoJsonLayer;

package/src/components/LocationMarkers.js

@@ -2,7 +2,7 @@
 
 import { MixedGeoJSONLayer, PulsingMarkerLayer, useMap } from '@peripleo/maplibre';
 import React, { useEffect } from 'react';
-import { DEFAULT_FILL_STYLE, DEFAULT_POINT_STYLE, DEFAULT_STROKE_STYLE } from '../utils/MapStyles';
+import MapStyles from '../utils/MapStyles';
 import MapUtils from '../utils/Map';
 
 type Props = {
@@ -80,9 +80,9 @@ const LocationMarkers = (props: Props) => {
 
 LocationMarkers.defaultProps = {
   buffer: DEFAULT_BUFFER,
-  fillStyle: DEFAULT_FILL_STYLE,
-  pointStyle: DEFAULT_POINT_STYLE,
-  strokeStyle: DEFAULT_STROKE_STYLE
+  fillStyle: MapStyles.fill,
+  pointStyle: MapStyles.point,
+  strokeStyle: MapStyles.stroke
 };
 
 export default LocationMarkers;

package/src/index.js

@@ -11,3 +11,4 @@ export { default as RasterLayer } from './components/RasterLayer';
 
 // Utils
 export { default as Map } from './utils/Map';
+export { default as MapStyles } from './utils/MapStyles';

package/src/utils/MapStyles.js

@@ -1,6 +1,6 @@
 // @flow
 
-export const DEFAULT_POINT_STYLE = {
+const point = {
   type: 'circle',
   paint: {
     'circle-radius': [
@@ -21,7 +21,7 @@ export const DEFAULT_POINT_STYLE = {
   }
 };
 
-export const DEFAULT_FILL_STYLE = {
+const fill = {
   type: 'fill',
   paint: {
     'fill-color': '#ff623b',
@@ -29,10 +29,16 @@ export const DEFAULT_FILL_STYLE = {
   }
 };
 
-export const DEFAULT_STROKE_STYLE = {
+const stroke = {
   type: 'line',
   paint: {
     'line-color': '#ff623b',
     'line-opacity': 0.6
   }
 };
+
+export default {
+  point,
+  fill,
+  stroke
+};

package/types/components/GeoJsonLayer.js.flow

@@ -1,13 +1,11 @@
 // @flow
 
 import React, {
-  useCallback,
   useEffect,
-  useMemo,
   useState
 } from 'react';
 import { Layer, Source } from 'react-map-gl';
-import _ from 'underscore';
+import MapStyles from '../utils/MapStyles';
 
 type Props = {
   data?: { [key: string]: any },
@@ -17,69 +15,9 @@ type Props = {
   url?: string
 };
 
-const DEFAULT_COLOR = '#CC3333';
-const HIGHLIGHT_COLOR = '#990000';
-
-const DEFAULT_FILL_STYLES = {
-  'fill-color': DEFAULT_COLOR,
-  'fill-opacity': 0.2
-};
-
-const DEFAULT_LINE_STYLES = {
-  'line-color': HIGHLIGHT_COLOR,
-  'line-opacity': 0.6
-};
-
-const DEFAULT_POINT_STYLES = {
-  'circle-radius': [
-    'interpolate',
-    ['linear'],
-    ['number', ['get', 'point_count'], 1],
-    0, 4,
-    10, 14
-  ],
-  'circle-stroke-width': 1,
-  'circle-color': DEFAULT_COLOR,
-  'circle-stroke-color': HIGHLIGHT_COLOR
-};
-
 const GeoJsonLayer = (props: Props) => {
   const [data, setData] = useState(props.data);
 
-  /**
-   * Returns the layer style for the passed style and default.
-   *
-   * @type {function(*, *): *}
-   */
-  const getLayerStyles = useCallback((style, defaultStyle) => _.defaults(style, defaultStyle), []);
-
-  /**
-   * Sets the fill layer style.
-   *
-   * @type {*}
-   */
-  const fillStyle = useMemo(() => (
-    getLayerStyles(props.fillStyle, DEFAULT_FILL_STYLES)
-  ), [getLayerStyles, props.fillStyle]);
-
-  /**
-   * Sets the line layer style.
-   *
-   * @type {*}
-   */
-  const lineStyle = useMemo(() => (
-    getLayerStyles(props.lineStyle, DEFAULT_LINE_STYLES)
-  ), [getLayerStyles, props.lineStyle]);
-
-  /**
-   * Sets the point layer style.
-   *
-   * @type {*}
-   */
-  const pointStyle = useMemo(() => (
-    getLayerStyles(props.pointStyle, DEFAULT_POINT_STYLES)
-  ), [getLayerStyles, props.pointStyle]);
-
   /**
    * If the data is passed as a URL, fetches the passed URL and sets the response on the state.
    */
@@ -98,21 +36,27 @@ const GeoJsonLayer = (props: Props) => {
     >
       <Layer
         filter={['!=', '$type', 'Point']}
-        paint={fillStyle}
+        paint={props.fillStyle}
         type='fill'
       />
       <Layer
         filter={['!=', '$type', 'Point']}
-        paint={lineStyle}
+        paint={props.lineStyle}
         type='line'
       />
       <Layer
         filter={['==', '$type', 'Point']}
-        paint={pointStyle}
+        paint={props.pointStyle}
         type='circle'
       />
     </Source>
   );
 };
 
+GeoJsonLayer.defaultProps = {
+  fillStyle: MapStyles.fill,
+  pointStyle: MapStyles.point,
+  strokeStyle: MapStyles.stroke
+};
+
 export default GeoJsonLayer;

package/types/components/LocationMarkers.js.flow

@@ -2,7 +2,7 @@
 
 import { MixedGeoJSONLayer, PulsingMarkerLayer, useMap } from '@peripleo/maplibre';
 import React, { useEffect } from 'react';
-import { DEFAULT_FILL_STYLE, DEFAULT_POINT_STYLE, DEFAULT_STROKE_STYLE } from '../utils/MapStyles';
+import MapStyles from '../utils/MapStyles';
 import MapUtils from '../utils/Map';
 
 type Props = {
@@ -80,9 +80,9 @@ const LocationMarkers = (props: Props) => {
 
 LocationMarkers.defaultProps = {
   buffer: DEFAULT_BUFFER,
-  fillStyle: DEFAULT_FILL_STYLE,
-  pointStyle: DEFAULT_POINT_STYLE,
-  strokeStyle: DEFAULT_STROKE_STYLE
+  fillStyle: MapStyles.fill,
+  pointStyle: MapStyles.point,
+  strokeStyle: MapStyles.stroke
 };
 
 export default LocationMarkers;

package/types/index.js.flow

@@ -11,3 +11,4 @@ export { default as RasterLayer } from './components/RasterLayer';
 
 // Utils
 export { default as Map } from './utils/Map';
+export { default as MapStyles } from './utils/MapStyles';

package/types/utils/MapStyles.js.flow

@@ -1,6 +1,6 @@
 // @flow
 
-export const DEFAULT_POINT_STYLE = {
+const point = {
   type: 'circle',
   paint: {
     'circle-radius': [
@@ -21,7 +21,7 @@ export const DEFAULT_POINT_STYLE = {
   }
 };
 
-export const DEFAULT_FILL_STYLE = {
+const fill = {
   type: 'fill',
   paint: {
     'fill-color': '#ff623b',
@@ -29,10 +29,16 @@ export const DEFAULT_FILL_STYLE = {
   }
 };
 
-export const DEFAULT_STROKE_STYLE = {
+const stroke = {
   type: 'line',
   paint: {
     'line-color': '#ff623b',
     'line-opacity': 0.6
   }
 };
+
+export default {
+  point,
+  fill,
+  stroke
+};