From 004097ef93b8f7a6d003c0fd70ebc9b9afd81260 Mon Sep 17 00:00:00 2001
From: Greger <gregersn@gmail.com>
Date: Wed, 11 Jun 2025 00:42:31 +0200
Subject: [PATCH 01/12] Make id field in exports more consistent. (#1210)

The id field for geojson export was not consistent with csv exports.
Removes the prefix on routes, rivers and markers geojson, and on
markers csv, to make them all use only an integer as id.

This makes it easier to import and do joins in other software.
---
 index.html                     | 4 ++--
 modules/io/export.js           | 9 +++------
 modules/ui/markers-overview.js | 4 ++--
 versioning.js                  | 2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index c8a93c8a..92c2b35e 100644
--- a/index.html
+++ b/index.html
@@ -8146,7 +8146,7 @@
     <script defer src="modules/ui/rivers-overview.js?v=1.99.00"></script>
     <script defer src="modules/ui/military-overview.js?v=1.108.5"></script>
     <script defer src="modules/ui/regiments-overview.js?v=1.108.5"></script>
-    <script defer src="modules/ui/markers-overview.js?v=1.108.5"></script>
+    <script defer src="modules/ui/markers-overview.js?v=1.108.7"></script>
     <script defer src="modules/ui/regiment-editor.js?v=1.108.5"></script>
     <script defer src="modules/ui/battle-screen.js?v=1.108.5"></script>
     <script defer src="modules/ui/emblems-editor.js?v=1.99.00"></script>
@@ -8161,7 +8161,7 @@
     <script defer src="modules/io/save.js?v=1.107.4"></script>
     <script defer src="modules/io/load.js?v=1.108.0"></script>
     <script defer src="modules/io/cloud.js?v=1.106.0"></script>
-    <script defer src="modules/io/export.js?v=1.100.00"></script>
+    <script defer src="modules/io/export.js?v=1.108.7"></script>
 
     <script defer src="modules/renderers/draw-features.js?v=1.108.2"></script>
     <script defer src="modules/renderers/draw-borders.js?v=1.104.0"></script>
diff --git a/modules/io/export.js b/modules/io/export.js
index 92d31e50..fa816bb2 100644
--- a/modules/io/export.js
+++ b/modules/io/export.js
@@ -485,11 +485,10 @@ function saveGeoJsonCells() {
 function saveGeoJsonRoutes() {
   const features = pack.routes.map(({i, points, group, name = null}) => {
     const coordinates = points.map(([x, y]) => getCoordinates(x, y, 4));
-    const id = `route${i}`;
     return {
       type: "Feature",
       geometry: {type: "LineString", coordinates},
-      properties: {id, group, name}
+      properties: {id: i, group, name}
     };
   });
   const json = {type: "FeatureCollection", features};
@@ -504,11 +503,10 @@ function saveGeoJsonRivers() {
       if (!cells || cells.length < 2) return;
       const meanderedPoints = Rivers.addMeandering(cells, points);
       const coordinates = meanderedPoints.map(([x, y]) => getCoordinates(x, y, 4));
-      const id = `river${i}`;
       return {
         type: "Feature",
         geometry: {type: "LineString", coordinates},
-        properties: {id, source, mouth, parent, basin, widthFactor, sourceWidth, discharge, name, type}
+        properties: {id: i, source, mouth, parent, basin, widthFactor, sourceWidth, discharge, name, type}
       };
     }
   );
@@ -522,9 +520,8 @@ function saveGeoJsonMarkers() {
   const features = pack.markers.map(marker => {
     const {i, type, icon, x, y, size, fill, stroke} = marker;
     const coordinates = getCoordinates(x, y, 4);
-    const id = `marker${i}`;
     const note = notes.find(note => note.id === id);
-    const properties = {id, type, icon, x, y, ...note, size, fill, stroke};
+    const properties = {id: i, type, icon, x, y, ...note, size, fill, stroke};
     return {type: "Feature", geometry: {type: "Point", coordinates}, properties};
   });
 
diff --git a/modules/ui/markers-overview.js b/modules/ui/markers-overview.js
index bcb2efb0..648de18c 100644
--- a/modules/ui/markers-overview.js
+++ b/modules/ui/markers-overview.js
@@ -214,7 +214,7 @@ function overviewMarkers() {
 
     const body = pack.markers.map(marker => {
       const {i, type, icon, x, y} = marker;
-      const id = `marker${i}`;
+      
       const note = notes.find(note => note.id === id);
       const name = note ? quote(note.name) : "Unknown";
       const legend = note ? quote(note.legend) : "";
@@ -222,7 +222,7 @@ function overviewMarkers() {
       const lat = getLatitude(y, 2);
       const lon = getLongitude(x, 2);
 
-      return [id, type, icon, name, legend, x, y, lat, lon].join(",");
+      return [i, type, icon, name, legend, x, y, lat, lon].join(",");
     });
 
     const data = headers + body.join("\n");
diff --git a/versioning.js b/versioning.js
index d638fc6d..6713f019 100644
--- a/versioning.js
+++ b/versioning.js
@@ -13,7 +13,7 @@
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
 
-const VERSION = "1.108.6";
+const VERSION = "1.108.7";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {

From fe2fa6d6b829ae377de70f664c10f16d8e4a7c6e Mon Sep 17 00:00:00 2001
From: Krory <69607760+kroryan@users.noreply.github.com>
Date: Sat, 14 Jun 2025 14:03:06 +0200
Subject: [PATCH 02/12]  Ollama integration as a new AI provider (#1208)

* ollama implementation

* ollama implementation

* Update ai-generator.js

* Update README.md

* Create OLLAMAREADME.MD

* Update OLLAMAREADME.MD

* Update notes-editor.js

* Update index.html

* Update OLLAMAREADME.MD

* Update ai-generator.js
---
 index.html                 |   8 +-
 modules/ui/OLLAMAREADME.MD |  78 ++++++++++++
 modules/ui/ai-generator.js | 246 ++++++++++++++++++++++++++++---------
 3 files changed, 271 insertions(+), 61 deletions(-)
 create mode 100644 modules/ui/OLLAMAREADME.MD

diff --git a/index.html b/index.html
index 92c2b35e..e1d7b07f 100644
--- a/index.html
+++ b/index.html
@@ -4978,14 +4978,16 @@
               Temperature:
               <input id="aiGeneratorTemperature" type="number" min="-1" max="2" step=".1" class="icon-key" />
             </label>
-            <label for="aiGeneratorKey"
-              >Key:
+            <label for="aiGeneratorKey"              >Key:
               <input id="aiGeneratorKey" placeholder="Enter API key" class="icon-key" />
               <button
                 id="aiGeneratorKeyHelp"
                 class="icon-help-circled"
-                data-tip="Open provider's website to get the API key there. Note: the Map Genenerator doesn't store the key or any generated data"
+                data-tip="Open provider's website to get the API key there. Note: the Map Generator doesn't store the key or any generated data"
               />
+              <div id="ollamaHint" style="display: none; font-size: 0.85em; color: #999; margin-top: 0.5em;">
+                Using Ollama requires it to be running locally on your machine at http://localhost:11434 beside azgaar you would not be able to use ollama if you are using azgaar online in the oficial website
+              </div>
             </label>
           </div>
         </div>
diff --git a/modules/ui/OLLAMAREADME.MD b/modules/ui/OLLAMAREADME.MD
new file mode 100644
index 00000000..a3fd1d7c
--- /dev/null
+++ b/modules/ui/OLLAMAREADME.MD
@@ -0,0 +1,78 @@
+
+## Recent Changes (May 18, 2025)
+
+### Ollama Integration for AI Text Generation
+
+An integration with [Ollama](https://ollama.com/) has been added as a new provider for the AI text generator feature, allowing users to leverage local large language models.
+
+**Key Changes:**
+
+* **New Provider:** "Ollama" is now available in the AI generator's model/provider selection.
+* **Model Name as Key:** When Ollama is selected, the "API Key" input field is repurposed to accept the Ollama model name (e.g., `llama3`, `mistral`, etc.) instead of a traditional API key.
+* **Local Endpoint:** The integration communicates with a local Ollama instance. Configuration details below.
+* **Streaming Support:** Responses from Ollama are streamed into the text area.
+
+## Ollama Setup and Configuration
+
+To use Ollama with Fantasy Map Generator, you need to ensure Ollama is correctly running and configured on your machine.
+
+**1. Install Ollama:**
+
+* Download and install Ollama from [ollama.com](https://ollama.com/).
+* Download the desired models (e.g., `ollama run llama3`).
+
+**2. Configure Ollama for Network Access (Crucial Step):**
+
+By default, Ollama might only listen for connections from the same machine (`localhost` or `127.0.0.1`). For Fantasy Map Generator to access Ollama, especially from other devices on your local network, you must configure Ollama to listen on all network interfaces and allow cross-origin requests.
+
+* **Set `OLLAMA_HOST` Environment Variable:**
+    * This variable tells Ollama which network interfaces to listen on.
+    * **Action:** Set `OLLAMA_HOST` to `0.0.0.0`.
+    * **How to set (Windows Permanent):**
+        1.  Search for "Edit the system environment variables" in the Windows search bar.
+        2.  Click "Environment Variables...".
+        3.  In the "System variables" section (bottom pane), click "New..." (or "Edit..." if it exists).
+        4.  Variable name: `OLLAMA_HOST`
+        5.  Variable value: `0.0.0.0`
+        6.  Click "OK" on all dialogs.
+        7.  **Restart your PC** for the changes to take effect for all processes.
+    * **How to set (Linux/macOS - per session or persistent):**
+        1.  **Per session:** In your terminal, before running `ollama serve`: `export OLLAMA_HOST="0.0.0.0"`
+        2.  **Persistent:** Add `export OLLAMA_HOST="0.0.0.0"` to your shell profile file (e.g., `~/.bashrc`, `~/.zshrc`), then `source` the file or restart your terminal.
+
+* **Set `OLLAMA_ORIGINS` Environment Variable (CORS Configuration):**
+    * This variable is essential for browsers to allow JavaScript code from one origin (Fantasy Map Generator's port 8000) to communicate with Ollama on a different port (11434).
+    * **Action:** Set `OLLAMA_ORIGINS` to allow your Fantasy Map Generator's origin.
+    * **How to set (Windows Permanent):** Follow the same steps as for `OLLAMA_HOST`, but use:
+        * Variable name: `OLLAMA_ORIGINS`
+        * Variable value: `http://<YOUR_PC_IP_ADDRESS>:8000` (e.g., `http://192.168.178.46:8000`)
+        * **For development (easiest):** You can use `*` as the value (`OLLAMA_ORIGINS=*`) to allow all origins. This is less secure for production but simplifies testing.
+        * **Restart your PC** after setting the variable.
+    * **How to set (Linux/macOS - per session or persistent):**
+        1.  **Per session:** `export OLLAMA_ORIGINS="http://<YOUR_PC_IP_ADDRESS>:8000"` or `export OLLAMA_ORIGINS="*"`
+        2.  **Persistent:** Add the `export` line to your shell profile file.
+
+* **Firewall Configuration:**
+    * Ensure your PC's firewall (e.g., Windows Defender Firewall) is not blocking incoming connections to Ollama's default port, `11434`.
+    * **Action:** Create an inbound rule to allow TCP traffic on port `11434`.
+
+**3. Configure Fantasy Map Generator's `ai-generator.js`:**
+
+The `ai-generator.js` file needs to point to the correct Ollama endpoint.
+
+* **Scenario A: Using only on the same machine (`localhost`):**
+    * Ensure the `fetch` call in the `generateWithOllama` function (inside `modules/ui/ai-generator.js`) points to `http://localhost:11434/api/generate`. This is usually the default.
+
+* **Scenario B: Using from other machines on the local network:**
+    * You **must** change the `fetch` call in the `generateWithOllama` function (inside `modules/ui/ai-generator.js`) to use the actual local IP address of your machine where Ollama is running.
+    * **Example:**
+        ```javascript
+        // Inside modules/ui/ai-generator.js, within generateWithOllama function:
+        const response = await fetch("http://192.168.178.46:11434/api/generate" // Replace with your actual PC's IP
+
+        ```
+    * **How to find your PC's IP:**
+        * **Windows:** Open Command Prompt (`cmd`) and type `ipconfig`. Look for "IPv4 Address" under your active network adapter.
+        * **Linux/macOS:** Open Terminal and type `ip addr show` or `ifconfig`.
+
+---
diff --git a/modules/ui/ai-generator.js b/modules/ui/ai-generator.js
index 734f1246..a0c532f9 100644
--- a/modules/ui/ai-generator.js
+++ b/modules/ui/ai-generator.js
@@ -8,6 +8,10 @@ const PROVIDERS = {
   anthropic: {
     keyLink: "https://console.anthropic.com/account/keys",
     generate: generateWithAnthropic
+  },
+  ollama: {
+    keyLink: "https://ollama.com/library",
+    generate: generateWithOllama
   }
 };
 
@@ -22,11 +26,16 @@ const MODELS = {
   "o1-mini": "openai",
   "claude-3-5-haiku-latest": "anthropic",
   "claude-3-5-sonnet-latest": "anthropic",
-  "claude-3-opus-latest": "anthropic"
+  "claude-3-opus-latest": "anthropic",
+  "Ollama (enter model in key field)": "ollama" 
 };
 
 const SYSTEM_MESSAGE = "I'm working on my fantasy map.";
 
+if (typeof modules.generateWithAi_setupDone === 'undefined') {
+  modules.generateWithAi_setupDone = false;
+}
+
 async function generateWithOpenAI({key, model, prompt, temperature, onContent}) {
   const headers = {
     "Content-Type": "application/json",
@@ -49,7 +58,7 @@ async function generateWithOpenAI({key, model, prompt, temperature, onContent})
     if (content) onContent(content);
   };
 
-  await handleStream(response, getContent);
+  await handleStream(response, getContent, "openai");
 }
 
 async function generateWithAnthropic({key, model, prompt, temperature, onContent}) {
@@ -73,13 +82,60 @@ async function generateWithAnthropic({key, model, prompt, temperature, onContent
     if (content) onContent(content);
   };
 
-  await handleStream(response, getContent);
+  await handleStream(response, getContent, "anthropic");
 }
 
-async function handleStream(response, getContent) {
+async function generateWithOllama({key, model, prompt, temperature, onContent}) {
+  // For Ollama, 'key' is the actual model name entered by the user.
+  // 'model' is the value from the dropdown, e.g., "Ollama (enter model in key field)".
+  const ollamaModelName = key;
+
+  const headers = {
+    "Content-Type": "application/json"
+  };
+
+  const body = {
+    model: ollamaModelName,
+    prompt: prompt,
+    system: SYSTEM_MESSAGE,
+    options: {
+      temperature: temperature
+    },
+    stream: true
+  };
+
+  const response = await fetch("http://localhost:11434/api/generate", {
+    method: "POST",
+    headers,
+    body: JSON.stringify(body)
+  });
+
+  const getContent = json => {
+    // Ollama streams JSON objects with a "response" field for content
+    // and "done": true in the final message (which might have an empty response).
+    if (json.response) {
+      onContent(json.response);
+    }
+  };
+
+  await handleStream(response, getContent, "ollama");
+}
+
+async function handleStream(response, getContent, providerType) {
   if (!response.ok) {
-    const json = await response.json();
-    throw new Error(json?.error?.message || "Failed to generate");
+    let errorMessage = `Failed to generate (${response.status} ${response.statusText})`;
+    try {
+      const json = await response.json();
+      if (providerType === "ollama" && json?.error) {
+        errorMessage = json.error;
+      } else {
+        errorMessage = json?.error?.message || json?.error || `Failed to generate (${response.status} ${response.statusText})`;
+      }
+    } catch (e) {
+      
+      ERROR && console.error("Failed to parse error response JSON:", e)
+    }
+    throw new Error(errorMessage);
   }
 
   const reader = response.body.getReader();
@@ -95,12 +151,23 @@ async function handleStream(response, getContent) {
 
     for (let i = 0; i < lines.length - 1; i++) {
       const line = lines[i].trim();
-      if (line.startsWith("data: ") && line !== "data: [DONE]") {
-        try {
-          const json = JSON.parse(line.slice(6));
-          getContent(json);
-        } catch (jsonError) {
-          ERROR && console.error(`Failed to parse JSON:`, jsonError, `Line: ${line}`);
+      if (providerType === "ollama") {
+        if (line) {
+          try {
+            const json = JSON.parse(line);
+            getContent(json);
+          } catch (jsonError) {
+            ERROR && console.error(`Failed to parse JSON from Ollama:`, jsonError, `Line: ${line}`);
+          }
+        }
+      } else { 
+        if (line.startsWith("data: ") && line !== "data: [DONE]") {
+          try {
+            const json = JSON.parse(line.slice(6));
+            getContent(json);
+          } catch (jsonError) {
+            ERROR && console.error(`Failed to parse JSON:`, jsonError, `Line: ${line}`);
+          }
         }
       }
     }
@@ -110,65 +177,59 @@ async function handleStream(response, getContent) {
 }
 
 function generateWithAi(defaultPrompt, onApply) {
-  updateValues();
 
-  $("#aiGenerator").dialog({
-    title: "AI Text Generator",
-    position: {my: "center", at: "center", of: "svg"},
-    resizable: false,
-    buttons: {
-      Generate: function (e) {
-        generate(e.target);
-      },
-      Apply: function () {
-        const result = byId("aiGeneratorResult").value;
-        if (!result) return tip("No result to apply", true, "error", 4000);
-        onApply(result);
-        $(this).dialog("close");
-      },
-      Close: function () {
-        $(this).dialog("close");
-      }
-    }
-  });
-
-  if (modules.generateWithAi) return;
-  modules.generateWithAi = true;
-
-  byId("aiGeneratorKeyHelp").on("click", function (e) {
-    const model = byId("aiGeneratorModel").value;
-    const provider = MODELS[model];
-    openURL(PROVIDERS[provider].keyLink);
-  });
-
-  function updateValues() {
+  function updateDialogElements() {
     byId("aiGeneratorResult").value = "";
     byId("aiGeneratorPrompt").value = defaultPrompt;
     byId("aiGeneratorTemperature").value = localStorage.getItem("fmg-ai-temperature") || "1";
 
     const select = byId("aiGeneratorModel");
+    const currentModelVal = select.value; 
     select.options.length = 0;
     Object.keys(MODELS).forEach(model => select.options.add(new Option(model, model)));
-    select.value = localStorage.getItem("fmg-ai-model");
-    if (!select.value || !MODELS[select.value]) select.value = DEFAULT_MODEL;
+    
+    const storedModel = localStorage.getItem("fmg-ai-model");
+    if (storedModel && MODELS[storedModel]) {
+      select.value = storedModel;
+    } else if (currentModelVal && MODELS[currentModelVal]) {
+      select.value = currentModelVal;
+    } else {
+      select.value = DEFAULT_MODEL;
+    }
+    if (!select.value || !MODELS[select.value]) select.value = DEFAULT_MODEL; 
 
     const provider = MODELS[select.value];
-    byId("aiGeneratorKey").value = localStorage.getItem(`fmg-ai-kl-${provider}`) || "";
+    const keyInput = byId("aiGeneratorKey");
+    if (keyInput) { 
+        keyInput.value = localStorage.getItem(`fmg-ai-kl-${provider}`) || "";
+        if (provider === "ollama") {
+          keyInput.placeholder = "Enter Ollama model name (e.g., llama3)";
+        } else {
+          keyInput.placeholder = "Enter API Key";
+        }
+    } else {
+        ERROR && console.error("AI Generator: Could not find 'aiGeneratorKey' element in updateDialogElements.");
+    }
   }
 
-  async function generate(button) {
+  async function doGenerate(button) {
     const key = byId("aiGeneratorKey").value;
-    if (!key) return tip("Please enter an API key", true, "error", 4000);
+    const modelValue = byId("aiGeneratorModel").value;
+    const provider = MODELS[modelValue];
 
-    const model = byId("aiGeneratorModel").value;
-    if (!model) return tip("Please select a model", true, "error", 4000);
-    localStorage.setItem("fmg-ai-model", model);
-
-    const provider = MODELS[model];
+    if (provider !== "ollama" && !key) {
+      return tip("Please enter an API key", true, "error", 4000);
+    }
+    if (provider === "ollama" && !key) {
+      return tip("Please enter the Ollama model name in the key field", true, "error", 4000);
+    }
+    if (!modelValue) return tip("Please select a model", true, "error", 4000);
+    
+    localStorage.setItem("fmg-ai-model", modelValue);
     localStorage.setItem(`fmg-ai-kl-${provider}`, key);
 
-    const prompt = byId("aiGeneratorPrompt").value;
-    if (!prompt) return tip("Please enter a prompt", true, "error", 4000);
+    const promptText = byId("aiGeneratorPrompt").value;
+    if (!promptText) return tip("Please enter a prompt", true, "error", 4000);
 
     const temperature = byId("aiGeneratorTemperature").valueAsNumber;
     if (isNaN(temperature)) return tip("Temperature must be a number", true, "error", 4000);
@@ -179,14 +240,83 @@ function generateWithAi(defaultPrompt, onApply) {
       const resultArea = byId("aiGeneratorResult");
       resultArea.disabled = true;
       resultArea.value = "";
-      const onContent = content => (resultArea.value += content);
+      const onContentCallback = content => (resultArea.value += content);
 
-      await PROVIDERS[provider].generate({key, model, prompt, temperature, onContent});
+      await PROVIDERS[provider].generate({key: key, model: modelValue, prompt: promptText, temperature, onContent: onContentCallback});
     } catch (error) {
-      return tip(error.message, true, "error", 4000);
+      tip(error.message, true, "error", 4000);
     } finally {
       button.disabled = false;
       byId("aiGeneratorResult").disabled = false;
     }
   }
+
+  $("#aiGenerator").dialog({
+    title: "AI Text Generator",
+    position: {my: "center", at: "center", of: "svg"},
+    resizable: false,
+    width: Math.min(600, window.innerWidth - 20),
+    modal: true,
+    open: function() {
+
+      if (!modules.generateWithAi_setupDone) {
+        const keyHelpButton = byId("aiGeneratorKeyHelp");
+        if (keyHelpButton) {
+          keyHelpButton.addEventListener("click", function () {
+            const modelValue = byId("aiGeneratorModel").value;
+            const provider = MODELS[modelValue];
+            if (provider === "ollama") {
+              openURL(PROVIDERS.ollama.keyLink);
+            } else if (provider && PROVIDERS[provider] && PROVIDERS[provider].keyLink) {
+              openURL(PROVIDERS[provider].keyLink);
+            }
+          });
+        } else {
+          ERROR && console.error("AI Generator: Could not find 'aiGeneratorKeyHelp' element for event listener.");
+        }
+
+        const modelSelect = byId("aiGeneratorModel");
+        if (modelSelect) {
+          modelSelect.addEventListener("change", function() {
+              const newModelValue = this.value;
+              const newProvider = MODELS[newModelValue];
+              const keyInput = byId("aiGeneratorKey");
+              if (keyInput) {
+                if (newProvider === "ollama") {
+                    keyInput.placeholder = "Enter Ollama model name (e.g., llama3)";
+                } else {
+                    keyInput.placeholder = "Enter API Key";
+                }
+
+                keyInput.value = localStorage.getItem(`fmg-ai-kl-${newProvider}`) || "";
+              } else {
+                ERROR && console.error("AI Generator: Could not find 'aiGeneratorKey' element during model change listener.");
+              }
+          });
+        } else {
+          ERROR && console.error("AI Generator: Could not find 'aiGeneratorModel' element for event listener.");
+        }
+        modules.generateWithAi_setupDone = true;
+      }
+
+      updateDialogElements();
+    },
+    buttons: {
+      "Generate": function (e) {
+
+        doGenerate(e.currentTarget || e.target);
+      },
+      "Apply": function () {
+        const result = byId("aiGeneratorResult").value;
+        if (!result) return tip("No result to apply", true, "error", 4000);
+        onApply(result);
+        $(this).dialog("close");
+      },
+      "Close": function () {
+        $(this).dialog("close");
+      }
+    }
+  });
 }
+
+window.generateWithAi = generateWithAi;

From bba3587e50db6d2a137d77f13d21ca140e89cbbc Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Sat, 14 Jun 2025 15:20:01 +0200
Subject: [PATCH 03/12] refactor: ollama generation

---
 index.html                 |  15 ++-
 modules/ui/OLLAMAREADME.MD |  78 ------------
 modules/ui/ai-generator.js | 242 +++++++++++--------------------------
 3 files changed, 81 insertions(+), 254 deletions(-)
 delete mode 100644 modules/ui/OLLAMAREADME.MD

diff --git a/index.html b/index.html
index e1d7b07f..9cb1750b 100644
--- a/index.html
+++ b/index.html
@@ -4978,16 +4978,19 @@
               Temperature:
               <input id="aiGeneratorTemperature" type="number" min="-1" max="2" step=".1" class="icon-key" />
             </label>
-            <label for="aiGeneratorKey"              >Key:
-              <input id="aiGeneratorKey" placeholder="Enter API key" class="icon-key" />
+            <label for="aiGeneratorKey"
+              >Key:
+              <input
+                id="aiGeneratorKey"
+                placeholder="Enter API key"
+                class="icon-key"
+                data-tip="Enter API key. Note: the Generator doesn't store the key or any generated data"
+              />
               <button
                 id="aiGeneratorKeyHelp"
                 class="icon-help-circled"
-                data-tip="Open provider's website to get the API key there. Note: the Map Generator doesn't store the key or any generated data"
+                data-tip="Click to see the usage instructions"
               />
-              <div id="ollamaHint" style="display: none; font-size: 0.85em; color: #999; margin-top: 0.5em;">
-                Using Ollama requires it to be running locally on your machine at http://localhost:11434 beside azgaar you would not be able to use ollama if you are using azgaar online in the oficial website
-              </div>
             </label>
           </div>
         </div>
diff --git a/modules/ui/OLLAMAREADME.MD b/modules/ui/OLLAMAREADME.MD
deleted file mode 100644
index a3fd1d7c..00000000
--- a/modules/ui/OLLAMAREADME.MD
+++ /dev/null
@@ -1,78 +0,0 @@
-
-## Recent Changes (May 18, 2025)
-
-### Ollama Integration for AI Text Generation
-
-An integration with [Ollama](https://ollama.com/) has been added as a new provider for the AI text generator feature, allowing users to leverage local large language models.
-
-**Key Changes:**
-
-* **New Provider:** "Ollama" is now available in the AI generator's model/provider selection.
-* **Model Name as Key:** When Ollama is selected, the "API Key" input field is repurposed to accept the Ollama model name (e.g., `llama3`, `mistral`, etc.) instead of a traditional API key.
-* **Local Endpoint:** The integration communicates with a local Ollama instance. Configuration details below.
-* **Streaming Support:** Responses from Ollama are streamed into the text area.
-
-## Ollama Setup and Configuration
-
-To use Ollama with Fantasy Map Generator, you need to ensure Ollama is correctly running and configured on your machine.
-
-**1. Install Ollama:**
-
-* Download and install Ollama from [ollama.com](https://ollama.com/).
-* Download the desired models (e.g., `ollama run llama3`).
-
-**2. Configure Ollama for Network Access (Crucial Step):**
-
-By default, Ollama might only listen for connections from the same machine (`localhost` or `127.0.0.1`). For Fantasy Map Generator to access Ollama, especially from other devices on your local network, you must configure Ollama to listen on all network interfaces and allow cross-origin requests.
-
-* **Set `OLLAMA_HOST` Environment Variable:**
-    * This variable tells Ollama which network interfaces to listen on.
-    * **Action:** Set `OLLAMA_HOST` to `0.0.0.0`.
-    * **How to set (Windows Permanent):**
-        1.  Search for "Edit the system environment variables" in the Windows search bar.
-        2.  Click "Environment Variables...".
-        3.  In the "System variables" section (bottom pane), click "New..." (or "Edit..." if it exists).
-        4.  Variable name: `OLLAMA_HOST`
-        5.  Variable value: `0.0.0.0`
-        6.  Click "OK" on all dialogs.
-        7.  **Restart your PC** for the changes to take effect for all processes.
-    * **How to set (Linux/macOS - per session or persistent):**
-        1.  **Per session:** In your terminal, before running `ollama serve`: `export OLLAMA_HOST="0.0.0.0"`
-        2.  **Persistent:** Add `export OLLAMA_HOST="0.0.0.0"` to your shell profile file (e.g., `~/.bashrc`, `~/.zshrc`), then `source` the file or restart your terminal.
-
-* **Set `OLLAMA_ORIGINS` Environment Variable (CORS Configuration):**
-    * This variable is essential for browsers to allow JavaScript code from one origin (Fantasy Map Generator's port 8000) to communicate with Ollama on a different port (11434).
-    * **Action:** Set `OLLAMA_ORIGINS` to allow your Fantasy Map Generator's origin.
-    * **How to set (Windows Permanent):** Follow the same steps as for `OLLAMA_HOST`, but use:
-        * Variable name: `OLLAMA_ORIGINS`
-        * Variable value: `http://<YOUR_PC_IP_ADDRESS>:8000` (e.g., `http://192.168.178.46:8000`)
-        * **For development (easiest):** You can use `*` as the value (`OLLAMA_ORIGINS=*`) to allow all origins. This is less secure for production but simplifies testing.
-        * **Restart your PC** after setting the variable.
-    * **How to set (Linux/macOS - per session or persistent):**
-        1.  **Per session:** `export OLLAMA_ORIGINS="http://<YOUR_PC_IP_ADDRESS>:8000"` or `export OLLAMA_ORIGINS="*"`
-        2.  **Persistent:** Add the `export` line to your shell profile file.
-
-* **Firewall Configuration:**
-    * Ensure your PC's firewall (e.g., Windows Defender Firewall) is not blocking incoming connections to Ollama's default port, `11434`.
-    * **Action:** Create an inbound rule to allow TCP traffic on port `11434`.
-
-**3. Configure Fantasy Map Generator's `ai-generator.js`:**
-
-The `ai-generator.js` file needs to point to the correct Ollama endpoint.
-
-* **Scenario A: Using only on the same machine (`localhost`):**
-    * Ensure the `fetch` call in the `generateWithOllama` function (inside `modules/ui/ai-generator.js`) points to `http://localhost:11434/api/generate`. This is usually the default.
-
-* **Scenario B: Using from other machines on the local network:**
-    * You **must** change the `fetch` call in the `generateWithOllama` function (inside `modules/ui/ai-generator.js`) to use the actual local IP address of your machine where Ollama is running.
-    * **Example:**
-        ```javascript
-        // Inside modules/ui/ai-generator.js, within generateWithOllama function:
-        const response = await fetch("http://192.168.178.46:11434/api/generate" // Replace with your actual PC's IP
-
-        ```
-    * **How to find your PC's IP:**
-        * **Windows:** Open Command Prompt (`cmd`) and type `ipconfig`. Look for "IPv4 Address" under your active network adapter.
-        * **Linux/macOS:** Open Terminal and type `ip addr show` or `ifconfig`.
-
----
diff --git a/modules/ui/ai-generator.js b/modules/ui/ai-generator.js
index a0c532f9..92d9d380 100644
--- a/modules/ui/ai-generator.js
+++ b/modules/ui/ai-generator.js
@@ -10,7 +10,7 @@ const PROVIDERS = {
     generate: generateWithAnthropic
   },
   ollama: {
-    keyLink: "https://ollama.com/library",
+    keyLink: "https://github.com/Azgaar/Fantasy-Map-Generator/wiki/Ollama-text-generation",
     generate: generateWithOllama
   }
 };
@@ -27,15 +27,11 @@ const MODELS = {
   "claude-3-5-haiku-latest": "anthropic",
   "claude-3-5-sonnet-latest": "anthropic",
   "claude-3-opus-latest": "anthropic",
-  "Ollama (enter model in key field)": "ollama" 
+  "ollama (local models)": "ollama"
 };
 
 const SYSTEM_MESSAGE = "I'm working on my fantasy map.";
 
-if (typeof modules.generateWithAi_setupDone === 'undefined') {
-  modules.generateWithAi_setupDone = false;
-}
-
 async function generateWithOpenAI({key, model, prompt, temperature, onContent}) {
   const headers = {
     "Content-Type": "application/json",
@@ -58,7 +54,7 @@ async function generateWithOpenAI({key, model, prompt, temperature, onContent})
     if (content) onContent(content);
   };
 
-  await handleStream(response, getContent, "openai");
+  await handleStream(response, getContent);
 }
 
 async function generateWithAnthropic({key, model, prompt, temperature, onContent}) {
@@ -82,59 +78,38 @@ async function generateWithAnthropic({key, model, prompt, temperature, onContent
     if (content) onContent(content);
   };
 
-  await handleStream(response, getContent, "anthropic");
+  await handleStream(response, getContent);
 }
 
 async function generateWithOllama({key, model, prompt, temperature, onContent}) {
-  // For Ollama, 'key' is the actual model name entered by the user.
-  // 'model' is the value from the dropdown, e.g., "Ollama (enter model in key field)".
-  const ollamaModelName = key;
-
-  const headers = {
-    "Content-Type": "application/json"
-  };
-
-  const body = {
-    model: ollamaModelName,
-    prompt: prompt,
-    system: SYSTEM_MESSAGE,
-    options: {
-      temperature: temperature
-    },
-    stream: true
-  };
+  const ollamaModelName = key; // for Ollama, 'key' is the actual model name entered by the user
 
   const response = await fetch("http://localhost:11434/api/generate", {
     method: "POST",
-    headers,
-    body: JSON.stringify(body)
+    headers: {"Content-Type": "application/json"},
+    body: JSON.stringify({
+      model: ollamaModelName,
+      prompt,
+      system: SYSTEM_MESSAGE,
+      options: {temperature},
+      stream: true
+    })
   });
 
   const getContent = json => {
-    // Ollama streams JSON objects with a "response" field for content
-    // and "done": true in the final message (which might have an empty response).
-    if (json.response) {
-      onContent(json.response);
-    }
+    if (json.response) onContent(json.response);
   };
 
-  await handleStream(response, getContent, "ollama");
+  await handleStream(response, getContent);
 }
 
-async function handleStream(response, getContent, providerType) {
+async function handleStream(response, getContent) {
   if (!response.ok) {
     let errorMessage = `Failed to generate (${response.status} ${response.statusText})`;
     try {
       const json = await response.json();
-      if (providerType === "ollama" && json?.error) {
-        errorMessage = json.error;
-      } else {
-        errorMessage = json?.error?.message || json?.error || `Failed to generate (${response.status} ${response.statusText})`;
-      }
-    } catch (e) {
-      
-      ERROR && console.error("Failed to parse error response JSON:", e)
-    }
+      errorMessage = json.error?.message || json.error || errorMessage;
+    } catch {}
     throw new Error(errorMessage);
   }
 
@@ -151,24 +126,14 @@ async function handleStream(response, getContent, providerType) {
 
     for (let i = 0; i < lines.length - 1; i++) {
       const line = lines[i].trim();
-      if (providerType === "ollama") {
-        if (line) {
-          try {
-            const json = JSON.parse(line);
-            getContent(json);
-          } catch (jsonError) {
-            ERROR && console.error(`Failed to parse JSON from Ollama:`, jsonError, `Line: ${line}`);
-          }
-        }
-      } else { 
-        if (line.startsWith("data: ") && line !== "data: [DONE]") {
-          try {
-            const json = JSON.parse(line.slice(6));
-            getContent(json);
-          } catch (jsonError) {
-            ERROR && console.error(`Failed to parse JSON:`, jsonError, `Line: ${line}`);
-          }
-        }
+      if (!line) continue;
+      if (line === "data: [DONE]") break;
+
+      try {
+        const parsed = line.startsWith("data: ") ? JSON.parse(line.slice(6)) : JSON.parse(line);
+        getContent(parsed);
+      } catch (error) {
+        ERROR && console.error("Failed to parse line:", line, error);
       }
     }
 
@@ -177,59 +142,65 @@ async function handleStream(response, getContent, providerType) {
 }
 
 function generateWithAi(defaultPrompt, onApply) {
+  updateValues();
 
-  function updateDialogElements() {
+  $("#aiGenerator").dialog({
+    title: "AI Text Generator",
+    position: {my: "center", at: "center", of: "svg"},
+    resizable: false,
+    buttons: {
+      Generate: function (e) {
+        generate(e.target);
+      },
+      Apply: function () {
+        const result = byId("aiGeneratorResult").value;
+        if (!result) return tip("No result to apply", true, "error", 4000);
+        onApply(result);
+        $(this).dialog("close");
+      },
+      Close: function () {
+        $(this).dialog("close");
+      }
+    }
+  });
+
+  if (modules.generateWithAi) return;
+  modules.generateWithAi = true;
+
+  byId("aiGeneratorKeyHelp").on("click", function (e) {
+    const model = byId("aiGeneratorModel").value;
+    const provider = MODELS[model];
+    openURL(PROVIDERS[provider].keyLink);
+  });
+
+  function updateValues() {
     byId("aiGeneratorResult").value = "";
     byId("aiGeneratorPrompt").value = defaultPrompt;
     byId("aiGeneratorTemperature").value = localStorage.getItem("fmg-ai-temperature") || "1";
 
     const select = byId("aiGeneratorModel");
-    const currentModelVal = select.value; 
     select.options.length = 0;
     Object.keys(MODELS).forEach(model => select.options.add(new Option(model, model)));
-    
-    const storedModel = localStorage.getItem("fmg-ai-model");
-    if (storedModel && MODELS[storedModel]) {
-      select.value = storedModel;
-    } else if (currentModelVal && MODELS[currentModelVal]) {
-      select.value = currentModelVal;
-    } else {
-      select.value = DEFAULT_MODEL;
-    }
-    if (!select.value || !MODELS[select.value]) select.value = DEFAULT_MODEL; 
+    select.value = localStorage.getItem("fmg-ai-model");
+    if (!select.value || !MODELS[select.value]) select.value = DEFAULT_MODEL;
 
     const provider = MODELS[select.value];
-    const keyInput = byId("aiGeneratorKey");
-    if (keyInput) { 
-        keyInput.value = localStorage.getItem(`fmg-ai-kl-${provider}`) || "";
-        if (provider === "ollama") {
-          keyInput.placeholder = "Enter Ollama model name (e.g., llama3)";
-        } else {
-          keyInput.placeholder = "Enter API Key";
-        }
-    } else {
-        ERROR && console.error("AI Generator: Could not find 'aiGeneratorKey' element in updateDialogElements.");
-    }
+    byId("aiGeneratorKey").value = localStorage.getItem(`fmg-ai-kl-${provider}`) || "";
   }
 
-  async function doGenerate(button) {
+  async function generate(button) {
     const key = byId("aiGeneratorKey").value;
-    const modelValue = byId("aiGeneratorModel").value;
-    const provider = MODELS[modelValue];
+    if (!key) return tip("Please enter an API key", true, "error", 4000);
 
-    if (provider !== "ollama" && !key) {
-      return tip("Please enter an API key", true, "error", 4000);
-    }
-    if (provider === "ollama" && !key) {
-      return tip("Please enter the Ollama model name in the key field", true, "error", 4000);
-    }
-    if (!modelValue) return tip("Please select a model", true, "error", 4000);
-    
-    localStorage.setItem("fmg-ai-model", modelValue);
+    const model = byId("aiGeneratorModel").value;
+    if (!model) return tip("Please select a model", true, "error", 4000);
+    localStorage.setItem("fmg-ai-model", model);
+
+    const provider = MODELS[model];
     localStorage.setItem(`fmg-ai-kl-${provider}`, key);
 
-    const promptText = byId("aiGeneratorPrompt").value;
-    if (!promptText) return tip("Please enter a prompt", true, "error", 4000);
+    const prompt = byId("aiGeneratorPrompt").value;
+    if (!prompt) return tip("Please enter a prompt", true, "error", 4000);
 
     const temperature = byId("aiGeneratorTemperature").valueAsNumber;
     if (isNaN(temperature)) return tip("Temperature must be a number", true, "error", 4000);
@@ -240,83 +211,14 @@ function generateWithAi(defaultPrompt, onApply) {
       const resultArea = byId("aiGeneratorResult");
       resultArea.disabled = true;
       resultArea.value = "";
-      const onContentCallback = content => (resultArea.value += content);
+      const onContent = content => (resultArea.value += content);
 
-      await PROVIDERS[provider].generate({key: key, model: modelValue, prompt: promptText, temperature, onContent: onContentCallback});
+      await PROVIDERS[provider].generate({key, model, prompt, temperature, onContent});
     } catch (error) {
-      tip(error.message, true, "error", 4000);
+      return tip(error.message, true, "error", 4000);
     } finally {
       button.disabled = false;
       byId("aiGeneratorResult").disabled = false;
     }
   }
-
-  $("#aiGenerator").dialog({
-    title: "AI Text Generator",
-    position: {my: "center", at: "center", of: "svg"},
-    resizable: false,
-    width: Math.min(600, window.innerWidth - 20),
-    modal: true,
-    open: function() {
-
-      if (!modules.generateWithAi_setupDone) {
-        const keyHelpButton = byId("aiGeneratorKeyHelp");
-        if (keyHelpButton) {
-          keyHelpButton.addEventListener("click", function () {
-            const modelValue = byId("aiGeneratorModel").value;
-            const provider = MODELS[modelValue];
-            if (provider === "ollama") {
-              openURL(PROVIDERS.ollama.keyLink);
-            } else if (provider && PROVIDERS[provider] && PROVIDERS[provider].keyLink) {
-              openURL(PROVIDERS[provider].keyLink);
-            }
-          });
-        } else {
-          ERROR && console.error("AI Generator: Could not find 'aiGeneratorKeyHelp' element for event listener.");
-        }
-
-        const modelSelect = byId("aiGeneratorModel");
-        if (modelSelect) {
-          modelSelect.addEventListener("change", function() {
-              const newModelValue = this.value;
-              const newProvider = MODELS[newModelValue];
-              const keyInput = byId("aiGeneratorKey");
-              if (keyInput) {
-                if (newProvider === "ollama") {
-                    keyInput.placeholder = "Enter Ollama model name (e.g., llama3)";
-                } else {
-                    keyInput.placeholder = "Enter API Key";
-                }
-
-                keyInput.value = localStorage.getItem(`fmg-ai-kl-${newProvider}`) || "";
-              } else {
-                ERROR && console.error("AI Generator: Could not find 'aiGeneratorKey' element during model change listener.");
-              }
-          });
-        } else {
-          ERROR && console.error("AI Generator: Could not find 'aiGeneratorModel' element for event listener.");
-        }
-        modules.generateWithAi_setupDone = true;
-      }
-
-      updateDialogElements();
-    },
-    buttons: {
-      "Generate": function (e) {
-
-        doGenerate(e.currentTarget || e.target);
-      },
-      "Apply": function () {
-        const result = byId("aiGeneratorResult").value;
-        if (!result) return tip("No result to apply", true, "error", 4000);
-        onApply(result);
-        $(this).dialog("close");
-      },
-      "Close": function () {
-        $(this).dialog("close");
-      }
-    }
-  });
 }
-
-window.generateWithAi = generateWithAi;

From d96e339043b0f8e0479fa250c2cfdd9fe7c47705 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Sat, 14 Jun 2025 15:20:41 +0200
Subject: [PATCH 04/12] chore: update version to 1.108.8

---
 index.html    | 2 +-
 versioning.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 9cb1750b..c2afdb33 100644
--- a/index.html
+++ b/index.html
@@ -8143,7 +8143,7 @@
     <script defer src="modules/ui/burg-editor.js?v=1.106.6"></script>
     <script defer src="modules/ui/units-editor.js?v=1.104.0"></script>
     <script defer src="modules/ui/notes-editor.js?v=1.107.3"></script>
-    <script defer src="modules/ui/ai-generator.js?v=1.105.22"></script>
+    <script defer src="modules/ui/ai-generator.js?v=1.108.8"></script>
     <script defer src="modules/ui/diplomacy-editor.js?v=1.99.00"></script>
     <script defer src="modules/ui/zones-editor.js?v=1.105.20"></script>
     <script defer src="modules/ui/burgs-overview.js?v=1.105.15"></script>
diff --git a/versioning.js b/versioning.js
index 6713f019..b5e0f1a1 100644
--- a/versioning.js
+++ b/versioning.js
@@ -13,7 +13,7 @@
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
 
-const VERSION = "1.108.7";
+const VERSION = "1.108.8";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {

From c891689796128c29ad76ea98748ce77a0e26c1e6 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Sat, 14 Jun 2025 15:24:23 +0200
Subject: [PATCH 05/12] feat(ai-generator): update supported AI models list

---
 modules/ui/ai-generator.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/ui/ai-generator.js b/modules/ui/ai-generator.js
index 92d9d380..8ef13cf6 100644
--- a/modules/ui/ai-generator.js
+++ b/modules/ui/ai-generator.js
@@ -22,8 +22,12 @@ const MODELS = {
   "chatgpt-4o-latest": "openai",
   "gpt-4o": "openai",
   "gpt-4-turbo": "openai",
-  "o1-preview": "openai",
-  "o1-mini": "openai",
+  o3: "openai",
+  "o3-mini": "openai",
+  "o3-pro": "openai",
+  "o4-mini": "openai",
+  "claude-opus-4-20250514": "anthropic",
+  "claude-sonnet-4-20250514": "anthropic",
   "claude-3-5-haiku-latest": "anthropic",
   "claude-3-5-sonnet-latest": "anthropic",
   "claude-3-opus-latest": "anthropic",

From a3dcc8d2c4fb974a679e14f606f97643cd33cf8f Mon Sep 17 00:00:00 2001
From: Nekomantikku <154403265+Nekomantikku@users.noreply.github.com>
Date: Fri, 20 Jun 2025 00:18:57 +0200
Subject: [PATCH 06/12] Merge pull request #1212 from Nekomantikku/master

Add shell script to launch local HTTP server and open browser (GNU/Linux)
---
 run_python_server.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 run_python_server.sh

diff --git a/run_python_server.sh b/run_python_server.sh
new file mode 100644
index 00000000..7ac82957
--- /dev/null
+++ b/run_python_server.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+if command -v python3 >/dev/null 2>&1; then
+	PYTHON=python3
+elif command -v python >/dev/null 2>&1; then
+	PYTHON=python
+else 
+	echo "Neither 'python' nor 'python3' was found. Please install Python 3 package." >&2
+	exit 1
+fi
+
+chromium http://localhost:8000
+
+$PYTHON -m http.server 8000

From c26827bfe5c9cabc229d17ed3964f4bf4e7ed093 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Tue, 1 Jul 2025 23:16:07 +0200
Subject: [PATCH 07/12] fix(markers-overview): correct note lookup by marker id

---
 index.html                     | 2 +-
 modules/ui/markers-overview.js | 4 ++--
 versioning.js                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index c2afdb33..9ac26860 100644
--- a/index.html
+++ b/index.html
@@ -8151,7 +8151,7 @@
     <script defer src="modules/ui/rivers-overview.js?v=1.99.00"></script>
     <script defer src="modules/ui/military-overview.js?v=1.108.5"></script>
     <script defer src="modules/ui/regiments-overview.js?v=1.108.5"></script>
-    <script defer src="modules/ui/markers-overview.js?v=1.108.7"></script>
+    <script defer src="modules/ui/markers-overview.js?v=1.108.9"></script>
     <script defer src="modules/ui/regiment-editor.js?v=1.108.5"></script>
     <script defer src="modules/ui/battle-screen.js?v=1.108.5"></script>
     <script defer src="modules/ui/emblems-editor.js?v=1.99.00"></script>
diff --git a/modules/ui/markers-overview.js b/modules/ui/markers-overview.js
index 648de18c..2f47e2e1 100644
--- a/modules/ui/markers-overview.js
+++ b/modules/ui/markers-overview.js
@@ -214,8 +214,8 @@ function overviewMarkers() {
 
     const body = pack.markers.map(marker => {
       const {i, type, icon, x, y} = marker;
-      
-      const note = notes.find(note => note.id === id);
+
+      const note = notes.find(note => note.id === i);
       const name = note ? quote(note.name) : "Unknown";
       const legend = note ? quote(note.legend) : "";
 
diff --git a/versioning.js b/versioning.js
index b5e0f1a1..99ab5235 100644
--- a/versioning.js
+++ b/versioning.js
@@ -13,7 +13,7 @@
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
 
-const VERSION = "1.108.8";
+const VERSION = "1.108.9";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {

From 738732364e53062053ac44fa9c29764a037de37a Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Wed, 2 Jul 2025 00:52:41 +0200
Subject: [PATCH 08/12] fix(ui): correct marker note lookup by adding prefix

---
 index.html                     | 2 +-
 modules/ui/markers-overview.js | 2 +-
 versioning.js                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 9ac26860..885cf007 100644
--- a/index.html
+++ b/index.html
@@ -8151,7 +8151,7 @@
     <script defer src="modules/ui/rivers-overview.js?v=1.99.00"></script>
     <script defer src="modules/ui/military-overview.js?v=1.108.5"></script>
     <script defer src="modules/ui/regiments-overview.js?v=1.108.5"></script>
-    <script defer src="modules/ui/markers-overview.js?v=1.108.9"></script>
+    <script defer src="modules/ui/markers-overview.js?v=1.108.10"></script>
     <script defer src="modules/ui/regiment-editor.js?v=1.108.5"></script>
     <script defer src="modules/ui/battle-screen.js?v=1.108.5"></script>
     <script defer src="modules/ui/emblems-editor.js?v=1.99.00"></script>
diff --git a/modules/ui/markers-overview.js b/modules/ui/markers-overview.js
index 2f47e2e1..02999eb0 100644
--- a/modules/ui/markers-overview.js
+++ b/modules/ui/markers-overview.js
@@ -215,7 +215,7 @@ function overviewMarkers() {
     const body = pack.markers.map(marker => {
       const {i, type, icon, x, y} = marker;
 
-      const note = notes.find(note => note.id === i);
+      const note = notes.find(note => note.id === "marker" + i);
       const name = note ? quote(note.name) : "Unknown";
       const legend = note ? quote(note.legend) : "";
 
diff --git a/versioning.js b/versioning.js
index 99ab5235..4d5659de 100644
--- a/versioning.js
+++ b/versioning.js
@@ -13,7 +13,7 @@
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
 
-const VERSION = "1.108.9";
+const VERSION = "1.108.10";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {

From d06ebe5ac81e3dd30bb0fe65579446f2ac9e9353 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Fri, 18 Jul 2025 02:31:10 +0200
Subject: [PATCH 09/12] fix(v1.108.11): add external icons to export in base64
 format

---
 index.html           |  2 +-
 modules/io/export.js | 34 ++++++++++++++++++++++++++++++++++
 versioning.js        |  2 +-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 885cf007..c021b1fb 100644
--- a/index.html
+++ b/index.html
@@ -8166,7 +8166,7 @@
     <script defer src="modules/io/save.js?v=1.107.4"></script>
     <script defer src="modules/io/load.js?v=1.108.0"></script>
     <script defer src="modules/io/cloud.js?v=1.106.0"></script>
-    <script defer src="modules/io/export.js?v=1.108.7"></script>
+    <script defer src="modules/io/export.js?v=1.108.11"></script>
 
     <script defer src="modules/renderers/draw-features.js?v=1.108.2"></script>
     <script defer src="modules/renderers/draw-borders.js?v=1.104.0"></script>
diff --git a/modules/io/export.js b/modules/io/export.js
index fa816bb2..b0c9c769 100644
--- a/modules/io/export.js
+++ b/modules/io/export.js
@@ -320,6 +320,40 @@ async function getMapURL(type, options) {
     if (pattern) cloneDefs.appendChild(pattern.cloneNode(true));
   }
 
+  {
+    // replace external marker icons
+    const externalMarkerImages = cloneEl.querySelectorAll('#markers image[href]:not([href=""])');
+    const imageHrefs = Array.from(externalMarkerImages).map(img => img.getAttribute("href"));
+
+    for (const url of imageHrefs) {
+      await new Promise(resolve => {
+        getBase64(url, base64 => {
+          externalMarkerImages.forEach(img => {
+            if (img.getAttribute("href") === url) img.setAttribute("href", base64);
+          });
+          resolve();
+        });
+      });
+    }
+  }
+
+  {
+    // replace external regiment icons
+    const externalRegimentImages = cloneEl.querySelectorAll('#armies image[href]:not([href=""])');
+    const imageHrefs = Array.from(externalRegimentImages).map(img => img.getAttribute("href"));
+
+    for (const url of imageHrefs) {
+      await new Promise(resolve => {
+        getBase64(url, base64 => {
+          externalRegimentImages.forEach(img => {
+            if (img.getAttribute("href") === url) img.setAttribute("href", base64);
+          });
+          resolve();
+        });
+      });
+    }
+  }
+
   if (!cloneEl.getElementById("fogging-cont")) cloneEl.getElementById("fog")?.remove(); // remove unused fog
   if (!cloneEl.getElementById("regions")) cloneEl.getElementById("statePaths")?.remove(); // removed unused statePaths
   if (!cloneEl.getElementById("labels")) cloneEl.getElementById("textPaths")?.remove(); // removed unused textPaths
diff --git a/versioning.js b/versioning.js
index 4d5659de..a785e90e 100644
--- a/versioning.js
+++ b/versioning.js
@@ -13,7 +13,7 @@
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
 
-const VERSION = "1.108.10";
+const VERSION = "1.108.11";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {

From ab08dc9429e33bfbbd32bd46c07d793fa8aade30 Mon Sep 17 00:00:00 2001
From: Ender-Emp <100535512+Ender-Emp@users.noreply.github.com>
Date: Sat, 2 Aug 2025 06:48:10 -0500
Subject: [PATCH 10/12] fix regex of 'and' adjectivization rule (#1225)

---
 index.html             | 2 +-
 utils/languageUtils.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index c021b1fb..3c0ba0f3 100644
--- a/index.html
+++ b/index.html
@@ -8083,7 +8083,7 @@
     <script src="utils/polyfills.js?v=1.99.00"></script>
     <script src="utils/probabilityUtils.js?v=1.99.05"></script>
     <script src="utils/stringUtils.js?v=1.106.0"></script>
-    <script src="utils/languageUtils.js?v=1.99.00"></script>
+    <script src="utils/languageUtils.js?v=1.108.11"></script>
     <script src="utils/unitUtils.js?v=1.99.00"></script>
     <script src="utils/pathUtils.js?v=1.106.0"></script>
     <script defer src="utils/debugUtils.js?v=1.106.0"></script>
diff --git a/utils/languageUtils.js b/utils/languageUtils.js
index 87f5d67d..9caa1b6f 100644
--- a/utils/languageUtils.js
+++ b/utils/languageUtils.js
@@ -135,7 +135,7 @@ const adjectivizationRules = [
   {
     name: "an",
     probability: 0.5,
-    condition: new RegExp("^[a-zA-Z]{0-7}$"),
+    condition: new RegExp("^[a-zA-Z]{0,7}$"),
     action: noun => trimVowels(noun) + "an"
   }
 ];

From 538cc3423a878466e27cc820246fc4d680e993d1 Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Fri, 29 Aug 2025 14:36:34 +0200
Subject: [PATCH 11/12] fix: 1227

---
 index.html                 |  2 +-
 modules/ui/units-editor.js | 11 ++++++++---
 versioning.js              |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 3c0ba0f3..0c8a1e58 100644
--- a/index.html
+++ b/index.html
@@ -8141,7 +8141,7 @@
     <script defer src="modules/ui/rivers-creator.js?v=1.106.0"></script>
     <script defer src="modules/ui/relief-editor.js?v=1.99.00"></script>
     <script defer src="modules/ui/burg-editor.js?v=1.106.6"></script>
-    <script defer src="modules/ui/units-editor.js?v=1.104.0"></script>
+    <script defer src="modules/ui/units-editor.js?v=1.108.12"></script>
     <script defer src="modules/ui/notes-editor.js?v=1.107.3"></script>
     <script defer src="modules/ui/ai-generator.js?v=1.108.8"></script>
     <script defer src="modules/ui/diplomacy-editor.js?v=1.99.00"></script>
diff --git a/modules/ui/units-editor.js b/modules/ui/units-editor.js
index a30e9a7d..aa63e64a 100644
--- a/modules/ui/units-editor.js
+++ b/modules/ui/units-editor.js
@@ -121,11 +121,16 @@ function editUnits() {
 
   function addRuler() {
     if (!layerIsOn("toggleRulers")) toggleRulers();
+
+    const width = Math.min(graphWidth, svgWidth);
+    const height = Math.min(graphHeight, svgHeight);
     const pt = byId("map").createSVGPoint();
-    (pt.x = graphWidth / 2), (pt.y = graphHeight / 4);
+    pt.x = width / 2;
+    pt.y = height / 4;
     const p = pt.matrixTransform(viewbox.node().getScreenCTM().inverse());
-    const dx = graphWidth / 4 / scale;
-    const dy = (rulers.data.length * 40) % (graphHeight / 2);
+
+    const dx = width / 4 / scale;
+    const dy = (rulers.data.length * 40) % (height / 2);
     const from = [(p.x - dx) | 0, (p.y + dy) | 0];
     const to = [(p.x + dx) | 0, (p.y + dy) | 0];
     rulers.create(Ruler, [from, to]).draw();
diff --git a/versioning.js b/versioning.js
index a785e90e..1094599c 100644
--- a/versioning.js
+++ b/versioning.js
@@ -13,7 +13,7 @@
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
 
-const VERSION = "1.108.11";
+const VERSION = "1.108.12";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {

From f73a8906cebe1d8206a88c2be2018483c5b34ac9 Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Fri, 29 Aug 2025 17:20:03 +0200
Subject: [PATCH 12/12] Add comprehensive GitHub Copilot instructions for
 Fantasy Map Generator (#1233)

* Initial plan

* Add comprehensive GitHub Copilot instructions for Fantasy Map Generator

Co-authored-by: Azgaar <26469650+Azgaar@users.noreply.github.com>

* chore: copilot instructions

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Azgaar <26469650+Azgaar@users.noreply.github.com>
Co-authored-by: Azgaar <azgaar.fmg@yandex.com>
---
 .github/copilot-instructions.md | 89 +++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 .github/copilot-instructions.md

diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 00000000..698d23ae
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,89 @@
+# Fantasy Map Generator
+
+Azgaar's Fantasy Map Generator is a client-side JavaScript web application for creating fantasy maps. It generates detailed fantasy worlds with countries, cities, rivers, biomes, and cultural elements.
+
+Always reference these instructions first and fallback to search or bash commands only when you encounter unexpected information that does not match the info here.
+
+## Working Effectively
+
+- **CRITICAL**: This is a static web application - NO build process needed. No npm install, no compilation, no bundling.
+- Run the application using HTTP server (required - cannot run with file:// protocol):
+  - `python3 -m http.server 8000` - takes 2-3 seconds to start
+- Access at: `http://localhost:8000`
+
+## Validation
+
+- Always manually validate any changes by:
+  1. Starting the HTTP server (NEVER CANCEL - wait for full startup)
+  2. Navigate to the application in browser
+  3. Click the "►" button to open the menu and generate a new map
+  4. **CRITICAL VALIDATION**: Verify the map generates with countries, cities, roads, and geographic features
+  5. Test UI interaction: click "Layers" button, verify layer controls work
+  6. Test regeneration: click "New Map!" button, verify new map generates correctly
+- **Known Issues**: Google Analytics and font loading errors are normal (blocked external resources)
+
+## Repository Structure
+
+### Core Files
+
+- `index.html` - Main application entry point
+- `main.js` - Core application logic
+- `versioning.js` - Version management and update handling
+
+### Key Directories
+
+- `modules/` - core functionality modules:
+  - `modules/ui/` - UI components (editors, tools, style management)
+  - `modules/dynamic/` - runtime modules (export, installation)
+  - `modules/renderers/` - drawing and rendering logic
+- `utils/` - utility libraries (math, arrays, strings, etc.)
+- `styles/` - visual style presets (JSON files)
+- `libs/` - Third-party libraries (D3.js, TinyMCE, etc.)
+- `images/` - backgrounds, UI elements
+- `charges/` - heraldic symbols and coat of arms elements
+- `config/` - Heightmap templates and configurations
+- `heightmaps/` - Terrain generation data
+
+## Common Tasks
+
+### Making Code Changes
+
+1. Edit JavaScript files directly (no compilation needed)
+2. Refresh browser to see changes immediately
+3. **ALWAYS test map generation** after making changes
+4. Update version in `versioning.js` for all changes
+5. Update file hashes in `index.html` for changed files (format: `file.js?v=1.108.1`)
+
+### Debugging Map Generation
+
+- Open browser developer tools console
+- Look for timing logs, e.g. "TOTAL: ~0.76s"
+- Map generation logs show each step (heightmap, rivers, states, etc.)
+- Error messages will indicate specific generation failures
+
+### Testing Different Map Types
+
+- Use "New Map!" button for quick regeneration
+- Access "Layers" menu to change map visualization
+- Available presets: Political, Cultural, Religions, Biomes, Heightmap, Physical, Military
+
+## Troubleshooting
+
+### Application Won't Load
+
+- Ensure using HTTP server (not file://)
+- Check console for JavaScript errors
+- Verify all files are present in repository
+
+### Map Generation Fails
+
+- Check browser console for error messages
+- Look for specific module failures in generation logs
+- Try refreshing page and generating new map
+
+### Performance Issues
+
+- Map generation should complete in ~1 second for standard configurations
+- If slower, check browser console for errors
+
+Remember: This is a sophisticated client-side application that generates complete fantasy worlds with political systems, geography, cultures, and detailed cartographic elements. Always validate that your changes preserve the core map generation functionality.