#195 Added row 430 to TerrE0.

EGrid/src/eg80/Grids80s0e1.scala

@@ -6,7 +6,7 @@ object Grids80s0e1 extends EGrid80LongMulti
 { ThisSys =>
 
   override def gridsXSpacing: Double = 40
-  override val grids: RArr[EGridLongFull] = EGrid80.grids(2, 0, 432)
+  override val grids: RArr[EGridLongFull] = EGrid80.grids(2, 0, 430)
   override def headGridInt: Int = 0
   override val gridMans: RArr[EGridLongMan] = iToMap(1)(EGridLongMan(_, ThisSys))
 

EGrid/src/eg80/Terr80E0.scala

@@ -6,7 +6,7 @@ import pEarth._,prid._, phex._, WTile._, egrid._
  *  in base 32. The c offset for North East Europe will be 1536 or 1G0 in base 32. Current y offset is 300 for the equator. The Old c offset was 200 so a diff of 312 */
 object Terr80E0 extends Long80Terrs
 {
-  implicit val grid: EGrid80LongFull = EGrid80.e0(432)
+  implicit val grid: EGrid80LongFull = EGrid80.e0(430)
 
   override val terrs: HCenLayer[WTile] =
   {
@@ -57,14 +57,16 @@ object Terr80E0 extends Long80Terrs
     wr(438, sea * 5, hills * 3, mtain * 3, hills, mtain * 2, hills * 4, sea * 2, hills * 2, sea * 4, hills * 3, sea)
     wr(436, sea * 5, hills * 3, plain * 3, desert * 2, hills, mtain * 4, sea * 5, hills, sea * 2, hills * 2, mtain, hills)
     wr(434, sea * 6, hills * 2, plain, desert, desHill, plain, hills, plain * 2, hills * 3, sea * 6, hills, sea * 2, hills * 2, mtain, hills)
-    wr(432, sea * 6, hills * 3, plain, desert, hills * 3, desert, plain, hills * 2, sea * 11, hills * 2)
+    wr(432, sea * 6, hills * 3, plain, desert, hills * 3, desert, plain, hills * 2, sea * 7, hills, sea * 3, hills * 2)
+    wr(430, sea * 5, plain, hills * 5, desert, hills, desHill, mtain, plain, sea * 8, hills * 2, sea * 4, hills)
     res
   }
 
   override val sTerrs: HSideOptLayer[WSide] =
   { val res: HSideOptLayer[WSide] = grid.newSideOpts[WSide]
     res.setSomeInts(Sea, 463,517,  465,499,  465,501,  475,547,  476,546,  476,494,  477,493,  487,503)//British Isles
     res.setSomeInts(Sea, 477,545,  477,547,  478,544,  478,548,  478,552,  479,545,  479,551,  485,545,  484,546)
+    res.setSomeInts(Sea, 433,551)
     res
   }
 
@@ -99,6 +101,9 @@ object Terr80E0 extends Long80Terrs
     res.setVert1In(478, 550)//Zealand - Sweden
     res.setMouth0(476, 552)//Zealand - Sweden south
 
+    res.setMouth1(432, 548)//Sardinia - Corsica west
+    res.setMouth4(434, 554)//Sardinia - Corsica east
+
     res
   }
 }

Earth/srcPts/pEurope/EuropeSW.scala

