rebase

Signed-off-by: Xun Li <[email protected]>
GeoDaCenter · Nov 15, 2023 · 755006d · 755006d
1 parent 1b9a845
commit 755006d
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 500 deletions.
diff --git a/src/components/src/side-panel/layer-panel/layer-configurator.tsx b/src/components/src/side-panel/layer-panel/layer-configurator.tsx
@@ -891,10 +891,6 @@ export default function LayerConfiguratorFactory(
       );
     }
 
-    _renderGeoarrowLayerConfig(props) {
-      return this._renderGeojsonLayerConfig(props);
-    }
-
     _render3DLayerConfig({layer, visConfiguratorProps}) {
       return (
         <Fragment>

diff --git a/src/layers/src/arrow-layer/arrow-layer.ts b/src/layers/src/arrow-layer/arrow-layer.ts
diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.ts
@@ -419,7 +419,7 @@ export default class GeoJsonLayer extends Layer {
     const getGeoColumn = geoColumnAccessor(this.config.columns);
     const getGeoField = geoFieldAccessor(this.config.columns);
 
-    if (this.dataToFeature.length === 0) {
+    // if (this.dataToFeature.length === 0) {
       const updateLayerMetaFunc =
         dataContainer instanceof ArrowDataContainer
           ? getGeojsonLayerMetaFromArrow
@@ -431,9 +431,13 @@ export default class GeoJsonLayer extends Layer {
         getGeoField
       });
 
-      this.dataToFeature = dataToFeature;
+      // append new data from binaryGeometries to this.binaryFeatures
+      for (let i = this.dataToFeature.length; i < dataToFeature.length; ++i) {
+        this.dataToFeature.push(dataToFeature[i]);
+      }
+      // this.dataToFeature = dataToFeature;
       this.updateMeta({bounds, fixedRadius, featureTypes});
-    }
+    // }
   }
 
   setInitialLayerConfig({dataContainer}) {
@@ -497,7 +501,7 @@ export default class GeoJsonLayer extends Layer {
     const updateTriggers = {
       ...this.getVisualChannelUpdateTriggers(),
       getFilterValue: gpuFilter.filterValueUpdateTriggers,
-      getFiltered: this.filteredIndexTrigger
+      // getFiltered: this.filteredIndexTrigger
     };
 
     const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
@@ -531,7 +535,7 @@ export default class GeoJsonLayer extends Layer {
         capRounded: true,
         jointRounded: true,
         updateTriggers,
-        extensions: [...defaultLayerProps.extensions, new FilterArrowExtension()],
+        // extensions: [...defaultLayerProps.extensions, new FilterArrowExtension()],
         _subLayerProps: {
           ...(featureTypes?.polygon ? {'polygons-stroke': opaOverwrite} : {}),
           ...(featureTypes?.line ? {linestrings: opaOverwrite} : {}),

diff --git a/src/layers/src/geojson-layer/geojson-utils.ts b/src/layers/src/geojson-layer/geojson-utils.ts
@@ -43,12 +43,6 @@ export enum FeatureTypes {
 }
 
 /* eslint-enable */
-
-type RawArrowFeature = {
-  encoding?: string;
-  data: any;
-};
-
 export function parseGeoJsonRawFeature(rawFeature: unknown): Feature | null {
   if (typeof rawFeature === 'object') {
     // Support GeoJson feature as object