Merge f56369a into 737e519

docs/README.md

@@ -9,7 +9,7 @@ While math.gl is highly **optimized for use with the WebGL and WebGPU APIs**, it
 - **3D math** - Basic vectors and matrices, as well as 3D primitives and culling: **`@math.gl/types`**, **`@math.gl/core`**, **`@math.gl/culling`**
 - **Geospatial projections** - Support for a variety of geospatial projections **`@math.gl/geospatial`**, **`@math.gl/geoid`**, **`@math.gl/proj4`**, **`@math.gl/web-mercator`**
 - **Geospatial utilities** - Cutting polygons and calculating sun position and direction **`@math.gl/polygon`**,  **`@math.gl/sun`**
-- **Discrete Global Grids** - Standardized interfaces to a number of the major discrete global grids. **`@math.gl/geohash`**, **`@math.gl/quadkey`**, **`@math.gl/s2`**
+- **Discrete Global Grids** - Standardized interfaces to a number of the major discrete global grids. **`@math.gl/dggs-geohash`**, **`@math.gl/dggs-quadkey`**, **`@math.gl/dggs-s2`**
 
 ## Modules
 
@@ -33,9 +33,9 @@ math.gl is a toolbox that offers a suite of composable modules.
 | **DGGS (Discrete global grid support) libraries** | Module <span style={{width: 300}} /> | Description                     |
 | ------------------------------------------------- | ------------------------------------ | ------------------------------- |
 |                                                   |                                      |                                 |
-| ![geohash](./images/dggs/geohash.png 'geohash')   | **`@math.gl/geohash`**               | Get geometry of GeoHash tokens. |
-| ![quadkey](./images/dggs/quadkey.png 'quadkey')   | **`@math.gl/quadkey`**               | Get geometry of QuadKey tokens  |
-| ![s2](./images/dggs/s2.png 's2')                  | **`@math.gl/s2`**                    | Get geometry of S2 tokens.      |
+| ![geohash](./images/dggs/geohash.png 'geohash')   | **`@math.gl/dggs-geohash`**               | Get geometry of GeoHash tokens. |
+| ![quadkey](./images/dggs/quadkey.png 'quadkey')   | **`@math.gl/dggs-quadkey`**               | Get geometry of QuadKey tokens  |
+| ![s2](./images/dggs/s2.png 's2')                  | **`@math.gl/dggs-s2`**                    | Get geometry of S2 tokens.      |
 
 <br/>
 In addition, math.gl provides a few deprecated legacy modules, to avoid breaking older applications.

docs/developer-guide/geospatial/dggs.md

@@ -14,12 +14,12 @@ In terms of API design and nomenclature, the golden standard for DGGS systems at
 
 ## Supported Grid Systems
 
-| DGGS                                            | Module             | Functionality                   |
-| ----------------------------------------------- | ------------------ | ------------------------------- |
-| ![GeoHash](../../images/dggs/geohash.png 'GeoHash') | `@math.gl/geohash` | Get geometry of GeoHash tokens. |
-| ![QuadKey](../../images/dggs/quadkey.png 'QuadKey') | `@math.gl/quadkey` | Get geometry of QuadKey tokens  |
-| ![S2](../../images/dggs/s2.png 'S2')                | `@math.gl/s2`      | Get geometry of S2 tokens.      |
-| ![H3](../../images/dggs/h3.png 'H3')                | `h3-js` \*         | Get geometry of H3 tokens.      |
+| DGGS                                                | Module                  | Functionality                   |
+| --------------------------------------------------- | ----------------------- | ------------------------------- |
+| ![GeoHash](../../images/dggs/geohash.png 'GeoHash') | `@math.gl/dggs-geohash` | Get geometry of GeoHash tokens. |
+| ![QuadKey](../../images/dggs/quadkey.png 'QuadKey') | `@math.gl/dggs-quadkey` | Get geometry of QuadKey tokens  |
+| ![S2](../../images/dggs/s2.png 'S2')                | `@math.gl/dggs-s2`      | Get geometry of S2 tokens.      |
+| ![H3](../../images/dggs/h3.png 'H3')                | `h3-js` \*              | Get geometry of H3 tokens.      |
 
 Note that `h3-js` is not a `math.gl` library. For H3 it is recommended to work directly with the H3 JavaScript bindings.
 

