Where possible update extent min/max inplace for performance

`extent.extend()` is immutable and makes a new Extent()
If we're just looping to build an extent out of points or smaller extents,
we can update min and max inplace for better performance.

modules/core/validation/models.js

@@ -1,4 +1,5 @@
 import { Extent } from '@id-sdk/extent';
+import { utilTotalExtent } from '../../util';
 import { t } from '../../core/localizer';
 
 export function validationIssue(attrs) {
@@ -45,9 +46,7 @@ export function validationIssue(attrs) {
             return new Extent(this.loc);
         }
         if (this.entityIds && this.entityIds.length) {
-            return this.entityIds.reduce(function(extent, entityId) {
-                return extent.extend(resolver.entity(entityId).extent(resolver));
-            }, new Extent());
+            return utilTotalExtent(this.entityIds, resolver);
         }
         return null;
     };

modules/modes/select.js

@@ -16,7 +16,6 @@ import { behaviorSelect } from '../behavior/select';
 import { operationMove } from '../operations/move';
 import { prefs } from '../core/preferences';
 
-import { Extent } from '@id-sdk/extent';
 import { geoChooseEdge } from '../geo';
 import { geoMetersToLat, geoMetersToLon  } from '@id-sdk/geo';
 import { modeBrowse } from './browse';
