diff --git a/plugin-designs/regions-dashboard/src/RegionCountryMap.vue b/plugin-designs/regions-dashboard/src/RegionCountryMap.vue index c39b78508..82442bc4a 100644 --- a/plugin-designs/regions-dashboard/src/RegionCountryMap.vue +++ b/plugin-designs/regions-dashboard/src/RegionCountryMap.vue @@ -191,10 +191,20 @@ const SRC_PINS = 'rcm-people-groups' const SRC_COUNTRIES = 'rcm-country-boundaries' function countryFilter() { - // CountryMap.vue:187-191. The country-boundaries tileset carries one feature PER WORLDVIEW, so - // without this the highlight is drawn two or three times over. - return ['all', - ['in', ['get', 'iso_3166_1_alpha_3'], ['literal', props.countryCodes]], + // CountryMap.vue:187-191. The ISO half needs no branch: THE FIELD BRIDGE above already copies + // iso3 -> iso_3166_1_alpha_3 onto every geojson feature before setData, so one name is read + // everywhere. I nearly added a second name for that one fact, having read the RAW file instead of + // the data as loaded — the bridge was three lines above the filter. + // + // ★ THE WORLDVIEW HALF IS THE BUG, and it has no bridge. The TILESET repeats a country once per + // worldview, so without this clause the highlight draws two or three times over. The geojson has + // no such duplication and carries NO worldview property at all, so both sides of the `any` are + // false on every feature and the `all` excluded the entire layer. rega measured it by eye at + // b0cd3140: source 200, basemap and 2,107 pins drawn, 0 features in the fill layer, while Mapbox + // drew 156. Mapbox-only, not a thing to translate. + const byCode = ['in', ['get', 'iso_3166_1_alpha_3'], ['literal', props.countryCodes]] + if (isMaplibreProvider) return byCode + return ['all', byCode, ['any', ['==', ['get', 'worldview'], 'all'], ['in', 'US', ['get', 'worldview']]]] } diff --git a/public/dx-maps/doxa-maps-spa/manifest.json b/public/dx-maps/doxa-maps-spa/manifest.json index f5a1449a3..d70e30b68 100644 --- a/public/dx-maps/doxa-maps-spa/manifest.json +++ b/public/dx-maps/doxa-maps-spa/manifest.json @@ -888,7 +888,7 @@ "bundle": "regions-dashboard", "scriptUrl": "./regions-dashboard/regions-dashboard.js", "output": "dx-maps/regions-dashboard/regions-dashboard.js", - "integrity": "sha384-lpzd66s+yTDop/akosXlKIXuiOCv3r2RMUOWBcj217m3HvxSQ2UtPHIHqx4xwVAK", + "integrity": "sha384-7KtEO1Ri7x+mY3JmOY+ZFWt1nH424T6sjIO2slg93jtxmoGmkzFY+0MjgQB46xyY", "elements": [ "regions-dashboard" ], @@ -908,7 +908,7 @@ "scriptUrl": "./regions-dashboard/regions-dashboard.js", "embed": { "iframe": "", - "script": "\n\n\n\n" + "script": "\n\n\n\n" } }, { @@ -922,7 +922,7 @@ "scriptUrl": "./regions-dashboard/regions-dashboard.js", "embed": { "iframe": "", - "script": "\n\n" + "script": "\n\n" } }, { @@ -936,7 +936,7 @@ "scriptUrl": "./regions-dashboard/regions-dashboard.js", "embed": { "iframe": "", - "script": "\n\n\n\n" + "script": "\n\n\n\n" } } ] diff --git a/public/dx-maps/manifest.json b/public/dx-maps/manifest.json index f5a1449a3..d70e30b68 100644 --- a/public/dx-maps/manifest.json +++ b/public/dx-maps/manifest.json @@ -888,7 +888,7 @@ "bundle": "regions-dashboard", "scriptUrl": "./regions-dashboard/regions-dashboard.js", "output": "dx-maps/regions-dashboard/regions-dashboard.js", - "integrity": "sha384-lpzd66s+yTDop/akosXlKIXuiOCv3r2RMUOWBcj217m3HvxSQ2UtPHIHqx4xwVAK", + "integrity": "sha384-7KtEO1Ri7x+mY3JmOY+ZFWt1nH424T6sjIO2slg93jtxmoGmkzFY+0MjgQB46xyY", "elements": [ "regions-dashboard" ], @@ -908,7 +908,7 @@ "scriptUrl": "./regions-dashboard/regions-dashboard.js", "embed": { "iframe": "", - "script": "\n\n\n\n" + "script": "\n\n\n\n" } }, { @@ -922,7 +922,7 @@ "scriptUrl": "./regions-dashboard/regions-dashboard.js", "embed": { "iframe": "", - "script": "\n\n" + "script": "\n\n" } }, { @@ -936,7 +936,7 @@ "scriptUrl": "./regions-dashboard/regions-dashboard.js", "embed": { "iframe": "", - "script": "\n\n\n\n" + "script": "\n\n\n\n" } } ] diff --git a/public/dx-maps/regions-dashboard/region-dashboards/index.html b/public/dx-maps/regions-dashboard/region-dashboards/index.html index f476ea78d..2399ba080 100644 --- a/public/dx-maps/regions-dashboard/region-dashboards/index.html +++ b/public/dx-maps/regions-dashboard/region-dashboards/index.html @@ -30,7 +30,7 @@ - + - + - +