@performant-software/geospatial 3.1.18-beta.0 → 3.1.18-beta.2

package/dist/index.es262.js

@@ -1,16 +1,11 @@
-import c from "./index.es264.js";
-import n from "./index.es268.js";
-function S(l, a, r) {
-  var f = a[1][0] - a[0][0], m = a[1][1] - a[0][1], i = l.clipExtent && l.clipExtent();
-  l.scale(150).translate([0, 0]), i != null && l.clipExtent(null), c(r, l.stream(n));
-  var t = n.result(), u = Math.min(f / (t[1][0] - t[0][0]), m / (t[1][1] - t[0][1])), s = +a[0][0] + (f - u * (t[1][0] + t[0][0])) / 2, E = +a[0][1] + (m - u * (t[1][1] + t[0][1])) / 2;
-  return i != null && l.clipExtent(i), l.scale(u * 150).translate([s, E]);
-}
-function h(l, a, r) {
-  return S(l, [[0, 0], a], r);
+import { MAX_ARRAY_INDEX as o } from "./index.es37.js";
+function u(e) {
+  return function(t) {
+    var r = e(t);
+    return typeof r == "number" && r >= 0 && r <= o;
+  };
 }
 export {
-  S as fitExtent,
-  h as fitSize
+  u as default
 };
 //# sourceMappingURL=index.es262.js.map

package/dist/index.es262.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es262.js","sources":["../../../node_modules/d3-geo/src/projection/fit.js"],"sourcesContent":["import {default as geoStream} from \"../stream\";\nimport boundsStream from \"../path/bounds\";\n\nexport function fitExtent(projection, extent, object) {\n  var w = extent[1][0] - extent[0][0],\n      h = extent[1][1] - extent[0][1],\n      clip = projection.clipExtent && projection.clipExtent();\n\n  projection\n      .scale(150)\n      .translate([0, 0]);\n\n  if (clip != null) projection.clipExtent(null);\n\n  geoStream(object, projection.stream(boundsStream));\n\n  var b = boundsStream.result(),\n      k = Math.min(w / (b[1][0] - b[0][0]), h / (b[1][1] - b[0][1])),\n      x = +extent[0][0] + (w - k * (b[1][0] + b[0][0])) / 2,\n      y = +extent[0][1] + (h - k * (b[1][1] + b[0][1])) / 2;\n\n  if (clip != null) projection.clipExtent(clip);\n\n  return projection\n      .scale(k * 150)\n      .translate([x, y]);\n}\n\nexport function fitSize(projection, size, object) {\n  return fitExtent(projection, [[0, 0], size], object);\n}\n"],"names":["fitExtent","projection","extent","object","w","h","clip","geoStream","boundsStream","b","k","x","y","fitSize","size"],"mappings":";;AAGO,SAASA,EAAUC,GAAYC,GAAQC,GAAQ;AACpD,MAAIC,IAAIF,EAAO,CAAC,EAAE,CAAC,IAAIA,EAAO,CAAC,EAAE,CAAC,GAC9BG,IAAIH,EAAO,CAAC,EAAE,CAAC,IAAIA,EAAO,CAAC,EAAE,CAAC,GAC9BI,IAAOL,EAAW,cAAcA,EAAW,WAAA;AAE/C,EAAAA,EACK,MAAM,GAAG,EACT,UAAU,CAAC,GAAG,CAAC,CAAC,GAEjBK,KAAQ,QAAML,EAAW,WAAW,IAAI,GAE5CM,EAAUJ,GAAQF,EAAW,OAAOO,CAAY,CAAC;AAEjD,MAAIC,IAAID,EAAa,OAAA,GACjBE,IAAI,KAAK,IAAIN,KAAKK,EAAE,CAAC,EAAE,CAAC,IAAIA,EAAE,CAAC,EAAE,CAAC,IAAIJ,KAAKI,EAAE,CAAC,EAAE,CAAC,IAAIA,EAAE,CAAC,EAAE,CAAC,EAAE,GAC7DE,IAAI,CAACT,EAAO,CAAC,EAAE,CAAC,KAAKE,IAAIM,KAAKD,EAAE,CAAC,EAAE,CAAC,IAAIA,EAAE,CAAC,EAAE,CAAC,MAAM,GACpDG,IAAI,CAACV,EAAO,CAAC,EAAE,CAAC,KAAKG,IAAIK,KAAKD,EAAE,CAAC,EAAE,CAAC,IAAIA,EAAE,CAAC,EAAE,CAAC,MAAM;AAExD,SAAIH,KAAQ,QAAML,EAAW,WAAWK,CAAI,GAErCL,EACF,MAAMS,IAAI,GAAG,EACb,UAAU,CAACC,GAAGC,CAAC,CAAC;AACvB;AAEO,SAASC,EAAQZ,GAAYa,GAAMX,GAAQ;AAChD,SAAOH,EAAUC,GAAY,CAAC,CAAC,GAAG,CAAC,GAAGa,CAAI,GAAGX,CAAM;AACrD;","x_google_ignoreList":[0]}
+{"version":3,"file":"index.es262.js","sources":["../node_modules/underscore/modules/_createSizePropertyCheck.js"],"sourcesContent":["import { MAX_ARRAY_INDEX } from './_setup.js';\n\n// Common internal logic for `isArrayLike` and `isBufferLike`.\nexport default function createSizePropertyCheck(getSizeProperty) {\n  return function(collection) {\n    var sizeProperty = getSizeProperty(collection);\n    return typeof sizeProperty == 'number' && sizeProperty >= 0 && sizeProperty <= MAX_ARRAY_INDEX;\n  }\n}\n"],"names":["createSizePropertyCheck","getSizeProperty","collection","sizeProperty","MAX_ARRAY_INDEX"],"mappings":";AAGA,SAAwBA,EAAwBC,GAAiB;AAC/D,SAAO,SAASC,GAAY;AAC1B,QAAIC,IAAeF,EAAgBC,CAAU;AAC7C,WAAO,OAAOC,KAAgB,YAAYA,KAAgB,KAAKA,KAAgBC;AAAA,EACjF;AACF;","x_google_ignoreList":[0]}

package/dist/index.es263.js

