From 97e504d2aaa3575761ffebbb10698bdbc831576b Mon Sep 17 00:00:00 2001
From: Azgaar <azgaar.fmg@yandex.com>
Date: Sun, 22 Sep 2024 13:04:22 +0200
Subject: [PATCH] fix: features - define first cell

---
 index.html          |  2 +-
 modules/features.js | 34 +++++++++++++++++++++++++---------
 versioning.js       |  2 +-
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index 022e5067..3c4d525b 100644
--- a/index.html
+++ b/index.html
@@ -8115,7 +8115,7 @@
     <script defer src="modules/io/cloud.js?v=1.99.00"></script>
     <script defer src="modules/io/export.js?v=1.100.00"></script>
 
-    <script defer src="modules/renderers/draw-features.js?v=1.104.0"></script>
+    <script defer src="modules/renderers/draw-features.js?v=1.104.15"></script>
     <script defer src="modules/renderers/draw-borders.js?v=1.104.0"></script>
     <script defer src="modules/renderers/draw-heightmap.js?v=1.104.0"></script>
     <script defer src="modules/renderers/draw-markers.js?v=1.104.0"></script>
diff --git a/modules/features.js b/modules/features.js
index 6e5b40fb..9ef785d6 100644
--- a/modules/features.js
+++ b/modules/features.js
@@ -129,7 +129,6 @@ window.Features = (function () {
       }
 
       features.push(addFeature({firstCell, land, border, featureId, totalCells}));
-
       queue[0] = featureIds.findIndex(f => f === UNMARKED); // find unmarked cell
     }
 
@@ -155,7 +154,7 @@ window.Features = (function () {
 
     function addFeature({firstCell, land, border, featureId, totalCells}) {
       const type = land ? "island" : border ? "ocean" : "lake";
-      const featureVertices = type === "ocean" ? [] : getFeatureVertices(firstCell);
+      const [startCell, featureVertices] = getCellsData(type, firstCell);
       const points = clipPoly(featureVertices.map(vertex => vertices.p[vertex]));
       const area = d3.polygonArea(points); // feature perimiter area
       const absArea = Math.abs(rn(area));
@@ -165,8 +164,8 @@ window.Features = (function () {
         type,
         land,
         border,
-        firstCell,
         cells: totalCells,
+        firstCell: startCell,
         vertices: featureVertices,
         area: absArea
       };
@@ -179,19 +178,36 @@ window.Features = (function () {
 
       return feature;
 
-      function getFeatureVertices(firstCell) {
+      function getCellsData(featureType, firstCell) {
+        if (featureType === "ocean") return [firstCell, []];
+
         const getType = cellId => featureIds[cellId];
         const type = getType(firstCell);
         const ofSameType = cellId => getType(cellId) === type;
         const ofDifferentType = cellId => getType(cellId) !== type;
 
-        const isOnBorder = borderCells[firstCell] || neighbors[firstCell].some(ofDifferentType);
-        if (!isOnBorder) throw new Error(`Markup: firstCell ${firstCell} is not on the feature or map border`);
+        const startCell = findOnBorderCell(firstCell);
+        const featureVertices = getFeatureVertices(startCell);
+        return [startCell, featureVertices];
 
-        const startingVertex = cells.v[firstCell].find(v => vertices.c[v].some(ofDifferentType));
-        if (startingVertex === undefined) throw new Error(`Markup: startingVertex for cell ${firstCell} is not found`);
+        function findOnBorderCell(firstCell) {
+          const isOnBorder = cellId => borderCells[cellId] || neighbors[cellId].some(ofDifferentType);
+          if (isOnBorder(firstCell)) return firstCell;
 
-        return connectVertices({vertices, startingVertex, ofSameType, closeRing: false});
+          const startCell = cells.i.filter(ofSameType).find(isOnBorder);
+          if (startCell === undefined)
+            throw new Error(`Markup: firstCell ${firstCell} is not on the feature or map border`);
+
+          return startCell;
+        }
+
+        function getFeatureVertices(startCell) {
+          const startingVertex = cells.v[startCell].find(v => vertices.c[v].some(ofDifferentType));
+          if (startingVertex === undefined)
+            throw new Error(`Markup: startingVertex for cell ${startCell} is not found`);
+
+          return connectVertices({vertices, startingVertex, ofSameType, closeRing: false});
+        }
       }
     }
   }
diff --git a/versioning.js b/versioning.js
index 3a7ad3b3..bf3deac2 100644
--- a/versioning.js
+++ b/versioning.js
@@ -12,7 +12,7 @@
  *
  * Example: 1.102.2 -> Major version 1, Minor version 102, Patch version 2
  */
-const VERSION = "1.104.14";
+const VERSION = "1.104.15";
 if (parseMapVersion(VERSION) !== VERSION) alert("versioning.js: Invalid format or parsing function");
 
 {