docs/docs-sidebar.json

@@ -150,26 +150,26 @@
       },
       {
         "type": "category",
-        "label": "@math.gl/geohash",
+        "label": "@math.gl/dggs-geohash",
         "items": [
-          "modules/geohash/README",
-          "modules/geohash/api-reference/geohash"
+          "modules/dggs-geohash/README",
+          "modules/dggs-geohash/api-reference/geohash"
         ]
       },
       {
         "type": "category",
-        "label": "@math.gl/quadkey",
+        "label": "@math.gl/dggs-quadkey",
         "items": [
-          "modules/quadkey/README",
-          "modules/quadkey/api-reference/quadkey"
+          "modules/dggs-quadkey/README",
+          "modules/dggs-quadkey/api-reference/quadkey"
         ]
       },
       {
         "type": "category",
-        "label": "@math.gl/s2",
+        "label": "@math.gl/dggs-s2",
         "items": [
-          "modules/s2/README",
-          "modules/s2/api-reference/s2"
+          "modules/dggs-s2/README",
+          "modules/dggs-s2/api-reference/s2"
         ]
       }
     ]

docs/modules/geohash/README.md → docs/modules/dggs-geohash/README.md

@@ -5,18 +5,18 @@
 </p>
 
 
-`@math.gl/geohash` is a JavaScript library with 
+`@math.gl/dggs-geohash` is a JavaScript library with 
 
 ## Installation
 
 ```bash
-npm install @math.gl/sun
+npm install @math.gl/dggs-geohash
 ```
 
 ## Usage
 
 ```js
-import {getGeohashPolygon} from '@math.gl/quadkey';
+import {getGeohashPolygon} from '@math.gl/dggs-geohash';
 const polygon = getGeohashPolygon(geohash);
 ```
 

docs/modules/quadkey/README.md → docs/modules/dggs-quadkey/README.md

@@ -4,19 +4,19 @@
   <img src="https://img.shields.io/badge/From-v3.7-blue.svg?style=flat-square" alt="From-v3.7" />
 </p>
 
-`@math.gl/quadkey` is a JavaScript library providing math for the Quadkey DGGS (Discrete Global Grid System).
+`@math.gl/dggs-quadkey` is a JavaScript library providing math for the Quadkey DGGS (Discrete Global Grid System).
 
 ## Installation
 
 ```bash
-npm install @math.gl/quadkey
+npm install @math.gl/dggs-quadkey
 ```
 
 ## Usage
 
 Get a polygon representing the outline of a specific 
 ```js
-import {getQuadkeyLngLat} from '@math.gl/quadkey';
+import {getQuadkeyLngLat} from '@math.gl/dggs-quadkey';
 const center = getQuadkeyLngLat(quadkey);
 ```
 

docs/modules/s2/README.md → docs/modules/dggs-s2/README.md

@@ -4,18 +4,18 @@
   <img src="https://img.shields.io/badge/From-v3.7-blue.svg?style=flat-square" alt="From-v3.7" />
 </p>
 
-`@math.gl/s2` is a small JavaScript library for working with the S2 DGGS (Discrete Global Grid System).
+`@math.gl/dggs-s2` is a small JavaScript library for working with the S2 DGGS (Discrete Global Grid System).
 
 ## Installation
 
 ```bash
-npm install @math.gl/s2
+npm install @math.gl/dggs-s2
 ```
 
 ## Usage
 
 ```js
-import {} from '@math.gl/s2';
+import {} from '@math.gl/dggs-s2';
 ```
 
 ## Attribution

docs/whats-new.md

@@ -45,27 +45,27 @@
   </tbody>
 </table>
 
-## v3.7 (In Development)
+## v4.0 (In Development)
 
-Target Release Date: March, 2023
+Target Release Date: Q4, 2023
 
 - Three new modules for working with DGGS (Discrete Global Grid System) math.
 - Node.js v18 is now officially supported.
 - Typescript v5 now used
 
