Fix insets ignoring custom nuts2jsonBaseURL; add worldTopojsonURL override

buildInset()'s main-map attribute copy list never included
nuts2jsonBaseURL_, so any override set on the top-level map was
silently dropped for every inset (default/'image'/'eu'/'euEfta'
presets and custom insets alike) - they kept hitting the real
Nuts2json GitHub/ec.europa.eu host regardless. Verified with a
headless-browser network trace before and after.

Separately, geo('WORLD') maps fetch a bundled eurostat-map topojson
asset (not Nuts2json data), so that URL was hardcoded and had no
override at all. Added a dedicated worldTopojsonURL_ config/setter
(propagated to insets the same way nuts2jsonBaseURL_ already was)
instead of conflating it with nuts2jsonBaseURL's semantics.

Author: joewdavies

build/eurostatmap.js

@@ -37,6 +37,8 @@ export interface InsetConfig {
     zoomButtons?: boolean
     /** Custom base URL for this inset's nuts2json boundary data. */
     nuts2jsonBaseURL?: string
+    /** Custom URL for this inset's world boundaries topojson (only relevant if the inset's `geo` is 'WORLD'). */
+    worldTopojsonURL?: string
     /** Custom D3 projection function for this inset. */
     projectionFunction?: Function | boolean
 

build/eurostatmap.min.js

@@ -46,6 +46,16 @@ export interface MapConfig {
      * ec.europa.eu cache when running on an ec.europa.eu host)
      */
     nuts2jsonBaseURL?: string
+
+    /**
+     * URL of the world boundaries topojson file used by `geo: 'WORLD'` maps. Not part of
+     * Nuts2json (a separate, bundled eurostat-map asset), so it is independent of
+     * `nuts2jsonBaseURL`. Applies to the top-level map and all of its insets.
+     * @default 'https://raw.githubusercontent.com/eurostat/eurostat-map/master/src/assets/topojson/WORLD_4326.json'
+     * (or the ec.europa.eu asset host when running on an ec.europa.eu host)
+     */
+    worldTopojsonURL?: string
+
     /** Geographic center as [longitude, latitude]. */
     geoCenter?: [number, number]
 

build/eurostatmap.min.js.map

@@ -87,6 +87,16 @@ export interface MapInstance {
     nuts2jsonBaseURL(): string
     nuts2jsonBaseURL(url: string): this
 
+    /**
+     * URL of the world boundaries topojson file used by `geo('WORLD')` maps. Not part of
+     * Nuts2json (a separate, bundled eurostat-map asset), so it is independent of
+     * `nuts2jsonBaseURL`. Setting this on the top-level map also propagates it to all insets.
+     * @default 'https://raw.githubusercontent.com/eurostat/eurostat-map/master/src/assets/topojson/WORLD_4326.json'
+     * (or the ec.europa.eu asset host when running on an ec.europa.eu host)
+     */
+    worldTopojsonURL(): string
+    worldTopojsonURL(url: string): this
+
     /**
      * Initial map viewport. x/y in projected coordinates, z is pixel size
      * (map units per screen pixel — smaller = more zoomed in).

build/types/core/InsetConfig.d.ts

@@ -198,11 +198,7 @@ export const Geometries = function (map, withCenterPoints) {
                 })
             }
         } else if (map.geo_ === 'WORLD') {
-            const worldMapTopojsonURL = window.location.hostname.includes('ec.europa.eu')
-                ? 'https://ec.europa.eu/assets/estat/E/E4/gisco/IMAGE/WORLD_4326.json'
-                : 'https://raw.githubusercontent.com/eurostat/eurostat-map/master/src/assets/topojson/WORLD_4326.json'
-
-            promises.push(fetchWithCache(worldMapTopojsonURL))
+            promises.push(fetchWithCache(map.worldTopojsonURL_))
         } else {
             const mainUrl = buildUrl(map.nuts2jsonBaseURL_, map.nutsYear_, map.geo_, map.proj_, map.scale_, map.nutsLevel_)
             promises.push(fetchWithCache(mainUrl)) // index 0: polygon topology for current level

build/types/core/MapConfig.d.ts

@@ -196,6 +196,8 @@ const buildInset = function (config, out, withCenterPoints, mapType) {
         'projectionFunction_',
         'filterGeometriesFunction_',
         'processCentroids_',
+        'nuts2jsonBaseURL_',
+        'worldTopojsonURL_',
     ].forEach(function (att) {
         mt[att] = out[att]
     })

build/types/core/MapInstance.d.ts

@@ -213,6 +213,11 @@ export const createMapInstance = function (config, withCenterPoints, mapType) {
     out.nuts2jsonBaseURL_ = window.location.hostname.includes('ec.europa.eu')
         ? 'https://ec.europa.eu/eurostat/cache/GISCO/pub/nuts2json/v2/'
         : 'https://raw.githubusercontent.com/eurostat/Nuts2json/master/pub/v2'
+    //URL of the world boundaries topojson used by geo('WORLD') maps. Not part of Nuts2json (a
+    //separate, bundled eurostat-map asset), so it isn't derived from nuts2jsonBaseURL_.
+    out.worldTopojsonURL_ = window.location.hostname.includes('ec.europa.eu')
+        ? 'https://ec.europa.eu/assets/estat/E/E4/gisco/IMAGE/WORLD_4326.json'
+        : 'https://raw.githubusercontent.com/eurostat/eurostat-map/master/src/assets/topojson/WORLD_4326.json'
 
     //style for no data regions
     out.noDataFillStyle_ = '#ADADAD'
@@ -261,7 +266,7 @@ export const createMapInstance = function (config, withCenterPoints, mapType) {
     }
 
     //special ones which affect also the insets
-    ;['tooltip_', 'nuts2jsonBaseURL_', 'processCentroids_', 'coastalMarginSettings_'].forEach(function (att) {
+    ;['tooltip_', 'nuts2jsonBaseURL_', 'worldTopojsonURL_', 'processCentroids_', 'coastalMarginSettings_'].forEach(function (att) {
         out[att.substring(0, att.length - 1)] = function (v) {
             if (!arguments.length) return out[att]
 

src/core/geo/geometries.js

@@ -37,6 +37,8 @@ export interface InsetConfig {
     zoomButtons?: boolean
     /** Custom base URL for this inset's nuts2json boundary data. */
     nuts2jsonBaseURL?: string
+    /** Custom URL for this inset's world boundaries topojson (only relevant if the inset's `geo` is 'WORLD'). */
+    worldTopojsonURL?: string
     /** Custom D3 projection function for this inset. */
     projectionFunction?: Function | boolean