@deck.gl/carto 8.8.0-alpha.2 → 8.8.0-alpha.5

package/src/layers/schema/carto-tile.ts

@@ -0,0 +1,221 @@
+// KeyValueObject ========================================
+interface KeyValueObject {
+  key: string;
+  value: string;
+}
+
+class KeyValueObjectReader {
+  static read(pbf, end?: number): KeyValueObject {
+    return pbf.readFields(KeyValueObjectReader._readField, {key: '', value: ''}, end);
+  }
+  static _readField(this: void, tag: number, obj: KeyValueObject, pbf) {
+    if (tag === 1) obj.key = pbf.readString();
+    else if (tag === 2) obj.value = pbf.readString();
+  }
+}
+
+// Properties ========================================
+
+export interface Properties {
+  data: KeyValueObject[];
+}
+
+class PropertiesReader {
+  static read(pbf, end?: number) {
+    return pbf.readFields(PropertiesReader._readField, {data: []}, end);
+  }
+  static _readField(this: void, tag: number, obj: Properties, pbf) {
+    if (tag === 1) obj.data.push(KeyValueObjectReader.read(pbf, pbf.readVarint() + pbf.pos));
+  }
+}
+
+// Doubles ========================================
+
+interface Doubles {
+  value: Float32Array;
+  size: number;
+}
+
+class DoublesReader {
+  static read(pbf, end?: number): Doubles {
+    // TODO perhaps we can do better and directly map from the source
+    // ArrayBuffer using ArrayBuffer.slice()
+    const {value, size} = pbf.readFields(DoublesReader._readField, {value: [], size: 0}, end);
+    return {value: new Float32Array(value), size};
+  }
+  static _readField(this: void, tag: number, obj, pbf) {
+    if (tag === 1) pbf.readPackedDouble(obj.value);
+    else if (tag === 2) obj.size = pbf.readVarint(true);
+  }
+}
+
+// Ints ========================================
+
+interface Ints {
+  value: Uint32Array;
+  size: number;
+}
+
+class IntsReader {
+  static read(pbf, end?: number): Ints {
+    const {value, size} = pbf.readFields(IntsReader._readField, {value: [], size: 0}, end);
+    return {value: new Uint32Array(value), size};
+  }
+  static _readField(this: void, tag: number, obj, pbf) {
+    if (tag === 1) pbf.readPackedVarint(obj.value);
+    else if (tag === 2) obj.size = pbf.readVarint(true);
+  }
+}
+
+// NumericProp ========================================
+
+interface NumericProp {
+  value: number[];
+}
+
+class NumericPropReader {
+  static read(pbf, end?: number): NumericProp {
+    return pbf.readFields(NumericPropReader._readField, {value: []}, end);
+  }
+  static _readField(this: void, tag: number, obj: NumericProp, pbf) {
+    if (tag === 1) pbf.readPackedDouble(obj.value);
+  }
+}
+
+// NumericPropKeyValue ========================================
+interface NumbericPropKeyValue {
+  key: string;
+  value: NumericProp;
+}
+
+class NumericPropKeyValueReader {
+  static read(pbf, end?: number): NumbericPropKeyValue {
+    return pbf.readFields(NumericPropKeyValueReader._readField, {key: '', value: null}, end);
+  }
+  static _readField(this: void, tag: number, obj: NumbericPropKeyValue, pbf) {
+    if (tag === 1) obj.key = pbf.readString();
+    else if (tag === 2) obj.value = NumericPropReader.read(pbf, pbf.readVarint() + pbf.pos);
+  }
+}
+
+// Points ========================================
+
+interface Points {
+  positions: Doubles;
+  globalFeatureIds: Ints;
+  featureIds: Ints;
+  properties: Properties[];
+  numericProps: Record<string, NumericProp>;
+}
+
+class PointsReader {
+  static read(pbf, end?: number): Points {
+    return pbf.readFields(
+      PointsReader._readField,
+      {positions: null, globalFeatureIds: null, featureIds: null, properties: [], numericProps: {}},
+      end
+    );
+  }
+  static _readField(this: void, tag: number, obj: Points, pbf) {
+    if (tag === 1) obj.positions = DoublesReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 2) obj.globalFeatureIds = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 3) obj.featureIds = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 4) obj.properties.push(PropertiesReader.read(pbf, pbf.readVarint() + pbf.pos));
+    else if (tag === 5) {
+      const entry = NumericPropKeyValueReader.read(pbf, pbf.readVarint() + pbf.pos);
+      obj.numericProps[entry.key] = entry.value;
+    }
+  }
+}
+
+interface Lines extends Points {
+  pathIndices: Ints;
+}
+// Lines ========================================
+
+class LinesReader {
+  static read(pbf, end?: number): Lines {
+    return pbf.readFields(
+      LinesReader._readField,
+      {
+        positions: null,
+        pathIndices: null,
+        globalFeatureIds: null,
+        featureIds: null,
+        properties: [],
+        numericProps: {}
+      },
+      end
+    );
+  }
+  static _readField(this: void, tag: number, obj: Lines, pbf) {
+    if (tag === 1) obj.positions = DoublesReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 2) obj.pathIndices = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 3) obj.globalFeatureIds = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 4) obj.featureIds = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 5) obj.properties.push(PropertiesReader.read(pbf, pbf.readVarint() + pbf.pos));
+    else if (tag === 6) {
+      const entry = NumericPropKeyValueReader.read(pbf, pbf.readVarint() + pbf.pos);
+      obj.numericProps[entry.key] = entry.value;
+    }
+  }
+}
+// Polygons ========================================
+
+interface Polygons extends Points {
+  polygonIndices: Ints;
+  primitivePolygonIndices: Ints;
+  triangles: Ints;
+}
+
+class PolygonsReader {
+  static read(pbf, end?: number): Polygons {
+    return pbf.readFields(
+      PolygonsReader._readField,
+      {
+        positions: null,
+        polygonIndices: null,
+        globalFeatureIds: null,
+        featureIds: null,
+        primitivePolygonIndices: null,
+        triangles: null,
+        properties: [],
+        numericProps: {}
+      },
+      end
+    );
+  }
+  static _readField(this: void, tag: number, obj: Polygons, pbf) {
+    if (tag === 1) obj.positions = DoublesReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 2) obj.polygonIndices = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 3) obj.globalFeatureIds = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 4) obj.featureIds = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 5)
+      obj.primitivePolygonIndices = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 6) obj.triangles = IntsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 7) obj.properties.push(PropertiesReader.read(pbf, pbf.readVarint() + pbf.pos));
+    else if (tag === 8) {
+      const entry = NumericPropKeyValueReader.read(pbf, pbf.readVarint() + pbf.pos);
+      obj.numericProps[entry.key] = entry.value;
+    }
+  }
+}
+
+// Tile ========================================
+
+export interface Tile {
+  points: Points;
+  lines: Lines;
+  polygons: Polygons;
+}
+
+export class TileReader {
+  static read(pbf, end?: number): Tile {
+    return pbf.readFields(TileReader._readField, {points: null, lines: null, polygons: null}, end);
+  }
+  static _readField(this: void, tag: number, obj: Tile, pbf) {
+    if (tag === 1) obj.points = PointsReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 2) obj.lines = LinesReader.read(pbf, pbf.readVarint() + pbf.pos);
+    else if (tag === 3) obj.polygons = PolygonsReader.read(pbf, pbf.readVarint() + pbf.pos);
+  }
+}

