CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-14 13:18:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid requesting blank tiles from EsriWorldImagery

Browse Source 
(closes #4327)

This allows the real tiles to overzoom, so the user does not see
tiles with the "map data not yet available" message
This commit is contained in:
Bryan Housel
2017-09-09 08:51:13 -04:00
parent c6189bb3b9
commit 1c9719d763
2 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/background.js
+2
View File
@@ -243,6 +243,8 @@ export function rendererBackground(context) {
backgroundSources = dataImagery.map(function(source) {
if (source.type === 'bing') {
return rendererBackgroundSource.Bing(source, dispatch);
} else if (source.id === 'EsriWorldImagery') {
return rendererBackgroundSource.Esri(source);
} else {
return rendererBackgroundSource(source);
}
modules/renderer/background_source.js
+50
View File
@@ -228,6 +228,56 @@ rendererBackgroundSource.Bing = function(data, dispatch) {
};
rendererBackgroundSource.Esri = function(data) {
// don't request blank tiles, instead overzoom real tiles - #4327
if (data.template.match(/blankTile/) === null) {
data.template = data.template + '?blankTile=false';
}
var esri = rendererBackgroundSource(data),
cache = {};
esri.getVintage = function(center, tileCoord, callback) {
var tileId = tileCoord.slice(0, 3).join('/');
// FIXME: construct service URL
// zoom = Math.min(tileCoord[2], esri.scaleExtent[1]),
// centerPoint = center[1] + ',' + center[0], // lat,lng
// url = 'https://dev.virtualearth.net/REST/v1/Imagery/Metadata/Aerial/' + centerPoint +
// '?zl=' + zoom + '&key=' + key + '&jsonp={callback}';
if (!cache[tileId]) {
cache[tileId] = {};
}
if (cache[tileId] && cache[tileId].vintage) {
return callback(null, cache[tileId].vintage);
}
// FIXME: remove dummy result:
callback(null, { start: null, end: null, range: '? - ?'});
// FIXME: call service instead:
// jsonpRequest(url, function(result) {
// var err = (!result && 'Unknown Error') || result.errorDetails;
// if (err) {
// return callback(err);
// } else {
// var vintage = {
// start: localeDateString(result.resourceSets[0].resources[0].vintageStart),
// end: localeDateString(result.resourceSets[0].resources[0].vintageEnd)
// };
// vintage.range = vintageRange(vintage);
// cache[tileId].vintage = vintage;
// return callback(null, vintage);
// }
// });
};
return esri;
};
rendererBackgroundSource.None = function() {
var source = rendererBackgroundSource({ id: 'none', template: '' });