@@ -24,6 +24,7 @@ object FranceSouth extends EArea2("FranceSouth", 44.54 ll 2.53, plain)
 object IberiaSouth extends EArea2("IberiaSouth", 38.48 ll -4.55, plain)
 { val valencia = 39.45 ll -0.32
   val xabia = 38.74 ll 0.22
+  val p15 = 38.43 ll -0.39
   val capePalos = 37.63 ll -0.70
   val p20 = 36.93 ll -1.90
   val southEast = 36.74 ll -2.13
@@ -35,18 +36,21 @@ object IberiaSouth extends EArea2("IberiaSouth", 38.48 ll -4.55, plain)
   val chipiona = 36.3 ll -6.19
   val heulva = 37 ll -7
   val swPortugal = 37.06 ll -8.34
+  val comporta = 38.38 ll -8.80
   val estoril = 38.71 ll -9.48
-  val p85 = 38.76 ll -9.03
+  val p85 = 38.75 ll -9.47
+  val p87 = 38.77 ll -9.50
   val mondegoMouth = 40.15 ll -8.87
-  override val polygonLL = PolygonLL(valencia, xabia, capePalos, p20, southEast, malaga, p10, bistroPoint, tarifa, chipiona, heulva, swPortugal,
-    estoril, p85, mondegoMouth)
+  override val polygonLL = PolygonLL(valencia, xabia, p15, capePalos, p20, southEast, malaga, p10, bistroPoint, tarifa, chipiona, heulva, swPortugal,
+    comporta, estoril, p85, p87, mondegoMouth)
 }
 
 /** [[PolygonLL]] graphic depends on [[IberiaSouth]]. */
 object IberiaNorth extends EArea2("Iberia", 41 ll -3.5, hills)
 { 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
   val cambrills = 41.07 ll 1.06
   val ebroMouth = 40.72 ll 0.87
@@ -56,6 +60,8 @@ object IberiaNorth extends EArea2("Iberia", 41 ll -3.5, hills)
 
   val p50 = 40.19 ll -8.91
   val espinho = 41.02 ll -8.64
+  val p55 = 42.11 ll -8.90
+  val p62 = 42.52 ll -9.04
   val escaselas = 42.92 ll -9.29
   val malipica = 43.34 ll -8.83
   val carino = 43.76 ll -7.86
@@ -65,7 +71,7 @@ object IberiaNorth extends EArea2("Iberia", 41 ll -3.5, hills)
   val laNivelleMouth = 43.39 ll -1.67
 
   override val polygonLL = PolygonLL(neSpain, begur, barcelona, cambrills, ebroMouth, p37, p40, p42, IberiaSouth.valencia, IberiaSouth.mondegoMouth,
-    p50, espinho, escaselas, malipica, carino, fozMouth, santander, p80, laNivelleMouth, laMassaneMouth)
+    p50, espinho, p55, p62, escaselas, malipica, carino, fozMouth, santander, p80, laNivelleMouth, laMassaneMouth)
 }
 
 /** [[PolygonLL]] graphic for Italy depends on [[ItalySouth]]. */
@@ -81,6 +87,8 @@ object Italy extends EArea2("ItalyNorth", 43.61 ll 11.82, hills)
 
 
   val gaeta = 41.20 ll 13.57
+  val p55 = 41.23 ll 13.04
+  val anzio = 41.45 ll 12.62
   val santaMarinella = 42.03 ll 11.83
   val puntaAla = 42.80 ll 10.73
   val livorno = 43.54 ll 10.29
@@ -91,7 +99,7 @@ object Italy extends EArea2("ItalyNorth", 43.61 ll 11.82, hills)
   val voltri = 44.42 ll 8.75
 
   override val polygonLL = PolygonLL(venice, ven1, cervia, ancona, guilianova, vasto, campomarina, vieste, ItalySouth.siponto, ItalySouth.diProcida,
-    gaeta, santaMarinella, puntaAla, livorno, forteDeiMarmi, palmaria, recco, genoa, voltri)
+    gaeta, p55, anzio, santaMarinella, puntaAla, livorno, forteDeiMarmi, palmaria, recco, genoa, voltri)
 }
 
 /** [[PolygonLL]] graphic for Italy depends on nothing. */

Earth/srcPts/pEurope/MedIslands.scala

@@ -55,53 +55,59 @@ object Crete extends EArea2("Crete", 35.23 ll 24.92, hills)
 
 /** [[PolygonLL]] graphic for Cyprus depends on nothing. */
 object Cyprus extends EArea2("Cyprus", 34.98 ll 33.15, hills)
