From 6cf7ddc672d1721a760c00072aa52113282c89c4 Mon Sep 17 00:00:00 2001
From: Zsolt Ero <zsolt.ero@gmail.com>
Date: Fri, 17 Oct 2025 12:00:31 +0200
Subject: [PATCH] work

---
 biome.jsonc                         | 11 +++-----
 website/public/debug/lang/colon.js  | 44 +++++++----------------------
 website/public/debug/lang/switch.js |  8 ++++--
 3 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/biome.jsonc b/biome.jsonc
index 5049d69..29eb3f3 100644
--- a/biome.jsonc
+++ b/biome.jsonc
@@ -1,13 +1,10 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
   "formatter": {
     "indentStyle": "space",
     "lineWidth": 100
   },
-  "organizeImports": {
-    "enabled": true,
-    "ignore": []
-  },
+  "assist": { "actions": { "source": { "organizeImports": "on" } } },
   "linter": {
     "enabled": true,
     "rules": {
@@ -16,7 +13,7 @@
         "noForEach": "off"
       }
     },
-    "ignore": []
+    "includes": ["**"]
   },
   "javascript": {
     "formatter": {
@@ -26,6 +23,6 @@
   },
   "files": {
     "maxSize": 100000,
-    "ignore": ["venv", "dist", ".astro"]
+    "includes": ["**", "!**/venv", "!**/dist", "!**/.astro"]
   }
 }
diff --git a/website/public/debug/lang/colon.js b/website/public/debug/lang/colon.js
index 3214f73..e55ddc6 100644
--- a/website/public/debug/lang/colon.js
+++ b/website/public/debug/lang/colon.js
@@ -20,52 +20,26 @@ function modifyStyle({ style, langCode }) {
     // highway numbers, etc. - skip ref-only fields
     if (JSON.stringify(textField) === JSON.stringify(['to-string', ['get', 'ref']])) continue
 
-    const id = layer.id
-
-    let separator
-    if (id.includes('line') || id.includes('highway')) {
-      separator = ' '
-    } else {
-      separator = '\n'
-    }
-
     const nameUnderscore = `name_${langCode}`
     const nameColon = `name:${langCode}`
 
-    // Construct parts with exactly name_ and name: versions only (no int special case, no 'name' fallback)
-    const parts = [
-      ['get', nameUnderscore],
-      ['get', nameColon],
-    ]
+    // Always display both values
+    layer.layout['text-field'] = ['concat', ['get', nameUnderscore], '\n', ['get', nameColon]]
 
-    layer.layout['text-field'] = [
-      'case',
-      ['has', 'name:nonlatin'],
-      ['concat', ['get', 'name:latin'], separator, ['get', 'name:nonlatin']],
-      ['coalesce', ...parts],
-    ]
-
-    // Set color to red if both exist and are different, black otherwise
+    // Color red when they are different
     if (!layer.paint) layer.paint = {}
-
     layer.paint['text-color'] = [
       'case',
-      // If both name_ and name: exist and are different, show red
-      [
-        'all',
-        ['has', nameUnderscore],
-        ['has', nameColon],
-        ['!=', ['get', nameUnderscore], ['get', nameColon]]
-      ],
+      ['!=', ['get', nameUnderscore], ['get', nameColon]],
       '#ff0000', // Red when different
-      '#000000'  // Black when same or only one exists
+      '#000000', // Default color when same (adjust as needed)
     ]
   }
 }
 
 function applyLanguage() {
-  const hash = window.location.hash.substring(1); // Remove the '#'
-  const langCode = hash || null;
+  const hash = window.location.hash.substring(1) // Remove the '#'
+  const langCode = hash || null
 
   const style = map.getStyle()
   modifyStyle({ style, langCode })
@@ -75,7 +49,9 @@ function applyLanguage() {
 map.on('load', () => {
   // Add default hash if not present
   if (!window.location.hash) {
-    alert('To change the map language, modify the language code in the URL #.\nLabels will be RED if name_xx and name:xx differ')
+    alert(
+      'To change the map language, modify the language code in the URL #.\nLabels will be RED when different. name_xx on line 1, name:xx on line 2',
+    )
     window.location.hash = '#en'
     // The hashchange event will trigger applyLanguage()
   } else {
diff --git a/website/public/debug/lang/switch.js b/website/public/debug/lang/switch.js
index 8c3b0d6..b1f9ac4 100644
--- a/website/public/debug/lang/switch.js
+++ b/website/public/debug/lang/switch.js
@@ -51,8 +51,8 @@ function modifyStyle({ style, langCode }) {
 }
 
 function applyLanguage() {
-  const hash = window.location.hash.substring(1); // Remove the '#'
-  const langCode = hash || null;
+  const hash = window.location.hash.substring(1) // Remove the '#'
+  const langCode = hash || null
 
   const style = map.getStyle()
   modifyStyle({ style, langCode })
@@ -62,7 +62,9 @@ function applyLanguage() {
 map.on('load', () => {
   // Add default hash if not present
   if (!window.location.hash) {
-    alert('To change the map language, modify the language code in the URL.\n\nExamples:\n• #en → English\n• #de → German\n• #fr → French\n• #es → Spanish\n• #int → International names\n\nDefault language set to: en (English)')
+    alert(
+      'To change the map language, modify the language code in the URL.\n\nExamples:\n• #en → English\n• #de → German\n• #fr → French\n• #es → Spanish\n• #int → International names',
+    )
     window.location.hash = '#es'
     // The hashchange event will trigger applyLanguage()
   } else {