@@ -305,13 +304,7 @@ export function modeSelect(context, selectedIDs) {
         selectElements();
 
         if (_follow) {
-            var extent = new Extent();
-            var graph = context.graph();
-            selectedIDs.forEach(function(id) {
-                var entity = context.entity(id);
-                extent = extent.extend(entity.extent(graph));
-            });
-
+            var extent = utilTotalExtent(selectedIDs, context.graph());
             var loc = extent.center();
             context.map().centerEase(loc);
             // we could enter the mode multiple times, so reset follow for next time

modules/osm/way.js

@@ -4,7 +4,7 @@ import { vecCross } from '@id-sdk/math';
 import { osmEntity } from './entity';
 import { osmLanes } from './lanes';
 import { osmTagSuggestingArea, osmOneWayTags, osmRightSideIsInsideTags } from './tags';
-import { utilArrayUniq } from '../util';
+import { utilArrayUniq, utilTotalExtent } from '../util';
 import { Extent } from '@id-sdk/extent';
 
 
@@ -45,14 +45,7 @@ Object.assign(osmWay.prototype, {
 
     extent: function(resolver) {
         return resolver.transient(this, 'extent', function() {
-            var extent = new Extent();
-            for (var i = 0; i < this.nodes.length; i++) {
-                var node = resolver.hasEntity(this.nodes[i]);
-                if (node) {
-                   extent = extent.extend(node.extent());
-                }
-            }
-            return extent;
+            return utilTotalExtent(this.nodes, resolver);
         });
     },
 

modules/renderer/map.js

@@ -11,7 +11,7 @@ import { geoRawMercator} from '../geo';
 import { geoScaleToZoom, geoZoomToScale } from '@id-sdk/geo';
 import { modeBrowse } from '../modes/browse';
 import { svgAreas, svgLabels, svgLayers, svgLines, svgMidpoints, svgPoints, svgVertices } from '../svg';
-import { utilFastMouse, utilFunctor, utilSetTransform, utilEntityAndDeepMemberIDs } from '../util/util';
+import { utilFastMouse, utilFunctor, utilSetTransform, utilTotalExtent, utilEntityAndDeepMemberIDs } from '../util/util';
 import { utilBindOnce } from '../util/bind_once';
 import { utilDetect } from '../util/detect';
 import { utilGetDimensions } from '../util/dimensions';
@@ -948,19 +948,12 @@ export function rendererMap(context) {
     };
 
 
-    map.zoomToEase = function(obj, duration) {
+    map.zoomToEase = function(val, duration) {
         var extent;
-        if (Array.isArray(obj)) {
-            obj.forEach(function(entity) {
-                var entityExtent = entity.extent(context.graph());
-                if (!extent) {
-                    extent = entityExtent;
-                } else {
-                    extent = extent.extend(entityExtent);
-                }
-            });
+        if (Array.isArray(val)) {
+            extent = utilTotalExtent(val, context.graph());
         } else {
-            extent = obj.extent(context.graph());
+            extent = val.extent(context.graph());
         }
         if (!isFinite(extent.area())) return map;
 

modules/services/streetside.js

@@ -647,7 +647,10 @@ export default {
         poly = geomRotatePoints(poly, -angle, origin);
 
         let extent = poly.reduce((extent, point) => {
-          return extent.extend(new Extent(point));
+          // update extent in place
+          extent.min = [ Math.min(extent.min[0], point[0]), Math.min(extent.min[1], point[1]) ];
+          extent.max = [ Math.max(extent.max[0], point[0]), Math.max(extent.max[1], point[1]) ];
+          return extent;
         }, new Extent());
 
         // find nearest other bubble in the search polygon

modules/ui/field.js

@@ -5,11 +5,10 @@ import { t, localizer } from '../core/localizer';
 import { locationManager } from '../core/locations';
 import { svgIcon } from '../svg/icon';
 import { uiTooltip } from './tooltip';
-import { Extent } from '@id-sdk/extent';
 import { uiFieldHelp } from './field_help';
 import { uiFields } from './fields';
 import { uiTagReference } from './tag_reference';
-import { utilRebind, utilUniqueDomId } from '../util';
+import { utilRebind, utilTotalExtent, utilUniqueDomId } from '../util';
 
 
 export function uiField(context, presetField, entityIDs, options) {
@@ -40,12 +39,9 @@ export function uiField(context, presetField, entityIDs, options) {
     var _state = '';
     var _tags = {};
 
-    var _entityExtent;
+    var _entityExtent = null;
     if (entityIDs && entityIDs.length) {
-        _entityExtent = entityIDs.reduce(function(extent, entityID) {
-            var entity = context.graph().entity(entityID);
-            return extent.extend(entity.extent(context.graph()));
-        }, new Extent());
+        _entityExtent = utilTotalExtent(entityIDs, context.graph());
     }
 
     var _locked = false;

modules/ui/fields/restrictions.js

@@ -221,10 +221,12 @@ export function uiFieldRestrictions(field, context) {
         projection.scale(geoZoomToScale(z));
 
         // Calculate extent of all key vertices
-        var extent = new Extent();
-        for (var i = 0; i < _intersection.vertices.length; i++) {
-            extent = extent.extend(_intersection.vertices[i].extent());
-        }
+        var extent = _intersection.vertices.reduce((extent, node) => {
+          // update extent in place
+          extent.min = [ Math.min(extent.min[0], node.loc[0]), Math.min(extent.min[1], node.loc[1]) ];
+          extent.max = [ Math.max(extent.max[0], node.loc[0]), Math.max(extent.max[1], node.loc[1]) ];
+          return extent;
+        }, new Extent());
 
         // If this is a large intersection, adjust zoom to fit extent
         if (_intersection.vertices.length > 1) {

modules/ui/preset_list.js

@@ -7,10 +7,9 @@ import { actionChangePreset } from '../actions/change_preset';
 import { operationDelete } from '../operations/delete';
 import { svgIcon } from '../svg/index';
 import { uiTooltip } from './tooltip';
-import { Extent } from '@id-sdk/extent';
 import { uiPresetIcon } from './preset_icon';
 import { uiTagReference } from './tag_reference';
-import { utilKeybinding, utilNoAuto, utilRebind } from '../util';
+import { utilKeybinding, utilNoAuto, utilRebind, utilTotalExtent } from '../util';
 
 
 export function uiPresetList(context) {
@@ -483,11 +482,7 @@ export function uiPresetList(context) {
 
         if (_entityIDs && _entityIDs.length) {
             // calculate current location
-            const extent = _entityIDs.reduce(function(extent, entityID) {
-                var entity = context.graph().entity(entityID);
-                return extent.extend(entity.extent(context.graph()));
-            }, new Extent());
-            _currLoc = extent.center();
+            _currLoc = utilTotalExtent(_entityIDs, context.graph()).center();
 
             // match presets
             var presets = _entityIDs.map(function(entityID) {

modules/util/util.js

@@ -16,17 +16,18 @@ export function utilTagText(entity) {
 }
 
 
+// Accepts an array of entities -or- entityIDs
 export function utilTotalExtent(array, graph) {
-    var extent =  new Extent();
-    var val, entity;
-    for (var i = 0; i < array.length; i++) {
-        val = array[i];
-        entity = typeof val === 'string' ? graph.hasEntity(val) : val;
+    return array.reduce(function(extent, val) {
+        var entity = (typeof val === 'string' ? graph.hasEntity(val) : val);
         if (entity) {
-            extent = extent.extend(entity.extent(graph));
+            var other = entity.extent(graph);
+            // update extent in place
+            extent.min = [ Math.min(extent.min[0], other.min[0]), Math.min(extent.min[1], other.min[1]) ];
+            extent.max = [ Math.max(extent.max[0], other.max[0]), Math.max(extent.max[1], other.max[1]) ];
         }
-    }
-    return extent;
+        return extent;
+    }, new Extent());
 }