CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-25 09:34:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hide background sources from the list if they're blocked (close #7905)

Browse Source
This commit is contained in:
Quincy Morgan
2020-09-03 12:30:59 -04:00
parent 15078bd39c
commit a72a2bb860
5 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/renderer/background.js
+14 -5
View File
@@ -281,9 +281,18 @@ export function rendererBackground(context) {
const currSource = baseLayer.source();
const osm = context.connection();
const blocklists = osm && osm.imageryBlocklists();
const isBlocked = blocklists && function(source) {
return blocklists.some(function(blocklist) {
return new RegExp(blocklist).test(source.template());
});
};
return _imageryIndex.backgrounds.filter(source => {
if (!source.polygon) return true; // always include imagery with worldwide coverage
if (includeCurrent && currSource === source) return true; // optionally include the current imagery
if (isBlocked && isBlocked(source)) return false; // even bundled sources may be blocked - #7905
if (!source.polygon) return true; // always include imagery with worldwide coverage
if (zoom && zoom < 6) return false; // optionally exclude local imagery at low zooms
return visible[source.id]; // include imagery visible in given extent
});
@@ -300,19 +309,19 @@ export function rendererBackground(context) {
background.baseLayerSource = function(d) {
if (!arguments.length) return baseLayer.source();
// test source against OSM imagery blacklists..
// test source against OSM imagery blocklists..
const osm = context.connection();
if (!osm) return background;
const blacklists = osm.imageryBlacklists();
const blocklists = osm.imageryBlocklists();
const template = d.template();
let fail = false;
let tested = 0;
let regex;
for (let i = 0; i < blacklists.length; i++) {
for (let i = 0; i < blocklists.length; i++) {
try {
regex = new RegExp(blacklists[i]);
regex = new RegExp(blocklists[i]);
fail = regex.test(template);
tested++;
if (fail) break;