Merge 32ba39c into 92f35d6

modules/aggregation-layers/src/grid-layer/grid-aggregator.js

@@ -68,8 +68,7 @@ function _pointsToGridHashing(points = [], cellSize, getPosition) {
   // calculate count per cell
   const gridHash = {};
   for (const pt of points) {
-    const lat = getPosition(pt)[1];
-    const lng = getPosition(pt)[0];
+    const [lng, lat] = getPosition(pt);
 
     if (Number.isFinite(lat) && Number.isFinite(lng)) {
       const latIdx = Math.floor((lat + 90) / gridOffset.yOffset);

modules/aggregation-layers/src/hexagon-layer/hexagon-aggregator.js

@@ -19,6 +19,7 @@
 // THE SOFTWARE.
 
 import {hexbin} from 'd3-hexbin';
+import {createIterable} from '@deck.gl/core';
 
 /**
  * Use d3-hexbin to performs hexagonal binning from geo points to hexagons
@@ -35,13 +36,15 @@ export function pointToHexbin({data, radius, getPosition}, viewport) {
 
   // add world space coordinates to points
   const screenPoints = [];
-  for (const pt of data) {
+  const {iterable, objectInfo} = createIterable(data);
+  for (const object of iterable) {
+    objectInfo.index++;
     screenPoints.push(
       Object.assign(
         {
-          screenCoord: viewport.projectFlat(getPosition(pt))
+          screenCoord: viewport.projectFlat(getPosition(object, objectInfo))
         },
-        pt
+        object
       )
     );
   }

modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.js

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Layer, WebMercatorViewport, log} from '@deck.gl/core';
+import {Layer, WebMercatorViewport, createIterable, log} from '@deck.gl/core';
 import {defaultColorRange} from '../utils/color-utils';
 import GPUGridAggregator from '../utils/gpu-grid-aggregation/gpu-grid-aggregator';
 import {AGGREGATION_OPERATION} from '../utils/gpu-grid-aggregation/gpu-grid-aggregator-constants';
@@ -261,11 +261,14 @@ export default class ScreenGridLayer extends Layer {
     const colorWeights = [];
     const {weights} = this.state;
 
-    for (const point of data) {
-      const position = getPosition(point);
+    // TODO - using array.push is expensive
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const position = getPosition(object, objectInfo);
       positions.push(position[0]);
       positions.push(position[1]);
-      colorWeights.push(...this._getWeight(point));
+      colorWeights.push(...this._getWeight(object, objectInfo));
     }
     weights.color.values = colorWeights;
     this.setState({positions});

modules/layers/src/arc-layer/arc-layer.js

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Layer} from '@deck.gl/core';
+import {Layer, createIterable} from '@deck.gl/core';
 
 import GL from '@luma.gl/constants';
 import {Model, Geometry, fp64} from 'luma.gl';
@@ -165,9 +165,11 @@ export default class ArcLayer extends Layer {
     const {data, getSourcePosition, getTargetPosition} = this.props;
     const {value, size} = attribute;
     let i = 0;
-    for (const object of data) {
-      const sourcePosition = getSourcePosition(object);
-      const targetPosition = getTargetPosition(object);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const sourcePosition = getSourcePosition(object, objectInfo);
+      const targetPosition = getTargetPosition(object, objectInfo);
       value[i + 0] = sourcePosition[0];
       value[i + 1] = sourcePosition[1];
       value[i + 2] = targetPosition[0];
@@ -188,9 +190,11 @@ export default class ArcLayer extends Layer {
     const {data, getSourcePosition, getTargetPosition} = this.props;
     const {value, size} = attribute;
     let i = 0;
-    for (const object of data) {
-      const sourcePosition = getSourcePosition(object);
-      const targetPosition = getTargetPosition(object);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const sourcePosition = getSourcePosition(object, objectInfo);
+      const targetPosition = getTargetPosition(object, objectInfo);
       value[i + 0] = fp64LowPart(sourcePosition[0]);
       value[i + 1] = fp64LowPart(sourcePosition[1]);
       value[i + 2] = fp64LowPart(targetPosition[0]);

modules/layers/src/grid-cell-layer/grid-cell-layer.js

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Layer} from '@deck.gl/core';
+import {Layer, createIterable} from '@deck.gl/core';
 import GL from '@luma.gl/constants';
 import {Model, CubeGeometry, fp64, PhongMaterial} from '@luma.gl/core';
 const {fp64LowPart} = fp64;
@@ -139,8 +139,10 @@ export default class GridCellLayer extends Layer {
     const {data, getPosition} = this.props;
     const {value} = attribute;
     let i = 0;
-    for (const point of data) {
-      const position = getPosition(point);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const position = getPosition(object, objectInfo);
       value[i++] = fp64LowPart(position[0]);
       value[i++] = fp64LowPart(position[1]);
     }

modules/layers/src/hexagon-cell-layer/hexagon-cell-layer.js

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Layer, log} from '@deck.gl/core';
+import {Layer, log, createIterable} from '@deck.gl/core';
 import GL from '@luma.gl/constants';
 import {Model, CylinderGeometry, fp64, PhongMaterial} from '@luma.gl/core';
 const {fp64LowPart} = fp64;
@@ -191,8 +191,10 @@ export default class HexagonCellLayer extends Layer {
     const {data, getCentroid} = this.props;
     const {value} = attribute;
     let i = 0;
-    for (const object of data) {
-      const position = getCentroid(object);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const position = getCentroid(object, objectInfo);
       value[i++] = fp64LowPart(position[0]);
       value[i++] = fp64LowPart(position[1]);
     }

modules/layers/src/icon-layer/icon-layer.js

@@ -17,7 +17,7 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-import {Layer} from '@deck.gl/core';
+import {Layer, createIterable} from '@deck.gl/core';
 import GL from '@luma.gl/constants';
 import {Model, Geometry, fp64} from 'luma.gl';
 
@@ -221,8 +221,10 @@ export default class IconLayer extends Layer {
     const {data, getPosition} = this.props;
     const {value} = attribute;
     let i = 0;
-    for (const point of data) {
-      const position = getPosition(point);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const position = getPosition(object, objectInfo);
       value[i++] = fp64LowPart(position[0]);
       value[i++] = fp64LowPart(position[1]);
     }
@@ -233,8 +235,10 @@ export default class IconLayer extends Layer {
     const {iconManager} = this.state;
     const {value} = attribute;
     let i = 0;
-    for (const object of data) {
-      const rect = iconManager.getIconMapping(object);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const rect = iconManager.getIconMapping(object, objectInfo);
       value[i++] = rect.width / 2 - rect.anchorX || 0;
       value[i++] = rect.height / 2 - rect.anchorY || 0;
     }
@@ -245,8 +249,10 @@ export default class IconLayer extends Layer {
     const {iconManager} = this.state;
     const {value} = attribute;
     let i = 0;
-    for (const object of data) {
-      const mapping = iconManager.getIconMapping(object);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const mapping = iconManager.getIconMapping(object, objectInfo);
       const colorMode = mapping.mask;
       value[i++] = colorMode ? 1 : 0;
     }
@@ -257,8 +263,10 @@ export default class IconLayer extends Layer {
     const {iconManager} = this.state;
     const {value} = attribute;
     let i = 0;
-    for (const object of data) {
-      const rect = iconManager.getIconMapping(object);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const rect = iconManager.getIconMapping(object, objectInfo);
       value[i++] = rect.x || 0;
       value[i++] = rect.y || 0;
       value[i++] = rect.width || 0;

modules/layers/src/icon-layer/icon-manager.js

@@ -2,6 +2,7 @@
 import GL from '@luma.gl/constants';
 import {Texture2D, readPixelsToBuffer} from 'luma.gl';
 import {loadImage} from '@loaders.gl/core';
+import {createIterable} from '@deck.gl/core';
 
 const DEFAULT_CANVAS_WIDTH = 1024;
 const DEFAULT_BUFFER = 4;
@@ -148,8 +149,10 @@ export function getDiffIcons(data, getIcon, cachedIcons) {
 
   cachedIcons = cachedIcons || {};
   const icons = {};
-  for (const point of data) {
-    const icon = getIcon(point);
+  const {iterable, objectInfo} = createIterable(data);
+  for (const object of iterable) {
+    objectInfo.index++;
+    const icon = getIcon(object, objectInfo);
     const id = getIconId(icon);
 
     if (!icon) {
@@ -164,7 +167,6 @@ export function getDiffIcons(data, getIcon, cachedIcons) {
       icons[id] = icon;
     }
   }
-
   return icons;
 }
 
@@ -200,8 +202,8 @@ export default class IconManager {
     return this._texture;
   }
 
-  getIconMapping(dataPoint) {
-    const icon = this._getIcon(dataPoint);
+  getIconMapping(object, objectInfo) {
+    const icon = this._getIcon(object, objectInfo);
     const id = this._autoPacking ? getIconId(icon) : icon;
     return this._mapping[id] || {};
   }

modules/layers/src/line-layer/line-layer.js

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Layer} from '@deck.gl/core';
+import {Layer, createIterable} from '@deck.gl/core';
 import GL from '@luma.gl/constants';
 import {Model, Geometry, fp64} from 'luma.gl';
 const {fp64LowPart} = fp64;
@@ -134,9 +134,11 @@ export default class LineLayer extends Layer {
     const {data, getSourcePosition, getTargetPosition} = this.props;
     const {value, size} = attribute;
     let i = 0;
-    for (const object of data) {
-      const sourcePosition = getSourcePosition(object);
-      const targetPosition = getTargetPosition(object);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const sourcePosition = getSourcePosition(object, objectInfo);
+      const targetPosition = getTargetPosition(object, objectInfo);
       value[i + 0] = fp64LowPart(sourcePosition[0]);
       value[i + 1] = fp64LowPart(sourcePosition[1]);
       value[i + 2] = fp64LowPart(targetPosition[0]);

modules/layers/src/point-cloud-layer/point-cloud-layer.js

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {Layer} from '@deck.gl/core';
+import {Layer, createIterable} from '@deck.gl/core';
 import GL from '@luma.gl/constants';
 import {Model, Geometry, fp64, PhongMaterial} from '@luma.gl/core';
 const {fp64LowPart} = fp64;
@@ -133,8 +133,10 @@ export default class PointCloudLayer extends Layer {
     const {data, getPosition} = this.props;
     const {value} = attribute;
     let i = 0;
-    for (const point of data) {
-      const position = getPosition(point);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const position = getPosition(object, objectInfo);
       value[i++] = fp64LowPart(position[0]);
       value[i++] = fp64LowPart(position[1]);
     }

modules/layers/src/polygon-layer/polygon-layer.js

@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 
 import {PhongMaterial} from '@luma.gl/core';
-import {CompositeLayer} from '@deck.gl/core';
+import {CompositeLayer, createIterable} from '@deck.gl/core';
 import SolidPolygonLayer from '../solid-polygon-layer/solid-polygon-layer';
 import PathLayer from '../path-layer/path-layer';
 import * as Polygon from '../solid-polygon-layer/polygon';
@@ -87,8 +87,13 @@ export default class PolygonLayer extends CompositeLayer {
     const paths = [];
     const positionSize = positionFormat === 'XY' ? 2 : 3;
 
-    for (const object of data) {
-      const {positions, holeIndices} = Polygon.normalize(getPolygon(object), positionSize);
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const {positions, holeIndices} = Polygon.normalize(
+        getPolygon(object, objectInfo),
+        positionSize
+      );
 
       if (holeIndices) {
         // split the positions array into `holeIndices.length + 1` rings

modules/layers/src/text-layer/text-layer.js

@@ -18,7 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-import {CompositeLayer, log} from '@deck.gl/core';
+import {CompositeLayer, log, createIterable} from '@deck.gl/core';
 import MultiIconLayer from './multi-icon-layer/multi-icon-layer';
 import FontAtlasManager, {
   DEFAULT_CHAR_SET,
@@ -155,9 +155,11 @@ export default class TextLayer extends CompositeLayer {
     const {iconMapping} = this.state;
 
     const transformedData = [];
-    let objectIndex = 0;
-    for (const val of data) {
-      const text = getText(val);
+
+    const {iterable, objectInfo} = createIterable(data);
+    for (const object of iterable) {
+      objectInfo.index++;
+      const text = getText(object, objectInfo);
       if (text) {
         const letters = Array.from(text);
         const offsets = [0];
@@ -170,8 +172,8 @@ export default class TextLayer extends CompositeLayer {
             offsets,
             len: text.length,
             // reference of original object and object index
-            object: val,
-            objectIndex
+            object,
+            objectIndex: objectInfo.index
           };
 
           const frame = iconMapping[letter];
@@ -185,8 +187,6 @@ export default class TextLayer extends CompositeLayer {
           transformedData.push(datum);
         });
       }
-
-      objectIndex++;
     }
 
     this.setState({data: transformedData});