Skip to content

Commit

Permalink
Merge e1be2d7 into 1f7b025
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibgreen
ibgreen committed Feb 18, 2021
2 parents 1f7b025 + e1be2d7 commit d787054
Show file tree
Hide file tree
Showing 14 changed files with 381 additions and 341 deletions.
8 changes: 4 additions & 4 deletions examples/advanced/package.json
View file
Expand Up @@ -8,10 +8,10 @@
"types-check": "tsc --noEmit"
},
"dependencies": {
"@deck.gl/core": "^8.0.6",
"@deck.gl/layers": "^8.0.6",
"@deck.gl/mesh-layers": "^8.0.6",
"@deck.gl/react": "^8.0.6",
"@deck.gl/core": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@deck.gl/mesh-layers": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-map-gl": "^5.2.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/getting-started/package.json
View file
@@ -1,7 +1,7 @@
{
"dependencies": {
"@deck.gl/core": "^8.0.3",
"@deck.gl/react": "^8.0.3",
"@deck.gl/core": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"@nebula.gl/overlays": "0.12.0",
"@turf/helpers": "6.1.4",
"global": "4.3.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/codesandbox/world-heritage/package.json
View file
@@ -1,7 +1,7 @@
{
"dependencies": {
"@deck.gl/core": "^8.0.3",
"@deck.gl/react": "^8.0.3",
"@deck.gl/core": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"@nebula.gl/overlays": "^0.18.4",
"@turf/helpers": "6.1.4",
"global": "4.3.2",
Expand Down
10 changes: 5 additions & 5 deletions examples/editable-h3-cluster-layer/package.json
View file
Expand Up @@ -4,11 +4,11 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@deck.gl/core": "^8.0.15",
"@deck.gl/layers": "^8.0.15",
"@deck.gl/geo-layers": "^8.0.15",
"@deck.gl/mesh-layers": "^8.0.15",
"@deck.gl/react": "^8.0.15",
"@deck.gl/core": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@deck.gl/geo-layers": "^8.4.6",
"@deck.gl/mesh-layers": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"global": "4.3.2",
"react": "16.8.6",
"react-dom": "16.8.6",
Expand Down
10 changes: 5 additions & 5 deletions examples/editor/package.json
View file
Expand Up @@ -4,11 +4,11 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@deck.gl/core": "^8.0.6",
"@deck.gl/layers": "^8.0.6",
"@deck.gl/geo-layers": "^8.0.6",
"@deck.gl/mesh-layers": "^8.0.6",
"@deck.gl/react": "^8.0.6",
"@deck.gl/core": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@deck.gl/geo-layers": "^8.4.6",
"@deck.gl/mesh-layers": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"react": "^16.8.0",
"react-dom": "^16.4.2",
"react-map-gl": "^5.2.1"
Expand Down
6 changes: 3 additions & 3 deletions examples/no-map/package.json
View file
Expand Up @@ -4,9 +4,9 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@deck.gl/core": "^8.0.3",
"@deck.gl/layers": "^8.0.3",
"@deck.gl/react": "^8.0.3",
"@deck.gl/core": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"react": "^16.0.0",
"react-dom": "^16.4.2",
"react-map-gl": "^3.3.4"
Expand Down
4 changes: 2 additions & 2 deletions examples/overlays/package.json
View file
Expand Up @@ -4,8 +4,8 @@
"start-local": "webpack-dev-server --env.local --progress --hot --open"
},
"dependencies": {
"@deck.gl/core": "^8.0.3",
"@deck.gl/react": "^8.0.3",
"@deck.gl/core": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"nebula.gl": "^0.5.1",
"nebula.gl-react": "^0.5.1",
"react": "^16.0.0",
Expand Down
12 changes: 6 additions & 6 deletions modules/layers/package.json
View file
Expand Up @@ -80,11 +80,11 @@
"viewport-mercator-project": ">=6.0.0"
},
"peerDependencies": {
"@deck.gl/core": "^8.0.3",
"@deck.gl/geo-layers": "^8.0.3",
"@deck.gl/layers": "^8.0.3",
"@deck.gl/mesh-layers": "^8.0.3",
"@luma.gl/constants": "^8.0.1",
"@luma.gl/core": "^8.0.1"
"@deck.gl/core": "^8.4.6",
"@deck.gl/geo-layers": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@deck.gl/mesh-layers": "^8.4.6",
"@luma.gl/constants": "^8.4.3",
"@luma.gl/core": "^8.4.3"
}
}
12 changes: 6 additions & 6 deletions modules/main/package.json
View file
Expand Up @@ -49,7 +49,7 @@
"test-rendering": "(cd test/rendering-test && webpack-dev-server --config webpack.config.test-rendering.js --progress --hot --open)"
},
"dependencies": {
"@luma.gl/constants": "^8.0.1",
"@luma.gl/constants": "^8.4.3",
"@nebula.gl/layers": "0.22.2",
"@turf/bbox": ">=4.0.0",
"@turf/bbox-polygon": ">=4.0.0",
Expand Down Expand Up @@ -80,10 +80,10 @@
"viewport-mercator-project": ">=6.0.0"
},
"peerDependencies": {
"@deck.gl/core": "^8.0.3",
"@deck.gl/geo-layers": "^8.0.3",
"@deck.gl/layers": "^8.0.3",
"@luma.gl/constants": "^8.0.1",
"@luma.gl/core": "^8.0.1"
"@deck.gl/core": "^8.4.6",
"@deck.gl/geo-layers": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@luma.gl/constants": "^8.4.3",
"@luma.gl/core": "^8.4.3"
}
}
4 changes: 2 additions & 2 deletions modules/main/src/lib/layers/segments-layer.ts
View file
@@ -1,5 +1,5 @@
import { PathMarkerLayer } from '@nebula.gl/layers';
import { MAX } from '@luma.gl/constants';
import { GL } from '@luma.gl/constants';

import { ArrowStyles, DEFAULT_STYLE, MAX_ARROWS } from '../style';
import NebulaLayer from '../nebula-layer';
Expand Down Expand Up @@ -83,7 +83,7 @@ export default class SegmentsLayer extends NebulaLayer {
parameters: {
depthTest: false,
blend: !this.noBlend,
blendEquation: MAX,
blendEquation: GL.MAX,
},
getPath: (nf: any) => nf.geoJson.geometry.coordinates,
// @ts-ignore
Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Expand Up @@ -54,11 +54,11 @@
"@babel/preset-react": "7.9.4",
"@babel/preset-typescript": "7.9.0",
"@babel/register": "7.9.0",
"@deck.gl/core": "^8.0.6",
"@deck.gl/geo-layers": "^8.0.6",
"@deck.gl/layers": "^8.0.6",
"@deck.gl/mesh-layers": "^8.0.6",
"@deck.gl/react": "^8.0.6",
"@deck.gl/core": "^8.4.6",
"@deck.gl/geo-layers": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@deck.gl/mesh-layers": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"@types/geojson": "^7946.0.7",
"@types/jest": "25.2.1",
"@types/react": "16.9.32",
Expand Down
12 changes: 6 additions & 6 deletions website/package.json
View file
Expand Up @@ -18,12 +18,12 @@
"fix-mjs-bug": "find ../node_modules -name '*.mjs' | xargs rm"
},
"dependencies": {
"@deck.gl/core": "^8.0.3",
"@deck.gl/layers": "^8.0.3",
"@deck.gl/react": "^8.0.3",
"@luma.gl/constants": "^8.0.1",
"@luma.gl/core": "^8.0.1",
"@luma.gl/webgl": "^8.0.1",
"@deck.gl/core": "^8.4.6",
"@deck.gl/layers": "^8.4.6",
"@deck.gl/react": "^8.4.6",
"@luma.gl/constants": "^8.4.3",
"@luma.gl/core": "^8.4.3",
"@luma.gl/webgl": "^8.4.3",
"@probe.gl/stats-widget": "^3.0.1",
"gl": "^4.2.2",
"react": "^16.6.0",
Expand Down

0 comments on commit d787054

Please sign in to comment.