major_road -> main_road (to match friedrich terminology)

2 files changed, 14 insertions, 14 deletions

diff --git a/tools/layout.svg b/tools/layout.svg
index be98c85..edffc20 100644
--- a/tools/layout.svg
+++ b/tools/layout.svg
@@ -40,10 +40,10 @@
      inkscape:window-height="480"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="5.7431908"
+     inkscape:zoom="4.9386971"
      inkscape:cx="203.18431"
      inkscape:cy="1571.788"
-     inkscape:current-layer="g5174"
+     inkscape:current-layer="svg4"
      inkscape:document-rotation="0"
      showguides="false">
     <inkscape:grid
@@ -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:inline"
      x="0"
-     style="display:inline" />
+     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="major_road"
+     inkscape:label="main_road"
      sodipodi:insensitive="true">
     <path
        style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000;stop-opacity:1"
diff --git a/tools/parse-layout.js b/tools/parse-layout.js
index dba68af..468f83c 100644
--- a/tools/parse-layout.js
+++ b/tools/parse-layout.js
@@ -310,7 +310,7 @@ for (let key in points) {
 				type: key,
 				x: Math.round(x),
 				y: Math.round(y),
-				major_roads: [],
+				main_roads: [],
 				roads: [],
 			})
 		} else {
@@ -343,8 +343,8 @@ cities.sort((a,b) => {
 for (let e of edges.major_road) {
 	let a = find_closest_city(e.x1, e.y1)
 	let b = find_closest_city(e.x2, e.y2)
-	cities[a].major_roads.push(b)
-	cities[b].major_roads.push(a)
+	cities[a].main_roads.push(b)
+	cities[b].main_roads.push(a)
 }
 
 for (let e of edges.road) {
@@ -362,7 +362,7 @@ let arrays = {
 	// type: [],
 	x: [],
 	y: [],
-	major_roads: [],
+	main_roads: [],
 	roads: [],
 }