Updated SVGs and improved scripting

# Conflicts:
#	yarn.lock

app/build.gradle

@@ -113,3 +113,9 @@ dependencies {
     implementation platform('androidx.compose:compose-bom:2026.05.01')
     debugImplementation 'androidx.compose.ui:ui-tooling:1.11.2'
 }
+
+tasks.configureEach { task ->
+    if (task.name.startsWith("merge") && task.name.endsWith("Assets")) {
+        task.outputs.upToDateWhen { false }
+    }
+}

app/src/main/res/values-night/themes.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Beans" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Status bar color in dark mode -->
+        <item name="android:statusBarColor">@color/blue</item>
+        <!-- Window background in dark mode -->
+        <item name="android:windowBackground">@color/darkgray</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+
+        <item name="colorPrimary">@color/blue</item>
+        <item name="colorPrimaryDark">@color/blue</item>
+        <item name="colorAccent">@color/blue</item>
+    </style>
+</resources>

app/src/main/res/values-v21/themes.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Beans" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/blue</item>
+        <item name="android:windowBackground">@color/blue</item>
+    </style>
+</resources>

app/src/main/res/values/themes.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.Beans" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Status bar color -->
+        <item name="android:statusBarColor">@color/blue</item>
+        <!-- Window background - shows through statusBarsPadding() area -->
+        <item name="android:windowBackground">@color/blue</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+
+        <!-- Optional: Primary colors for the theme -->
+        <item name="colorPrimary">@color/blue</item>
+        <item name="colorPrimaryDark">@color/blue</item>
+        <item name="colorAccent">@color/blue</item>
+    </style>
+</resources>

genenum.js

@@ -1,8 +1,10 @@
 #!/bin/node
 
-import {readFileSync, existsSync} from 'fs'
+import {readFileSync,writeFileSync,existsSync} from 'fs'
 import area from '@turf/area'
 import * as turf from '@turf/turf'
+import * as path from 'path';
+import { JSDOM } from 'jsdom';
 
 
 const countries =
