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

Restore 'custom' and 'none' options to background imagery list

Browse Source 
(closes #5226)
This commit is contained in:
Bryan Housel
2018-08-18 10:57:26 -04:00
parent 4cfd5b0078
commit 9802b2f831
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/renderer/background.js
View File

@@ -211,7 +211,7 @@ export function rendererBackground(context) {
matchImagery.forEach(function(d) { matchIDs[d.id] = true; });
return _backgroundSources.filter(function(source) {
return matchIDs[source.id];
return matchIDs[source.id] || !source.polygon; // no polygon = worldwide
});
};
@@ -378,20 +378,18 @@ export function rendererBackground(context) {
data.imagery.features = {};
// build efficient index and querying for data.imagery
var world = [[[-180, -90], [-180, 90], [180, 90], [180, -90], [-180, -90]]];
var features = data.imagery.map(function(source) {
if (!source.polygon) return null;
var feature = {
type: 'Feature',
id: source.id,
properties: _omit(source, ['polygon']),
geometry: {
type: 'MultiPolygon',
coordinates: [ source.polygon || world ]
}
properties: { id: source.id },
geometry: { type: 'MultiPolygon', coordinates: [ source.polygon ] }
};
data.imagery.features[source.id] = feature;
return feature;
});
}).filter(Boolean);
data.imagery.query = whichPolygon({
type: 'FeatureCollection',
features: features