diff --git a/src/components/ui/map.tsx b/src/components/ui/map.tsx index 24ea8a0..f5b48aa 100644 --- a/src/components/ui/map.tsx +++ b/src/components/ui/map.tsx @@ -26,15 +26,15 @@ const defaultStyles = { light: "/map-cdn/basemaps/gl/positron-gl-style/style.json", }; +const cartoTilesRe = /^https:\/\/tiles(?:-[a-d])?\.basemaps\.cartocdn\.com\//; + function proxyCartoUrl(url: string): string { if (url.startsWith("https://basemaps.cartocdn.com/")) { return url.replace("https://basemaps.cartocdn.com/", "/map-cdn/basemaps/"); } - if (url.startsWith("https://tiles.basemaps.cartocdn.com/")) { - return url.replace( - "https://tiles.basemaps.cartocdn.com/", - "/map-cdn/tiles/", - ); + const m = cartoTilesRe.exec(url); + if (m) { + return url.replace(m[0], "/map-cdn/tiles/"); } return url; }