Use deck.gl mesh layer

uber · Oct 22, 2019 · 6b5dfea · 6b5dfea
1 parent 80578e9
commit 6b5dfea
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 351 deletions.
diff --git a/modules/layers/package.json b/modules/layers/package.json
@@ -76,6 +76,7 @@
   "peerDependencies": {
     "@deck.gl/core": "^7.0.0",
     "@deck.gl/layers": "^7.0.0",
+    "@deck.gl/mesh-layers": "^7.0.0",
     "@luma.gl/constants": "^7.0.0",
     "@luma.gl/core": "^7.0.0"
   }

diff --git a/modules/layers/src/layers/mesh-layer/mesh-layer-fragment.glsl.js b/modules/layers/src/layers/mesh-layer/mesh-layer-fragment.glsl.js
diff --git a/modules/layers/src/layers/mesh-layer/mesh-layer-vertex.glsl.js b/modules/layers/src/layers/mesh-layer/mesh-layer-vertex.glsl.js
diff --git a/modules/layers/src/layers/mesh-layer/mesh-layer.js b/modules/layers/src/layers/mesh-layer/mesh-layer.js
diff --git a/modules/layers/src/layers/path-marker-layer/path-marker-layer.js b/modules/layers/src/layers/path-marker-layer/path-marker-layer.js
@@ -1,7 +1,7 @@
 import { CompositeLayer, COORDINATE_SYSTEM } from '@deck.gl/core';
 import { ScatterplotLayer } from '@deck.gl/layers';
+import { SimpleMeshLayer as MeshLayer } from '@deck.gl/mesh-layers';
 import PathOutlineLayer from '../path-outline-layer/path-outline-layer';
-import MeshLayer from '../mesh-layer/mesh-layer';
 import Arrow2DGeometry from './arrow-2d-geometry';
 
 import createPathMarkers from './create-path-markers';

diff --git a/modules/layers/test/lib/mode-handlers/draw-line-string-handler.test.js b/modules/layers/test/lib/mode-handlers/draw-line-string-handler.test.js
@@ -81,8 +81,7 @@ describe('when no selection', () => {
       },
       featureIndexes: [featureCollection.features.length],
       editContext: {
-      featureIndexes: [featureCollection.features.length],
-
+        featureIndexes: [featureCollection.features.length]
       }
     });
   });