Skip to content

Commit 297181a

Browse files
committed
Adds some more network properties to the networks file, allowing better differentiation of NWM networks by tile width, plus viaducts.
1 parent 99914b1 commit 297181a

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/main/scala/module/networks.scala

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ class Network private (val height: Int, val typ: NetworkType, val base: Option[N
99
import Network._
1010
def isRhw: Boolean = RhwNetworks.contains(this)
1111
def isNwm: Boolean = NwmNetworks.contains(this)
12+
def isViaduct: Boolean = Viaducts.contains(this)
1213
def isTla: Boolean = this == Tla3 || this == Tla5 || this == Tla7m
1314
def isSymm: Boolean = typ == Symmetrical
1415
def isOwr4Like: Boolean = this == Owr4 || this == Owr4m
16+
def isNwmSingle: Boolean = NwmNetworksSingleTile.contains(this)
17+
def isNwmDual: Boolean = NwmNetworksDualTile.contains(this)
18+
def isNwmTriple: Boolean = NwmNetworksTripleTile.contains(this)
1519
}
1620

1721
/** List of all the base and override networks.
@@ -151,10 +155,12 @@ object Network extends scalaenum.Enum {
151155
val GlrNetworks: ValueSet = Network.values rangeFrom Glr1 rangeTo Glr4
152156
val RhwNetworks: ValueSet = ValueSet(Dirtroad) ++ (Network.values rangeFrom L1Rhw2 rangeTo L2Rhw10c)
153157
val NwmNetworks: ValueSet = Network.values rangeFrom Tla3 rangeTo Ave6m
158+
val NwmNetworksSingleTile: ValueSet = Network.values rangeFrom Tla3 rangeTo Nrd4
159+
val NwmNetworksDualTile: ValueSet = Network.values rangeFrom Tla5 rangeTo Rd6
160+
val NwmNetworksTripleTile: ValueSet = Network.values rangeFrom Ave6 rangeTo Ave6m
154161
val SamNetworks: ValueSet = Network.values rangeFrom Sam1 rangeTo Sam11
155162
val Viaducts: ValueSet = Network.values rangeFrom L1Road rangeTo L2Avenue
156163
val RoadNetworks: ValueSet = RhwNetworks ++ NwmNetworks ++ SamNetworks ++ Viaducts + Road + Highway + Street + Avenue + Onewayroad + Groundhighway
157-
158164
}
159165

160166
} // end of syntax

0 commit comments

Comments
 (0)