Skip to content

Commit

Permalink
#228 More converton of 80km E30.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rich2
Rich2 committed Mar 26, 2023
1 parent c09a136 commit 7173c74
Show file tree
Hide file tree
Showing 7 changed files with 104 additions and 83 deletions.
2 changes: 1 addition & 1 deletion EGrid/src/eg160/Terr160E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object Terr160E30 extends Long160Terrs
TRow(278, hills * 3, plain * 10),
TRow(276, plain, hills, plain * 12),
TRow(274, hills * 2, plain, hills * 3, plain * 4, sea, plain * 3),
TRow(272, hills, plain, hills * 2, plain * 2, plain, sea, plain * 2, plain * 4),
TRow(272, hills, plain, hills * 2, plain * 2, plain, sea, plain, Head2Land(2), Head2Land(3), plain * 3),
TRow(270, hills * 3, plain * 4, sea * 5, mtain, hills, plain),
TRow(268, sea, Head2Land(3, Mountains), hills * 3, plain * 2, sea * 6, plain, mtain),
TRow(266, Head2Land(0), Head2Land(4, Mountains), hills * 3, plain * 2, hills * 8),
Expand Down
7 changes: 4 additions & 3 deletions EGrid/src/eg220/Terr220E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ 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),
VRow(155, MouthUp(1544), MouthUp(1548)),
TRow(154, plain * 2, hills * 2, plain * 3, Head3Land(2), plain * 2),
VRow(153, MouthUR(1540)),
TRow(152, hills * 2, plain * 2, sea, Head3Land(3), Head3Land(1), Head2Land(3, Hilly), plain * 2),
TRow(150, Head1Land(4, Hilly), hills * 3, sea * 5, Head1Land(4, Mountains), hills),
VRow(149, MouthDR(1554)),
TRow(148, Head2Land(0, Hilly), Head1Land(4, Hilly), plain, hills * 2, Head1Land(0, Hilly), mtain, hills * 2, Head1Land(0, Mountains), hills),
Expand Down
4 changes: 2 additions & 2 deletions EGrid/src/eg320/Terr320E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ object Terr320E30 extends Long320Terrs
TRow(142, plain * 6),
TRow(140, plain * 6),
TRow(138, mtain * 2, hills, plain * 3, desert),
VRow(137, MouthUp(1522), MouthUR(1540), MouthUR(1544)),
TRow(136, hills, plain * 2, Head1Land(2), Head4Land(2), Head3Land(3), plain),
VRow(137, MouthUp(1522), MouthUR(1540), VertInDR(1542), MouthUR(1544)),
TRow(136, hills, plain * 2, Head1Land(2), Head3Land(3), Head2Land(3), plain),
VRow(135, VertInUR(1522)),
TRow(134, Head1Land(4, Hilly), hills, hills, sea * 3, mtain),
VRow(133, MouthUp(1530)),
Expand Down
93 changes: 48 additions & 45 deletions EGrid/src/eg80/Terr80E30.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,7 @@ object Terr80E30 extends Long80Terrs
def wr(r: Int, tileValues: Multiple[WTile]*): Unit = { res.setRow(r, tileValues :_*); () }
def gs(r: Int, cStart: Int, tileValues: Multiple[WTile]*): Unit = { res.setRowEnd(r, cStart, tileValues :_*); () }

