@deck.gl/geo-layers 8.9.18 → 8.10.0-alpha.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/geo-layers",
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
-  "version": "8.9.18",
+  "version": "8.10.0-alpha.1",
   "publishConfig": {
     "access": "public"
   },
@@ -44,7 +44,7 @@
     "@math.gl/culling": "^3.6.2",
     "@math.gl/web-mercator": "^3.6.2",
     "@types/geojson": "^7946.0.8",
-    "h3-js": "^3.7.0",
+    "h3-js": "^4.1.0",
     "long": "^3.2.0"
   },
   "peerDependencies": {
@@ -55,5 +55,5 @@
     "@loaders.gl/core": "^3.4.2",
     "@luma.gl/core": "^8.0.0"
   },
-  "gitHead": "e581cda7ad4df20fb3706023d64216e07ac78692"
+  "gitHead": "8a3793449f88140ad1e16da7a190d192904629eb"
 }

package/src/h3-layers/h3-cluster-layer.ts

@@ -1,4 +1,4 @@
-import {h3SetToMultiPolygon, H3IndexInput} from 'h3-js';
+import {cellsToMultiPolygon, H3IndexInput} from 'h3-js';
 
 import {AccessorFunction, createIterable, UpdateParameters, DefaultProps} from '@deck.gl/core';
 import {default as H3HexagonLayer} from './h3-hexagon-layer';
@@ -45,7 +45,7 @@ export default class H3ClusterLayer<DataT = any, ExtraProps extends {} = {}> ext
       for (const object of iterable) {
         objectInfo.index++;
         const hexagons = getHexagons(object, objectInfo);
-        const multiPolygon = h3SetToMultiPolygon(hexagons, true);
+        const multiPolygon = cellsToMultiPolygon(hexagons, true);
 
         for (const polygon of multiPolygon) {
           polygons.push(this.getSubLayerRow({polygon}, object, objectInfo.index));

package/src/h3-layers/h3-hexagon-layer.ts

@@ -1,11 +1,11 @@
 import {
-  h3ToGeoBoundary,
-  h3GetResolution,
-  h3ToGeo,
-  geoToH3,
-  h3IsPentagon,
-  h3Distance,
-  edgeLength,
+  cellToBoundary,
+  getResolution,
+  cellToLatLng,
+  latLngToCell,
+  isPentagon,
+  gridDistance,
+  getHexagonEdgeLengthAvg,
   H3Index
 } from 'h3-js';
 import {lerp} from '@math.gl/core';
@@ -41,13 +41,13 @@ export function normalizeLongitudes(vertices: number[][], refLng?: number): void
 
 // scale polygon vertices w.r.t center (hexId)
 export function scalePolygon(hexId: H3Index, vertices: number[][], factor: number): void {
-  const [lat, lng] = h3ToGeo(hexId);
+  const [lat, lng] = cellToLatLng(hexId);
   const actualCount = vertices.length;
 
   // normalize with respect to center
   normalizeLongitudes(vertices, lng);
 
-  // `h3ToGeoBoundary` returns same array object for first and last vertex (closed polygon),
+  // `cellToBoundary` returns same array object for first and last vertex (closed polygon),
   // if so skip scaling the last vertex
   const vertexCount = vertices[0] === vertices[actualCount - 1] ? actualCount - 1 : actualCount;
   for (let i = 0; i < vertexCount; i++) {
@@ -58,12 +58,12 @@ export function scalePolygon(hexId: H3Index, vertices: number[][], factor: numbe
 
 function getHexagonCentroid(getHexagon, object, objectInfo) {
   const hexagonId = getHexagon(object, objectInfo);
-  const [lat, lng] = h3ToGeo(hexagonId);
+  const [lat, lng] = cellToLatLng(hexagonId);
   return [lng, lat];
 }
 
 function h3ToPolygon(hexId: H3Index, coverage: number = 1): number[][] {
-  const vertices = h3ToGeoBoundary(hexId, true);
+  const vertices = cellToBoundary(hexId, true);
 
   if (coverage !== 1) {
     // scale and normalize vertices w.r.t to center
@@ -199,7 +199,7 @@ export default class H3HexagonLayer<
       objectInfo.index++;
       const hexId = this.props.getHexagon(object, objectInfo);
       // Take the resolution of the first hex
-      const hexResolution = h3GetResolution(hexId);
+      const hexResolution = getResolution(hexId);
       if (resolution < 0) {
         resolution = hexResolution;
         if (!this.props.highPrecision) break;
@@ -207,7 +207,7 @@ export default class H3HexagonLayer<
         hasMultipleRes = true;
         break;
       }
-      if (h3IsPentagon(hexId)) {
+      if (isPentagon(hexId)) {
         hasPentagon = true;
         break;
       }
@@ -215,7 +215,7 @@ export default class H3HexagonLayer<
 
     return {
       resolution,
-      edgeLengthKM: resolution >= 0 ? edgeLength(resolution, 'km') : 0,
+      edgeLengthKM: resolution >= 0 ? getHexagonEdgeLengthAvg(resolution, 'km') : 0,
       hasMultipleRes,
       hasPentagon
     };
@@ -245,23 +245,26 @@ export default class H3HexagonLayer<
       return;
     }
     const hex =
-      this.props.centerHexagon || geoToH3(viewport.latitude, viewport.longitude, resolution);
+      this.props.centerHexagon || latLngToCell(viewport.latitude, viewport.longitude, resolution);
     if (centerHex === hex) {
       return;
     }
     if (centerHex) {
-      const distance = h3Distance(centerHex, hex);
-      // h3Distance returns a negative number if the distance could not be computed
-      // due to the two indexes very far apart or on opposite sides of a pentagon.
-      if (distance >= 0 && distance * edgeLengthKM < UPDATE_THRESHOLD_KM) {
-        return;
+      try {
+        const distance = gridDistance(centerHex, hex);
+        if (distance * edgeLengthKM < UPDATE_THRESHOLD_KM) {
+          return;
+        }
+      } catch {
+        // gridDistance throws if the distance could not be computed
+        // due to the two indexes very far apart or on opposite sides of a pentagon.
       }
     }
 
     const {unitsPerMeter} = viewport.distanceScales;
 
     let vertices = h3ToPolygon(hex);
-    const [centerLat, centerLng] = h3ToGeo(hex);
+    const [centerLat, centerLng] = cellToLatLng(hex);
 
     const [centerX, centerY] = viewport.projectFlat([centerLng, centerLat]);
     vertices = vertices.map(p => {

package/typed/h3-layers/h3-hexagon-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IAuCvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}
+{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IA0CvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}