Merge ed4afdb into 33cf068

examples/deck/example.js

@@ -2,7 +2,8 @@
 
 import window from 'global/window';
 import React, { Component } from 'react';
-import DeckGL, { MapView, MapController, COORDINATE_SYSTEM } from 'deck.gl';
+import DeckGL from '@deck.gl/react';
+import { MapView, MapController } from '@deck.gl/core';
 import { StaticMap } from 'react-map-gl';
 import GL from '@luma.gl/constants';
 import circle from '@turf/circle';
@@ -536,10 +537,6 @@ export default class Example extends Component<
       modeHandlers,
       mode,
       modeConfig,
-      // TODO: remove this after update to 6.2
-      fp64: false,
-      coordinateSystem: COORDINATE_SYSTEM.LNGLAT_EXPERIMENTAL,
-      //
       autoHighlight: false,
 
       // Editing callbacks

examples/deck/package.json

@@ -4,8 +4,9 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "deck.gl": "^6.4.5",
-    "nebula.gl": "^0.5.1",
+    "@deck.gl/core": "^7.0.0",
+    "@deck.gl/layers": "^7.0.0",
+    "@deck.gl/react": "^7.0.0",
     "react": "^16.0.0",
     "react-dom": "^16.4.2",
     "react-map-gl": "^3.3.4"

examples/overlays/package.json

@@ -4,7 +4,7 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "deck.gl": "^6.0.3",
+    "deck.gl": "^7.0.0",
     "nebula.gl": "^0.5.1",
     "nebula.gl-react": "^0.5.1",
     "react": "^16.0.0",

examples/sf/package.json

@@ -4,7 +4,7 @@
     "start-local": "webpack-dev-server --env.local --progress --hot --open"
   },
   "dependencies": {
-    "deck.gl": "^6.4.5",
+    "deck.gl": "^7.0.0",
     "nebula.gl": "^0.5.1",
     "nebula.gl-react": "^0.5.1",
     "react": "^16.0.0",

examples/webpack.config.local.js

@@ -39,11 +39,8 @@ function makeLocalDevConfig(EXAMPLE_DIR = LIB_DIR) {
         '@nebula.gl/overlays/dist': OVERLAYS_SRC_DIR,
         '@nebula.gl/overlays': OVERLAYS_SRC_DIR,
 
-        'deck.gl': resolve(LIB_DIR, './node_modules/deck.gl'),
-        '@deck.gl/experimental-layers': resolve(
-          LIB_DIR,
-          './node_modules/@deck.gl/experimental-layers'
-        ),
+        '@deck.gl/core': resolve(LIB_DIR, './node_modules/@deck.gl/core'),
+        '@deck.gl/layers': resolve(LIB_DIR, './node_modules/@deck.gl/layers'),
 
         // Use luma.gl specified by root package.json
         'luma.gl': resolve(LIB_DIR, './node_modules/luma.gl'),

modules/core/package.json

@@ -45,7 +45,7 @@
     "test-rendering": "(cd test/rendering-test && webpack-dev-server --config webpack.config.test-rendering.js --progress --hot --open)"
   },
   "dependencies": {
-    "@luma.gl/constants": "^7.0.0-alpha.3",
+    "@luma.gl/constants": "^7.0.0",
     "@nebula.gl/layers": "0.11.2",
     "@turf/bbox": ">=4.0.0",
     "@turf/bbox-polygon": ">=4.0.0",
@@ -70,9 +70,14 @@
     "@turf/transform-translate": ">=4.0.0",
     "@turf/union": ">=4.0.0",
     "cubic-hermite-spline": "^1.0.1",
-    "deck.gl": ">=6.0.5",
     "geojson-types": "^2.0.1",
     "global": ">=4.3.0",
     "viewport-mercator-project": ">=5.0.0"
+  },
+  "peerDependencies": {
+    "@luma.gl/constants": "^7.0.0",
+    "@luma.gl/core": "^7.0.0",
+    "@deck.gl/core": "^7.0.0",
+    "@deck.gl/layers": "^7.0.0"
   }
 }

modules/core/src/lib/deck-renderer/deck-drawer.js

@@ -1,5 +1,5 @@
 // @flow
-import { PolygonLayer, COORDINATE_SYSTEM } from 'deck.gl';
+import { PolygonLayer } from '@deck.gl/layers';
 import { point, polygon } from '@turf/helpers';
 import turfBbox from '@turf/bbox';
 import turfBboxPolygon from '@turf/bbox-polygon';
@@ -235,7 +235,6 @@ export default class DeckDrawer {
         getLineDashArray: x => POLYGON_DASHES,
         getLineColor: obj => obj.lineColor || [0, 0, 0, 255],
         getFillColor: obj => obj.fillColor || [0, 0, 0, 255],
-        coordinateSystem: COORDINATE_SYSTEM.LNGLAT_EXPERIMENTAL,
         getPolygon: o => o.polygon
       }),
       new PolygonLayer({
@@ -247,7 +246,6 @@ export default class DeckDrawer {
         opacity: 1.0,
         stroked: false,
         pickable: true,
-        coordinateSystem: COORDINATE_SYSTEM.LNGLAT_EXPERIMENTAL,
         getPolygon: o => o.polygon
       })
     ];

