Math/extent conversion (facebook#272)

* Bump version to newest id-sdk release.

* Convert geoExtent to id-sdk/Extent. Most tests working.

* Fix remaining tests.

* Remove geo modules no longer in use.

* Revert "Fix remaining tests."

This reverts commit 7ba89ce.

* Fix a number of instances of extents being used as raw tuples.

* Woops- converted zoom/pan functionality that interacts with d3. NOT a candidate for Extent() conversion.

* Fix roads/ways not appearing in the map, also fix a crossing ways test problem.

* Fix an issue with the measurement panel not setting its extent correctly.

* fix usages of Extend.extend() because it no longer modifies the extent in-place.

* Fix copy / paste bug that falsely claimed everything had an extent of +/- Infinity.

modules/behavior/lasso.js

@@ -1,6 +1,8 @@
 import { select as d3_select } from 'd3-selection';
 
-import { geoExtent, geoPointInPolygon } from '../geo';
+import { geoPointInPolygon } from '../geo';
+import { Extent } from '@id-sdk/extent';
+
 import { modeSelect } from '../modes/select';
 import { uiLasso } from '../ui/lasso';
 import { utilArrayIntersection } from '../util/array';
@@ -62,7 +64,7 @@ export function behaviorLasso(context) {
             }
 
             var bounds = lasso.extent().map(context.projection.invert);
-            var extent = geoExtent(normalize(bounds[0], bounds[1]));
+            var extent = new Extent(normalize(bounds[0], bounds[1]));
 
             var intersects = context.history().intersects(extent).filter(function(entity) {
                 return entity.type === 'node' &&

modules/behavior/paste.js

@@ -1,6 +1,7 @@
 import { actionCopyEntities } from '../actions/copy_entities';
 import { actionMove } from '../actions/move';
-import { geoExtent, geoPointInPolygon, geoVecSubtract } from '../geo';
+import { geoPointInPolygon, geoVecSubtract } from '../geo';
+import { Extent } from '@id-sdk/extent';
 import { modeMove } from '../modes/move';
 import { uiCmd } from '../ui/cmd';
 
@@ -16,14 +17,14 @@ export function behaviorPaste(context) {
         var baseGraph = context.graph();
         var mouse = context.map().mouse();
         var projection = context.projection;
-        var viewport = geoExtent(projection.clipExtent()).polygon();
+        var viewport = new Extent(projection.clipExtent()).polygon();
 
         if (!geoPointInPolygon(mouse, viewport)) return;
 
         var oldIDs = context.copyIDs();
         if (!oldIDs.length) return;
 
-        var extent = geoExtent();
+        var extent = new Extent();
         var oldGraph = context.copyGraph();
         var newIDs = [];
 
@@ -38,7 +39,7 @@ export function behaviorPaste(context) {
             var oldEntity = oldGraph.entity(id);
             var newEntity = copies[id];
 
-            extent._extend(oldEntity.extent(oldGraph));
+            extent = extent.extend(oldEntity.extent(oldGraph));
 
             // Exclude child nodes from newIDs if their parent way was also copied.
             var parents = context.graph().parentWays(newEntity);

modules/core/rapid_context.js

@@ -1,4 +1,4 @@
-import { geoExtent } from '../geo';
+import { Extent } from '@id-sdk/extent';
 import { localizer, t } from '../core/localizer';
 import toGeoJSON from '@mapbox/togeojson';
 import { dispatch as d3_dispatch } from 'd3-dispatch';
@@ -66,7 +66,7 @@ export function coreRapidContext(context) {
         }
       });
 
-      _taskExtent = new geoExtent([minlon, minlat], [maxlon, maxlat]);
+      _taskExtent = new Extent([minlon, minlat], [maxlon, maxlat]);
       dispatch.call('task_extent_set');
     }
   };

modules/core/validation/models.js

@@ -1,4 +1,4 @@
-import { geoExtent } from '../../geo';
+import { Extent } from '@id-sdk/extent';
 import { t } from '../../core/localizer';
 
 export function validationIssue(attrs) {
@@ -42,12 +42,12 @@ export function validationIssue(attrs) {
 
     this.extent = function(resolver) {
         if (this.loc) {
-            return geoExtent(this.loc);
+            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));
-            }, geoExtent());
+            }, new Extent());
         }
         return null;
     };

modules/core/validator.js

@@ -2,7 +2,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch';
 
 import { prefs } from './preferences';
 import { coreDifference } from './difference';
-import { geoExtent } from '../geo/extent';
+import { Extent } from '@id-sdk/extent';
 import { modeSelect } from '../modes/select';
 import { utilArrayChunk, utilArrayGroupBy, utilRebind } from '../util';
 import * as Validations from '../validations/index';
