fix picking with binary geojson (visgl#6011)

harisbal · Jul 25, 2021 · 1d058a0 · 1d058a0
1 parent 7bc510b
commit 1d058a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/modules/layers/src/geojson-layer/geojson-binary.js b/modules/layers/src/geojson-layer/geojson-binary.js
@@ -89,7 +89,7 @@ export function calculatePickingColors(geojsonBinary, encodePickingColor) {
     polygons: null
   };
   for (const key in pickingColors) {
-    const featureIds = geojsonBinary[key].featureIds.value;
+    const featureIds = geojsonBinary[key].globalFeatureIds.value;
     pickingColors[key] = new Uint8ClampedArray(featureIds.length * 3);
     const pickingColor = [];
     for (let i = 0; i < featureIds.length; i++) {

diff --git a/modules/layers/src/geojson-layer/geojson-layer-props.js b/modules/layers/src/geojson-layer/geojson-layer-props.js
@@ -38,21 +38,17 @@ export function createLayerPropsFromFeatures(features, featuresDiff) {
   return layerProps;
 }
 
-export function createLayerPropsFromBinary(geojsonBinary, uniqueIdProperty, encodePickingColor) {
+export function createLayerPropsFromBinary(geojsonBinary, encodePickingColor) {
   const layerProps = createEmptyLayerProps();
   const {points, lines, polygons} = geojsonBinary;
 
-  const customPickingColors = calculatePickingColors(
-    geojsonBinary,
-    uniqueIdProperty,
-    encodePickingColor
-  );
+  const customPickingColors = calculatePickingColors(geojsonBinary, encodePickingColor);
 
   layerProps.points.data = {
     length: points.positions.value.length / points.positions.size,
     attributes: {
       getPosition: points.positions,
-      pickingColors: {
+      instancePickingColors: {
         size: 3,
         value: customPickingColors.points
       }
@@ -67,7 +63,7 @@ export function createLayerPropsFromBinary(geojsonBinary, uniqueIdProperty, enco
     startIndices: lines.pathIndices.value,
     attributes: {
       getPath: lines.positions,
-      pickingColors: {
+      instancePickingColors: {
         size: 3,
         value: customPickingColors.lines
       }