CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-19 17:43:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't re-request inflight nominatim requests

Browse Source
This commit is contained in:
Bryan Housel
2017-04-20 14:45:22 -04:00
parent 43b8ab1754
commit 108150faf9
1 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
modules/services/nominatim.js
View File

@@ -6,13 +6,22 @@ import { utilQsString } from '../util/index';
var apibase = 'https://nominatim.openstreetmap.org/',
inflight = {},
nominatimCache;
export default {
init: function() { nominatimCache = rbush(); },
reset: function() { nominatimCache = rbush(); },
init: function() {
inflight = {};
nominatimCache = rbush();
},
reset: function() {
_.forEach(inflight, function(req) { req.abort(); });
inflight = {};
nominatimCache = rbush();
},
countryCode: function (location, callback) {
@@ -24,32 +33,37 @@ export default {
return callback(null, countryCodes[0].data);
}
d3.json(apibase + 'reverse?' +
utilQsString({
format: 'json',
addressdetails: 1,
lat: location[1],
lon: location[0]
}), function(err, result) {
if (err)
return callback(err);
else if (result && result.error)
return callback(result.error);
var params = { format: 'json', addressdetails: 1, lat: location[1], lon: location[0] };
var url = apibase + 'reverse?' + utilQsString(params);
if (inflight[url]) return;
var extent = geoExtent(location).padByMeters(1000);
nominatimCache.insert(_.assign(extent.bbox(),
{ data: result.address.country_code }
));
inflight[url] = d3.json(url, function(err, result) {
delete inflight[url];
callback(null, result.address.country_code);
}
);
if (err)
return callback(err);
else if (result && result.error)
return callback(result.error);
var extent = geoExtent(location).padByMeters(1000);
nominatimCache.insert(_.assign(extent.bbox(),
{ data: result.address.country_code }
));
callback(null, result.address.country_code);
});
},
search: function (val, callback) {
var searchVal = encodeURIComponent(val);
d3.json(apibase + 'search/' + searchVal + '?limit=10&format=json', callback);
var url = apibase + 'search/' + searchVal + '?limit=10&format=json';
if (inflight[url]) return;
inflight[url] = d3.json(url, function(err, result) {
delete inflight[url];
callback(err, result);
});
}
};