Merge remote-tracking branch 'origin/development' into upg100/mapinfo-toplayer

# Conflicts:
#	public/dx-maps/doxa-maps-spa/doxa-maps-spa.js
#	public/dx-maps/doxa-maps-spa/doxa-maps-spa/app/index.html
#	public/dx-maps/doxa-maps-spa/doxa-maps-spa/index.html
#	public/dx-maps/doxa-maps-spa/manifest.json
#	public/dx-maps/manifest.json
This commit is contained in:
Doxa Maps 2026-09-29 20:35:44 +00:00
commit c934f8020e
6 changed files with 39 additions and 22 deletions

View file

@ -45,7 +45,24 @@ export const TAB_INFO = {
storageKey: 'dashboard-plus-grid',
leadKey: 'mapInfo.tab.dashboard-plus-grid.lead',
takeawayKey: 'mapInfo.tab.dashboard-plus-grid.takeaway',
examples: [],
// Big Picture's export is a spreadsheet, so its example is a real excerpt of one (sr): the six
// largest groups by population among those joinable locally, of the full list's 2,107. The column
// keys are the ones the live table resolves, so the popup header and the real one cannot drift;
// cell text stays untranslated because the live table's cells are not translated either.
examples: [{
kind: 'table',
columns: [{ key: 'dashboard.people_group' }, { key: 'dashboard.country' },
{ key: 'dashboard.region' }, { key: 'dashboard.population' }],
rows: [
['Hararghe Oromo', 'Ethiopia', 'Africa', 6355000],
['Gaaliin', 'Sudan', 'Middle East', 4520000],
['White Moor', 'Morocco', 'Middle East', 3120000],
['Baloch, Western', 'Iran', 'Middle East', 3035000],
['Baloch, Eastern', 'Pakistan', 'Asia', 2980000],
['Bhuiyar', 'India', 'Asia', 2925000],
],
total: 2107,
}],
},
'research-map-plus-grid': {
storageKey: 'research-map-plus-grid',

File diff suppressed because one or more lines are too long

View file

@ -61,7 +61,7 @@
<script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
<!-- Bundle IIFE — registers the <doxa-maps-spa> custom element. -->
<script src="../../doxa-maps-spa.js" integrity="sha384-Fl9uJ/TJiDlhkPbX/Zlw0Kx0erGh9XvXRqvNfAQN9fEv0+7kvXIjRw34R40XO8Hb" crossorigin="anonymous"></script>
<script src="../../doxa-maps-spa.js" integrity="sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5" crossorigin="anonymous"></script>
<script>
// Mapbox token resolution — the A3 ladder, in precedence order:

View file

@ -61,7 +61,7 @@
<script>window.MAP_APP_API_URL = "https://pray.doxa.life";</script>
<!-- Bundle IIFE — registers the <doxa-maps-spa> custom element. -->
<script src="../doxa-maps-spa.js" integrity="sha384-Fl9uJ/TJiDlhkPbX/Zlw0Kx0erGh9XvXRqvNfAQN9fEv0+7kvXIjRw34R40XO8Hb" crossorigin="anonymous"></script>
<script src="../doxa-maps-spa.js" integrity="sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5" crossorigin="anonymous"></script>
<script>
// Mapbox token resolution — the A3 ladder, in precedence order:

View file

@ -361,7 +361,7 @@
"bundle": "doxa-maps-spa",
"scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
"output": "dx-maps/doxa-maps-spa/doxa-maps-spa.js",
"integrity": "sha384-Fl9uJ/TJiDlhkPbX/Zlw0Kx0erGh9XvXRqvNfAQN9fEv0+7kvXIjRw34R40XO8Hb",
"integrity": "sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5",
"elements": [
"doxa-maps-spa"
],
@ -389,7 +389,7 @@
"scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
"embed": {
"iframe": "<iframe src=\"./doxa-maps-spa/doxa-maps-spa/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-Fl9uJ/TJiDlhkPbX/Zlw0Kx0erGh9XvXRqvNfAQN9fEv0+7kvXIjRw34R40XO8Hb\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
},
"instances": [
{

View file

@ -361,7 +361,7 @@
"bundle": "doxa-maps-spa",
"scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
"output": "dx-maps/doxa-maps-spa/doxa-maps-spa.js",
"integrity": "sha384-Fl9uJ/TJiDlhkPbX/Zlw0Kx0erGh9XvXRqvNfAQN9fEv0+7kvXIjRw34R40XO8Hb",
"integrity": "sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5",
"elements": [
"doxa-maps-spa"
],
@ -389,7 +389,7 @@
"scriptUrl": "./doxa-maps-spa/doxa-maps-spa.js",
"embed": {
"iframe": "<iframe src=\"./doxa-maps-spa/doxa-maps-spa/index.html?utm_source=YOUR_SOURCE\" width=\"100%\" height=\"600\" style=\"border:none;border-radius:12px;\" allowfullscreen></iframe>",
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-Fl9uJ/TJiDlhkPbX/Zlw0Kx0erGh9XvXRqvNfAQN9fEv0+7kvXIjRw34R40XO8Hb\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
"script": "<script>window.MAP_APP_API_URL=\"https://pray.doxa.life\";</script>\n<script src=\"./doxa-maps-spa/doxa-maps-spa.js\" integrity=\"sha384-0+sHtNWeugOjBSp/XwWGuNRgBECJkdkdiCxmGcYuYWSWVhVqQtXwWDVmvuiEXBQ5\" crossorigin=\"anonymous\"></script>\n<!-- provider: \"maplibre\" is the default; change it to \"mapbox\" and fill tk to use Mapbox. -->\n<doxa-maps-spa profile-config='{\"profile\":\"doxa-maps-spa\",\"provider\":\"maplibre\",\"tk\":\"YOUR_MAPBOX_TOKEN\",\"utmSource\":\"YOUR_SOURCE\",\"assetsBase\":\"YOUR_TREE_URL/assets\"}'></doxa-maps-spa>"
},
"instances": [
{