gs(498, 1136 + 366, taiga, sea * 2, taiga * 9, Lake, taiga * 6)
gs(496, 1136 + 364, taiga, sea * 3, taiga * 6, Lake, taiga * 2, Lake, taiga * 6)
gs(494, 1136 + 362, taiga * 2, sea * 2, taiga * 6, Lake * 2, taiga * 8)
gs(492, 1136 + 364, taiga * 2, sea * 2, taiga, sea * 4, taiga * 11)
gs(490, 1136 + 362, taiga * 2, sea * 4, plain * 15)
gs(488, 1136 + 360, taiga, sea * 4, plain * 16)
wr(486, plain, sea * 4, plain, sea, plain * 15)
wr(484, plain , sea, plain, sea, plain, sea, plain * 16)
wr(482, plain, sea * 3, plain * 18)
wr(480, plain, sea * 4, plain * 18)
gs(478, 1136 + 358, sea * 4, plain * 19)
gs(476, 1136 + 356, sea * 4, plain * 19)
gs(474, 1136 + 354, sea, plain * 23)
gs(472, 1136 + 356, plain * 24)
gs(470, 1136 + 354, plain * 25)
gs(468, 1136 + 352, plain * 25)
gs(466, 1136 + 354, plain * 25)
gs(464, 1136 + 352, plain * 26)
gs(462, 1136 + 350, hills, plain * 25)
gs(460, 1136 + 352, hills, plain * 25)
gs(458, 1136 + 350, hills * 3, mtain * 3, plain * 21)
gs(456, 1136 + 348, hills, plain, hills * 4, mtain * 2, hills, plain * 18)
gs(454, 1136 + 350, plain * 7, mtain * 2, hills * 3, plain * 15)
gs(452, 1136 + 348, mtain, plain * 6, hills, mtain * 2, hills * 3, plain * 15)
gs(450, 1136 + 346, hills, plain * 5, hills * 3, mtain *2, hills * 3, plain * 7, sea, plain * 6)
gs(448, 1136 + 348, hills, plain, hills, plain * 3, hills * 3, mtain, hills, plain * 3, sea * 2, plain * 2, sea * 3, plain * 7)
gs(446, 1136 + 346, hills * 2, plain * 4, mtain * 4, hills * 1, plain * 3, sea * 3, plain * 3, sea, plain * 8)
wr(444, hills * 3, plain * 3, hills * 4, plain * 4, sea * 3, plain, hills *2, plain, plain * 5, hills, plain * 2)
wr(442, mtain * 3, hills * 5, plain * 5, sea * 9, mtain * 2, hills * 2, plain * 3)
wr(440, hills, mtain * 4, hills, mtain, plain * 3, hills * 2, plain, sea * 11, mtain * 3, hills, plain * 2)
wr(438, sea, mtain * 5, hills, mtain * 2, hills * 4, sea * 13, mtain * 3, plain)
wr(436, Sea * 2, mtain * 2, hills * 2, mtain * 2, hills * 2, plain * 2, sea * 14, plain, hills, mtain * 2)
wr(434, hills, sea * 3, hills, mtain, hills * 2, mtain, hills * 2, plain, hills, sea * 4, hills * 4, sea * 6, hills, mtain, hills * 2)
wr(432, hills, plain, sea * 2, hills, mtain, hills * 6, plain * 2, hills, hills * 7, plain, hills * 8)


wr(430, hills, plain, sea * 2, hills, mtain, hills, plain, hills * 2, sea, hills, sea, hills * 2, mtain * 5, hills * 3, mtain * 4, hills * 3,
mtain)
Expand Down Expand Up @@ -77,8 +44,8 @@ object Terr80E30 extends Long80Terrs

override val sTerrs: HSideLayer[WSide] =
{ val res: HSideLayer[WSide] = grid.newSideLayer[WSide](WSideNone)
res.setSomeInts(WSideMid(), 423,1497, 423,1499, 423,1501, 423,1503, 422,1504, 417,1527, 417,1529, 415,1553, 444, 1562)
res.setSomeInts(WSideMid(), 422,1472, 429,1521, 429,1523, 431,1529, 432,1530)//Greece
res.setSomeInts(WSideMid(), 423,1497, 423,1499, 423,1501, 423,1503, 422,1504, 417,1527, 417,1529, 415,1553)//, 444, 1562)
//res.setSomeInts(WSideMid(), 422,1472, 429,1521, 429,1523, 431,1529, 432,1530)//Greece
res.setSomeInts(WSideLt(), 423,1495, 422,1496)//Kefalonia - Greece
res
}
Expand All @@ -102,15 +69,15 @@ object Terr80E30 extends Long80Terrs
res.setMouth1(414, 1550)//Cyprus - Turkey west
res.setMouth4(416, 1556)//Cyprus - Turkey east