@@ -24,7 +26,7 @@ const countries =
 
 
 const groups = {
-  "EEE":["ALB","AND","AUT","BLR","BEL","BIH","BGR","HRV","CYP","CZE","DNK","EST","FIN","FRA","DEU","GRC","HUN","ISL","IRL","ITA","KAZ","XKO","LVA","LIE","LTU","LUX","MLT","MDA","MCO","MNE","NLD","MKD","NOR","POL","PRT","ROU","RUS","SMR","SRB","SVK","SVN","ESP","SWE","CHE","UKR","GBR","VAT","XAD"],
+  "EEE":["ALA","ALB","AND","AUT","BLR","BEL","BIH","BGR","HRV","CYP","CZE","DNK","EST","FIN","FRA","DEU","GIB","GGY","GRC","HUN","ISL","IRL","IMN","JEY","ITA","KAZ","XKO","LVA","LIE","LTU","LUX","MLT","MDA","MCO","MNE","NLD","MKD","NOR","SJM","POL","PRT","ROU","RUS","SMR","SRB","SVK","SVN","ESP","SWE","CHE","UKR","GBR","VAT","XAD"],
   "ABB":["AFG","ARM","AZE","BHR","BGD","BTN","BRN","KHM","CHN","GEO","HKG","IND","IDN","IRN","IRQ","ISR","JPN","JOR","KWT","KGZ","LAO","LBN","MAC","MYS","MDV","MNG","MMR","NPL","PRK","OMN","PAK","PSE","PHL","QAT","SAU","SGP","KOR","LKA","SYR","TWN","TJK","THA","TLS","TUR","TKM","ARE","UZB","VNM","YEM","ZNC"],
   "FFF":["DZA","AGO","BDI","BEN","BWA","BFA","BDI","CPV","CMR","CAF","TCD","COM","COG","COD","CIV","DJI","EGY","GNQ","ERI","SWZ","ETH","GAB","GMB","GHA","GIN","GNB","KEN","LSO","LBR","LBY","MDG","MWI","MLI","MRT","MUS","MYT","MAR","MOZ","NAM","NER","NGA","COD","REU","RWA","STP","SEN","SYC","SLE","SOM","ZAF","SSD","SHN","SDN","TZA","TGO","TUN","UGA","COD","ZMB","ZWE","ESH"],
   "NNN":["ABW","AIA","ATG","BHS","BRB","BLZ","BMU","VGB","CAN","CYM","CRI","CUB","CUW","DMA","DOM","SLV","GRL","GRD","GLP","GTM","HTI","HND","JAM","MTQ","MEX","MSR","ANT","CUW","NIC","PAN","PRI","KNA","LCA","MAF","SPM","VCT","TTO","TCA","USA","XCL"],
@@ -32,7 +34,6 @@ const groups = {
   "UUU":["ASM","AUS","COK","FJI","PYF","GUM","KIR","MHL","FSM","NRU","NCL","NZL","NIU","NFK","MNP","PLW","PNG","PCN","SLB","TKL","TON","TUV","VUT","WLF"],
   "XXX":[
       "ATA", // Antarctica: not in any other region
-      "ALA",// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
       "BES",// Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
       "BVT",// Bouvet Island: an uninhabited territory of Norway in the South Atlantic
       "IOT",// British Indian Ocean Territory: a British overseas territory in the Indian Ocean
@@ -40,16 +41,11 @@ const groups = {
       "CCK",// Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
       "FRO",// Faroe Islands: an autonomous region of Denmark
       "ATF",// French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
-      "GIB",// Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
-      "GGY",// Guernsey: a British Crown dependency in the English Channel
       "HMD",// Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
-      "IMN",// Isle of Man: a British Crown dependency located in the Irish Sea
-      "JEY",// Jersey: a British Crown dependency located in the English Channel
       "BLM",// Saint Barthélemy: an overseas collectivity of France in the Caribbean
       "WSM",// Samoa: an independent island nation in the South Pacific
       "SXM",// Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
       "SGS",// South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
-      "SJM",// Svalbard and Jan Mayen: an archipelago administered by Norway
       "UMI",// United States Minor Outlying Islands: a collection of nine insular areas of the United States
       "VIR",// United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
   ]
@@ -166,4 +162,52 @@ async function run(){
   }
 }
 
+
+function fixSvg(svgPath) {
+  const countryToRegion = {};
+  for (const [region, countries] of Object.entries(groups)) {
+    countries.forEach(country => countryToRegion[country] = region);
+  }
+  const absoluteInputPath = path.resolve(svgPath);
+  if (!existsSync(absoluteInputPath)) {
+    throw new Error(`Input file not found at: ${absoluteInputPath}`);
+  }
+  const svgContent = readFileSync(absoluteInputPath, 'utf8');
+  const dom = new JSDOM(svgContent, { contentType: 'image/svg+xml' });
+  const document = dom.window.document;
+  const svgRoot = document.querySelector('svg');
+    if (!svgRoot) {
+      throw new Error("Invalid or empty SVG structure encountered.");
+    }
+    if (svgRoot.getAttribute('data-processed') === 'true') {
+      console.log(`Skipping: File at "${svgPath}" has already been processed.`);
+      return;
+    }
+
+  const elementGroups = Array.from(svgRoot.querySelectorAll('g'));
+ elementGroups.forEach(group => {
+    const currentId = group.getAttribute('id') || '';
+    const baseIsoCode = currentId.replace(/\d+$/, '');
+    const regionKey = countryToRegion[baseIsoCode] || 'XXXX';
+    let regionGroup = svgRoot.querySelector(`g[id="${regionKey}"]`);
+    if (!regionGroup) {
+      regionGroup = document.createElementNS('http://w3.org', 'g');
+      regionGroup.setAttribute('id', regionKey);
+      svgRoot.appendChild(regionGroup);
+    }
+    regionGroup.appendChild(group);
+  });
+  svgRoot.setAttribute('data-processed', 'true');
+  const absoluteOutputPath = path.resolve(svgPath);
+  let cleanXmlString = svgRoot.outerHTML;
+  cleanXmlString = cleanXmlString.replace(/[\r\n]+/g, '');
+  cleanXmlString = cleanXmlString.replace(/xmlns="http:\/\/w3\.org"\s?/g, '');
+  cleanXmlString = cleanXmlString.replace(/xmlns="http:\/\/www\.w3\.org\/2000\/svg"\s?/g, '');
+  cleanXmlString = cleanXmlString.replace('<svg', '<svg xmlns="http://www.w3.org/2000/svg"');
+  writeFileSync(absoluteOutputPath, cleanXmlString, 'utf8');
+}
+
 run()
+fixSvg("./app/src/main/assets/loxim01.svg")
+fixSvg("./app/src/main/assets/webmercator01.svg")
+fixSvg("./app/src/main/assets/aeqd01.svg")

gensvg.sh

@@ -8,10 +8,11 @@ GADM_BASEPATH="https://geodata.ucdavis.edu/gadm"
 mapshaper="./node_modules/mapshaper/bin/mapshaper"
 ATA_URL="https://media.githubusercontent.com/media/wmgeolab/geoBoundaries/905b0baf5f4fb3b9ccf45293647dcacdb2b799d4/releaseData/gbOpen/ATA/ADM0/geoBoundaries-ATA-ADM0_simplified.geojson"
 
+# Caspian Sea: "XCA"
 countries=(
   "AFG" "XAD" "ALA" "ALB" "DZA" "ASM" "AND" "AGO" "AIA" "ATG" "ARG" "ARM" "ABW" "AUS" "AUT" "AZE"
   "BHS" "BHR" "BGD" "BRB" "BLR" "BEL" "BLZ" "BEN" "BMU" "BTN" "BOL" "BES" "BIH" "BWA" "BVT" "BRA" "IOT" "VGB" "BRN" "BGR" "BFA" "BDI" "KHM"
-  "CMR" "CAN" "CPV" "XCA" "CYM" "CAF" "TCD" "CHL" "CHN" "CXR" "XCL" "CCK" "COL" "COM" "COK" "CRI" "CIV" "HRV" "CUB" "CUW" "CYP" "CZE" "COD"
+  "CMR" "CAN" "CPV"  "CYM" "CAF" "TCD" "CHL" "CHN" "CXR" "XCL" "CCK" "COL" "COM" "COK" "CRI" "CIV" "HRV" "CUB" "CUW" "CYP" "CZE" "COD"
   "DNK" "DJI" "DMA" "DOM" "ECU" "EGY" "SLV" "GNQ" "ERI" "EST" "ETH" "FLK" "FRO" "FJI" "FIN" "FRA" "GUF" "PYF" "ATF"
   "GAB" "GMB" "GEO" "DEU" "GHA" "GIB" "GRC" "GRL" "GRD" "GLP" "GUM" "GTM" "GGY" "GIN" "GNB" "GUY" "HTI" "HMD" "HND" "HUN"
   "ISL" "IND" "IDN" "IRN" "IRQ" "IRL" "IMN" "ISR" "ITA" "JAM" "JPN" "JEY" "JOR" "KAZ" "KEN" "KIR" "XKO" "KWT" "KGZ"
@@ -115,6 +116,47 @@ toSVG_1() {
     "$mapshaper" -i combine-files ${input_files[@]} -proj aeqd +lat_0=90 -simplify 0.005 weighted keep-shapes resolution=1200x1200 -o ./app/src/main/assets/aeqd1.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
 }
 
+generate_svg_map() {
+    local OUT_FILE="$1"      # First argument: Output destination path
+    local PROJ_ARGS="$2"     # Second argument: Projection parameters
+    shift 2                  # Remove the first two arguments, leaving only the files
+    local FILES_TO_RUN=("$@") # Capture all remaining arguments as the file array
+
+    echo "Generating: $OUT_FILE using projection [$PROJ_ARGS]"
+    echo "Processing ${#FILES_TO_RUN[@]} files..."
+
+    local JS_PIPELINE_LOGIC="
+        const conflicts = {
+                'Z01': 'IND', 'Z04': 'IND', 'Z05': 'IND', 'Z07': 'IND', 'Z09': 'IND',
+                'Z02': 'CHN', 'Z03': 'CHN','Z08': 'CHN',
+                'Z06': 'PAK'
+        };
+        let rawCode = GID_0 || 'UNK';
+        let cCode = conflicts[rawCode] ? conflicts[rawCode] : rawCode;
+        let isGidMissing = (!GID || GID === 'undefined' || GID === 'null' || GID === '');
+        if (isGidMissing) {
+            COUNTRY_GROUP = cCode+'2';
+        } else {
+            COUNTRY_GROUP = cCode+'1';
+        }
+    "
+
+    "$mapshaper" -i "${FILES_TO_RUN[@]}" combine-files \
+        -snap \
+        -merge-layers force\
+        -proj $PROJ_ARGS densify \
+        -simplify 2% weighted keep-shapes \
+        -filter-islands min-area=0 \
+        -sort 'this.area' ascending \
+        -each "$JS_PIPELINE_LOGIC" \
+        -split COUNTRY_GROUP \
+        -o "$OUT_FILE" \
+        format=svg \
+        id-field=GID \
+        precision=0.1 \
+        target=*
+
+}
 
 toSVG_01() {
     input_files=()
@@ -136,9 +178,9 @@ toSVG_01() {
         fi
     done
 
-    "$mapshaper" -i combine-files ${input_files[@]} snap -proj loxim densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/loxim01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    generate_svg_map "./app/src/main/assets/loxim01.svg" "loxim" "${input_files[@]}"
-    "$mapshaper" -i combine-files ${input_files[@]} snap -proj webmercator densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/webmercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    generate_svg_map "./app/src/main/assets/webmercator01.svg" "webmercator" "${input_files[@]}"
-    "$mapshaper" -i combine-files ${input_files[@]} snap -proj aeqd +lat_0=90 densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/aeqd01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    generate_svg_map "./app/src/main/assets/aeqd01.svg" "aeqd +lat_0=90" "${input_files[@]}"
 }
 
 do_1() {
@@ -153,10 +195,12 @@ do_0() {
     do
         download_0 "$country"
     done
-    wget -q -O "./temp/1/ATA.json" "$ATA_URL"
+    wget -q -O "./temp/0/ATA.json" "$ATA_URL"
 }
 # do_0
 # do_1
 # toSVG_0
 # toSVG_1
 toSVG_01
+
+#CUW, CCK, XCL, CXR, IOT, BVT, ABW, FLK, GIB, HMD, KIR, SXM, MDV, MCO, NIU, NFK, PCN, MAF, SGS, VAT

package.json

@@ -3,7 +3,7 @@
     "@turf/area": "^7.3.5",
     "@turf/turf": "^7.3.5",
     "jsdom": "^29.1.1",
-    "mapshaper": "^0.7.19"
+    "mapshaper": "^0.7.22"
   },
   "type": "module"
 }