From 271a4cbac7ccc3c628ac217affb2abf7388eb18f Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 8 Nov 2019 18:17:17 +0100 Subject: [PATCH] Update rbush to 3.0.1 (close #6359) --- modules/core/tree.js | 4 ++-- modules/services/improveOSM.js | 4 ++-- modules/services/keepRight.js | 4 ++-- modules/services/mapillary.js | 10 +++++----- modules/services/nominatim.js | 6 +++--- modules/services/openstreetcam.js | 4 ++-- modules/services/osm.js | 12 ++++++------ modules/services/streetside.js | 4 ++-- modules/svg/labels.js | 6 +++--- package.json | 2 +- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/core/tree.js b/modules/core/tree.js index b95185c66..d5c0bfc1f 100644 --- a/modules/core/tree.js +++ b/modules/core/tree.js @@ -1,10 +1,10 @@ -import rbush from 'rbush'; +import RBush from 'rbush'; import { coreDifference } from './difference'; export function coreTree(head) { - var rtree = rbush(); + var rtree = new RBush(); var bboxes = {}; var tree = {}; diff --git a/modules/services/improveOSM.js b/modules/services/improveOSM.js index 097cf0815..e4eed4171 100644 --- a/modules/services/improveOSM.js +++ b/modules/services/improveOSM.js @@ -1,4 +1,4 @@ -import rbush from 'rbush'; +import RBush from 'rbush'; import { dispatch as d3_dispatch } from 'd3-dispatch'; import { json as d3_json } from 'd3-fetch'; @@ -137,7 +137,7 @@ export default { inflightTile: {}, inflightPost: {}, closed: {}, - rtree: rbush() + rtree: new RBush() }; }, diff --git a/modules/services/keepRight.js b/modules/services/keepRight.js index afe644de8..48e21da0a 100644 --- a/modules/services/keepRight.js +++ b/modules/services/keepRight.js @@ -1,4 +1,4 @@ -import rbush from 'rbush'; +import RBush from 'rbush'; import { dispatch as d3_dispatch } from 'd3-dispatch'; import { json as d3_json } from 'd3-fetch'; @@ -281,7 +281,7 @@ export default { inflightTile: {}, inflightPost: {}, closed: {}, - rtree: rbush() + rtree: new RBush() }; }, diff --git a/modules/services/mapillary.js b/modules/services/mapillary.js index 38580f654..40ff7c457 100644 --- a/modules/services/mapillary.js +++ b/modules/services/mapillary.js @@ -2,7 +2,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { select as d3_select, selectAll as d3_selectAll } from 'd3-selection'; -import rbush from 'rbush'; +import RBush from 'rbush'; import { geoExtent, geoScaleToZoom } from '../geo'; import { svgDefs } from '../svg/defs'; @@ -292,11 +292,11 @@ export default { } _mlyCache = { - images: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush(), forImageKey: {} }, + images: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: new RBush(), forImageKey: {} }, image_detections: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, forImageKey: {} }, - map_features: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush() }, - points: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush() }, - sequences: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: rbush(), forImageKey: {}, lineString: {} } + map_features: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: new RBush() }, + points: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: new RBush() }, + sequences: { inflight: {}, loaded: {}, nextPage: {}, nextURL: {}, rtree: new RBush(), forImageKey: {}, lineString: {} } }; _mlySelectedImage = null; diff --git a/modules/services/nominatim.js b/modules/services/nominatim.js index 053a8ba70..9aee69649 100644 --- a/modules/services/nominatim.js +++ b/modules/services/nominatim.js @@ -1,6 +1,6 @@ import { json as d3_json } from 'd3-fetch'; -import rbush from 'rbush'; +import RBush from 'rbush'; import { geoExtent } from '../geo'; import { utilQsString } from '../util'; @@ -14,13 +14,13 @@ export default { init: function() { _inflight = {}; - _nominatimCache = rbush(); + _nominatimCache = new RBush(); }, reset: function() { Object.values(_inflight).forEach(function(controller) { controller.abort(); }); _inflight = {}; - _nominatimCache = rbush(); + _nominatimCache = new RBush(); }, diff --git a/modules/services/openstreetcam.js b/modules/services/openstreetcam.js index 2d816c527..17689ef15 100644 --- a/modules/services/openstreetcam.js +++ b/modules/services/openstreetcam.js @@ -3,7 +3,7 @@ import { json as d3_json } from 'd3-fetch'; import { event as d3_event, select as d3_select, selectAll as d3_selectAll } from 'd3-selection'; import { zoom as d3_zoom, zoomIdentity as d3_zoomIdentity } from 'd3-zoom'; -import rbush from 'rbush'; +import RBush from 'rbush'; import { geoExtent, geoScaleToZoom } from '../geo'; import { utilDetect } from '../util/detect'; @@ -194,7 +194,7 @@ export default { } _oscCache = { - images: { inflight: {}, loaded: {}, nextPage: {}, rtree: rbush() }, + images: { inflight: {}, loaded: {}, nextPage: {}, rtree: new RBush() }, sequences: {} }; diff --git a/modules/services/osm.js b/modules/services/osm.js index adccf92ca..484a4bce4 100644 --- a/modules/services/osm.js +++ b/modules/services/osm.js @@ -4,7 +4,7 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { xml as d3_xml } from 'd3-fetch'; import osmAuth from 'osm-auth'; -import rbush from 'rbush'; +import RBush from 'rbush'; import { JXON } from '../util/jxon'; import { geoExtent, geoRawMercator, geoVecAdd, geoZoomToScale } from '../geo'; @@ -24,8 +24,8 @@ var oauth = osmAuth({ }); var _blacklists = ['.*\.google(apis)?\..*/(vt|kh)[\?/].*([xyz]=.*){3}.*']; -var _tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: rbush() }; -var _noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: rbush() }; +var _tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: new RBush() }; +var _noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: new RBush() }; var _userCache = { toLoad: {}, user: {} }; var _changeset = {}; @@ -380,8 +380,8 @@ export default { Object.values(_noteCache.inflightPost).forEach(abortRequest); if (_changeset.inflight) abortRequest(_changeset.inflight); - _tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: rbush() }; - _noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: rbush() }; + _tileCache = { toLoad: {}, loaded: {}, inflight: {}, seen: {}, rtree: new RBush() }; + _noteCache = { toLoad: {}, loaded: {}, inflight: {}, inflightPost: {}, note: {}, closed: {}, rtree: new RBush() }; _userCache = { toLoad: {}, user: {} }; _changeset = {}; @@ -1066,7 +1066,7 @@ export default { var target = {}; Object.keys(source).forEach(function(k) { if (k === 'rtree') { - target.rtree = rbush().fromJSON(source.rtree.toJSON()); // clone rbush + target.rtree = new RBush().fromJSON(source.rtree.toJSON()); // clone rbush } else if (k === 'note') { target.note = {}; Object.keys(source.note).forEach(function(id) { diff --git a/modules/services/streetside.js b/modules/services/streetside.js index e551f6165..e88aff0a6 100644 --- a/modules/services/streetside.js +++ b/modules/services/streetside.js @@ -7,7 +7,7 @@ import { selectAll as d3_selectAll } from 'd3-selection'; -import rbush from 'rbush'; +import RBush from 'rbush'; import { t } from '../util/locale'; import { jsonpRequest } from '../util/jsonp_request'; @@ -449,7 +449,7 @@ export default { } _ssCache = { - bubbles: { inflight: {}, loaded: {}, nextPage: {}, rtree: rbush(), points: {}, leaders: [] }, + bubbles: { inflight: {}, loaded: {}, nextPage: {}, rtree: new RBush(), points: {}, leaders: [] }, sequences: {} }; }, diff --git a/modules/svg/labels.js b/modules/svg/labels.js index d363396a0..790c25427 100644 --- a/modules/svg/labels.js +++ b/modules/svg/labels.js @@ -1,7 +1,7 @@ import _throttle from 'lodash-es/throttle'; import { geoPath as d3_geoPath } from 'd3-geo'; -import rbush from 'rbush'; +import RBush from 'rbush'; import { textDirection } from '../util/locale'; import { @@ -19,8 +19,8 @@ export function svgLabels(projection, context) { var path = d3_geoPath(projection); var detected = utilDetect(); var baselineHack = (detected.ie || detected.browser.toLowerCase() === 'edge'); - var _rdrawn = rbush(); - var _rskipped = rbush(); + var _rdrawn = new RBush(); + var _rskipped = new RBush(); var _textWidthCache = {}; var _entitybboxes = {}; diff --git a/package.json b/package.json index 115a02432..35f3dc6f7 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "osm-auth": "1.0.2", "pannellum": "2.4.1", "q": "1.5.1", - "rbush": "2.0.2", + "rbush": "3.0.1", "string.fromcodepoint": "0.2.1", "which-polygon": "2.2.0", "wmf-sitematrix": "0.1.4"