@@ -155,7 +155,7 @@ export function coreValidator(context) {
     // uncache existing
     cache.uncacheIssuesOfType('unsquare_way');
 
-    const buildings = context.history().tree().intersects(geoExtent([-180,-90],[180, 90]), graph)  // everywhere
+    const buildings = context.history().tree().intersects(new Extent([-180,-90],[180, 90]), graph)  // everywhere
       .filter(entity => (entity.type === 'way' && entity.tags.building && entity.tags.building !== 'no'));
 
     // rerun for all buildings

modules/geo/geom.js

@@ -3,7 +3,7 @@ import {
     polygonCentroid as d3_polygonCentroid
 } from 'd3-polygon';
 
-import { geoExtent } from './extent.js';
+import { Extent } from '@id-sdk/extent';
 
 import {
     geoVecAngle, geoVecCross, geoVecDot, geoVecEqual,
@@ -291,8 +291,8 @@ export function geoGetSmallestSurroundingRectangle(points) {
         var angle = Math.atan2(c2[1] - c1[1], c2[0] - c1[0]);
         var poly = geoRotate(hull, -angle, centroid);
         var extent = poly.reduce(function(extent, point) {
-            return extent.extend(geoExtent(point));
-        }, geoExtent());
+            return extent.extend(new Extent(point));
+        }, new Extent());
 
         var area = extent.area();
         if (area < minArea) {

modules/geo/index.js

@@ -1,6 +1,3 @@
-export { geoExtent } from './extent.js';
-export { geoExtentFromBounds } from './extent.js';
-
 export { geoLatToMeters } from './geo.js';
 export { geoLonToMeters } from './geo.js';
 export { geoMetersToLat } from './geo.js';

modules/geo/raw_mercator.js

@@ -1,3 +1,4 @@
+import { Extent } from '@id-sdk/extent';
 import {
     geoMercatorRaw as d3_geoMercatorRaw,
     geoTransform as d3_geoTransform

modules/modes/select.js

@@ -16,7 +16,8 @@ import { behaviorSelect } from '../behavior/select';
 import { operationMove } from '../operations/move';
 import { prefs } from '../core/preferences';
 
-import { geoExtent, geoChooseEdge, geoMetersToLat, geoMetersToLon } from '../geo';
+import { Extent } from '@id-sdk/extent';
+import { geoChooseEdge, geoMetersToLat, geoMetersToLon } from '../geo';
 import { modeBrowse } from './browse';
 import { modeDragNode } from './drag_node';
 import { modeDragNote } from './drag_note';
@@ -277,11 +278,11 @@ export function modeSelect(context, selectedIDs) {
         selectElements();
 
         if (_follow) {
-            var extent = geoExtent();
+            var extent = new Extent();
             var graph = context.graph();
             selectedIDs.forEach(function(id) {
                 var entity = context.entity(id);
-                extent._extend(entity.extent(graph));
+                extent = extent.extend(entity.extent(graph));
             });
 
             var loc = extent.center();
@@ -343,9 +344,9 @@ export function modeSelect(context, selectedIDs) {
 
                     function tooSmall() {
                         if (isUp) return false;
-                        let dLon = Math.abs(extent[1][0] - extent[0][0]);
-                        let dLat = Math.abs(extent[1][1] - extent[0][1]);
-                        return dLon < geoMetersToLon(1, extent[1][1]) &&
+                        let dLon = Math.abs(extent.max[0] - extent.min[0]);
+                        let dLat = Math.abs(extent.max[1] - extent.min[1]);
+                        return dLon < geoMetersToLon(1, extent.max[1]) &&
                             dLat < geoMetersToLat(1);
                     }
 

modules/modes/select_data.js

@@ -11,7 +11,7 @@ import { behaviorSelect } from '../behavior/select';
 
 import { t } from '../core/localizer';
 
-import { geoExtent } from '../geo';
+import { Extent } from '@id-sdk/extent';
 import { modeBrowse } from './browse';
 import { modeDragNode } from './drag_node';
 import { modeDragNote } from './drag_note';
@@ -61,8 +61,9 @@ export function modeSelectData(context, selectedDatum) {
     }
 
 
-    mode.zoomToSelected = function() {
-        var extent = geoExtent(d3_geoBounds(selectedDatum));
+    mode.zoomToSelected = function () {
+        var bounds = d3_geoBounds(selectedDatum);
+        var extent = new Extent(bounds[0], bounds[1]);
         context.map().centerZoomEase(extent.center(), context.map().trimmedExtentZoom(extent));
     };
 
@@ -83,7 +84,7 @@ export function modeSelectData(context, selectedDatum) {
         sidebar.show(dataEditor.datum(selectedDatum));
 
         // expand the sidebar, avoid obscuring the data if needed
-        var extent = geoExtent(d3_geoBounds(selectedDatum));
+        var extent = new Extent(d3_geoBounds(selectedDatum));
         sidebar.expand(sidebar.intersects(extent));
 
         context.map()

modules/operations/paste.js

@@ -2,7 +2,9 @@
 import { actionCopyEntities } from '../actions/copy_entities';
 import { actionMove } from '../actions/move';
 import { modeSelect } from '../modes/select';
-import { geoExtent, geoVecSubtract } from '../geo';
+import { geoVecSubtract } from '../geo';
+import { Extent } from '@id-sdk/extent';
+
 import { t } from '../core/localizer';
 import { uiCmd } from '../ui/cmd';
 import { utilDisplayLabel } from '../util/util';
@@ -20,7 +22,7 @@ export function operationPaste(context) {
         if (!oldIDs.length) return;
 
         var projection = context.projection;
-        var extent = geoExtent();
+        var extent = new Extent();
         var oldGraph = context.copyGraph();
         var newIDs = [];
 
@@ -35,7 +37,7 @@ export function operationPaste(context) {
             var oldEntity = oldGraph.entity(id);
             var newEntity = copies[id];
 
-            extent._extend(oldEntity.extent(oldGraph));
+            extent = extent.extend(oldEntity.extent(oldGraph));
 
             // Exclude child nodes from newIDs if their parent way was also copied.
             var parents = context.graph().parentWays(newEntity);

modules/osm/changeset.js

@@ -1,5 +1,5 @@
 import { osmEntity } from './entity';
-import { geoExtent } from '../geo';
+import { Extent } from '@id-sdk/extent';
 
 
 export function osmChangeset() {
@@ -21,7 +21,7 @@ Object.assign(osmChangeset.prototype, {
 
 
     extent: function() {
-        return new geoExtent();
+        return new new Extent();
     },