-**`@math.gl/geohash`** (NEW MODULE)
+**`@math.gl/dggs-geohash`** (NEW MODULE)
 
 - New module with math for the GeoHash DGGS (Discrete Global Grid System).
 
-**`@math.gl/quadkey`** (NEW MODULE)
+**`@math.gl/dggs-quadkey`** (NEW MODULE)
 
 - New module with math for the quadkey DGGS (Discrete Global Grid System).
 
-**`@math.gl/s2`** (NEW MODULE)
+**`@math.gl/dggs-s2`** (NEW MODULE)
 
 - New module that contains a lightweight implementation of the S2 DGGS (Discrete Global Grid System).
 
-**`@math.gl/core`
+**`@math.gl/core`**
 
 - `config` is now truly global (stored on `globalThis`).
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.0.0-alpha.4",
+  "version": "4.0.0-beta.0",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": [

modules/geohash/package.json → modules/dggs-geohash/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@math.gl/geohash",
+  "name": "@math.gl/dggs-geohash",
   "description": "Math for the GeoHash DGGS (Discrete Global Grid System)",
   "license": "MIT",
   "type": "module",

modules/geohash/test/geohash.spec.ts → modules/dggs-geohash/test/geohash.spec.ts

@@ -1,5 +1,5 @@
 import test from 'tape-promise/tape';
