@performant-software/geospatial 2.1.0-beta.9 → 2.1.0

package/dist/index.es96.js

@@ -1,89 +1,10 @@
-import m from "./index.es19.js";
-import { toString as g, SymbolProto as h } from "./index.es15.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 v from "./index.es89.js";
-import w from "./index.es98.js";
-import q from "./index.es200.js";
-import d from "./index.es204.js";
-var B = "[object DataView]";
-function c(e, r, f, n) {
-  if (e === r)
-    return e !== 0 || 1 / e === 1 / r;
-  if (e == null || r == null)
-    return !1;
-  if (e !== e)
-    return r !== r;
-  var o = typeof e;
-  return o !== "function" && o !== "object" && typeof r != "object" ? !1 : O(e, r, f, n);
-}
-function O(e, r, f, n) {
-  e instanceof m && (e = e._wrapped), r instanceof m && (r = r._wrapped);
-  var o = g.call(e);
-  if (o !== g.call(r))
-    return !1;
-  if (V && o == "[object Object]" && v(e)) {
-    if (!v(r))
-      return !1;
-    o = B;
-  }
-  switch (o) {
-    case "[object RegExp]":
-    case "[object String]":
-      return "" + e == "" + r;
-    case "[object Number]":
-      return +e != +e ? +r != +r : +e == 0 ? 1 / +e === 1 / r : +e == +r;
-    case "[object Date]":
-    case "[object Boolean]":
-      return +e == +r;
-    case "[object Symbol]":
-      return h.valueOf.call(e) === h.valueOf.call(r);
-    case "[object ArrayBuffer]":
-    case B:
-      return O(d(e), d(r), f, n);
-  }
-  var i = o === "[object Array]";
-  if (!i && D(e)) {
-    var A = j(e);
-    if (A !== j(r))
-      return !1;
-    if (e.buffer === r.buffer && e.byteOffset === r.byteOffset)
-      return !0;
-    i = !0;
-  }
-  if (!i) {
-    if (typeof e != "object" || typeof r != "object")
-      return !1;
-    var u = e.constructor, s = r.constructor;
-    if (u !== s && !(y(u) && u instanceof u && y(s) && s instanceof s) && "constructor" in e && "constructor" in r)
-      return !1;
-  }
-  f = f || [], n = n || [];
-  for (var t = f.length; t--; )
-    if (f[t] === e)
-      return n[t] === r;
-  if (f.push(e), n.push(r), i) {
-    if (t = e.length, t !== r.length)
-      return !1;
-    for (; t--; )
-      if (!c(e[t], r[t], f, n))
-        return !1;
-  } else {
-    var p = w(e), l;
-    if (t = p.length, w(r).length !== t)
-      return !1;
-    for (; t--; )
-      if (l = p[t], !(q(r, l) && c(e[l], r[l], f, n)))
-        return !1;
-  }
-  return f.pop(), n.pop(), !0;
-}
-function z(e, r) {
-  return c(e, r);
+import t from "./index.es65.js";
+import e from "./index.es78.js";
+import i from "./index.es92.js";
+function o(r) {
+  return t(r) ? e(r) ? r.slice() : i({}, r) : r;
 }
 export {
-  z as default
+  o as default
 };
 //# sourceMappingURL=index.es96.js.map

package/dist/index.es96.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es96.js","sources":["../../../node_modules/underscore/modules/isEqual.js"],"sourcesContent":["import _ from './underscore.js';\nimport { toString, SymbolProto } from './_setup.js';\nimport getByteLength from './_getByteLength.js';\nimport isTypedArray from './isTypedArray.js';\nimport isFunction from './isFunction.js';\nimport { hasStringTagBug }  from './_stringTagBug.js';\nimport isDataView from './isDataView.js';\nimport keys from './keys.js';\nimport has from './_has.js';\nimport toBufferView from './_toBufferView.js';\n\n// We use this string twice, so give it a name for minification.\nvar tagDataView = '[object DataView]';\n\n// Internal recursive comparison function for `_.isEqual`.\nfunction eq(a, b, aStack, bStack) {\n  // Identical objects are equal. `0 === -0`, but they aren't identical.\n  // See the [Harmony `egal` proposal](https://wiki.ecmascript.org/doku.php?id=harmony:egal).\n  if (a === b) return a !== 0 || 1 / a === 1 / b;\n  // `null` or `undefined` only equal to itself (strict comparison).\n  if (a == null || b == null) return false;\n  // `NaN`s are equivalent, but non-reflexive.\n  if (a !== a) return b !== b;\n  // Exhaust primitive checks\n  var type = typeof a;\n  if (type !== 'function' && type !== 'object' && typeof b != 'object') return false;\n  return deepEq(a, b, aStack, bStack);\n}\n\n// Internal recursive comparison function for `_.isEqual`.\nfunction deepEq(a, b, aStack, bStack) {\n  // Unwrap any wrapped objects.\n  if (a instanceof _) a = a._wrapped;\n  if (b instanceof _) b = b._wrapped;\n  // Compare `[[Class]]` names.\n  var className = toString.call(a);\n  if (className !== toString.call(b)) return false;\n  // Work around a bug in IE 10 - Edge 13.\n  if (hasStringTagBug && className == '[object Object]' && isDataView(a)) {\n    if (!isDataView(b)) return false;\n    className = tagDataView;\n  }\n  switch (className) {\n    // These types are compared by value.\n    case '[object RegExp]':\n      // RegExps are coerced to strings for comparison (Note: '' + /a/i === '/a/i')\n    case '[object String]':\n      // Primitives and their corresponding object wrappers are equivalent; thus, `\"5\"` is\n      // equivalent to `new String(\"5\")`.\n      return '' + a === '' + b;\n    case '[object Number]':\n      // `NaN`s are equivalent, but non-reflexive.\n      // Object(NaN) is equivalent to NaN.\n      if (+a !== +a) return +b !== +b;\n      // An `egal` comparison is performed for other numeric values.\n      return +a === 0 ? 1 / +a === 1 / b : +a === +b;\n    case '[object Date]':\n    case '[object Boolean]':\n      // Coerce dates and booleans to numeric primitive values. Dates are compared by their\n      // millisecond representations. Note that invalid dates with millisecond representations\n      // of `NaN` are not equivalent.\n      return +a === +b;\n    case '[object Symbol]':\n      return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b);\n    case '[object ArrayBuffer]':\n    case tagDataView:\n      // Coerce to typed array so we can fall through.\n      return deepEq(toBufferView(a), toBufferView(b), aStack, bStack);\n  }\n\n  var areArrays = className === '[object Array]';\n  if (!areArrays && isTypedArray(a)) {\n      var byteLength = getByteLength(a);\n      if (byteLength !== getByteLength(b)) return false;\n      if (a.buffer === b.buffer && a.byteOffset === b.byteOffset) return true;\n      areArrays = true;\n  }\n  if (!areArrays) {\n    if (typeof a != 'object' || typeof b != 'object') return false;\n\n    // Objects with different constructors are not equivalent, but `Object`s or `Array`s\n    // from different frames are.\n    var aCtor = a.constructor, bCtor = b.constructor;\n    if (aCtor !== bCtor && !(isFunction(aCtor) && aCtor instanceof aCtor &&\n                             isFunction(bCtor) && bCtor instanceof bCtor)\n                        && ('constructor' in a && 'constructor' in b)) {\n      return false;\n    }\n  }\n  // Assume equality for cyclic structures. The algorithm for detecting cyclic\n  // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.\n\n  // Initializing stack of traversed objects.\n  // It's done here since we only need them for objects and arrays comparison.\n  aStack = aStack || [];\n  bStack = bStack || [];\n  var length = aStack.length;\n  while (length--) {\n    // Linear search. Performance is inversely proportional to the number of\n    // unique nested structures.\n    if (aStack[length] === a) return bStack[length] === b;\n  }\n\n  // Add the first object to the stack of traversed objects.\n  aStack.push(a);\n  bStack.push(b);\n\n  // Recursively compare objects and arrays.\n  if (areArrays) {\n    // Compare array lengths to determine if a deep comparison is necessary.\n    length = a.length;\n    if (length !== b.length) return false;\n    // Deep compare the contents, ignoring non-numeric properties.\n    while (length--) {\n      if (!eq(a[length], b[length], aStack, bStack)) return false;\n    }\n  } else {\n    // Deep compare objects.\n    var _keys = keys(a), key;\n    length = _keys.length;\n    // Ensure that both objects contain the same number of properties before comparing deep equality.\n    if (keys(b).length !== length) return false;\n    while (length--) {\n      // Deep compare each member\n      key = _keys[length];\n      if (!(has(b, key) && eq(a[key], b[key], aStack, bStack))) return false;\n    }\n  }\n  // Remove the first object from the stack of traversed objects.\n  aStack.pop();\n  bStack.pop();\n  return true;\n}\n\n// Perform a deep comparison to check if two objects are equal.\nexport default function isEqual(a, b) {\n  return eq(a, b);\n}\n"],"names":["tagDataView","eq","a","b","aStack","bStack","type","deepEq","_","className","toString","hasStringTagBug","isDataView","SymbolProto","toBufferView","areArrays","isTypedArray","byteLength","getByteLength","aCtor","bCtor","isFunction","length","_keys","keys","key","has","isEqual"],"mappings":"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","x_google_ignoreList":[0]}
+{"version":3,"file":"index.es96.js","sources":["../../../node_modules/underscore/modules/clone.js"],"sourcesContent":["import isObject from './isObject.js';\nimport isArray from './isArray.js';\nimport extend from './extend.js';\n\n// Create a (shallow-cloned) duplicate of an object.\nexport default function clone(obj) {\n  if (!isObject(obj)) return obj;\n  return isArray(obj) ? obj.slice() : extend({}, obj);\n}\n"],"names":["clone","obj","isObject","isArray","extend"],"mappings":";;;AAKA,SAAwBA,EAAMC,GAAK;AAC7B,SAACC,EAASD,CAAG,IACVE,EAAQF,CAAG,IAAIA,EAAI,UAAUG,EAAO,IAAIH,CAAG,IADvBA;AAE7B;","x_google_ignoreList":[0]}

package/dist/index.es97.js

@@ -1,6 +1,7 @@
-import e from "./index.es199.js";
-const a = e("WeakSet");
+function e(t, a) {
+  return a(t), t;
+}
 export {
-  a as default
+  e as default
 };
 //# sourceMappingURL=index.es97.js.map

package/dist/index.es97.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es97.js","sources":["../../../node_modules/underscore/modules/isWeakSet.js"],"sourcesContent":["import tagTester from './_tagTester.js';\n\nexport default tagTester('WeakSet');\n"],"names":["isWeakSet","tagTester"],"mappings":";AAEA,MAAeA,IAAAC,EAAU,SAAS;","x_google_ignoreList":[0]}
+{"version":3,"file":"index.es97.js","sources":["../../../node_modules/underscore/modules/tap.js"],"sourcesContent":["// Invokes `interceptor` with the `obj` and then returns `obj`.\n// The primary purpose of this method is to \"tap into\" a method chain, in\n// order to perform operations on intermediate results within the chain.\nexport default function tap(obj, interceptor) {\n  interceptor(obj);\n  return obj;\n}\n"],"names":["tap","obj","interceptor"],"mappings":"AAGwB,SAAAA,EAAIC,GAAKC,GAAa;AAC5C,SAAAA,EAAYD,CAAG,GACRA;AACT;","x_google_ignoreList":[0]}

package/dist/index.es98.js

@@ -1,18 +1,11 @@
-import e from "./index.es77.js";
-import { nativeKeys as f, hasEnumBug as m } from "./index.es15.js";
-import n from "./index.es200.js";
-import o from "./index.es206.js";
-function c(r) {
-  if (!e(r))
-    return [];
-  if (f)
-    return f(r);
-  var t = [];
-  for (var i in r)
-    n(r, i) && t.push(i);
-  return m && o(r, t), t;
+import f from "./index.es209.js";
+import i from "./index.es210.js";
+import m from "./index.es67.js";
+function d(e, r, o) {
+  var t = i(e, f(r));
+  return m(t) ? o : t;
 }
 export {
-  c as default
+  d as default
 };
 //# sourceMappingURL=index.es98.js.map

package/dist/index.es98.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es98.js","sources":["../../../node_modules/underscore/modules/keys.js"],"sourcesContent":["import isObject from './isObject.js';\nimport { nativeKeys, hasEnumBug } from './_setup.js';\nimport has from './_has.js';\nimport collectNonEnumProps from './_collectNonEnumProps.js';\n\n// Retrieve the names of an object's own properties.\n// Delegates to **ECMAScript 5**'s native `Object.keys`.\nexport default function keys(obj) {\n  if (!isObject(obj)) return [];\n  if (nativeKeys) return nativeKeys(obj);\n  var keys = [];\n  for (var key in obj) if (has(obj, key)) keys.push(key);\n  // Ahem, IE < 9.\n  if (hasEnumBug) collectNonEnumProps(obj, keys);\n  return keys;\n}\n"],"names":["keys","obj","isObject","nativeKeys","key","has","hasEnumBug","collectNonEnumProps"],"mappings":";;;;AAOA,SAAwBA,EAAKC,GAAK;AAC5B,MAAA,CAACC,EAASD,CAAG;AAAG,WAAO;AACvB,MAAAE;AAAY,WAAOA,EAAWF,CAAG;AACrC,MAAID,IAAO,CAAA;AACX,WAASI,KAAOH;AAAS,IAAAI,EAAIJ,GAAKG,CAAG,KAAGJ,EAAK,KAAKI,CAAG;AAEjD,SAAAE,KAAYC,EAAoBN,GAAKD,CAAI,GACtCA;AACT;","x_google_ignoreList":[0]}
+{"version":3,"file":"index.es98.js","sources":["../../../node_modules/underscore/modules/get.js"],"sourcesContent":["import toPath from './_toPath.js';\nimport deepGet from './_deepGet.js';\nimport isUndefined from './isUndefined.js';\n\n// Get the value of the (deep) property on `path` from `object`.\n// If any property in `path` does not exist or if the value is\n// `undefined`, return `defaultValue` instead.\n// The `path` is normalized through `_.toPath`.\nexport default function get(object, path, defaultValue) {\n  var value = deepGet(object, toPath(path));\n  return isUndefined(value) ? defaultValue : value;\n}\n"],"names":["get","object","path","defaultValue","value","deepGet","toPath","isUndefined"],"mappings":";;;AAQwB,SAAAA,EAAIC,GAAQC,GAAMC,GAAc;AACtD,MAAIC,IAAQC,EAAQJ,GAAQK,EAAOJ,CAAI,CAAC;AACjC,SAAAK,EAAYH,CAAK,IAAID,IAAeC;AAC7C;","x_google_ignoreList":[0]}

package/dist/index.es99.js

@@ -1,13 +1,14 @@
-import e from "./index.es77.js";
-import { hasEnumBug as f } from "./index.es15.js";
-import i from "./index.es206.js";
-function s(r) {
-  if (!e(r))
-    return [];
-  var o = [];
-  for (var t in r)
-    o.push(t);
-  return f && i(r, o), o;
+import n from "./index.es200.js";
+import o from "./index.es209.js";
+function s(t, r) {
+  r = o(r);
+  for (var a = r.length, f = 0; f < a; f++) {
+    var e = r[f];
+    if (!n(t, e))
+      return !1;
+    t = t[e];
+  }
+  return !!a;
 }
 export {
   s as default

package/dist/index.es99.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es99.js","sources":["../../../node_modules/underscore/modules/allKeys.js"],"sourcesContent":["import isObject from './isObject.js';\nimport { hasEnumBug } from './_setup.js';\nimport collectNonEnumProps from './_collectNonEnumProps.js';\n\n// Retrieve all the enumerable property names of an object.\nexport default function allKeys(obj) {\n  if (!isObject(obj)) return [];\n  var keys = [];\n  for (var key in obj) keys.push(key);\n  // Ahem, IE < 9.\n  if (hasEnumBug) collectNonEnumProps(obj, keys);\n  return keys;\n}\n"],"names":["allKeys","obj","isObject","keys","key","hasEnumBug","collectNonEnumProps"],"mappings":";;;AAKA,SAAwBA,EAAQC,GAAK;AAC/B,MAAA,CAACC,EAASD,CAAG;AAAG,WAAO;AAC3B,MAAIE,IAAO,CAAA;AACX,WAASC,KAAOH;AAAK,IAAAE,EAAK,KAAKC,CAAG;AAE9B,SAAAC,KAAYC,EAAoBL,GAAKE,CAAI,GACtCA;AACT;","x_google_ignoreList":[0]}
+{"version":3,"file":"index.es99.js","sources":["../../../node_modules/underscore/modules/has.js"],"sourcesContent":["import _has from './_has.js';\nimport toPath from './_toPath.js';\n\n// Shortcut function for checking if an object has a given property directly on\n// itself (in other words, not on a prototype). Unlike the internal `has`\n// function, this public version can also traverse nested properties.\nexport default function has(obj, path) {\n  path = toPath(path);\n  var length = path.length;\n  for (var i = 0; i < length; i++) {\n    var key = path[i];\n    if (!_has(obj, key)) return false;\n    obj = obj[key];\n  }\n  return !!length;\n}\n"],"names":["has","obj","path","toPath","length","i","key","_has"],"mappings":";;AAMwB,SAAAA,EAAIC,GAAKC,GAAM;AACrC,EAAAA,IAAOC,EAAOD,CAAI;AAElB,WADIE,IAASF,EAAK,QACTG,IAAI,GAAGA,IAAID,GAAQC,KAAK;AAC3B,QAAAC,IAAMJ,EAAKG,CAAC;AACZ,QAAA,CAACE,EAAKN,GAAKK,CAAG;AAAU,aAAA;AAC5B,IAAAL,IAAMA,EAAIK,CAAG;AAAA,EACf;AACA,SAAO,CAAC,CAACF;AACX;","x_google_ignoreList":[0]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@performant-software/geospatial",
-  "version": "2.1.0-beta.9",
+  "version": "2.1.0",
   "description": "A package of components for all things map-related.",
   "license": "MIT",
   "main": "./dist/index.cjs.js",
@@ -27,7 +27,7 @@
     "underscore": "^1.13.6"
   },
   "peerDependencies": {
-    "@peripleo/maplibre": "^0.4.1",
+    "@peripleo/maplibre": "^0.5.1",
     "react": ">= 16.13.1 < 19.0.0",
     "react-dom": ">= 16.13.1 < 19.0.0"
   },

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

@@ -1,8 +1,9 @@
 // @flow
 
-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 { GeoJSONLayer, PulsingMarkerLayer, useMap } from '@peripleo/maplibre';
+import React, { useEffect, useMemo } from 'react';
+import _ from 'underscore';
+import MapStyles from '../utils/MapStyles';
 import MapUtils from '../utils/Map';
 
 type Props = {
@@ -11,11 +12,47 @@ type Props = {
    */
   animate?: boolean,
 
+  /**
+   * (Optional) data to pass to the fitToBounds function.
+   */
+  boundingBoxData?: any,
+
+  /**
+   * (Optional) options to pass to the fitToBounds function.
+   * See [spec](https://maplibre.org/maplibre-gl-js/docs/API/types/FitBoundsOptions/).
+   */
+  boundingBoxOptions?: any,
+
   /**
    * The number of miles to buffer the GeoJSON data.
    */
   buffer: number,
 
+  /**
+   * If true, markers will be clustered before the specified zoom level.
+   */
+  cluster?: boolean,
+
+  /**
+   * Max zoom to cluster points on.
+   */
+  clusterMaxZoom?: number,
+
+  /**
+   * Minimum number of points necessary to form a cluster.
+   */
+  clusterMinPoints?: number,
+
+  /**
+   * An object defining custom properties on the generated clusters.
+   */
+  clusterProperties?: any,
+
+  /**
+   * Radius of each cluster when clustering point.
+   */
+  clusterRadius?: number,
+
   /**
    * The GeoJSON data representing the location.
    */
@@ -26,6 +63,11 @@ type Props = {
    */
   fillStyle?: { [key: string]: any },
 
+  /**
+   * If `true`, the map will fit the bounding box around the passed data.
+   */
+  fitBoundingBox?: boolean,
+
   /**
    * An ID value to apply to the layer.
    */
@@ -50,24 +92,41 @@ const DEFAULT_BUFFER = 2;
 const LocationMarkers = (props: Props) => {
   const map = useMap();
 
+  /**
+   * Memo-izes the data prop.
+   *
+   * @type {{[p: string]: *}}
+   */
+  const data = useMemo(() => (_.isEmpty(props.data) ? null : props.data), [props.data]);
+
   /**
    * Sets the bounding box on the map.
    */
   useEffect(() => {
-    if (map && props.data) {
+    if (map && data && props.fitBoundingBox) {
       const boundingBox = MapUtils.getBoundingBox(props.data, props.buffer);
-      map.fitBounds(boundingBox);
+      map.fitBounds(boundingBox, props.boundingBoxOptions, props.boundingBoxData);
     }
-  }, [map, props.buffer, props.data]);
+  }, [map, props.buffer, props.data, props.boundingBoxData, props.boundingBoxOptions, props.fitBoundingBox]);
+
+  if (!data) {
+    return null;
+  }
 
   return (
     <>
       { props.animate && (
         <PulsingMarkerLayer
           data={props.data}
+          id={props.layerId}
         />
       )}
-      <MixedGeoJSONLayer
+      <GeoJSONLayer
+        cluster={props.cluster}
+        clusterMaxZoom={props.clusterMaxZoom}
+        clusterMinPoints={props.clusterMinPoints}
+        clusterProperties={props.clusterProperties}
+        clusterRadius={props.clusterRadius}
         data={props.data}
         fillStyle={props.fillStyle}
         id={props.layerId}
@@ -80,9 +139,10 @@ const LocationMarkers = (props: Props) => {
 
 LocationMarkers.defaultProps = {
   buffer: DEFAULT_BUFFER,
-  fillStyle: DEFAULT_FILL_STYLE,
-  pointStyle: DEFAULT_POINT_STYLE,
-  strokeStyle: DEFAULT_STROKE_STYLE
+  fillStyle: MapStyles.fill,
+  fitBoundingBox: true,
+  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/Map.js

@@ -2,6 +2,11 @@
 
 import { bbox, bboxPolygon, buffer } from '@turf/turf';
 
+const MIN_LATITUDE = -90;
+const MAX_LATITUDE = 90;
+const MIN_LONGITUDE = -180;
+const MAX_LONGITUDE = 180;
+
 /**
  * Returns a bounding box for the passed geometry (with optional buffer).
  *
@@ -30,6 +35,29 @@ const getBoundingBox = (geometry, bufferDistance = null) => {
   return bbox(polygonBuffer);
 };
 
+/**
+ * Returns true if the passed coordinates are valid.
+ *
+ * @param coordinates
+ *
+ * @returns {boolean}
+ */
+const validateCoordinates = (coordinates) => {
+  let valid = false;
+
+  if (coordinates) {
+    const [latitude, longitude] = coordinates;
+
+    valid = latitude >= MIN_LATITUDE
+      && latitude <= MAX_LATITUDE
+      && longitude >= MIN_LONGITUDE
+      && longitude <= MAX_LONGITUDE;
+  }
+
+  return valid;
+};
+
 export default {
-  getBoundingBox
+  getBoundingBox,
+  validateCoordinates
 };

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
+};