modules/core/src/lib/layers/segments-layer.js

@@ -1,6 +1,6 @@
 // @flow
 import { PathMarkerLayer } from '@nebula.gl/layers';
-import { MAX } from 'luma.gl/constants';
+import { MAX } from '@luma.gl/constants';
 
 import { ArrowStyles, DEFAULT_STYLE, MAX_ARROWS } from '../style';
 import NebulaLayer from '../nebula-layer';

modules/core/src/lib/layers/texts-layer.js

@@ -1,5 +1,5 @@
 // @flow
-import { COORDINATE_SYSTEM, TextLayer } from 'deck.gl';
+import { TextLayer } from '@deck.gl/layers';
 
 import NebulaLayer from '../nebula-layer';
 import { toDeckColor } from '../utils';
@@ -33,7 +33,6 @@ export default class TextsLayer extends NebulaLayer {
       // TODO: layer should offer option to scale with zoom
       sizeScale: 1 / Math.pow(2, 20 - zoom),
 
-      coordinateSystem: COORDINATE_SYSTEM.LNGLAT_EXPERIMENTAL,
       updateTriggers: { all: updateTrigger },
 
       nebulaLayer: this

modules/core/src/lib/nebula.js

@@ -2,7 +2,7 @@
 import EventEmitter from 'events';
 import document from 'global/document';
 import window from 'global/window';
-import { WebMercatorViewport } from 'deck.gl';
+import { WebMercatorViewport } from '@deck.gl/core';
 
 import DeckDrawer from './deck-renderer/deck-drawer';
 import LayerMouseEvent from './layer-mouse-event';

modules/layers/package.json

@@ -45,7 +45,6 @@
     "test-rendering": "(cd test/rendering-test && webpack-dev-server --config webpack.config.test-rendering.js --progress --hot --open)"
   },
   "dependencies": {
-    "@luma.gl/constants": "^7.0.0-alpha.3",
     "@turf/bbox": ">=4.0.0",
     "@turf/bbox-polygon": ">=4.0.0",
     "@turf/bearing": ">=4.0.0",
@@ -69,9 +68,14 @@
     "@turf/transform-translate": ">=4.0.0",
     "@turf/union": ">=4.0.0",
     "cubic-hermite-spline": "^1.0.1",
-    "deck.gl": ">=6.0.5",
     "geojson-types": "^2.0.1",
     "global": ">=4.3.0",
     "viewport-mercator-project": ">=5.0.0"
+  },
+  "peerDependencies": {
+    "@luma.gl/constants": "^7.0.0",
+    "@luma.gl/core": "^7.0.0",
+    "@deck.gl/core": "^7.0.0",
+    "@deck.gl/layers": "^7.0.0"
   }
 }

modules/layers/src/layers/editable-geojson-layer.js

@@ -1,7 +1,7 @@
 // @flow
 /* eslint-env browser */
 
-import { GeoJsonLayer, ScatterplotLayer, IconLayer } from 'deck.gl';
+import { GeoJsonLayer, ScatterplotLayer, IconLayer } from '@deck.gl/layers';
 import { ModeHandler } from '../mode-handlers/mode-handler.js';
 import { ViewHandler } from '../mode-handlers/view-handler.js';
 import { ModifyHandler } from '../mode-handlers/modify-handler.js';

modules/layers/src/layers/editable-layer.js

@@ -1,7 +1,7 @@
 // @flow
 /* eslint-env browser */
 
