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

perf: Compare regexes as strings otherwise they look different each frame

Browse Source 
Regexes are objects so comparing them with === will always return false
This was causing the sources to be rechecked every frame.
This commit is contained in:
Bryan Housel
2021-12-22 11:17:12 -05:00
parent 69aa69153d
commit d1410bce00
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/renderer/background.js
View File

@@ -20,6 +20,7 @@ export function rendererBackground(context) {
const dispatch = d3_dispatch('change');
const detected = utilDetect();
const baseLayer = rendererTileLayer(context).projection(context.projection);
let _checkedBlocklists = [];
let _isValid = true;
let _overlayLayers = [];
let _brightness = 1;
@@ -271,7 +272,6 @@ export function rendererBackground(context) {
context.history().photoOverlaysUsed(photoOverlaysUsed);
};
let _checkedBlocklists;
background.sources = (extent, zoom, includeCurrent) => {
if (!_imageryIndex) return []; // called before init()?
@@ -282,16 +282,17 @@ export function rendererBackground(context) {
const currSource = baseLayer.source();
// Recheck blocked sources only if we detect new blocklists pulled from the OSM API.
const osm = context.connection();
const blocklists = osm && osm.imageryBlocklists();
const blocklists = (osm && osm.imageryBlocklists()) || [];
const blocklistChanged = (blocklists.length !== _checkedBlocklists.length) ||
blocklists.some((regex, index) => String(regex) !== _checkedBlocklists[index]);
if (blocklists && blocklists !== _checkedBlocklists) {
if (blocklistChanged) {
_imageryIndex.backgrounds.forEach(source => {
source.isBlocked = blocklists.some(function(blocklist) {
return blocklist.test(source.template());
});
source.isBlocked = blocklists.some(regex => regex.test(source.template()));
});
_checkedBlocklists = blocklists;
_checkedBlocklists = blocklists.map(regex => String(regex));
}
return _imageryIndex.backgrounds.filter(source => {