Merge branch 'master' into x/website-fix

visgl · Jul 19, 2021 · 3fbe010 · 3fbe010
2 parents e8bb56d + 9ecb7b4
commit 3fbe010
Show file tree

Hide file tree

Showing 26 changed files with 250 additions and 232 deletions.
diff --git a/bindings/pydeck/pydeck/bindings/layer.py b/bindings/pydeck/pydeck/bindings/layer.py
@@ -151,7 +151,7 @@ def _prepare_binary_data(self, data_set):
         for column in data_set.columns:
             # np.stack will take data arrays and conveniently extract the shape
             np_data = np.stack(data_set[column].to_numpy())
-            # Get rid of the accssor so it doesn't appear in the JSON output
+            # Get rid of the accessor so it doesn't appear in the JSON output
             del self.__dict__[inverted_accessor_map[column]]
             binary_transmission.append(
                 {

diff --git a/examples/layer-browser/package.json b/examples/layer-browser/package.json
@@ -9,10 +9,10 @@
     "start-local-production": "webpack-dev-server --env.local --env.production --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/ply": "^3.0.0-beta.8",
-    "@loaders.gl/gltf": "^3.0.0-beta.8",
-    "@luma.gl/experimental": "^8.5.0-beta.1",
-    "@luma.gl/debug": "^8.5.0-beta.1",
+    "@loaders.gl/ply": "^3.0.2",
+    "@loaders.gl/gltf": "^3.0.2",
+    "@luma.gl/experimental": "^8.5.0",
+    "@luma.gl/debug": "^8.5.0",
     "colorbrewer": "^1.0.0",
     "d3-request": "^1.0.6",
     "d3-scale": "^3.1.0",

diff --git a/examples/playground/package.json b/examples/playground/package.json
@@ -8,12 +8,12 @@
     "build": "rm -rf dist && mkdir dist && cp index.html dist/ && webpack --env.local --env.production=true"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^3.0.0-beta.8",
-    "@loaders.gl/core": "^3.0.0-beta.8",
-    "@loaders.gl/csv": "^3.0.0-beta.8",
-    "@loaders.gl/draco": "^3.0.0-beta.8",
-    "@loaders.gl/gltf": "^3.0.0-beta.8",
-    "@luma.gl/constants": "^8.5.0-beta.1",
+    "@loaders.gl/3d-tiles": "^3.0.2",
+    "@loaders.gl/core": "^3.0.2",
+    "@loaders.gl/csv": "^3.0.2",
+    "@loaders.gl/draco": "^3.0.2",
+    "@loaders.gl/gltf": "^3.0.2",
+    "@luma.gl/constants": "^8.5.0",
     "brace": "^0.11.1",
     "deck.gl": "^8.3.0",
     "react": "~16.9.0",

diff --git a/examples/website/3d-tiles/package.json b/examples/website/3d-tiles/package.json
@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "deck.gl": "^8.4.0",
-    "@loaders.gl/3d-tiles": "^3.0.0-beta.8",
+    "@loaders.gl/3d-tiles": "^3.0.2",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "react-map-gl": "^5.0.0"

diff --git a/examples/website/globe/package.json b/examples/website/globe/package.json
@@ -7,7 +7,7 @@
     "start": "webpack-dev-server --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/csv": "^3.0.0-beta.8",
+    "@loaders.gl/csv": "^3.0.2",
     "@material-ui/core": "^4.10.2",
     "@material-ui/icons": "^4.9.1",
     "deck.gl": "^8.4.0",

diff --git a/examples/website/i3s/package.json b/examples/website/i3s/package.json
@@ -7,7 +7,7 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/i3s": "^3.0.0-beta.8",
+    "@loaders.gl/i3s": "^3.0.2",
     "deck.gl": "^8.4.0"
   },
   "devDependencies": {

diff --git a/examples/website/mesh/package.json b/examples/website/mesh/package.json
@@ -7,11 +7,11 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/obj": "^3.0.0-beta.8",
+    "@loaders.gl/obj": "^3.0.2",
     "deck.gl": "^8.4.0",
     "react": "^16.3.0",
     "react-dom": "^16.3.0",
-    "math.gl": "^3.5.0-beta.1"
+    "math.gl": "^3.5.1"
   },
   "devDependencies": {
     "@babel/core": "^7.4.0",

diff --git a/examples/website/point-cloud/package.json b/examples/website/point-cloud/package.json
@@ -7,7 +7,7 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/las": "^3.0.0-beta.8",
+    "@loaders.gl/las": "^3.0.2",
     "deck.gl": "^8.4.0",
     "react": "^16.3.0",
     "react-dom": "^16.3.0"

diff --git a/examples/website/radio/package.json b/examples/website/radio/package.json
@@ -7,7 +7,7 @@
     "start": "webpack-dev-server --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/csv": "^3.0.0-beta.8",
+    "@loaders.gl/csv": "^3.0.2",
     "@material-ui/core": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.57",
     "d3-scale": "^2.0.0",

diff --git a/examples/website/safegraph/package.json b/examples/website/safegraph/package.json
@@ -7,7 +7,7 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "@loaders.gl/csv": "^3.0.0-beta.8",
+    "@loaders.gl/csv": "^3.0.2",
     "d3-scale": "^2.0.0",
     "deck.gl": "^8.4.0",
     "mapbox-gl": "^1.0.0"

diff --git a/examples/website/scenegraph/package.json b/examples/website/scenegraph/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "deck.gl": "^8.4.0",
-    "@loaders.gl/gltf": "^3.0.0-beta.8",
+    "@loaders.gl/gltf": "^3.0.2",
     "react": "^16.3.0",
     "react-dom": "^16.3.0",
     "react-map-gl": "^5.0.0"

diff --git a/modules/aggregation-layers/package.json b/modules/aggregation-layers/package.json
@@ -29,8 +29,8 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@luma.gl/shadertools": "^8.5.0-beta.1",
-    "@math.gl/web-mercator": "^3.5.0-beta.1",
+    "@luma.gl/shadertools": "^8.5.0",
+    "@math.gl/web-mercator": "^3.5.1",
     "d3-hexbin": "^0.2.1"
   },
   "peerDependencies": {

diff --git a/modules/carto/package.json b/modules/carto/package.json
@@ -31,17 +31,17 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@loaders.gl/loader-utils": "^3.0.0-beta.8",
-    "@loaders.gl/mvt": "^3.0.0-beta.8",
-    "@loaders.gl/tiles": "^3.0.0-beta.8",
-    "@math.gl/web-mercator": "^3.5.0-beta.1",
+    "@loaders.gl/loader-utils": "^3.0.2",
+    "@loaders.gl/mvt": "^3.0.2",
+    "@loaders.gl/tiles": "^3.0.2",
+    "@math.gl/web-mercator": "^3.5.1",
     "cartocolor": "^4.0.2",
     "d3-scale": "^3.2.3"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
     "@deck.gl/geo-layers": "^8.0.0",
     "@deck.gl/layers": "^8.0.0",
-    "@loaders.gl/core": "^3.0.0-beta"
+    "@loaders.gl/core": "^3.0.2"
   }
 }
