#214 E0 terrain.

Rich2 · Feb 18, 2023 · bcc1c28 · bcc1c28
1 parent d0b9907
commit bcc1c28
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 20 deletions.
diff --git a/Dev/srcGrand/pww1/WW1Scen.scala b/Dev/srcGrand/pww1/WW1Scen.scala
@@ -19,6 +19,7 @@ object WW1Scen1 extends WW1Scen
   armies.unsafeSetSome(308, 528, Army(Germany))
 
 }
+
 object WW1Scen2 extends WW1Scen
 { override def turn: Int = 0
   override implicit def gridSys: EGrid120LongFull = Terr120E30.grid

diff --git a/EGrid/src/eg160/Multi160Systems.scala b/EGrid/src/eg160/Multi160Systems.scala
@@ -5,7 +5,7 @@ import prid._, phex._, egrid._, pEarth._
 /** 2 Grid system for 0E and 30E */
 object Grids160S0E1 extends EGrid160LongMulti
 { ThisSys =>
-  override val grids: RArr[EGridLongFull] = EGrid160.grids(2, 0, 276)
+  override val grids: RArr[EGridLongFull] = EGrid160.grids(2, 0, 266)
   override def headGridInt: Int = 0
   override def gridsXSpacing: Double = 40
   override val gridMans: RArr[EGridLongMan] = iToMap(1)(EGridLongMan(_, ThisSys))

diff --git a/EGrid/src/eg160/Terr160E0.scala b/EGrid/src/eg160/Terr160E0.scala
@@ -5,7 +5,7 @@ import pEarth._, prid._, phex._, WTile._, egrid._
 /** 160km terrain for 0 degrees eat. */
 object Terr160E0 extends Long160Terrs
 {
-  override implicit val grid: EGrid160LongFull = EGrid160.e0(272)
+  override implicit val grid: EGrid160LongFull = EGrid160.e0(266)
 
   /** Terrain for 160km 30East. Zealand has been moved north. 94GG has been left as Sea. */
   override val terrs: HCenLayer[WTile] =
@@ -32,6 +32,9 @@ object Terr160E0 extends Long160Terrs
     wr(276, sea * 5, plain * 4, hills * 2, mtain * 3)
     wr(274, sea * 6, plain * 3, hills, mtain * 4)
     wr(272, sea * 6, plain, hills * 2, mtain, hills, mtain, plain, hills)
+    wr(270, sea * 2, plain, hills * 3, plain * 2, hills * 2, mtain, sea, hills * 2, sea)
+    wr(268, sea * 3, hills, plain, hillDesert * 2, mtain * 2, sea * 3, hills, hills * 2)
+    wr(266, sea * 2, hills * 2, desert, hillDesert * 2, hills, sea * 3, hills, sea * 2, hills)
     res
   }
 

diff --git a/Earth/srcPts/pEurope/EuropeSW.scala b/Earth/srcPts/pEurope/EuropeSW.scala
@@ -2,9 +2,9 @@
 package ostrat; package pEarth; package pEurope
 import geom._, pglobe._, WTile._
 
+/** [[PolygonLL]] graphic depends on [[Iberia]] and [[Frankia]]. */
 object FranceSouth extends EArea2("FranceSouth", 44.54 ll 2.53, plain)
-{
-  val montelimar = 44.55 ll 4.71
+{ val montelimar = 44.55 ll 4.71
   val orangeCrossing = 44.07 ll 4.76
 
   val stRaphael = 43.42 ll 6.76
@@ -16,23 +16,13 @@ object FranceSouth extends EArea2("FranceSouth", 44.54 ll 2.53, plain)
   val laGrandeMotte = 43.55 ll 4.05
   val narbonne = 43.14 ll 3.08
 
-  val seFrance = 42.43 ll 3.17
-
-  val swFrance = 43 ll -2
-  val polygonLL = PolygonLL(swFrance, Frankia.southWest, Frankia.southEast, montelimar, orangeCrossing,
-     stRaphael, frejus,laBastideBlanche, capBenat, laSeyneSurMer, fosSurMer, laGrandeMotte, narbonne, seFrance)
+  override val polygonLL = PolygonLL(Iberia.laNivelleMouth, Frankia.southWest, Frankia.southEast, montelimar, orangeCrossing, stRaphael, frejus,
+    laBastideBlanche, capBenat, laSeyneSurMer, fosSurMer, laGrandeMotte, narbonne, Iberia.laMassaneMouth)
 }
 
+/** [[PolygonLL]] graphic depends on nothing. */
 object Iberia extends EArea2("Iberia", 41 ll -3.5, hills)
-{
-  val southWest = 40 ll -8.91
-  val espinho = 41.02 ll -8.64
-
-  val escaselas = 42.92 ll -9.29
-  val malipica = 43.34 ll -8.83
-  val carino = 43.76 ll -7.86
-  val santander = 43.49 ll -3.81
-
+{ val laMassaneMouth = 42.54 ll 3.05
   val neSpain = 42.18 ll 3.06
   val begur = 41.95 ll 3.22
   val barcelona = 41.31 ll 2.12
@@ -50,8 +40,17 @@ object Iberia extends EArea2("Iberia", 41 ll -3.5, hills)
   val valencia = 39.45 ll -0.32
   val xabia = 38.74 ll 0.22
   val almeriaEast = 36.28 ll -2.06
+  val southWest = 40 ll -8.91
+  val espinho = 41.02 ll -8.64
 
+  val escaselas = 42.92 ll -9.29
+  val malipica = 43.34 ll -8.83
+  val carino = 43.76 ll -7.86
+  val fozMouth = 43.57 ll -7.24
+  val santander = 43.49 ll -3.81
+  val p80 = 43.46 ll -2.75
+  val laNivelleMouth = 43.39 ll -1.67
 
-  val polygonLL = PolygonLL(malaga, p10, bistroPoint, tarifa, chipiona, heulva, swPortugal, estoril, espinho, escaselas, malipica, carino, santander, FranceSouth.swFrance,
-     FranceSouth.seFrance, neSpain, begur, barcelona, valencia, xabia, almeriaEast)
+  override val polygonLL = PolygonLL(neSpain, begur, barcelona, valencia, xabia, almeriaEast,malaga, p10, bistroPoint, tarifa, chipiona, heulva,
+    swPortugal, estoril, espinho, escaselas, malipica, carino, fozMouth, santander, p80, laNivelleMouth, laMassaneMouth)
 }