Merge pull request #12 from sensat/merge-v4-2-2-main

Merge v4.2.2 master
sensat · Aug 21, 2024 · 2edd18b · 2edd18b
2 parents f7e79b4 + 3f62952
commit 2edd18b
Show file tree

Hide file tree

Showing 49 changed files with 362 additions and 342 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 ## v4.2
 
+### v4.2.2
+
+- fix(i3s): slpk full path on Windows (#3011)
+
+### v4.2.1
+
+- fix(tile-converter): failing i3s-server (#2980)
+
 ### v4.2.0
 
 ### v4.2.0-beta.2

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "2.9.1",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "command": {
     "publish": {},
     "bootstrap": {}

diff --git a/modules/3d-tiles/package.json b/modules/3d-tiles/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/3d-tiles",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "3D Tiles, an open standard for streaming massive heterogeneous 3D geospatial datasets.",
   "license": "MIT",
   "type": "module",
@@ -47,15 +47,15 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.2.0",
-    "@loaders.gl/crypto": "4.2.0",
-    "@loaders.gl/draco": "4.2.0",
-    "@loaders.gl/gltf": "4.2.0",
-    "@loaders.gl/images": "4.2.0",
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/math": "4.2.0",
-    "@loaders.gl/tiles": "4.2.0",
-    "@loaders.gl/zip": "4.2.0",
+    "@loaders.gl/compression": "4.2.2",
+    "@loaders.gl/crypto": "4.2.2",
+    "@loaders.gl/draco": "4.2.2",
+    "@loaders.gl/gltf": "4.2.2",
+    "@loaders.gl/images": "4.2.2",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/math": "4.2.2",
+    "@loaders.gl/tiles": "4.2.2",
+    "@loaders.gl/zip": "4.2.2",
     "@math.gl/core": "^4.0.1",
     "@math.gl/culling": "^4.0.1",
     "@math.gl/geospatial": "^4.0.1",

diff --git a/modules/arrow/package.json b/modules/arrow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/arrow",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Simple columnar table loader for the Apache Arrow format",
   "license": "MIT",
   "type": "module",
@@ -54,11 +54,11 @@
     "build-worker2": "esbuild src/workers/arrow-worker.ts --bundle --outfile=dist/arrow-worker.js --platform=browser --external:{stream}"
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.2.0",
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
-    "@loaders.gl/wkt": "4.2.0",
-    "@loaders.gl/worker-utils": "4.2.0",
+    "@loaders.gl/gis": "4.2.2",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
+    "@loaders.gl/wkt": "4.2.2",
+    "@loaders.gl/worker-utils": "4.2.2",
     "@math.gl/polygon": "4.0.0",
     "apache-arrow": ">= 15.0.0"
   },

diff --git a/modules/bson/package.json b/modules/bson/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/bson",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Framework-independent loader for JSON and streaming JSON formats",
   "license": "MIT",
   "type": "module",
@@ -41,9 +41,9 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.2.0",
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
+    "@loaders.gl/gis": "4.2.2",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
     "@types/bson": "4.2.0",
     "bson": "4.2.0"
   },

diff --git a/modules/compression/package.json b/modules/compression/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/compression",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Decompression and compression plugins for loaders.gl",
   "license": "MIT",
   "type": "module",
@@ -51,8 +51,8 @@
     "build-worker-node": "esbuild src/workers/compression-worker-node.ts --outfile=dist/compression-worker-node.js --platform=node --target=node16 --bundle --minify --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/worker-utils": "4.2.0",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/worker-utils": "4.2.2",
     "@types/brotli": "^1.3.0",
     "@types/pako": "^1.0.1",
     "fflate": "0.7.4",

diff --git a/modules/core/package.json b/modules/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "The core API for working with loaders.gl loaders and writers",
   "license": "MIT",
   "type": "module",
@@ -56,9 +56,9 @@
     "build-worker-node": "esbuild src/workers/null-worker.ts --outfile=dist/null-worker-node.js --bundle --platform=node --target=node16 --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
-    "@loaders.gl/worker-utils": "4.2.0",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
+    "@loaders.gl/worker-utils": "4.2.2",
     "@probe.gl/log": "^4.0.2"
   },
   "gitHead": "c95a4ff72512668a93d9041ce8636bac09333fd5"

diff --git a/modules/crypto/package.json b/modules/crypto/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/crypto",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Cryptographic/hashing plugins for loaders.gl",
   "license": "MIT",
   "type": "module",
@@ -47,8 +47,8 @@
     "build-worker-node": "esbuild src/workers/crypto-worker-node.ts --outfile=dist/crypto-worker-node.js --platform=node --target=esnext,node16 --bundle --minify --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/worker-utils": "4.2.0",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/worker-utils": "4.2.2",
     "@types/crypto-js": "^4.0.2"
   },
   "devDependencies": {

diff --git a/modules/csv/package.json b/modules/csv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/csv",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Framework-independent loader for CSV and DSV table formats",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0"
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2"
   },
   "devDependencies": {
     "d3-dsv": "^1.2.0"

diff --git a/modules/draco/package.json b/modules/draco/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/draco",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Framework-independent loader and writer for Draco compressed meshes and point clouds",
   "license": "MIT",
   "type": "module",
@@ -58,9 +58,9 @@
     "build-writer-worker-node": "esbuild src/workers/draco-writer-worker-node.ts --outfile=dist/draco-writer-worker-node.js --target=node16 --platform=node --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
-    "@loaders.gl/worker-utils": "4.2.0",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
+    "@loaders.gl/worker-utils": "4.2.2",
     "draco3d": "1.5.7"
   },
   "devDependencies": {

diff --git a/modules/excel/package.json b/modules/excel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/excel",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Framework-independent loader for Excel files",
   "license": "MIT",
   "type": "module",
@@ -45,8 +45,8 @@
     "build-worker": "esbuild src/workers/excel-worker.ts --bundle --outfile=dist/excel-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
     "xlsx": "^0.18.5"
   },
   "peerDependencies": {

diff --git a/modules/flatgeobuf/package.json b/modules/flatgeobuf/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/flatgeobuf",
   "description": "Loader for FlatGeobuf",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -45,9 +45,9 @@
     "build-worker": "esbuild src/workers/flatgeobuf-worker.ts --bundle --outfile=dist/flatgeobuf-worker.js --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.2.0",
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
+    "@loaders.gl/gis": "4.2.2",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
     "@math.gl/proj4": "^4.0.0",
     "flatgeobuf": "3.27.2"
   },

