#206, #228 There is no longer a hex side straits connection between T…

…he black Sea and the Agean as per #230.
Rich2 · Mar 24, 2023 · 9a9fbae · 9a9fbae
1 parent db97d4b
commit 9a9fbae
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 40 deletions.
diff --git a/EGrid/src/eg220/Terr220E30.scala b/EGrid/src/eg220/Terr220E30.scala
@@ -1,10 +1,6 @@
 /* Copyright 2018-23 Richard Oliver. Licensed under Apache Licence version 2.0. */
 package ostrat; package eg220
-import prid._
-import phex._
-import egrid._
-import WTile._
-import ostrat.egrid
+import prid.phex._, egrid._, WTile._
 
 object Terr220E30 extends Long220Terrs
 {
@@ -14,12 +10,6 @@ object Terr220E30 extends Long220Terrs
   { val res: HCenLayer[WTile] = grid.newHCenLayer[WTile](sea)
     def wr(r: Int, tileValues: Multiple[WTile]*): Unit = { res.setRow(r, tileValues :_*); () }
 
-    wr(154, plain * 2, hills * 2, plain * 3, sea, plain * 2)
-    wr(152, hills * 2, plain * 2, sea * 2, plain, hills, plain * 2)
-    wr(150, hills * 4, sea * 5, mtain, hills)
-    wr(148, hills * 4, plain, hills * 4, mtain, hills)
-    wr(146, hills, hills * 2, hills * 2, desertHills * 3, mtain, desertHills * 2)
-    wr(144, hills, sea, hills, sea, hills * 4, desertHills, plain, mtain)
     wr(142, sea * 7, Island(Hilly), hills, desert * 3)
     wr(140, sea * 3, hills, sea * 4, hills, desert * 3)
     wr(138, sea * 2, desert, sea * 5, hills, desert * 3)
@@ -33,41 +23,25 @@ object Terr220E30 extends Long220Terrs
   override val sTerrs: HSideLayer[WSide] =
   { val res: HSideLayer[WSide] = grid.newSideLayer[WSide](WSideNone)
 
-    res.setSomeInts(WSideMid(), 144,1514,  146,1520,  147,1519,  148,1518,  149,1517)//Mediterranean
-    res.setSomeInts(WSideMid(), 145,1523,  147,1525,  147,1527,  146,1528,  147,1529,  147,1531,  147,1533,  148,1534,  152,1546)//Greece / Turkey
+    //res.setSomeInts(WSideMid(), 144,1514)//,  146,1520,  147,1519)//,  148,1518,  149,1517)//Mediterranean
+    //res.setSomeInts(WSideMid(), 145,1523,  147,1525,  147,1527,  146,1528,  147,1529,  147,1531,  147,1533)//,  148,1534)//,  152,1546)//Greece / Turkey
     res.setSomeInts(WSideMid(), 134, 1540,  133,1541,  134,1544)
-    res.setSomeInts(WSideRt(), 143, 1541)//Cyprus north west
-    res.setSomeInts(WSideLt(), 143,1543,  142,1544)//Cyprus north east and east.
+    //res.setSomeInts(WSideRt(), 143, 1541)//Cyprus north west
+    //res.setSomeInts(WSideLt(), 143,1543,  142,1544)//Cyprus north east and east.
     res
   }
 
   override val corners: HCornerLayer =
   { val res = grid.newHVertOffsetLayer
 
-    res.setCorner(148, 1516, 0, HVDn)//Adriatic
-    res.setCorner(150, 1518, 4, HVUR)//Adriatic
-    res.setVert1In(148, 1516)//Adriatic
-    res.setVert4In(148, 1520)//Adriatic
-    res.setVert1In(146, 1518)//Adriatic
-    res.setMouth0(144, 1520)//Adriatic south
 
-    res.setCorner(144, 1516, 5, HVDR)//Italy - Sicily north
-    res.setCorner(144, 1516, 4, HVUR)//Italy - Sicily
-    res.setMouth0(142, 1514)
-
-    res.setMouth1(144, 1520)//Peloponnese - Greece west
-    res.setMouth4(146, 1526)//Peloponnese - Greece
-    res.setMouth1(146, 1522)//Thessaloniki - Aegean
-    res.setVert0In(146, 1526)//Thrace - Aegean
-    res.setTJunction(147, 1528)//Aegean - Dardanelles
-    res.setMouth0(144, 1528)//Thrace - Aegean
-    res.setVert0In(146, 1530)//Dardanelles
-    res.setVert3In(148, 1532)//Sea of Marmara
-    res.setVert2In(148, 1532)//Constantinople
-    res.setMouth3(150, 1534)//Sea of Marmara north
-
-    res.setMouth3(154, 1546)//Kerch Straits north
-    res.setMouth0(150, 1546)//Kerch Straits south
+    //res.setMouth1(144, 1520)//Peloponnese - Greece west
+   // res.setMouth4(146, 1526)//Peloponnese - Greece
+    //res.setMouth1(146, 1522)//Thessaloniki - Aegean
+    //res.setVert0In(146, 1526)//Thrace - Aegean
+   // res.setTJunction(147, 1528)//Aegean - Dardanelles
+   // res.setMouth0(144, 1528)//Thrace - Aegean
+    //res.setVert0In(146, 1530)//Dardanelles
 
     res.setMouth3(136, 1540)//Suez Gulf of Suez north
     res.setVert4In(134, 1542)//Gulf of Suez
@@ -99,6 +73,15 @@ object Terr220E30 extends Long220Terrs
       TRow(160, plain * 3, forest, plain * 5),
       TRow(158, hills * 2, plain * 7),
       TRow(156, plain * 2, mtain, plain * 6, desert),
+      VRow(155, MouthUp(1548)),
+      TRow(154, plain * 2, hills * 2, plain * 3, Head2Land(2), plain * 2),
+      TRow(152, hills * 2, plain * 2, sea, Head2Land(3), Head3Land(1), Head3Land(3, Hilly), plain * 2),
+      TRow(150, Head1Land(4, Hilly), hills * 3, sea * 5, mtain, hills),
+      TRow(148, Head2Land(0, Hilly), Head1Land(4, Hilly), plain, hills * 4, mtain, hills),
+      VRow(147, MouthUL(1526)),
+      TRow(146, Head2Land(1, Hilly), Head1Land(4, Hilly), Head2Land(1, Hilly), hills * 2, desertHills * 3, mtain, desertHills * 2),
+      VRow(145, MouthDL(1522), MouthUR(1524)),
+      TRow(144, Head4Land(2, Hilly), sea, hills, sea, hills * 4, desertHills, plain, mtain),
     )
   }
   help.run

diff --git a/EGrid/src/eg320/Terr320E30.scala b/EGrid/src/eg320/Terr320E30.scala
@@ -28,8 +28,9 @@ object Terr320E30 extends Long320Terrs
       VRow(137, MouthUp(1522), MouthUR(1540), MouthUR(1544)),
       TRow(136, hills, plain * 2, Head1Land(2), Head4Land(2), Head3Land(3), plain),
       VRow(135, VertInUR(1522)),
-      TRow(134, Head1Land(4, Hilly), hills, Head2Land(2, Hilly), sea * 3, mtain),
-      TRow(132, Head2Land(1, Hilly), hills, Head3Land(4, Hilly), hills * 4),
+      TRow(134, Head1Land(4, Hilly), hills, hills, sea * 3, mtain),
+      VRow(133, MouthUp(1530)),
+      TRow(132, Head2Land(1, Hilly), hills, Head1Land(4, Hilly), hills * 4),
       VRow(131, MouthDR(1528)),
       TRow(130, Head4Land(2, Hilly), Head4Land(3, Hilly), Head3Land(1, Hilly), Head2Land(3, Hilly), hills * 4),
       VRow(129, MouthUR(1536)),