From d8b4d3a57a161a7e96b46b1f4915e990c03a6614 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Fri, 10 May 2024 17:43:25 +0200
Subject: x

---
 data.js               |  2 +-
 tools/layout.svg      | 22 +++++++++++-----------
 tools/parse-layout.js |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/data.js b/data.js
index f022c25..548a938 100644
--- a/data.js
+++ b/data.js
@@ -1399,7 +1399,7 @@ const data = {
 			591, 539, 596, 536, 576, 655, 703, 644, 757, 685, 642, 641, 651, 733, 703, 674, 404, 579, 725, 525, 643, 474, 778,
 			780, 456, 774, 705, 80, 109,
 		],
-		major_roads: [
+		main_roads: [
 			[],
 			[ 3, 7, 19 ],
 			[ 407, 3 ],
diff --git a/tools/layout.svg b/tools/layout.svg
index abc84cc..7fe274c 100644
--- a/tools/layout.svg
+++ b/tools/layout.svg
@@ -40,7 +40,7 @@
      inkscape:window-height="480"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="0.5"
+     inkscape:zoom="0.42996109"
      inkscape:cx="1321.8811"
      inkscape:cy="745.19143"
      inkscape:current-layer="svg4"
@@ -53,14 +53,14 @@
   <image
      sodipodi:absref="/home/tor/src/rally/public/maria/Maria.Gameboard.150.png"
      xlink:href="../Maria.Gameboard.150.png"
-     id="image2"
-     sodipodi:insensitive="true"
-     image-rendering="pixelated"
-     height="1654"
-     width="2485"
-     y="0"
+     style="display:none"
      x="0"
-     style="display:none" />
+     y="0"
+     width="2485"
+     height="1654"
+     image-rendering="pixelated"
+     sodipodi:insensitive="true"
+     id="image2" />
   <g
      id="g3013"
      inkscape:label="box">
@@ -4059,7 +4059,7 @@
   </g>
   <g
      id="g3273"
-     inkscape:label="main_road"
+     inkscape:label="major_road"
      sodipodi:insensitive="true"
      style="stroke:#b3b3b3">
     <path
@@ -15129,8 +15129,8 @@
   <g
      id="g4011"
      inkscape:label="$HRE_W"
-     sodipodi:insensitive="true"
-     style="display:none">
+     style="display:none"
+     sodipodi:insensitive="true">
     <rect
        style="fill:#ffff00;fill-opacity:0.54878"
        id="rect3976"
diff --git a/tools/parse-layout.js b/tools/parse-layout.js
index 468f83c..f2443fd 100644
--- a/tools/parse-layout.js
+++ b/tools/parse-layout.js
@@ -50,14 +50,14 @@ function parse_path_data(path) {
 	for (let i = 0; i < path.length;) {
 		switch (path[i]) {
 		case 'M':
-			x = cx = Number(path[i+1])
-			y = cy = Number(path[i+2])
+			x2 = x = cx = Number(path[i+1])
+			y2 = y = cy = Number(path[i+2])
 			i += 3
 			abs = true
 			break
 		case 'm':
-			x = cx = cx + Number(path[i+1])
-			y = cy = cy + Number(path[i+2])
+			x2 = x = cx = cx + Number(path[i+1])
+			y2 = y = cy = cy + Number(path[i+2])
 			i += 3
 			abs = false
 			break
-- 
cgit v1.2.3