@@ -1,63 +1,24 @@
-import { cartesian as J } from "./index.es249.js";
-import { atan2 as K, asin as O, abs as B, sqrt as Q, cos as R, radians as U, epsilon as H } from "./index.es250.js";
-import { transformer as V } from "./index.es200.js";
-var I = 16, W = R(30 * U);
-function h(e, t) {
-  return +t ? Y(e, t) : X(e);
-}
-function X(e) {
-  return V({
-    point: function(t, D) {
-      t = e(t, D), this.stream.point(t[0], t[1]);
-    }
-  });
+import { deepEqual as a } from "./index.es239.js";
+function g(i) {
+  return {
+    longitude: i.center.lng,
+    latitude: i.center.lat,
+    zoom: i.zoom,
+    pitch: i.pitch,
+    bearing: i.bearing,
+    padding: i.padding
+  };
 }
-function Y(e, t) {
-  function D(i, P, q, L, M, T, w, $, r, u, l, c, s, n) {
-    var E = w - i, S = $ - P, v = E * E + S * S;
-    if (v > 4 * t && s--) {
-      var p = L + u, a = M + l, g = T + c, y = Q(p * p + a * a + g * g), o = O(g /= y), f = B(B(g) - 1) < H || B(q - r) < H ? (q + r) / 2 : K(a, p), k = e(f, o), N = k[0], A = k[1], C = N - i, F = A - P, G = S * C - E * F;
-      (G * G / v > t || B((E * C + S * F) / v - 0.5) > 0.3 || L * u + M * l + T * c < W) && (D(i, P, q, L, M, T, N, A, f, p /= y, a /= y, g, s, n), n.point(N, A), D(N, A, f, p, a, g, w, $, r, u, l, c, s, n));
-    }
+function c(i, t) {
+  const n = t.viewState || t, e = {};
+  if ("longitude" in n && "latitude" in n && (n.longitude !== i.center.lng || n.latitude !== i.center.lat)) {
+    const o = i.center.constructor;
+    e.center = new o(n.longitude, n.latitude);
   }
-  return function(i) {
-    var P, q, L, M, T, w, $, r, u, l, c, s, n = {
-      point: E,
-      lineStart: S,
-      lineEnd: p,
-      polygonStart: function() {
-        i.polygonStart(), n.lineStart = a;
-      },
-      polygonEnd: function() {
-        i.polygonEnd(), n.lineStart = S;
-      }
-    };
-    function E(o, f) {
-      o = e(o, f), i.point(o[0], o[1]);
-    }
-    function S() {
-      r = NaN, n.point = v, i.lineStart();
-    }
-    function v(o, f) {
-      var k = J([o, f]), N = e(o, f);
-      D(r, u, $, l, c, s, r = N[0], u = N[1], $ = o, l = k[0], c = k[1], s = k[2], I, i), i.point(r, u);
-    }
-    function p() {
-      n.point = E, i.lineEnd();
-    }
-    function a() {
-      S(), n.point = g, n.lineEnd = y;
-    }
-    function g(o, f) {
-      v(P = o, f), q = r, L = u, M = l, T = c, w = s, n.point = v;
-    }
-    function y() {
-      D(r, u, $, l, c, s, q, L, P, M, T, w, I, i), n.lineEnd = p, p();
-    }
-    return n;
-  };
+  return "zoom" in n && n.zoom !== i.zoom && (e.zoom = n.zoom), "bearing" in n && n.bearing !== i.bearing && (e.bearing = n.bearing), "pitch" in n && n.pitch !== i.pitch && (e.pitch = n.pitch), n.padding && i.padding && !a(n.padding, i.padding) && (e.padding = n.padding), e;
 }
 export {
-  h as default
+  c as applyViewStateToTransform,
+  g as transformToViewState
 };
 //# sourceMappingURL=index.es263.js.map

package/dist/index.es263.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es263.js","sources":["../../../node_modules/d3-geo/src/projection/resample.js"],"sourcesContent":["import {cartesian} from \"../cartesian\";\nimport {abs, asin, atan2, cos, epsilon, radians, sqrt} from \"../math\";\nimport {transformer} from \"../transform\";\n\nvar maxDepth = 16, // maximum depth of subdivision\n    cosMinDistance = cos(30 * radians); // cos(minimum angular distance)\n\nexport default function(project, delta2) {\n  return +delta2 ? resample(project, delta2) : resampleNone(project);\n}\n\nfunction resampleNone(project) {\n  return transformer({\n    point: function(x, y) {\n      x = project(x, y);\n      this.stream.point(x[0], x[1]);\n    }\n  });\n}\n\nfunction resample(project, delta2) {\n\n  function resampleLineTo(x0, y0, lambda0, a0, b0, c0, x1, y1, lambda1, a1, b1, c1, depth, stream) {\n    var dx = x1 - x0,\n        dy = y1 - y0,\n        d2 = dx * dx + dy * dy;\n    if (d2 > 4 * delta2 && depth--) {\n      var a = a0 + a1,\n          b = b0 + b1,\n          c = c0 + c1,\n          m = sqrt(a * a + b * b + c * c),\n          phi2 = asin(c /= m),\n          lambda2 = abs(abs(c) - 1) < epsilon || abs(lambda0 - lambda1) < epsilon ? (lambda0 + lambda1) / 2 : atan2(b, a),\n          p = project(lambda2, phi2),\n          x2 = p[0],\n          y2 = p[1],\n          dx2 = x2 - x0,\n          dy2 = y2 - y0,\n          dz = dy * dx2 - dx * dy2;\n      if (dz * dz / d2 > delta2 // perpendicular projected distance\n          || abs((dx * dx2 + dy * dy2) / d2 - 0.5) > 0.3 // midpoint close to an end\n          || a0 * a1 + b0 * b1 + c0 * c1 < cosMinDistance) { // angular distance\n        resampleLineTo(x0, y0, lambda0, a0, b0, c0, x2, y2, lambda2, a /= m, b /= m, c, depth, stream);\n        stream.point(x2, y2);\n        resampleLineTo(x2, y2, lambda2, a, b, c, x1, y1, lambda1, a1, b1, c1, depth, stream);\n      }\n    }\n  }\n  return function(stream) {\n    var lambda00, x00, y00, a00, b00, c00, // first point\n        lambda0, x0, y0, a0, b0, c0; // previous point\n\n    var resampleStream = {\n      point: point,\n      lineStart: lineStart,\n      lineEnd: lineEnd,\n      polygonStart: function() { stream.polygonStart(); resampleStream.lineStart = ringStart; },\n      polygonEnd: function() { stream.polygonEnd(); resampleStream.lineStart = lineStart; }\n    };\n\n    function point(x, y) {\n      x = project(x, y);\n      stream.point(x[0], x[1]);\n    }\n\n    function lineStart() {\n      x0 = NaN;\n      resampleStream.point = linePoint;\n      stream.lineStart();\n    }\n\n    function linePoint(lambda, phi) {\n      var c = cartesian([lambda, phi]), p = project(lambda, phi);\n      resampleLineTo(x0, y0, lambda0, a0, b0, c0, x0 = p[0], y0 = p[1], lambda0 = lambda, a0 = c[0], b0 = c[1], c0 = c[2], maxDepth, stream);\n      stream.point(x0, y0);\n    }\n\n    function lineEnd() {\n      resampleStream.point = point;\n      stream.lineEnd();\n    }\n\n    function ringStart() {\n      lineStart();\n      resampleStream.point = ringPoint;\n      resampleStream.lineEnd = ringEnd;\n    }\n\n    function ringPoint(lambda, phi) {\n      linePoint(lambda00 = lambda, phi), x00 = x0, y00 = y0, a00 = a0, b00 = b0, c00 = c0;\n      resampleStream.point = linePoint;\n    }\n\n    function ringEnd() {\n      resampleLineTo(x0, y0, lambda0, a0, b0, c0, x00, y00, lambda00, a00, b00, c00, maxDepth, stream);\n      resampleStream.lineEnd = lineEnd;\n      lineEnd();\n    }\n\n    return resampleStream;\n  };\n}\n"],"names":["maxDepth","cosMinDistance","cos","radians","resample","project","delta2","resampleNone","transformer","x","y","resampleLineTo","x0","y0","lambda0","a0","b0","c0","x1","y1","lambda1","a1","b1","c1","depth","stream","dx","dy","d2","a","b","c","m","sqrt","phi2","asin","lambda2","abs","epsilon","atan2","p","x2","y2","dx2","dy2","dz","lambda00","x00","y00","a00","b00","c00","resampleStream","point","lineStart","lineEnd","ringStart","linePoint","lambda","phi","cartesian","ringPoint","ringEnd"],"mappings":";;;AAIA,IAAIA,IAAW,IACXC,IAAiBC,EAAI,KAAKC,CAAO;AAErC,SAAAC,EAAwBC,GAASC,GAAQ;AACvC,SAAO,CAACA,IAASF,EAASC,GAASC,CAAM,IAAIC,EAAaF,CAAO;AACnE;AAEA,SAASE,EAAaF,GAAS;AAC7B,SAAOG,EAAY;AAAA,IACjB,OAAO,SAASC,GAAGC,GAAG;AACpB,MAAAD,IAAIJ,EAAQI,GAAGC,CAAC,GAChB,KAAK,OAAO,MAAMD,EAAE,CAAC,GAAGA,EAAE,CAAC,CAAC;AAAA,IAC9B;AAAA,EAAA,CACD;AACH;AAEA,SAASL,EAASC,GAASC,GAAQ;AAEjC,WAASK,EAAeC,GAAIC,GAAIC,GAASC,GAAIC,GAAIC,GAAIC,GAAIC,GAAIC,GAASC,GAAIC,GAAIC,GAAIC,GAAOC,GAAQ;AAC/F,QAAIC,IAAKR,IAAKN,GACVe,IAAKR,IAAKN,GACVe,IAAKF,IAAKA,IAAKC,IAAKA;AACxB,QAAIC,IAAK,IAAItB,KAAUkB,KAAS;AAC9B,UAAIK,IAAId,IAAKM,GACTS,IAAId,IAAKM,GACTS,IAAId,IAAKM,GACTS,IAAIC,EAAKJ,IAAIA,IAAIC,IAAIA,IAAIC,IAAIA,CAAC,GAC9BG,IAAOC,EAAKJ,KAAKC,CAAC,GAClBI,IAAUC,EAAIA,EAAIN,CAAC,IAAI,CAAC,IAAIO,KAAWD,EAAIvB,IAAUM,CAAO,IAAIkB,KAAWxB,IAAUM,KAAW,IAAImB,EAAMT,GAAGD,CAAC,GAC9GW,IAAInC,EAAQ+B,GAASF,CAAI,GACzBO,IAAKD,EAAE,CAAC,GACRE,IAAKF,EAAE,CAAC,GACRG,IAAMF,IAAK7B,GACXgC,IAAMF,IAAK7B,GACXgC,IAAKlB,IAAKgB,IAAMjB,IAAKkB;AACzB,OAAIC,IAAKA,IAAKjB,IAAKtB,KACZ+B,GAAKX,IAAKiB,IAAMhB,IAAKiB,KAAOhB,IAAK,GAAG,IAAI,OACxCb,IAAKM,IAAKL,IAAKM,IAAKL,IAAKM,IAAKtB,OACnCU,EAAeC,GAAIC,GAAIC,GAASC,GAAIC,GAAIC,GAAIwB,GAAIC,GAAIN,GAASP,KAAKG,GAAGF,KAAKE,GAAGD,GAAGP,GAAOC,CAAM,GAC7FA,EAAO,MAAMgB,GAAIC,CAAE,GACnB/B,EAAe8B,GAAIC,GAAIN,GAASP,GAAGC,GAAGC,GAAGb,GAAIC,GAAIC,GAASC,GAAIC,GAAIC,GAAIC,GAAOC,CAAM;AAAA,IAEvF;AAAA,EACF;AACA,SAAO,SAASA,GAAQ;AACtB,QAAIqB,GAAUC,GAAKC,GAAKC,GAAKC,GAAKC,GAC9BrC,GAASF,GAAIC,GAAIE,GAAIC,GAAIC,GAEzBmC,IAAiB;AAAA,MACnB,OAAAC;AAAA,MACA,WAAAC;AAAA,MACA,SAAAC;AAAA,MACA,cAAc,WAAW;AAAE,QAAA9B,EAAO,aAAA,GAAgB2B,EAAe,YAAYI;AAAA,MAAW;AAAA,MACxF,YAAY,WAAW;AAAE,QAAA/B,EAAO,WAAA,GAAc2B,EAAe,YAAYE;AAAA,MAAW;AAAA,IAAA;AAGtF,aAASD,EAAM5C,GAAGC,GAAG;AACnB,MAAAD,IAAIJ,EAAQI,GAAGC,CAAC,GAChBe,EAAO,MAAMhB,EAAE,CAAC,GAAGA,EAAE,CAAC,CAAC;AAAA,IACzB;AAEA,aAAS6C,IAAY;AACnB,MAAA1C,IAAK,KACLwC,EAAe,QAAQK,GACvBhC,EAAO,UAAA;AAAA,IACT;AAEA,aAASgC,EAAUC,GAAQC,GAAK;AAC9B,UAAI5B,IAAI6B,EAAU,CAACF,GAAQC,CAAG,CAAC,GAAGnB,IAAInC,EAAQqD,GAAQC,CAAG;AACzD,MAAAhD,EAAeC,GAAIC,GAAIC,GAASC,GAAIC,GAAIC,GAAIL,IAAK4B,EAAE,CAAC,GAAG3B,IAAK2B,EAAE,CAAC,GAAG1B,IAAU4C,GAAQ3C,IAAKgB,EAAE,CAAC,GAAGf,IAAKe,EAAE,CAAC,GAAGd,IAAKc,EAAE,CAAC,GAAG/B,GAAUyB,CAAM,GACrIA,EAAO,MAAMb,GAAIC,CAAE;AAAA,IACrB;AAEA,aAAS0C,IAAU;AACjB,MAAAH,EAAe,QAAQC,GACvB5B,EAAO,QAAA;AAAA,IACT;AAEA,aAAS+B,IAAY;AACnB,MAAAF,EAAA,GACAF,EAAe,QAAQS,GACvBT,EAAe,UAAUU;AAAA,IAC3B;AAEA,aAASD,EAAUH,GAAQC,GAAK;AAC9B,MAAAF,EAAUX,IAAWY,GAAQC,CAAG,GAAGZ,IAAMnC,GAAIoC,IAAMnC,GAAIoC,IAAMlC,GAAImC,IAAMlC,GAAImC,IAAMlC,GACjFmC,EAAe,QAAQK;AAAA,IACzB;AAEA,aAASK,IAAU;AACjB,MAAAnD,EAAeC,GAAIC,GAAIC,GAASC,GAAIC,GAAIC,GAAI8B,GAAKC,GAAKF,GAAUG,GAAKC,GAAKC,GAAKnD,GAAUyB,CAAM,GAC/F2B,EAAe,UAAUG,GACzBA,EAAA;AAAA,IACF;AAEA,WAAOH;AAAA,EACT;AACF;","x_google_ignoreList":[0]}
+{"version":3,"file":"index.es263.js","sources":["../../../node_modules/@vis.gl/react-maplibre/dist/utils/transform.js"],"sourcesContent":["import { deepEqual } from \"./deep-equal.js\";\n/**\n * Capture a transform's current state\n * @param transform\n * @returns descriptor of the view state\n */\nexport function transformToViewState(tr) {\n    return {\n        longitude: tr.center.lng,\n        latitude: tr.center.lat,\n        zoom: tr.zoom,\n        pitch: tr.pitch,\n        bearing: tr.bearing,\n        padding: tr.padding\n    };\n}\n/* eslint-disable complexity */\n/**\n * Applies requested view state to a transform\n * @returns an object containing detected changes\n */\nexport function applyViewStateToTransform(\n/** An object that describes Maplibre's camera state */\ntr, \n/** Props from Map component */\nprops) {\n    const v = props.viewState || props;\n    const changes = {};\n    if ('longitude' in v &&\n        'latitude' in v &&\n        (v.longitude !== tr.center.lng || v.latitude !== tr.center.lat)) {\n        const LngLat = tr.center.constructor;\n        // @ts-expect-error we should not import LngLat class from maplibre-gl because we don't know the source of mapLib\n        changes.center = new LngLat(v.longitude, v.latitude);\n    }\n    if ('zoom' in v && v.zoom !== tr.zoom) {\n        changes.zoom = v.zoom;\n    }\n    if ('bearing' in v && v.bearing !== tr.bearing) {\n        changes.bearing = v.bearing;\n    }\n    if ('pitch' in v && v.pitch !== tr.pitch) {\n        changes.pitch = v.pitch;\n    }\n    if (v.padding && tr.padding && !deepEqual(v.padding, tr.padding)) {\n        changes.padding = v.padding;\n    }\n    return changes;\n}\n//# sourceMappingURL=transform.js.map"],"names":["transformToViewState","tr","applyViewStateToTransform","props","v","changes","LngLat","deepEqual"],"mappings":";AAMO,SAASA,EAAqBC,GAAI;AACrC,SAAO;AAAA,IACH,WAAWA,EAAG,OAAO;AAAA,IACrB,UAAUA,EAAG,OAAO;AAAA,IACpB,MAAMA,EAAG;AAAA,IACT,OAAOA,EAAG;AAAA,IACV,SAASA,EAAG;AAAA,IACZ,SAASA,EAAG;AAAA,EAAA;AAEpB;AAMO,SAASC,EAEhBD,GAEAE,GAAO;AACH,QAAMC,IAAID,EAAM,aAAaA,GACvBE,IAAU,CAAA;AAChB,MAAI,eAAeD,KACf,cAAcA,MACbA,EAAE,cAAcH,EAAG,OAAO,OAAOG,EAAE,aAAaH,EAAG,OAAO,MAAM;AACjE,UAAMK,IAASL,EAAG,OAAO;AAEzB,IAAAI,EAAQ,SAAS,IAAIC,EAAOF,EAAE,WAAWA,EAAE,QAAQ;AAAA,EACvD;AACA,SAAI,UAAUA,KAAKA,EAAE,SAASH,EAAG,SAC7BI,EAAQ,OAAOD,EAAE,OAEjB,aAAaA,KAAKA,EAAE,YAAYH,EAAG,YACnCI,EAAQ,UAAUD,EAAE,UAEpB,WAAWA,KAAKA,EAAE,UAAUH,EAAG,UAC/BI,EAAQ,QAAQD,EAAE,QAElBA,EAAE,WAAWH,EAAG,WAAW,CAACM,EAAUH,EAAE,SAASH,EAAG,OAAO,MAC3DI,EAAQ,UAAUD,EAAE,UAEjBC;AACX;","x_google_ignoreList":[0]}

package/dist/index.es264.js

@@ -1,53 +1,26 @@
-function l(n, i) {
-  n && f.hasOwnProperty(n.type) && f[n.type](n, i);
-}
-var u = {
-  Feature: function(n, i) {
-    l(n.geometry, i);
-  },
-  FeatureCollection: function(n, i) {
-    for (var e = n.features, t = -1, o = e.length; ++t < o; ) l(e[t].geometry, i);
-  }
-}, f = {
-  Sphere: function(n, i) {
-    i.sphere();
-  },
-  Point: function(n, i) {
-    n = n.coordinates, i.point(n[0], n[1], n[2]);
-  },
-  MultiPoint: function(n, i) {
-    for (var e = n.coordinates, t = -1, o = e.length; ++t < o; ) n = e[t], i.point(n[0], n[1], n[2]);
-  },
-  LineString: function(n, i) {
-    a(n.coordinates, i, 0);
-  },
-  MultiLineString: function(n, i) {
-    for (var e = n.coordinates, t = -1, o = e.length; ++t < o; ) a(e[t], i, 0);
-  },
-  Polygon: function(n, i) {
-    h(n.coordinates, i);
-  },
-  MultiPolygon: function(n, i) {
-    for (var e = n.coordinates, t = -1, o = e.length; ++t < o; ) h(e[t], i);
-  },
-  GeometryCollection: function(n, i) {
-    for (var e = n.geometries, t = -1, o = e.length; ++t < o; ) l(e[t], i);
-  }
-};
-function a(n, i, e) {
-  var t = -1, o = n.length - e, r;
-  for (i.lineStart(); ++t < o; ) r = n[t], i.point(r[0], r[1], r[2]);
-  i.lineEnd();
-}
-function h(n, i) {
-  var e = -1, t = n.length;
-  for (i.polygonStart(); ++e < t; ) a(n[e], i, 1);
-  i.polygonEnd();
-}
-function g(n, i) {
-  n && u.hasOwnProperty(n.type) ? u[n.type](n, i) : l(n, i);
+const a = ["type", "source", "source-layer", "minzoom", "maxzoom", "filter", "layout"];
+function c(r) {
+  if (!r)
+    return null;
+  if (typeof r == "string" || ("toJS" in r && (r = r.toJS()), !r.layers))
+    return r;
+  const t = {};
+  for (const e of r.layers)
+    t[e.id] = e;
+  const f = r.layers.map((e) => {
+    let n = null;
+    "interactive" in e && (n = Object.assign({}, e), delete n.interactive);
+    const o = t[e.ref];
+    if (o) {
+      n = n || Object.assign({}, e), delete n.ref;
+      for (const i of a)
+        i in o && (n[i] = o[i]);
+    }
+    return n || e;
+  });
+  return { ...r, layers: f };
 }
 export {
-  g as default
+  c as normalizeStyle
 };
 //# sourceMappingURL=index.es264.js.map

package/dist/index.es264.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.es264.js","sources":["../../../node_modules/d3-geo/src/stream.js"],"sourcesContent":["function streamGeometry(geometry, stream) {\n  if (geometry && streamGeometryType.hasOwnProperty(geometry.type)) {\n    streamGeometryType[geometry.type](geometry, stream);\n  }\n}\n\nvar streamObjectType = {\n  Feature: function(object, stream) {\n    streamGeometry(object.geometry, stream);\n  },\n  FeatureCollection: function(object, stream) {\n    var features = object.features, i = -1, n = features.length;\n    while (++i < n) streamGeometry(features[i].geometry, stream);\n  }\n};\n\nvar streamGeometryType = {\n  Sphere: function(object, stream) {\n    stream.sphere();\n  },\n  Point: function(object, stream) {\n    object = object.coordinates;\n    stream.point(object[0], object[1], object[2]);\n  },\n  MultiPoint: function(object, stream) {\n    var coordinates = object.coordinates, i = -1, n = coordinates.length;\n    while (++i < n) object = coordinates[i], stream.point(object[0], object[1], object[2]);\n  },\n  LineString: function(object, stream) {\n    streamLine(object.coordinates, stream, 0);\n  },\n  MultiLineString: function(object, stream) {\n    var coordinates = object.coordinates, i = -1, n = coordinates.length;\n    while (++i < n) streamLine(coordinates[i], stream, 0);\n  },\n  Polygon: function(object, stream) {\n    streamPolygon(object.coordinates, stream);\n  },\n  MultiPolygon: function(object, stream) {\n    var coordinates = object.coordinates, i = -1, n = coordinates.length;\n    while (++i < n) streamPolygon(coordinates[i], stream);\n  },\n  GeometryCollection: function(object, stream) {\n    var geometries = object.geometries, i = -1, n = geometries.length;\n    while (++i < n) streamGeometry(geometries[i], stream);\n  }\n};\n\nfunction streamLine(coordinates, stream, closed) {\n  var i = -1, n = coordinates.length - closed, coordinate;\n  stream.lineStart();\n  while (++i < n) coordinate = coordinates[i], stream.point(coordinate[0], coordinate[1], coordinate[2]);\n  stream.lineEnd();\n}\n\nfunction streamPolygon(coordinates, stream) {\n  var i = -1, n = coordinates.length;\n  stream.polygonStart();\n  while (++i < n) streamLine(coordinates[i], stream, 1);\n  stream.polygonEnd();\n}\n\nexport default function(object, stream) {\n  if (object && streamObjectType.hasOwnProperty(object.type)) {\n    streamObjectType[object.type](object, stream);\n  } else {\n    streamGeometry(object, stream);\n  }\n}\n"],"names":["streamGeometry","geometry","stream","streamGeometryType","streamObjectType","object","features","i","n","coordinates","streamLine","streamPolygon","geometries","closed","coordinate","geoStream"],"mappings":"AAAA,SAASA,EAAeC,GAAUC,GAAQ;AACxC,EAAID,KAAYE,EAAmB,eAAeF,EAAS,IAAI,KAC7DE,EAAmBF,EAAS,IAAI,EAAEA,GAAUC,CAAM;AAEtD;AAEA,IAAIE,IAAmB;AAAA,EACrB,SAAS,SAASC,GAAQH,GAAQ;AAChC,IAAAF,EAAeK,EAAO,UAAUH,CAAM;AAAA,EACxC;AAAA,EACA,mBAAmB,SAASG,GAAQH,GAAQ;AAE1C,aADII,IAAWD,EAAO,UAAUE,IAAI,IAAIC,IAAIF,EAAS,QAC9C,EAAEC,IAAIC,IAAG,CAAAR,EAAeM,EAASC,CAAC,EAAE,UAAUL,CAAM;AAAA,EAC7D;AACF,GAEIC,IAAqB;AAAA,EACvB,QAAQ,SAASE,GAAQH,GAAQ;AAC/B,IAAAA,EAAO,OAAA;AAAA,EACT;AAAA,EACA,OAAO,SAASG,GAAQH,GAAQ;AAC9B,IAAAG,IAASA,EAAO,aAChBH,EAAO,MAAMG,EAAO,CAAC,GAAGA,EAAO,CAAC,GAAGA,EAAO,CAAC,CAAC;AAAA,EAC9C;AAAA,EACA,YAAY,SAASA,GAAQH,GAAQ;AAEnC,aADIO,IAAcJ,EAAO,aAAaE,IAAI,IAAIC,IAAIC,EAAY,QACvD,EAAEF,IAAIC,IAAG,CAAAH,IAASI,EAAYF,CAAC,GAAGL,EAAO,MAAMG,EAAO,CAAC,GAAGA,EAAO,CAAC,GAAGA,EAAO,CAAC,CAAC;AAAA,EACvF;AAAA,EACA,YAAY,SAASA,GAAQH,GAAQ;AACnC,IAAAQ,EAAWL,EAAO,aAAaH,GAAQ,CAAC;AAAA,EAC1C;AAAA,EACA,iBAAiB,SAASG,GAAQH,GAAQ;AAExC,aADIO,IAAcJ,EAAO,aAAaE,IAAI,IAAIC,IAAIC,EAAY,QACvD,EAAEF,IAAIC,IAAG,CAAAE,EAAWD,EAAYF,CAAC,GAAGL,GAAQ,CAAC;AAAA,EACtD;AAAA,EACA,SAAS,SAASG,GAAQH,GAAQ;AAChC,IAAAS,EAAcN,EAAO,aAAaH,CAAM;AAAA,EAC1C;AAAA,EACA,cAAc,SAASG,GAAQH,GAAQ;AAErC,aADIO,IAAcJ,EAAO,aAAaE,IAAI,IAAIC,IAAIC,EAAY,QACvD,EAAEF,IAAIC,OAAiBC,EAAYF,CAAC,GAAGL,CAAM;AAAA,EACtD;AAAA,EACA,oBAAoB,SAASG,GAAQH,GAAQ;AAE3C,aADIU,IAAaP,EAAO,YAAYE,IAAI,IAAIC,IAAII,EAAW,QACpD,EAAEL,IAAIC,OAAkBI,EAAWL,CAAC,GAAGL,CAAM;AAAA,EACtD;AACF;AAEA,SAASQ,EAAWD,GAAaP,GAAQW,GAAQ;AAC/C,MAAIN,IAAI,IAAIC,IAAIC,EAAY,SAASI,GAAQC;AAE7C,OADAZ,EAAO,UAAA,GACA,EAAEK,IAAIC,IAAG,CAAAM,IAAaL,EAAYF,CAAC,GAAGL,EAAO,MAAMY,EAAW,CAAC,GAAGA,EAAW,CAAC,GAAGA,EAAW,CAAC,CAAC;AACrG,EAAAZ,EAAO,QAAA;AACT;AAEA,SAASS,EAAcF,GAAaP,GAAQ;AAC1C,MAAIK,IAAI,IAAIC,IAAIC,EAAY;AAE5B,OADAP,EAAO,aAAA,GACA,EAAEK,IAAIC,IAAG,CAAAE,EAAWD,EAAYF,CAAC,GAAGL,GAAQ,CAAC;AACpD,EAAAA,EAAO,WAAA;AACT;AAEA,SAAAa,EAAwBV,GAAQH,GAAQ;AACtC,EAAIG,KAAUD,EAAiB,eAAeC,EAAO,IAAI,IACvDD,EAAiBC,EAAO,IAAI,EAAEA,GAAQH,CAAM,IAE5CF,EAAeK,GAAQH,CAAM;AAEjC;","x_google_ignoreList":[0]}
+{"version":3,"file":"index.es264.js","sources":["../../../node_modules/@vis.gl/react-maplibre/dist/utils/style-utils.js"],"sourcesContent":["const refProps = ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'];\n// Prepare a map style object for diffing\n// If immutable - convert to plain object\n// Work around some issues in older styles that would fail Mapbox's diffing\nexport function normalizeStyle(style) {\n    if (!style) {\n        return null;\n    }\n    if (typeof style === 'string') {\n        return style;\n    }\n    if ('toJS' in style) {\n        style = style.toJS();\n    }\n    if (!style.layers) {\n        return style;\n    }\n    const layerIndex = {};\n    for (const layer of style.layers) {\n        layerIndex[layer.id] = layer;\n    }\n    const layers = style.layers.map(layer => {\n        let normalizedLayer = null;\n        if ('interactive' in layer) {\n            normalizedLayer = Object.assign({}, layer);\n            // Breaks style diffing :(\n            // @ts-ignore legacy field not typed\n            delete normalizedLayer.interactive;\n        }\n        // Style diffing doesn't work with refs so expand them out manually before diffing.\n        // @ts-ignore legacy field not typed\n        const layerRef = layerIndex[layer.ref];\n        if (layerRef) {\n            normalizedLayer = normalizedLayer || Object.assign({}, layer);\n            // @ts-ignore\n            delete normalizedLayer.ref;\n            // https://github.com/mapbox/mapbox-gl-js/blob/master/src/style-spec/deref.js\n            for (const propName of refProps) {\n                if (propName in layerRef) {\n                    normalizedLayer[propName] = layerRef[propName];\n                }\n            }\n        }\n        return normalizedLayer || layer;\n    });\n    // Do not mutate the style object provided by the user\n    return { ...style, layers };\n}\n//# sourceMappingURL=style-utils.js.map"],"names":["refProps","normalizeStyle","style","layerIndex","layer","layers","normalizedLayer","layerRef","propName"],"mappings":"AAAA,MAAMA,IAAW,CAAC,QAAQ,UAAU,gBAAgB,WAAW,WAAW,UAAU,QAAQ;AAIrF,SAASC,EAAeC,GAAO;AAClC,MAAI,CAACA;AACD,WAAO;AAQX,MANI,OAAOA,KAAU,aAGjB,UAAUA,MACVA,IAAQA,EAAM,KAAA,IAEd,CAACA,EAAM;AACP,WAAOA;AAEX,QAAMC,IAAa,CAAA;AACnB,aAAWC,KAASF,EAAM;AACtB,IAAAC,EAAWC,EAAM,EAAE,IAAIA;AAE3B,QAAMC,IAASH,EAAM,OAAO,IAAI,CAAAE,MAAS;AACrC,QAAIE,IAAkB;AACtB,IAAI,iBAAiBF,MACjBE,IAAkB,OAAO,OAAO,CAAA,GAAIF,CAAK,GAGzC,OAAOE,EAAgB;AAI3B,UAAMC,IAAWJ,EAAWC,EAAM,GAAG;AACrC,QAAIG,GAAU;AACV,MAAAD,IAAkBA,KAAmB,OAAO,OAAO,CAAA,GAAIF,CAAK,GAE5D,OAAOE,EAAgB;AAEvB,iBAAWE,KAAYR;AACnB,QAAIQ,KAAYD,MACZD,EAAgBE,CAAQ,IAAID,EAASC,CAAQ;AAAA,IAGzD;AACA,WAAOF,KAAmBF;AAAA,EAC9B,CAAC;AAED,SAAO,EAAE,GAAGF,GAAO,QAAAG,EAAA;AACvB;","x_google_ignoreList":[0]}

package/dist/index.es266.js

@@ -1,4 +1,4 @@
-import { abs as n, epsilon as r } from "./index.es250.js";
+import { abs as n, epsilon as r } from "./index.es245.js";
 function i(o, t) {
   return n(o[0] - t[0]) < r && n(o[1] - t[1]) < r;
 }

package/dist/index.es267.js

@@ -1,9 +1,9 @@
-import A from "./index.es252.js";
-import D from "./index.es254.js";
-import { halfPi as S, epsilon as R } from "./index.es250.js";
+import A from "./index.es247.js";
+import D from "./index.es249.js";
+import { halfPi as S, epsilon as R } from "./index.es245.js";
 import F from "./index.es196.js";
 import "./index.es195.js";
-import G from "./index.es255.js";
+import G from "./index.es250.js";
 function T(e, p, m, v) {
   return function(g, n) {
     var d = p(n), j = g.invert(v[0], v[1]), h = A(), c = p(h), l = !1, a, f, u, r = {

package/dist/index.es27.js

@@ -1,7 +1,7 @@
 import { useContext as m, useRef as L, useState as g, useMemo as x, useEffect as h } from "react";
 import { MapContext as b } from "./index.es16.js";
-import d from "./index.es239.js";
-import { deepEqual as l } from "./index.es237.js";
+import d from "./index.es241.js";
+import { deepEqual as l } from "./index.es239.js";
 function k(t, e, a, o) {
   if (d(a.id === o.id, "layer id changed"), d(a.type === o.type, "layer type changed"), a.type === "custom" || o.type === "custom")
     return;

package/dist/index.es38.js

@@ -1,4 +1,4 @@
-import e from "./index.es205.js";
+import e from "./index.es207.js";
 import { root as t } from "./index.es37.js";
 var o = e("Function"), i = t.document && t.document.childNodes;
 typeof /./ != "function" && typeof Int8Array != "object" && typeof i != "function" && (o = function(n) {

package/dist/index.es39.js

@@ -1,5 +1,5 @@
 import { supportsDataView as e } from "./index.es37.js";
-import a from "./index.es242.js";
+import a from "./index.es260.js";
 var i = e && (!/\[native code\]/.test(String(DataView)) || a(new DataView(new ArrayBuffer(8)))), o = typeof Map < "u" && a(/* @__PURE__ */ new Map());
 export {
   i as hasDataViewBug,

package/dist/index.es40.js

@@ -1,5 +1,5 @@
-import e from "./index.es205.js";
-import n from "./index.es206.js";
+import e from "./index.es207.js";
+import n from "./index.es208.js";
 var t = e("Arguments");
 (function() {
   t(arguments) || (t = function(r) {

package/dist/index.es42.js

@@ -1,6 +1,6 @@
-import r from "./index.es205.js";
+import r from "./index.es207.js";
 import { isIE11 as t } from "./index.es39.js";
-import { ie11fingerprint as o, mapMethods as i } from "./index.es211.js";
+import { ie11fingerprint as o, mapMethods as i } from "./index.es213.js";
 const a = t ? o(i) : r("Map");
 export {
   a as default

package/dist/index.es43.js

@@ -1,6 +1,6 @@
-import e from "./index.es205.js";
+import e from "./index.es207.js";
 import { isIE11 as r } from "./index.es39.js";
-import { ie11fingerprint as t, weakMapMethods as a } from "./index.es211.js";
+import { ie11fingerprint as t, weakMapMethods as a } from "./index.es213.js";
 const m = r ? t(a) : e("WeakMap");
 export {
   m as default

package/dist/index.es44.js

@@ -1,6 +1,6 @@
-import t from "./index.es205.js";
+import t from "./index.es207.js";
 import { isIE11 as e } from "./index.es39.js";
-import { ie11fingerprint as r, setMethods as o } from "./index.es211.js";
+import { ie11fingerprint as r, setMethods as o } from "./index.es213.js";
 const f = e ? r(o) : t("Set");
 export {
   f as default

package/dist/index.es46.js

@@ -1,5 +1,5 @@
 import r from "./index.es41.js";
-import i from "./index.es222.js";
+import i from "./index.es224.js";
 function a(e, t) {
   return i(e, t, 1 / 0);
 }

package/dist/index.es47.js

@@ -1,5 +1,5 @@
-import e from "./index.es219.js";
-import a from "./index.es220.js";
+import e from "./index.es221.js";
+import a from "./index.es222.js";
 const o = e(a);
 export {
   o as default

package/dist/index.es48.js

@@ -1,5 +1,5 @@
-import e from "./index.es219.js";
-import a from "./index.es221.js";
+import e from "./index.es221.js";
+import a from "./index.es223.js";
 const o = e(a);
 export {
   o as default

package/dist/index.es50.js

@@ -1,5 +1,5 @@
 import m from "./index.es89.js";
-import p from "./index.es223.js";
+import p from "./index.es225.js";
 import s from "./index.es41.js";
 var l = m(function(u, e) {
   var h = l.placeholder, o = function() {

package/dist/index.es51.js

@@ -1,6 +1,6 @@
 import o from "./index.es89.js";
 import u from "./index.es38.js";
-import c from "./index.es223.js";
+import c from "./index.es225.js";
 const a = o(function(t, r, e) {
   if (!u(t)) throw new TypeError("Bind must be called on a function");
   var n = o(function(i) {

package/dist/index.es52.js

@@ -1,5 +1,5 @@
 import i from "./index.es89.js";
-import f from "./index.es224.js";
+import f from "./index.es226.js";
 import l from "./index.es51.js";
 const s = i(function(r, t) {
   t = f(t, !1, !1);

package/dist/index.es56.js

@@ -1,8 +1,8 @@
 import u from "./index.es89.js";
 import l from "./index.es38.js";
 import t from "./index.es156.js";
-import s from "./index.es216.js";
-import d from "./index.es215.js";
+import s from "./index.es218.js";
+import d from "./index.es217.js";
 const k = u(function(f, r, m) {
   var e, n;
   return l(r) ? n = r : (r = d(r), e = r.slice(0, -1), r = r[r.length - 1]), t(f, function(i) {

package/dist/index.es57.js

@@ -1,9 +1,9 @@
 import l from "./index.es89.js";
 import a from "./index.es38.js";
-import p from "./index.es218.js";
+import p from "./index.es220.js";
 import u from "./index.es112.js";
-import c from "./index.es230.js";
-import g from "./index.es224.js";
+import c from "./index.es232.js";
+import g from "./index.es226.js";
 const z = l(function(t, r) {
   var i = {}, f = r[0];
   if (t == null) return i;

package/dist/index.es58.js

@@ -2,7 +2,7 @@ import n from "./index.es89.js";
 import f from "./index.es38.js";
 import e from "./index.es143.js";
 import a from "./index.es156.js";
-import p from "./index.es224.js";
+import p from "./index.es226.js";
 import u from "./index.es163.js";
 import c from "./index.es57.js";
 const F = n(function(i, t) {

package/dist/index.es60.js

@@ -1,6 +1,6 @@
 import r from "./index.es89.js";
 import o from "./index.es183.js";
-import n from "./index.es224.js";
+import n from "./index.es226.js";
 const f = r(function(t) {
   return o(n(t, !0, !0));
 });

package/dist/index.es61.js

@@ -1,5 +1,5 @@
 import n from "./index.es89.js";
-import e from "./index.es224.js";
+import e from "./index.es226.js";
 import f from "./index.es159.js";
 import i from "./index.es163.js";
 const a = n(function(t, r) {

package/dist/index.es63.js

@@ -1,7 +1,7 @@
 import i from "./index.es41.js";
 import p from "./index.es155.js";
 import { ArrayProto as e } from "./index.es37.js";
-import s from "./index.es231.js";
+import s from "./index.es233.js";
 p(["pop", "push", "reverse", "shift", "sort", "splice", "unshift"], function(r) {
   var o = e[r];
   i.prototype[r] = function() {

package/dist/index.es88.js

@@ -2,7 +2,7 @@ import r from "./index.es41.js";
 import n from "./index.es155.js";
 import f from "./index.es116.js";
 import { push as u } from "./index.es37.js";
-import m from "./index.es231.js";
+import m from "./index.es233.js";
 function l(o) {
   return n(f(o), function(t) {
     var i = r[t] = o[t];

package/dist/index.es95.js

@@ -1,4 +1,4 @@
-import t from "./index.es205.js";
+import t from "./index.es207.js";
 const e = t("String");
 export {
   e as default

package/dist/index.es96.js

@@ -1,4 +1,4 @@
-import e from "./index.es205.js";
+import e from "./index.es207.js";
 const t = e("Number");
 export {
   t as default

package/dist/index.es97.js

@@ -1,4 +1,4 @@
-import t from "./index.es205.js";
+import t from "./index.es207.js";
 const a = t("Date");
 export {
   a as default

package/dist/index.es98.js

@@ -1,4 +1,4 @@
-import e from "./index.es205.js";
+import e from "./index.es207.js";
 const o = e("RegExp");
 export {
   o as default

package/dist/index.es99.js

@@ -1,4 +1,4 @@
-import r from "./index.es205.js";
+import r from "./index.es207.js";
 const t = r("Error");
 export {
   t as default

package/package.json

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

package/src/utils/Map.js

@@ -26,32 +26,41 @@ 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);
+        }
+      }
+    } 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 getCertaintyCircles = (
+const getCertaintyCircleFeatureCollection = (
   items,
   getCertaintyRadius: (item: any) => number | undefined
 ) => {
   const features = [];
 
   for (const item of items) {
-    if (getCertaintyRadius(item)) {
-      if (item.geometry?.type === 'FeatureCollection') {
-        for (const childFeature of item.geometry.features) {
-          if (childFeature.geometry?.type === 'Point') {
-            features.push(buildCircle(childFeature.geometry, getCertaintyRadius(item)));
-          }
-        }
-      } else if (item.geometry.type === 'GeometryCollection') {
-        for (const geometry of item.geometry.geometries) {
-          if (geometry.type === 'Point') {
-            features.push(buildCircle(geometry, getCertaintyRadius(item)));
-          }
-        }
-      } else if (item.geometry?.type === 'Point') {
-        features.push(buildCircle(item.geometry, getCertaintyRadius(item)));
-      }
+    const circle = getCertaintyCircle(item, getCertaintyRadius);
+    if (circle) {
+      features.push(circle);
     }
   }
 
@@ -204,7 +213,8 @@ const validateCoordinates = (coordinates) => {
 
 export default {
   addGeoreferenceLayer,
-  getCertaintyCircles,
+  getCertaintyCircle,
+  getCertaintyCircleFeatureCollection,
   getBoundingBox,
   removeLayer,
   toFeature,