diff --git a/modules/core/package.json b/modules/core/package.json
@@ -31,12 +31,12 @@
     "prepublishOnly": "npm run build-debugger && npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@loaders.gl/core": "^3.0.0-beta.8",
-    "@loaders.gl/images": "^3.0.0-beta.8",
-    "@luma.gl/core": "^8.5.0-beta.1",
-    "@math.gl/web-mercator": "^3.5.0-beta.1",
+    "@loaders.gl/core": "^3.0.2",
+    "@loaders.gl/images": "^3.0.2",
+    "@luma.gl/core": "^8.5.0",
+    "@math.gl/web-mercator": "^3.5.1",
     "gl-matrix": "^3.0.0",
-    "math.gl": "^3.5.0-beta.1",
+    "math.gl": "^3.5.1",
     "mjolnir.js": "^2.5.0",
     "probe.gl": "^3.4.0-beta.1"
   }

diff --git a/modules/extensions/package.json b/modules/extensions/package.json
@@ -29,7 +29,7 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@luma.gl/shadertools": "^8.5.0-beta.1"
+    "@luma.gl/shadertools": "^8.5.0"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",

diff --git a/modules/geo-layers/package.json b/modules/geo-layers/package.json
@@ -29,24 +29,24 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^3.0.0-beta.8",
-    "@loaders.gl/gis": "^3.0.0-beta.8",
-    "@loaders.gl/loader-utils": "^3.0.0-beta.8",
-    "@loaders.gl/mvt": "^3.0.0-beta.8",
-    "@loaders.gl/terrain": "^3.0.0-beta.8",
-    "@loaders.gl/tiles": "^3.0.0-beta.8",
-    "@luma.gl/experimental": "^8.5.0-beta.1",
-    "@math.gl/culling": "^3.5.0-beta.1",
-    "@math.gl/web-mercator": "^3.5.0-beta.1",
+    "@loaders.gl/3d-tiles": "^3.0.2",
+    "@loaders.gl/gis": "^3.0.2",
+    "@loaders.gl/loader-utils": "^3.0.2",
+    "@loaders.gl/mvt": "^3.0.2",
+    "@loaders.gl/terrain": "^3.0.2",
+    "@loaders.gl/tiles": "^3.0.2",
+    "@luma.gl/experimental": "^8.5.0",
+    "@math.gl/culling": "^3.5.1",
+    "@math.gl/web-mercator": "^3.5.1",
     "h3-js": "^3.6.0",
     "long": "^3.2.0",
-    "math.gl": "^3.5.0-beta.1"
+    "math.gl": "^3.5.1"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
     "@deck.gl/extensions": "^8.0.0",
     "@deck.gl/layers": "^8.0.0",
     "@deck.gl/mesh-layers": "^8.0.0",
-    "@loaders.gl/core": "^3.0.0-beta"
+    "@loaders.gl/core": "^3.0.2"
   }
 }