res.setMouth2(430, 1518)
res.setVert3In(430, 1522)
res.setMouth4(430, 1526)
res.setMouth1(430, 1526)
res.setVert2In(432, 1528)
res.setMouth3(434, 1530)

res.setMouth3(446, 1562)//Kerch Straits north
res.setMouth0(442, 1562)//Kerch Straits south
// res.setMouth2(430, 1518)
// res.setVert3In(430, 1522)
// res.setMouth4(430, 1526)
// res.setMouth1(430, 1526)
// res.setVert2In(432, 1528)
// res.setMouth3(434, 1530)
//
// res.setMouth3(446, 1562)//Kerch Straits north
// res.setMouth0(442, 1562)//Kerch Straits south

res.setCornerIn(422, 1474, 5)//Sicily - Italy north
res.setCornerIn(422, 1474, 4)//Sicily - Italy
Expand All @@ -137,6 +104,42 @@ object Terr80E30 extends Long80Terrs
VRow(505, MouthDR(1554)),
TRow(502, taiga * 2, sea * 2, taiga * 14),
TRow(500, taiga * 2, sea * 2, taiga * 15),
TRow(498, taiga, sea * 2, taiga * 9, Lake, taiga * 6),
TRow(496, taiga, sea * 3, taiga * 6, Lake, taiga * 2, Lake, taiga * 6),
TRow(494, taiga * 2, sea * 2, taiga * 6, Lake * 2, taiga * 8),
TRow(492, taiga * 2, sea * 2, taiga, sea * 4, taiga * 11),
TRow(490, taiga * 2, sea * 4, plain * 15),
TRow(488, taiga, sea * 4, plain * 16),
TRow(486, plain, sea * 4, plain, sea, plain * 15),
TRow(484, plain, sea, plain, sea, plain, sea, plain * 16),
TRow(482, plain, sea * 3, plain * 18),
TRow(480, plain, sea * 4, plain * 18),
TRow(478, sea * 4, plain * 19),
TRow(476, sea * 4, plain * 19),
TRow(474, sea, plain * 23),
TRow(472, plain * 24),
TRow(470, plain * 25),
TRow(468, plain * 25),
TRow(466, plain * 25),
TRow(464, plain * 26),
TRow(462, hills, plain * 25),
TRow(460, hills, plain * 25),
TRow(458, hills * 3, mtain * 3, plain * 21),
TRow(456, hills, plain, hills * 4, mtain * 2, hills, plain * 18),
TRow(454, plain * 7, mtain * 2, hills * 3, plain * 15),
TRow(452, mtain, plain * 6, hills, mtain * 2, hills * 3, plain * 15),
VRow(451, MouthUR(1570)),
TRow(450, hills, plain * 5, hills * 3, mtain * 2, hills * 3, plain * 7, sea, Head1Land(5), plain * 5),
TRow(448, hills, plain, hills, plain * 3, hills * 3, mtain, hills, plain * 3, sea * 2, plain * 2, sea * 3, plain * 7),
TRow(446, hills * 2, plain * 4, mtain * 4, hills * 1, plain * 3, sea * 3, plain * 2, sea * 2, plain * 8),
VRow(445, MouthUp(1562)),
TRow(444, hills * 3, plain * 3, hills * 4, plain * 4, sea * 4, hills * 2, Head2Land(2), Head2Land(3), plain * 4, hills, plain * 2),
TRow(442, mtain * 3, hills * 5, plain * 5, sea * 9, mtain * 2, hills * 2, plain * 3),
TRow(440, hills, mtain * 4, hills, mtain, plain * 3, hills * 2, plain, sea * 11, mtain * 3, hills, plain * 2),
TRow(438, sea, mtain * 5, hills, mtain * 2, hills * 4, sea * 13, mtain * 3, plain),
TRow(436, Sea * 2, mtain * 2, hills * 2, mtain * 2, hills * 2, plain * 2, sea * 14, plain, hills, mtain * 2),
TRow(434, hills, sea * 3, hills, mtain, hills * 2, mtain, hills * 2, plain, hills, sea * 4, hills * 4, sea * 6, hills, mtain, hills * 2),
TRow(432, hills, plain, sea * 2, hills, mtain, hills * 6, plain * 2, hills, hills * 7, plain, hills * 8),
)
}
help.run
Expand Down
5 changes: 3 additions & 2 deletions Earth/srcPts/EArea1s.scala
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/* Copyright 2018-23 Richard Oliver. Licensed under Apache Licence version 2.0. */
package ostrat; package pEarth
import geom._, pglobe._
import geom._
import pglobe._