diff --git a/modules/geopackage/package.json b/modules/geopackage/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/geopackage",
   "description": "GeoPackage data loaders",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -44,10 +44,10 @@
     "build-worker": "# esbuild src/workers/geopackage-worker.ts --bundle --outfile=dist/geopackage-worker.js --external:{util,fs,path} --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/gis": "4.2.0",
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
-    "@loaders.gl/wkt": "4.2.0",
+    "@loaders.gl/gis": "4.2.2",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
+    "@loaders.gl/wkt": "4.2.2",
     "@math.gl/proj4": "^4.0.0",
     "@types/sql.js": "^1.4.5",
     "fs": "^0.0.1-security",

diff --git a/modules/geotiff/package.json b/modules/geotiff/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/geotiff",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Framework-independent loaders for tiff and geotiff",
   "license": "MIT",
   "type": "module",
@@ -47,7 +47,7 @@
     "geotiff": "ilan-gold/geotiff.js#ilan-gold/viv_094"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
+    "@loaders.gl/loader-utils": "4.2.2",
     "fast-xml-parser": "^4.2.5",
     "geotiff": "^2.1.0"
   },

diff --git a/modules/gis/package.json b/modules/gis/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@loaders.gl/gis",
   "description": "Helpers for GIS category data",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "license": "MIT",
   "type": "module",
   "publishConfig": {
@@ -33,8 +33,8 @@
     "README.md"
   ],
   "dependencies": {
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
     "@mapbox/vector-tile": "^1.3.1",
     "@math.gl/polygon": "^4.0.0",
     "pbf": "^3.2.1"

diff --git a/modules/gltf/package.json b/modules/gltf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/gltf",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "Framework-independent loader for the glTF format",
   "license": "MIT",
   "type": "module",
@@ -44,11 +44,11 @@
     "build-bundle-dev": "ocular-bundle ./bundle.ts --env=dev --output=dist/dist.dev.js"
   },
   "dependencies": {
-    "@loaders.gl/draco": "4.2.0",
-    "@loaders.gl/images": "4.2.0",
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
-    "@loaders.gl/textures": "4.2.0",
+    "@loaders.gl/draco": "4.2.2",
+    "@loaders.gl/images": "4.2.2",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
+    "@loaders.gl/textures": "4.2.2",
     "@math.gl/core": "^4.0.0"
   },
   "peerDependencies": {

diff --git a/modules/i3s/package.json b/modules/i3s/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/i3s",
-  "version": "4.2.0",
+  "version": "4.2.2",
   "description": "i3s .",
   "license": "MIT",
   "type": "module",
@@ -43,16 +43,16 @@
     "build-worker-node": "esbuild src/workers/i3s-content-worker-node.ts --outfile=dist/i3s-content-worker-node.js --platform=node --target=node16 --minify --bundle --sourcemap --define:__VERSION__=\\\"$npm_package_version\\\""
   },
   "dependencies": {
-    "@loaders.gl/compression": "4.2.0",
-    "@loaders.gl/crypto": "4.2.0",
-    "@loaders.gl/draco": "4.2.0",
-    "@loaders.gl/images": "4.2.0",
-    "@loaders.gl/loader-utils": "4.2.0",
-    "@loaders.gl/math": "4.2.0",
-    "@loaders.gl/schema": "4.2.0",
-    "@loaders.gl/textures": "4.2.0",
-    "@loaders.gl/tiles": "4.2.0",
-    "@loaders.gl/zip": "4.2.0",
+    "@loaders.gl/compression": "4.2.2",
+    "@loaders.gl/crypto": "4.2.2",
+    "@loaders.gl/draco": "4.2.2",
+    "@loaders.gl/images": "4.2.2",
+    "@loaders.gl/loader-utils": "4.2.2",
+    "@loaders.gl/math": "4.2.2",
+    "@loaders.gl/schema": "4.2.2",
+    "@loaders.gl/textures": "4.2.2",
+    "@loaders.gl/tiles": "4.2.2",
+    "@loaders.gl/zip": "4.2.2",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/geospatial": "^4.0.0"

diff --git a/modules/i3s/src/lib/utils/url-utils.ts b/modules/i3s/src/lib/utils/url-utils.ts
@@ -6,13 +6,18 @@ import {Node3DIndexDocument, SceneLayer3D} from '../../types';
  * @returns url without search params
  */
 export function getUrlWithoutParams(url: string): string {
-  let urlWithoutParams;
+  let urlWithoutParams: string | null;
 
   try {
     const urlObj = new URL(url);
     urlWithoutParams = `${urlObj.origin}${urlObj.pathname}`;
+
+    // On Windows `new URL(url)` makes `C:\...` -> `null\...`
+    if (urlWithoutParams.startsWith('null')) {
+      urlWithoutParams = null;
+    }
   } catch (e) {
-    // do nothing
+    urlWithoutParams = null;
   }
   return urlWithoutParams || url;
 }