-import { CompositeLayer } from 'deck.gl';
+import { CompositeLayer } from '@deck.gl/core';
 import type {
   ClickEvent,
   StartDraggingEvent,
@@ -125,13 +125,12 @@ export default class EditableLayer extends CompositeLayer {
     const screenCoords = this.getScreenCoords(event);
     const groundCoords = this.getGroundCoords(screenCoords);
 
-    const picks = this.context.layerManager.pickObject({
+    const picks = this.context.deck.pickMultipleObjects({
       x: screenCoords[0],
       y: screenCoords[1],
-      mode: 'query',
       layerIds: [this.props.id],
       radius: 10,
-      viewports: [this.context.viewport]
+      depth: 2
     });
 
     this.setState({
@@ -184,13 +183,11 @@ export default class EditableLayer extends CompositeLayer {
       }
     }
 
-    const picks = this.context.layerManager.pickObject({
+    const picks = this.context.deck.pickMultipleObjects({
       x: screenCoords[0],
       y: screenCoords[1],
-      mode: 'query',
       layerIds: [this.props.id],
       radius: 10,
-      viewports: [this.context.viewport],
       depth: 2
     });
 

modules/layers/src/layers/elevated-edit-handle-layer.js

@@ -1,7 +1,8 @@
 // @flow
 /* eslint-env browser */
 
-import { CompositeLayer, ScatterplotLayer, LineLayer } from 'deck.gl';
+import { CompositeLayer } from '@deck.gl/core';
+import { ScatterplotLayer, LineLayer } from '@deck.gl/layers';
 
 const defaultProps = {};
 

modules/layers/src/layers/junction-scatterplot-layer.js

@@ -1,5 +1,6 @@
 // @flow
-import { CompositeLayer, ScatterplotLayer } from 'deck.gl';
+import { CompositeLayer } from '@deck.gl/core';
+import { ScatterplotLayer } from '@deck.gl/layers';
 
 export default class JunctionScatterplotLayer extends CompositeLayer {
   static layerName = 'JunctionScatterplotLayer';

modules/layers/src/layers/mesh-layer/mesh-layer.js

@@ -23,8 +23,8 @@
 // THE SOFTWARE.
 
 import { Layer, COORDINATE_SYSTEM } from '@deck.gl/core';
-import GL from 'luma.gl/constants';
-import { Model, Geometry, loadTextures, Texture2D, fp64 } from 'luma.gl';
+import GL from '@luma.gl/constants';
+import { Model, Geometry, loadTextures, Texture2D, fp64 } from '@luma.gl/core';
 const { fp64LowPart } = fp64;
 
 import vs from './mesh-layer-vertex.glsl';

modules/layers/src/layers/path-marker-layer/arrow-2d-geometry.js

@@ -1,4 +1,4 @@
-import { Geometry } from 'luma.gl';
+import { Geometry } from '@luma.gl/core';
 
 export default class Arrow2DGeometry extends Geometry {
   constructor(opts = {}) {

modules/layers/src/layers/path-outline-layer/path-outline-layer.js

@@ -1,6 +1,6 @@
 import { PathLayer } from '@deck.gl/layers';
 import GL from '@luma.gl/constants';
-import { Framebuffer, Texture2D } from 'luma.gl';
+import { Framebuffer, Texture2D } from '@luma.gl/core';
 import outline from '../../shaderlib/outline/outline';
 
 // TODO - this should be built into assembleShaders

modules/layers/src/layers/selection-layer.js

@@ -1,6 +1,7 @@
 // @flow
 /* eslint-env browser */
-import { PolygonLayer, CompositeLayer, COORDINATE_SYSTEM } from 'deck.gl';
+import { CompositeLayer } from '@deck.gl/core';
+import { PolygonLayer } from '@deck.gl/layers';
 import { polygon } from '@turf/helpers';
 import turfBuffer from '@turf/buffer';
 import turfDifference from '@turf/difference';
@@ -137,10 +138,6 @@ export default class SelectionLayer extends CompositeLayer {
       new EditableGeoJsonLayer(
         this.getSubLayerProps({
           id: LAYER_ID_GEOJSON,
-          // TODO: remove this after update to 6.2
-          fp64: false,
-          coordinateSystem: COORDINATE_SYSTEM.LNGLAT_EXPERIMENTAL,
-          //
           pickable: true,
           mode,
           selectedFeatureIndexes: [],
@@ -167,10 +164,6 @@ export default class SelectionLayer extends CompositeLayer {
         new PolygonLayer(
           this.getSubLayerProps({
             id: LAYER_ID_BLOCKER,
-            // TODO: remove this after update to 6.2
-            fp64: false,
-            coordinateSystem: COORDINATE_SYSTEM.LNGLAT_EXPERIMENTAL,
-            //
             pickable: true,
             stroked: false,
             opacity: 1.0,

modules/overlays/test/html-overlay.test.js

@@ -2,7 +2,7 @@
 import React from 'react';
 import Renderer from 'react-test-renderer';
 
-import DeckGL from 'deck.gl';
+import DeckGL from '@deck.gl/react';
 import HtmlOverlay from '../src/html-overlay';
 import HtmlOverlayItem from '../src/html-overlay-item';
 

modules/overlays/test/html-tooltip-overlay.test.js

@@ -2,7 +2,7 @@
 import React from 'react';
 import Renderer from 'react-test-renderer';
 
-import DeckGL from 'deck.gl';
+import DeckGL from '@deck.gl/react';
 import HtmlTooltipOverlay from '../src/html-tooltip-overlay';
 
 it('test HtmlTooltipOverlay no items shown', () => {

package.json

@@ -61,6 +61,9 @@
     "babel-preset-stage-0": "^6.24.1",
     "coveralls": "^3.0.3",
     "cypress": "^3.2.0",
+    "@deck.gl/core": "^7.0.0",
+    "@deck.gl/layers": "^7.0.0",
+    "@deck.gl/react": "^7.0.0",
     "eslint": "^4.13.1",
     "eslint-config-prettier": "^2.9.0",
     "eslint-config-uber-es2015": "^3.1.2",