-{ val northEast = 35.69 ll 34.58
-  val southEast = 34.96 ll 34.09
-  val p30 = 34.57 ll 33.04
-  val pontiBaba = 35.10 ll 32.28
-  val korucamBurnu = 35.40 ll 32.92
+{ val northEast: LatLong = 35.69 ll 34.58
+  val southEast: LatLong = 34.96 ll 34.09
+  val p30: LatLong = 34.57 ll 33.04
+  val pontiBaba: LatLong = 35.10 ll 32.28
+  val korucamBurnu: LatLong = 35.40 ll 32.92
 
   override val polygonLL: PolygonLL = PolygonLL(northEast, southEast, p30, pontiBaba, korucamBurnu)
 }
 
 /** [[PolygonLL]] graphic for Rhodes depends on nothing. */
 object Rhodes extends EArea2("Rhodes", 36.22 ll 27.95, hills)
-{ val north = 36.46 ll 28.22
-  val akraLindos = 36.05 ll 28.09
-  val p40 = 35.93 ll 27.86
-  val south = 35.88 ll 27.76
-  val p50 = 35.94 ll 27.72
-  val p65 = 36.15 ll 27.69
-  val p70 = 36.27 ll 27.81
+{ val north: LatLong = 36.46 ll 28.22
+  val akraLindos: LatLong = 36.05 ll 28.09
+  val p40: LatLong = 35.93 ll 27.86
+  val south: LatLong = 35.88 ll 27.76
+  val p50: LatLong = 35.94 ll 27.72
+  val p65: LatLong = 36.15 ll 27.69
+  val p70: LatLong = 36.27 ll 27.81
 
   override val polygonLL: PolygonLL = PolygonLL(north, akraLindos, p40, south, p50, p65, p70)
 }
 
 /** [[PolygonLL]] graphic for Corsica depends on nothing. */
 object Corsica extends EArea2("Corsica", 42.18 ll 9.17, hills)
-{ val nCorsica = 43.00 ll 9.42
-  val bastia = 42.70 ll 9.45
-  val olmuccia = 41.69 ll 9.40
-  val sCorsica = 41.37 ll 9.21
-  val swCorsica = 41.56 ll 8.79
-  val scandola = 42.37 ll 8.54
-  val nwCalvi = 42.57 ll 8.71
-  val pointeMignola = 42.73 ll 9.16
-  val fromontica = 42.67 ll 9.29
+{ val nCorsica: LatLong = 43.00 ll 9.42
+  val bastia: LatLong = 42.70 ll 9.45
+  val p10: LatLong = 42.57 ll 9.53
+  val olmuccia: LatLong = 41.69 ll 9.40
+  val sCorsica: LatLong = 41.37 ll 9.21
+  val swCorsica: LatLong = 41.56 ll 8.79
+  val scandola: LatLong = 42.37 ll 8.54
+  val nwCalvi: LatLong = 42.57 ll 8.71
+  val pointeMignola: LatLong = 42.73 ll 9.16
+  val fromontica: LatLong = 42.67 ll 9.29
 
-  val polygonLL = PolygonLL(nCorsica, bastia, olmuccia, sCorsica, swCorsica, scandola, nwCalvi, pointeMignola, fromontica)
+  override val polygonLL = PolygonLL(nCorsica, bastia, p10, olmuccia, sCorsica, swCorsica, scandola, nwCalvi, pointeMignola, fromontica)
 }
 
 /** [[PolygonLL]] graphic for Sardinia depends on nothing. */
 object Sardina extends EArea2("Sardina", 40.12 ll 9.07, hills)
-{ val calaCaterina = 39.10 ll 9.51
-  val perdaLonga = 38.87 ll 8.84
-  val capoTeulada = 38.86 ll 8.64
-  val portscuso = 39.21 ll 8.36
-  val capoFalcone = 40.97 ll 8.20
-  val platamona = 40.81 ll 8.46
-  val north = 41.25 ll 9.23
-  val east = 40.52 ll 9.82
+{ val north: LatLong = 41.25 ll 9.23
+  val east: LatLong = 40.52 ll 9.82
+  val p20: LatLong = 40.24 ll 9.62
+  val capoMonteSanto: LatLong = 40.08 ll 9.74
+  val calaCaterina: LatLong = 39.10 ll 9.51
+  val perdaLonga: LatLong = 38.87 ll 8.84
+  val capoTeulada: LatLong = 38.86 ll 8.64
+  val portscuso: LatLong = 39.21 ll 8.36
+  val alghero: LatLong = 40.56 ll 8.31
+  val capoCaccia: LatLong = 40.56 ll 8.16
+  val capoFalcone: LatLong = 40.97 ll 8.20
+  val platamona: LatLong = 40.81 ll 8.46
 
-  val polygonLL = PolygonLL(calaCaterina, perdaLonga, capoTeulada, portscuso, capoFalcone, platamona, north, east)
+  override val polygonLL = PolygonLL(north, east, p20, capoMonteSanto, calaCaterina, perdaLonga, capoTeulada, portscuso, alghero, capoCaccia,
+    capoFalcone, platamona)
 }