CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 16:19:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch to JSON endpoints of OSM API for fetching entities (re: #3765)

Browse Source
This commit is contained in:
Quincy Morgan
2020-03-02 15:54:46 -08:00
parent f4c39cc434
commit 52222df75f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/services/osm.js
+6 -6
View File
@@ -597,7 +597,7 @@ export default {
if (err) {
return callback(err);
} else {
return parseXML(payload, callback, options);
return parseJSON(payload, callback, options);
}
}
}
@@ -608,7 +608,7 @@ export default {
} else {
var url = urlroot + path;
var controller = new AbortController();
d3_xml(url, { signal: controller.signal })
d3_json(url, { signal: controller.signal })
.then(function(data) {
done(null, data);
})
@@ -638,7 +638,7 @@ export default {
var options = { skipSeen: false };
this.loadFromAPI(
'/api/0.6/' + type + '/' + osmID + (type !== 'node' ? '/full' : ''),
'/api/0.6/' + type + '/' + osmID + (type !== 'node' ? '/full' : '') + '.json',
function(err, entities) {
if (callback) callback(err, { data: entities });
},
@@ -655,7 +655,7 @@ export default {
var options = { skipSeen: false };
this.loadFromAPI(
'/api/0.6/' + type + '/' + osmID + '/' + version,
'/api/0.6/' + type + '/' + osmID + '/' + version + '.json',
function(err, entities) {
if (callback) callback(err, { data: entities });
},
@@ -679,7 +679,7 @@ export default {
utilArrayChunk(osmIDs, 150).forEach(function(arr) {
that.loadFromAPI(
'/api/0.6/' + type + '?' + type + '=' + arr.join(),
'/api/0.6/' + type + '.json?' + type + '=' + arr.join(),
function(err, entities) {
if (callback) callback(err, { data: entities });
},
@@ -986,7 +986,7 @@ export default {
dispatch.call('loading'); // start the spinner
}
var path = '/api/0.6/map?bbox=';
var path = '/api/0.6/map.json?bbox=';
var options = { skipSeen: true };
_tileCache.inflight[tile.id] = this.loadFromAPI(