-import {getGeohashBounds, getGeohashBoundaryFlat} from '@math.gl/geohash';
+import {getGeohashBounds, getGeohashBoundaryFlat} from '@math.gl/dggs-geohash';
 
 const TEST_DATA = [
   {

modules/quadkey/package.json → modules/dggs-quadkey/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@math.gl/quadkey",
+  "name": "@math.gl/dggs-quadkey",
   "description": "Math for the quadkey DGGS (Discrete Global Grid System)",
   "license": "MIT",
   "type": "module",

modules/quadkey/test/quadkey.spec.ts → modules/dggs-quadkey/test/quadkey.spec.ts

@@ -1,5 +1,5 @@
 import test from 'tape-promise/tape';
-import {quadkeyToWorldBounds, getQuadkeyBoundary} from '@math.gl/quadkey';
+import {quadkeyToWorldBounds, getQuadkeyBoundary} from '@math.gl/dggs-quadkey';
 
 const TEST_DATA = [
   {

modules/s2/README.md → modules/dggs-s2/README.md

@@ -1,4 +1,4 @@
-# @math.gl/s2
+# @math.gl/dggs-s2
 
 [math.gl](https://math.gl/docs) is a suite of math modules for 3D and geospatial applications.
 

modules/s2/package.json → modules/dggs-s2/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@math.gl/s2",
+  "name": "@math.gl/dggs-s2",
   "description": "A minimal S2 DGGS (Discrete Global Grid System) implementation",
   "license": "MIT",
   "type": "module",

modules/s2/test/s2-geometry.spec.ts → modules/dggs-s2/test/s2-geometry.spec.ts

@@ -2,7 +2,7 @@
 
 import test from 'tape-promise/tape';
 
-import {_toHilbertQuadKey as toHilbertQuadKey} from '@math.gl/s2';
+import {_toHilbertQuadKey as toHilbertQuadKey} from '@math.gl/dggs-s2';
 import {S2} from 's2-geometry';
 import Long from 'long';
 

modules/s2/test/s2-utils.spec.ts → modules/dggs-s2/test/s2-utils.spec.ts

@@ -1,7 +1,7 @@
 // loaders.gl, MIT license
 import test from 'tape-promise/tape';
 
-import {getS2BoundaryFlat} from '@math.gl/s2';
+import {getS2BoundaryFlat} from '@math.gl/dggs-s2';
 
 // import Long from 'long';
 

test/modules.spec.ts

@@ -8,6 +8,6 @@ import '../modules/proj4/test';
 import '../modules/sun/test';
 import '../modules/web-mercator/test';
 
-import '../modules/geohash/test';
-import '../modules/quadkey/test';
-import '../modules/s2/test';
+import '../modules/dggs-geohash/test';
+import '../modules/dggs-quadkey/test';
+import '../modules/dggs-s2/test';

tsconfig.json

@@ -44,8 +44,12 @@
       "@math.gl/core/test/*": ["modules/core/test/*"],
       "@math.gl/culling/*": ["modules/culling/src/*"],
       "@math.gl/culling/test/*": ["modules/culling/test/*"],
-      "@math.gl/geohash/*": ["modules/geohash/src/*"],
-      "@math.gl/geohash/test/*": ["modules/geohash/test/*"],
+      "@math.gl/dggs-pgeohash/*": ["modules/dggs-pgeohash/src/*"],
+      "@math.gl/dggs-pgeohash/test/*": ["modules/dggs-pgeohash/test/*"],
+      "@math.gl/dggs-s2/*": ["modules/dggs-s2/src/*"],
+      "@math.gl/dggs-s2/test/*": ["modules/dggs-s2/test/*"],
+      "@math.gl/dggs-quadkey/*": ["modules/dggs-quadkey/src/*"],
+      "@math.gl/dggs-quadkey/test/*": ["modules/dggs-quadkey/test/*"],
       "@math.gl/geoid/*": ["modules/geoid/src/*"],
       "@math.gl/geoid/test/*": ["modules/geoid/test/*"],
       "@math.gl/geospatial/*": ["modules/geospatial/src/*"],
@@ -54,14 +58,10 @@
       "@math.gl/polygon/test/*": ["modules/polygon/test/*"],
       "@math.gl/proj4/*": ["modules/proj4/src/*"],
       "@math.gl/proj4/test/*": ["modules/proj4/test/*"],
-      "@math.gl/s2/*": ["modules/s2/src/*"],
-      "@math.gl/s2/test/*": ["modules/s2/test/*"],
       "@math.gl/sun/*": ["modules/sun/src/*"],
       "@math.gl/sun/test/*": ["modules/sun/test/*"],
       "@math.gl/types/*": ["modules/types/src/*"],
       "@math.gl/types/test/*": ["modules/types/test/*"],
-      "@math.gl/quadkey/*": ["modules/quadkey/src/*"],
-      "@math.gl/quadkey/test/*": ["modules/quadkey/test/*"],
       "@math.gl/web-mercator/*": ["modules/web-mercator/src/*"],
       "@math.gl/web-mercator/test/*": ["modules/web-mercator/test/*"],
       "test/*": ["test/*"]

tsconfig.modules.json

@@ -18,15 +18,15 @@
   "references": [
     {"path": "modules/core"},
     {"path": "modules/culling"},
-    {"path": "modules/geohash"},
+    {"path": "modules/dggs-geohash"},
+    {"path": "modules/dggs-s2"},
+    {"path": "modules/dggs-quadkey"},
     {"path": "modules/geoid"},
     {"path": "modules/geospatial"},
     {"path": "modules/main"},
     {"path": "modules/polygon"},
     {"path": "modules/proj4"},
-    {"path": "modules/s2"},
     {"path": "modules/sun"},
-    {"path": "modules/quadkey"},
     {"path": "modules/web-mercator"}
   ],
   "include": [

website/docusaurus.config.js

@@ -59,9 +59,9 @@ const config = {
             '@math.gl/proj4': resolve('../modules/proj4/src'),
             '@math.gl/web-mercator': resolve('../modules/web-mercator/src'),
             '@math.gl/sun': resolve('../modules/sun/src'),
-            '@math.gl/geohash': resolve('../modules/mapbox/geohash'),
-            '@math.gl/quadkey': resolve('../modules/quadkey/src'),
-            '@math.gl/s2': resolve('../modules/s2/src'),
+            '@math.gl/ddgs-geohash': resolve('../modules/ddgs-geohash/src'),
+            '@math.gl/dggs-quadkey': resolve('../modules/dggs-quadkey/src'),
+            '@math.gl/dggs-s2': resolve('../modules/dggs-s2/src'),
 
             '@probe.gl/bench': resolve('../node_modules/@probe.gl/bench')
           }