From 2736740cd0d777450f8da7eea76f1defa7993944 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Sun, 8 Oct 2023 14:09:29 +0200 Subject: [PATCH] Fix: add all vector layers to CSP --- scripts/generateLayouts.ts | 3 +-- src/Models/RasterLayers.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/scripts/generateLayouts.ts b/scripts/generateLayouts.ts index c938e07dc2..e45c332bf8 100644 --- a/scripts/generateLayouts.ts +++ b/scripts/generateLayouts.ts @@ -245,8 +245,7 @@ function generateCsp( ...Constants.defaultOverpassUrls, Constants.countryCoderEndpoint, Constants.nominatimEndpoint, - AvailableRasterLayers.maptilerCarto.properties.url, - AvailableRasterLayers.maptilerDefaultLayer.properties.url, + ...AvailableRasterLayers.vectorLayers.map(l => l.properties.url), "https://api.openstreetmap.org", "https://pietervdvn.goatcounter.com", ] diff --git a/src/Models/RasterLayers.ts b/src/Models/RasterLayers.ts index 700a0cb300..c21c0ca25f 100644 --- a/src/Models/RasterLayers.ts +++ b/src/Models/RasterLayers.ts @@ -100,6 +100,12 @@ export class AvailableRasterLayers { geometry: BBox.global.asGeometry(), } + public static readonly vectorLayers = [ AvailableRasterLayers.maptilerDefaultLayer, + AvailableRasterLayers.osmCarto, + AvailableRasterLayers.maptilerCarto, + AvailableRasterLayers.maptilerBackdrop, + AvailableRasterLayers.americana] + public static layersAvailableAt( location: Store<{ lon: number; lat: number }> ): Store { @@ -122,13 +128,7 @@ export class AvailableRasterLayers { return GeoOperations.inside(lonlat, eliPolygon) }) matching.push(...AvailableRasterLayers.globalLayers) - matching.unshift( - AvailableRasterLayers.maptilerDefaultLayer, - AvailableRasterLayers.osmCarto, - AvailableRasterLayers.maptilerCarto, - AvailableRasterLayers.maptilerBackdrop, - AvailableRasterLayers.americana - ) + matching.unshift(...AvailableRasterLayers.vectorLayers) return matching }) )