Merge branch 'master' into develop

This commit is contained in:
Pieter Vander Vennet 2021-10-13 00:12:43 +02:00
commit b2d1cb4034
4 changed files with 34 additions and 16 deletions

View file

@ -21,7 +21,9 @@ export default class DynamicGeoJsonTileSource extends DynamicTileSource {
throw "Invalid layer: geojsonSource expected"
}
const whitelistUrl = source.geojsonSource.replace("{z}_{x}_{y}.geojson", "overview.json")
const whitelistUrl = source.geojsonSource
.replace("{z}", ""+source.geojsonZoomLevel)
.replace("{x}_{y}.geojson", "overview.json")
.replace("{layer}",layer.layerDef.id)
let whitelist = undefined
@ -46,7 +48,8 @@ export default class DynamicGeoJsonTileSource extends DynamicTileSource {
if(whitelist !== undefined){
const isWhiteListed = whitelist.get(zxy[1])?.has(zxy[2])
if(!isWhiteListed){
return undefined;
console.log("Not whitelisted:",zxy, isWhiteListed, whitelist)
// return undefined;
}
}