fix table for geoarrow

GeoDaCenter · Oct 18, 2023 · 9604569 · 9604569
1 parent 4e42ad7
commit 9604569
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 14 deletions.
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsx
@@ -931,7 +931,6 @@ export default function MapContainerFactory(
       // TODO this should be part of onLayerHover arguments, investigate
       // @ts-ignore (does not fail with local yarn-test)
       data.mapIndex = index;
-      console.log(data);
       this.props.visStateActions.onLayerHover(data);
     }, DEBOUNCE_MOUSE_MOVE_PROPAGATE);
 

diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.ts
@@ -512,6 +512,10 @@ export const FIELD_TYPE_DISPLAY = {
     label: 'geo',
     color: BLUE2
   },
+  [ALL_FIELD_TYPES.geoarrow]: {
+    label: 'geo',
+    color: BLUE2
+  },
   [ALL_FIELD_TYPES.integer]: {
     label: 'int',
     color: YELLOW
@@ -746,6 +750,17 @@ export const FIELD_OPTS = {
       tooltip: []
     }
   },
+  [ALL_FIELD_TYPES.geoarrow]: {
+    type: 'geometry',
+    scale: {
+      ...notSupportedScaleOpts,
+      ...notSupportAggrOpts
+    },
+    format: {
+      legend: d => '...',
+      tooltip: []
+    }
+  },
   [ALL_FIELD_TYPES.object]: {
     type: 'numerical',
     scale: {},

diff --git a/src/layers/src/arrow-layer/arrow-layer.ts b/src/layers/src/arrow-layer/arrow-layer.ts
@@ -27,14 +27,8 @@ import {
   getBinaryGeometriesFromGeoArrowPolygon,
   parseGeometryFromArrow
 } from '@kepler.gl/utils';
-import {Merge} from '@kepler.gl/types';
 
-import {LayerColumn, LayerBaseConfig} from '../base-layer';
-import GeoJsonLayer, {
-  SUPPORTED_ANALYZER_TYPES,
-  GeoJsonLayerVisConfig,
-  GeoJsonLayerVisualChannelConfig
-} from '../geojson-layer/geojson-layer';
+import GeoJsonLayer, {SUPPORTED_ANALYZER_TYPES} from '../geojson-layer/geojson-layer';
 
 export default class ArrowLayer extends GeoJsonLayer {
   binaryFeatures: BinaryFeatures[];
@@ -113,7 +107,6 @@ export default class ArrowLayer extends GeoJsonLayer {
     // the objectInfo.layer id should be `${this.id}-${i}`
     if (objectInfo?.picked) {
       const deckLayerId = objectInfo?.layer?.props?.id;
-      console.log(deckLayerId);
       return deckLayerId.startsWith(this.id);
     }
     return false;
@@ -122,16 +115,19 @@ export default class ArrowLayer extends GeoJsonLayer {
   hasHoveredObject(objectInfo) {
     // hover object returns the index of the object in the data array
     if (this.isLayerHovered(objectInfo) && objectInfo.index >= 0 && this.dataContainer) {
-      console.time('getHoverData');
       const {geojson} = this.config.columns;
       const col = this.dataContainer.getColumn(geojson.fieldIdx);
       const rawGeometry = col.get(objectInfo.index);
       const hoveredFeature = parseGeometryFromArrow({
         encoding: col.metadata?.get('ARROW:extension:name'),
         data: rawGeometry
       });
-      console.timeEnd('getHoverData');
-      return hoveredFeature;
+      return {
+        ...hoveredFeature,
+        properties: {
+          index: objectInfo.index
+        }
+      };
     }
     return null;
   }
@@ -174,7 +170,6 @@ export default class ArrowLayer extends GeoJsonLayer {
 
     const pickable = interactionConfig.tooltip.enabled;
     const hoveredObject = this.hasHoveredObject(objectHovered);
-    console.log(hoveredObject);
 
     const deckLayers = data.data.map((d, i) => {
       return new DeckGLGeoJsonLayer({

diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.ts
@@ -178,6 +178,8 @@ export const defaultElevation = 500;
 export const defaultLineWidth = 1;
 export const defaultRadius = 1;
 
+const defaultThresholdOfBigDataSet = 500000;
+
 export default class GeoJsonLayer extends Layer {
   declare config: GeoJsonLayerConfig;
   declare visConfigSettings: GeoJsonVisConfigSettings;
@@ -387,7 +389,7 @@ export default class GeoJsonLayer extends Layer {
       // set both fill and stroke to true
       return this.updateLayerVisConfig({
         filled: true,
-        stroked: false,
+        stroked: dataContainer.numRows() < defaultThresholdOfBigDataSet,
         strokeColor: colorMaker.next().value
       });
     } else if (featureTypes && featureTypes.point) {

diff --git a/src/reducers/src/interaction-utils.ts b/src/reducers/src/interaction-utils.ts
@@ -88,6 +88,7 @@ function autoFindTooltipFields(fields, maxDefaultTooltips) {
         .split(' ')
         .every(seg => !ptFields.includes(seg)) &&
       type !== ALL_FIELD_TYPES.geojson &&
+      type !== ALL_FIELD_TYPES.geoarrow &&
       type !== 'object'
   );
 

diff --git a/src/utils/src/data-utils.ts b/src/utils/src/data-utils.ts
@@ -273,6 +273,7 @@ export const FIELD_DISPLAY_FORMAT: {
       : Array.isArray(d)
       ? `[${String(d)}]`
       : '',
+  [ALL_FIELD_TYPES.geoarrow]: d => d,
   [ALL_FIELD_TYPES.object]: JSON.stringify,
   [ALL_FIELD_TYPES.array]: JSON.stringify
 };