package/src/layers/spatial-index-tile-layer.js

@@ -0,0 +1,48 @@
+import {TileLayer} from '@deck.gl/geo-layers';
+
+function isFeatureIdDefined(value) {
+  return value !== undefined && value !== null && value !== '';
+}
+
+export default class SpatialIndexTileLayer extends TileLayer {
+  _updateAutoHighlight(info) {
+    const {hoveredFeatureId} = this.state;
+    const hoveredFeature = info.object;
+    let newHoveredFeatureId;
+
+    if (hoveredFeature) {
+      newHoveredFeatureId = hoveredFeature.id;
+    }
+
+    if (hoveredFeatureId !== newHoveredFeatureId) {
+      let {highlightColor} = this.props;
+      if (typeof highlightColor === 'function') {
+        highlightColor = highlightColor(info);
+      }
+
+      this.setState({
+        highlightColor,
+        hoveredFeatureId: newHoveredFeatureId
+      });
+    }
+  }
+
+  getSubLayerPropsByTile(tile) {
+    return {
+      highlightedObjectIndex: this.getHighlightedObjectIndex(tile),
+      highlightColor: this.state.highlightColor
+    };
+  }
+
+  getHighlightedObjectIndex(tile) {
+    const {hoveredFeatureId} = this.state;
+    const data = tile.content;
+
+    const isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId);
+    if (!isFeatureIdPresent || !Array.isArray(data)) {
+      return -1;
+    }
+
+    return data.findIndex(feature => feature.id === hoveredFeatureId);
+  }
+}

package/src/layers/schema/carto-tile.js

