#228 Re-updating 320km E0 and E30.

Rich2 · Mar 27, 2023 · b7006c3 · b7006c3
1 parent f238239
commit b7006c3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/EGrid/src/eg320/Terr320E0.scala b/EGrid/src/eg320/Terr320E0.scala
@@ -21,18 +21,18 @@ object Terr320E0 extends Long320Terrs
       TRow(150, sea * 3, taigaHills),
       TRow(148, sea * 3, taigaHills, taiga),
       TRow(146, sea, hills, sea, Head4Land(4), Head3Land(2, Plains, Forest)),
-      TRow(144, sea, Head4Land(5), plain, sea, plain),
-      TRow(142, sea, Head4Land(2), Head1Land(5), Head3Land(1), plain * 2),
-      TRow(140, sea, Head4Land(2, Hilly), Head2Land(5), plain * 3),
+      TRow(144, sea, Headland(4, 5), plain, sea, plain),
+      TRow(142, sea, Headland(4, 2), Headland(1, 5), Headland(3, 1), plain * 2),
+      TRow(140, sea, Headland(4, 2, Hilly), Headland(2, 5), plain * 3),
       TRow(138, sea * 2, plain * 2, hills, mtain * 2),
       VRow(137, MouthUp(526)),
       TRow(136, sea * 3, plain, hills, mtain, plain),
       VRow(135, VertInUR(526)),
       TRow(134, sea, hills * 3, sea, Island(Hilly), Head1Land(1, Hilly)),
       TRow(132, sea, hills, plain * 2, sea, Island(Hilly), sea),
-      TRow(130, sea, Head3Land(3), Head1Land(3, Hilly), Head2Land(2, Hilly), sea * 2, Head3Land(5, Hilly), Island(Hilly)),
-      TRow(128, sea, Head2Land(5, Hilly), Head1Land(0, Hilly), hills * 3, Head1Land(1, Hilly), sea),
-      TRow(126, sea, Head1Land(5), mtain, desertHills, desert * 4),
+      TRow(130, sea, Headland(3, 3), Headland(1, 3, Hilly), Headland(2, 2, Hilly), sea * 2, Head3Land(5, Hilly), Island(Hilly)),
+      TRow(128, sea, Headland(2, 5, Hilly), Headland(1, 0, Hilly), hills * 3, Headland(1, 1, Hilly), sea),
+      TRow(126, sea, Headland(1, 5), mtain, desertHills, desert * 4),
       TRow(124, sea, desertHills, hills, desert * 6),
     )
   }

diff --git a/EGrid/src/eg320/Terr320E30.scala b/EGrid/src/eg320/Terr320E30.scala
@@ -14,23 +14,23 @@ object Terr320E30 extends Long320Terrs
       TRow(156, Head2Land(5, Hilly, Tundra), Head2Land(0, Hilly, Tundra), sea),
       TRow(154, taigaHills, taiga * 2, Head4Land(0, Plains, Tundra)),
       VRow(153, MouthUp(1534)),
-      TRow(152, Head1Land(2, Plains, Taiga), taiga, Head2Land(1, Plains, Taiga), taiga),
+      TRow(152, Headland(1, 2, Plains, Taiga), taiga, Headland(2, 1, Plains, Taiga), taiga),
       VRow(151, VertInDR(1532), MouthDL(1540)),
-      TRow(150, Head1Land(2, Plains, Taiga), taiga * 3),
+      TRow(150, Headland(1, 2, Plains, Taiga), taiga * 3),
       VRow(149, MouthUL(1536, Lake), MouthDR(1538, Lake)),
       VRow(147, MouthUR(1534)),
-      TRow(148, Head1Land(2, Plains, Taiga), Head3Land(3, Plains, Taiga), taiga * 3),
-      TRow(146, Head2Land(5), taiga * 4),
+      TRow(148, Headland(1, 2, Plains, Taiga), Head3Land(3, Plains, Taiga), taiga * 3),
+      TRow(146, Headland(2, 5), taiga * 4),
       TRow(144, plain * 5),
       TRow(142, plain * 6),
       TRow(140, plain * 6),
       TRow(138, mtain * 2, hills, plain * 3, desert),
       VRow(137, MouthUp(1522), MouthUR(1540), VertInDR(1542), MouthUR(1544)),
-      TRow(136, hills, plain * 2, Head1Land(2), Head3Land(3), Head2Land(3), plain),
+      TRow(136, hills, plain * 2, Headland(1, 2), Headland(3, 3), Headland(2, 3), plain),
       VRow(135, VertInUR(1522)),
       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),
+      TRow(132, Headland(2, 1, Hilly), hills, Headland(1, 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)),