/** 20North, 0 East */
object EuropeNW extends EArea1("EuropeNW", 20 ll 0)
Expand All @@ -11,7 +12,7 @@ object EuropeNW extends EArea1("EuropeNW", 20 ll 0)

object EuropeEast extends EArea1("EuropeEast", 60 ll 60)
{ import pEurope._
override val a2Arr: RArr[EArea2] = RArr(RussiaSouth, Greece, BalkansWest, BalkansEast, Finlandia, Gotland, Saaremaa, Hiiumaa, Crimea, MarmaraSea, Peloponnese)
override val a2Arr: RArr[EArea2] = RArr(RussiaSouth, AzovSea, Greece, BalkansWest, BalkansEast, Finlandia, Gotland, Saaremaa, Hiiumaa, Crimea, MarmaraSea, Peloponnese)
}

object EuropeSW extends EArea1("EuropeSw", 20 ll 0)
Expand Down
2 changes: 1 addition & 1 deletion Earth/srcPts/EArea2.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ostrat; package pEarth
import geom._, pglobe._

/** A second level area of the Earth. */
abstract class EArea2(val name: String, val cen: LatLong, val terr: ATerr) extends GeographicSymbolKey
abstract class EArea2(val name: String, val cen: LatLong, val terr: ATerr = Plain) extends GeographicSymbolKey
{
override def toString = name.appendCommas(terr.toString)
def aStrs: StrArr = StrArr(name)
Expand Down
74 changes: 45 additions & 29 deletions Earth/srcPts/pEurope/RussiaSouth.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,56 @@ import geom._, pglobe._

/** [[PolygonLL]] graphic for Crimea depends on nothing. */
object Crimea extends EArea2("Crimea", 45.33 ll 34.15, Plain)
{ val henichesk = 46.17 ll 34.82
val kamyanske = 45.28 ll 35.53
val kerch = 45.39 ll 36.63
val southEast = 45.10 ll 36.45
val p40 = 44.79 ll 35.08
val south = 44.39 ll 33.74
val p60 = 44.58 ll 33.38
val west = 45.40 ll 32.48
val p80 = 45.93 ll 33.76
val northWest = 46.16 ll 33.59
val polygonLL: PolygonLL = PolygonLL(henichesk, kamyanske, kerch, southEast, p40, south, p60, west, p80, northWest)
{ val kerch: LatLong = 45.39 ll 36.63
val southEast: LatLong = 45.10 ll 36.45
val p40: LatLong = 44.79 ll 35.08
val south: LatLong = 44.39 ll 33.74
val p60: LatLong = 44.58 ll 33.38
val p65: LatLong = 45.01 ll 33.55
val zaozerne: LatLong = 45.15 ll 33.27
val west: LatLong = 45.40 ll 32.48
val p80: LatLong = 45.93 ll 33.76
val northWest: LatLong = 46.16 ll 33.59

override val polygonLL: PolygonLL = PolygonLL(AzovSea.henichesk, AzovSea.kamyanske, AzovSea.straitsWest, kerch, southEast, p40, south, p60, p65,
zaozerne, west, p80, northWest)
}

/** [[PolygonLL]] graphic for Ukraine depends on [[Baltland]], [[Crimea]] [[BalkansEast]] and [[Polandia]]. */
/** [[PolygonLL]] graphic for Ukraine depends on [[AzovSea]], [[Baltland]], [[Crimea]] [[BalkansEast]] and [[Polandia]]. */
object Ukraine extends EArea2("Ukraine", 49 ll 34, Plain)
{ val caspianW = 44.53 ll 46.65
val rostov = 47.17 ll 39.29
val koblev = 46.63 ll 31.18
{ val caspianW: LatLong = 44.53 ll 46.65
val koblev: LatLong = 46.63 ll 31.18

override val polygonLL: PolygonLL = PolygonLL(Baltland.southEast, caspianW, rostov, Crimea.henichesk, Crimea.northWest, koblev,
override val polygonLL: PolygonLL = PolygonLL(Baltland.southEast, caspianW, AzovSea.northEast, AzovSea.henichesk, Crimea.northWest, koblev,
BalkansEast.odessa, Polandia.cenEast)
}

/** [[PolygonLL]] graphic for South Russia, depends on [[Ukraine]]. */
object RussiaSouth extends EArea2("RussiaSouth", 45.00 ll 42.57, Deserts)
{ val p10 = 43.87 ll 47.44
val sumqayit = 40.64 ll 49.55
val blackSeaE = 41.84 ll 41.77
val p60 = 42.74 ll 41.44
val p70 = 44.53 ll 38.09
val p72 = 44.95 ll 37.29
val p77 = 45.20 ll 36.60
val p75 = 45.11 ll 36.73
val llich = 45.41 ll 36.76

override val polygonLL: PolygonLL = PolygonLL(Ukraine.rostov, Ukraine.caspianW, p10, sumqayit, blackSeaE, p60, p70, p72, p75, p77, llich)
/** [[PolygonLL]] graphic for the Sea of Azov, depends on nothing. */
object AzovSea extends EArea2("AzovSea", 46.13 ll 36.80, Seas)
{ val northEast = 47.28 ll 39.20
val zaymoObryv = 47.02 ll 39.29
val azovSE: LatLong = 45.35 ll 37.46
val dolzhanskaya = 46.67 ll 37.75
val llich: LatLong = 45.41 ll 36.76
val straitsEast = 45.44 ll 36.79
val straitsWest = 45.44 ll 36.60
val kamyanske = 45.28 ll 35.53
val henichesk = 46.17 ll 34.82

override val polygonLL: PolygonLL = PolygonLL(northEast, zaymoObryv, dolzhanskaya, azovSE, llich, straitsEast, straitsWest, kamyanske, henichesk)
}

/** [[PolygonLL]] graphic for South Russia, depends on [[AzovSea]] and [[Ukraine]]. */
object RussiaSouth extends EArea2("RussiaSouth", 45.00 ll 42.57, Plain)
{ val p10: LatLong = 43.87 ll 47.44
val sumqayit: LatLong = 40.64 ll 49.55
val blackSeaE: LatLong = 41.84 ll 41.77
val p60: LatLong = 42.74 ll 41.44
val p70: LatLong = 44.53 ll 38.09
val p72: LatLong = 44.95 ll 37.29
val p75: LatLong = 45.11 ll 36.73
val p77: LatLong = 45.20 ll 36.60

override val polygonLL: PolygonLL = PolygonLL(AzovSea.northEast, Ukraine.caspianW, p10, sumqayit, blackSeaE, p60, p70, p72, p75, p77,
AzovSea.straitsEast, AzovSea.llich, AzovSea.azovSE, AzovSea.dolzhanskaya, AzovSea.zaymoObryv)
}

0 comments on commit 7173c74

Please sign in to comment.