@@ -1,195 +0,0 @@
-// KeyValueObject ========================================
-
-const KeyValueObject = {};
-
-KeyValueObject.read = function (pbf, end) {
-  return pbf.readFields(KeyValueObject._readField, {key: '', value: ''}, end);
-};
-KeyValueObject._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.key = pbf.readString();
-  else if (tag === 2) obj.value = pbf.readString();
-};
-
-// Properties ========================================
-
-const Properties = {};
-
-Properties.read = function (pbf, end) {
-  return pbf.readFields(Properties._readField, {data: []}, end);
-};
-Properties._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.data.push(KeyValueObject.read(pbf, pbf.readVarint() + pbf.pos));
-};
-
-// Doubles ========================================
-
-const Doubles = {};
-
-Doubles.read = function (pbf, end) {
-  // TODO perhaps we can do better and directly map from the source
-  // ArrayBuffer using ArrayBuffer.slice()
-  const {value, size} = pbf.readFields(Doubles._readField, {value: [], size: 0}, end);
-  return {value: new Float32Array(value), size};
-};
-Doubles._readField = function (tag, obj, pbf) {
-  if (tag === 1) pbf.readPackedDouble(obj.value);
-  else if (tag === 2) obj.size = pbf.readVarint(true);
-};
-
-// Ints ========================================
-
-const Ints = {};
-
-Ints.read = function (pbf, end) {
-  const {value, size} = pbf.readFields(Ints._readField, {value: [], size: 0}, end);
-  return {value: new Uint32Array(value), size};
-};
-Ints._readField = function (tag, obj, pbf) {
-  if (tag === 1) pbf.readPackedVarint(obj.value);
-  else if (tag === 2) obj.size = pbf.readVarint(true);
-};
-
-// NumericProp ========================================
-
-const NumericProp = {};
-
-NumericProp.read = function (pbf, end) {
-  return pbf.readFields(NumericProp._readField, {value: []}, end);
-};
-NumericProp._readField = function (tag, obj, pbf) {
-  if (tag === 1) pbf.readPackedDouble(obj.value);
-};
-
-// NumericPropKeyValue ========================================
-
-const NumericPropKeyValue = {};
-
-NumericPropKeyValue.read = function (pbf, end) {
-  return pbf.readFields(NumericPropKeyValue._readField, {key: '', value: null}, end);
-};
-NumericPropKeyValue._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.key = pbf.readString();
-  else if (tag === 2) obj.value = NumericProp.read(pbf, pbf.readVarint() + pbf.pos);
-};
-
-// NumericProp._FieldEntry1 ========================================
-
-NumericProp._FieldEntry1 = {};
-
-NumericProp._FieldEntry1.read = function (pbf, end) {
-  return pbf.readFields(NumericProp._FieldEntry1._readField, {key: '', value: 0}, end);
-};
-NumericProp._FieldEntry1._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.key = pbf.readString();
-  else if (tag === 2) obj.value = pbf.readDouble();
-};
-
-// StringProp ========================================
-
-const StringProp = {};
-
-StringProp.read = function (pbf, end) {
-  return pbf.readFields(StringProp._readField, {value: []}, end);
-};
-StringProp._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.value.push(pbf.readString());
-};
-
-// Points ========================================
-
-const Points = {};
-
-Points.read = function (pbf, end) {
-  return pbf.readFields(
-    Points._readField,
-    {positions: null, globalFeatureIds: null, featureIds: null, properties: [], numericProps: {}},
-    end
-  );
-};
-Points._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.positions = Doubles.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 2) obj.globalFeatureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 3) obj.featureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 4) obj.properties.push(Properties.read(pbf, pbf.readVarint() + pbf.pos));
-  else if (tag === 5) {
-    const entry = NumericPropKeyValue.read(pbf, pbf.readVarint() + pbf.pos);
-    obj.numericProps[entry.key] = entry.value;
-  }
-};
-
-// Lines ========================================
-
-const Lines = {};
-
-Lines.read = function (pbf, end) {
-  return pbf.readFields(
-    Lines._readField,
-    {
-      positions: null,
-      pathIndices: null,
-      globalFeatureIds: null,
-      featureIds: null,
-      properties: [],
-      numericProps: {}
-    },
-    end
-  );
-};
-Lines._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.positions = Doubles.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 2) obj.pathIndices = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 3) obj.globalFeatureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 4) obj.featureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 5) obj.properties.push(Properties.read(pbf, pbf.readVarint() + pbf.pos));
-  else if (tag === 6) {
-    const entry = NumericPropKeyValue.read(pbf, pbf.readVarint() + pbf.pos);
-    obj.numericProps[entry.key] = entry.value;
-  }
-};
-
-// Polygons ========================================
-
-const Polygons = {};
-
-Polygons.read = function (pbf, end) {
-  return pbf.readFields(
-    Polygons._readField,
-    {
-      positions: null,
-      polygonIndices: null,
-      globalFeatureIds: null,
-      featureIds: null,
-      primitivePolygonIndices: null,
-      triangles: null,
-      properties: [],
-      numericProps: {}
-    },
-    end
-  );
-};
-Polygons._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.positions = Doubles.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 2) obj.polygonIndices = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 3) obj.globalFeatureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 4) obj.featureIds = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 5) obj.primitivePolygonIndices = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 6) obj.triangles = Ints.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 7) obj.properties.push(Properties.read(pbf, pbf.readVarint() + pbf.pos));
-  else if (tag === 8) {
-    const entry = NumericPropKeyValue.read(pbf, pbf.readVarint() + pbf.pos);
-    obj.numericProps[entry.key] = entry.value;
-  }
-};
-
-// Tile ========================================
-
-export const Tile = {};
-
-Tile.read = function (pbf, end) {
-  return pbf.readFields(Tile._readField, {points: null, lines: null, polygons: null}, end);
-};
-Tile._readField = function (tag, obj, pbf) {
-  if (tag === 1) obj.points = Points.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 2) obj.lines = Lines.read(pbf, pbf.readVarint() + pbf.pos);
-  else if (tag === 3) obj.polygons = Polygons.read(pbf, pbf.readVarint() + pbf.pos);
-};