diff --git a/modules/geo-layers/src/terrain-layer/terrain-layer.js b/modules/geo-layers/src/terrain-layer/terrain-layer.js
@@ -110,6 +110,7 @@ export default class TerrainLayer extends CompositeLayer {
     loadOptions = {
       ...loadOptions,
       terrain: {
+        skirtHeight: this.state.isTiled ? meshMaxError * 2 : 0,
         ...loadOptions?.terrain,
         bounds,
         meshMaxError,

diff --git a/modules/jupyter-widget/package.json b/modules/jupyter-widget/package.json
@@ -37,10 +37,10 @@
     "@deck.gl/layers": "8.5.0-beta.1",
     "@deck.gl/mesh-layers": "8.5.0-beta.1",
     "@jupyter-widgets/base": "^1.1.10 || ^2 || ^3",
-    "@loaders.gl/3d-tiles": "^3.0.0-beta.8",
-    "@loaders.gl/core": "^3.0.0-beta.8",
-    "@loaders.gl/csv": "^3.0.0-beta.8",
-    "@luma.gl/constants": "^8.5.0-beta.1",
+    "@loaders.gl/3d-tiles": "^3.0.2",
+    "@loaders.gl/core": "^3.0.2",
+    "@loaders.gl/csv": "^3.0.2",
+    "@luma.gl/constants": "^8.5.0",
     "mapbox-gl": "^1.2.1"
   },
   "jupyterlab": {

diff --git a/modules/layers/package.json b/modules/layers/package.json
@@ -28,13 +28,13 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@loaders.gl/images": "^3.0.0-beta.8",
+    "@loaders.gl/images": "^3.0.2",
     "@mapbox/tiny-sdf": "^1.1.0",
-    "@math.gl/polygon": "^3.5.0-beta.1",
+    "@math.gl/polygon": "^3.5.1",
     "earcut": "^2.0.6"
   },
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
-    "@loaders.gl/core": "^3.0.0-beta"
+    "@loaders.gl/core": "^3.0.2"
   }
 }
diff --git a/modules/mesh-layers/package.json b/modules/mesh-layers/package.json
@@ -32,8 +32,8 @@
     "@deck.gl/core": "^8.0.0"
   },
   "dependencies": {
-    "@loaders.gl/gltf": "^3.0.0-beta.8",
-    "@luma.gl/experimental": "^8.5.0-beta.1",
-    "@luma.gl/shadertools": "^8.5.0-beta.1"
+    "@loaders.gl/gltf": "^3.0.2",
+    "@luma.gl/experimental": "^8.5.0",
+    "@luma.gl/shadertools": "^8.5.0"
   }
 }
diff --git a/modules/test-utils/package.json b/modules/test-utils/package.json
@@ -24,8 +24,8 @@
   ],
   "peerDependencies": {
     "@deck.gl/core": "^8.0.0",
-    "@luma.gl/test-utils": "^8.0.0",
-    "@luma.gl/webgl": "^8.0.0",
+    "@luma.gl/test-utils": "^8.5.0",
+    "@luma.gl/webgl": "^8.5.0",
     "@probe.gl/test-utils": "^3.4.0-beta.1"
   },
   "scripts": {}

diff --git a/package.json b/package.json
@@ -45,9 +45,9 @@
   },
   "devDependencies": {
     "@babel/register": "^7.13.0",
-    "@loaders.gl/csv": "^3.0.0-beta.8",
-    "@loaders.gl/polyfills": "^3.0.0-beta.8",
-    "@luma.gl/test-utils": "^8.5.0-beta.1",
+    "@loaders.gl/csv": "^3.0.2",
+    "@loaders.gl/polyfills": "^3.0.2",
+    "@luma.gl/test-utils": "^8.5.0",
     "@probe.gl/bench": "^3.4.0-beta.1",
     "@probe.gl/test-utils": "^3.4.0-beta.1",
     "abortcontroller-polyfill": "^1.5.0",

diff --git a/test/apps/arcgis-i3s/package.json b/test/apps/arcgis-i3s/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@deck.gl/core": "^8.1.0",
     "@deck.gl/layers": "^8.1.0",
-    "@loaders.gl/i3s": "^3.0.0-beta.6",
+    "@loaders.gl/i3s": "^3.0.2",
     "loaders.gl": "^0.3.5"
   },
   "devDependencies": {

diff --git a/test/apps/glsl-debugger/package.json b/test/apps/glsl-debugger/package.json
@@ -4,7 +4,7 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --port 3000 --open"
   },
   "dependencies": {
-    "@luma.gl/debug": "^8.1.3",
+    "@luma.gl/debug": "^8.5.0",
     "deck.gl": "^7.3.0-beta",
     "glsl-transpiler": "^1.8.5"
   },

diff --git a/website/package.json b/website/package.json
@@ -18,8 +18,8 @@
     "deploy": "NODE_DEBUG=gh-pages gh-pages -d public"
   },
   "dependencies": {
-    "@loaders.gl/obj": "^3.0.0-beta.6",
-    "@loaders.gl/ply": "^3.0.0-beta.6",
+    "@loaders.gl/obj": "^3.0.2",
+    "@loaders.gl/ply": "^3.0.2",
     "d3-color": "^1.4.1",
     "d3-hierarchy": "^2.0.0",
     "d3-request": "^1.0.6",