Merge pull request #2891 from finnishtransportagency/DROTH-3938_add-n…

…ew-side-code-value-based-on-master Droth 3938 add new side code value based on master
finnishtransportagency · Feb 5, 2024 · 10e88b3 · 10e88b3
2 parents ceef723 + b002e5f
commit 10e88b3
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 26 deletions.
diff --git a/digiroad2-geo/src/main/scala/fi/liikennevirasto/digiroad2/asset/asset.scala b/digiroad2-geo/src/main/scala/fi/liikennevirasto/digiroad2/asset/asset.scala
@@ -233,7 +233,7 @@ sealed trait SideCode {
   def value: Int
 }
 object SideCode {
-  val values = Set(BothDirections, TowardsDigitizing, AgainstDigitizing, Unknown)
+  val values = Set(BothDirections, TowardsDigitizing, AgainstDigitizing, Unknown, DoesNotAffectRoadLink)
 
   def apply(intValue: Int): SideCode = {
     values.find(_.value == intValue).getOrElse(Unknown)

diff --git a/digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/dao/DynamicLinearAssetDao.scala b/digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/dao/DynamicLinearAssetDao.scala
@@ -122,7 +122,7 @@ class DynamicLinearAssetDao {
     def apply(r: PositionedResult) : DynamicAssetRow = {
       val id = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val startMeasure = r.nextDouble()
       val endMeasure = r.nextDouble()
       val propertyPublicId = r.nextString
@@ -147,7 +147,7 @@ class DynamicLinearAssetDao {
       val verifiedDate = r.nextTimestampOption().map(timestamp => new DateTime(timestamp))
       val informationSource = r.nextIntOption()
 
-      DynamicAssetRow(id, linkId, sideCode, value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate, expired, typeId, timeStamp, geomModifiedDate, linkSource, verifiedBy, verifiedDate, informationSource)
+      DynamicAssetRow(id, linkId, sideCode.getOrElse(99), value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate, expired, typeId, timeStamp, geomModifiedDate, linkSource, verifiedBy, verifiedDate, informationSource)
     }
   }
 

diff --git a/digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/dao/lane/LaneDao.scala b/digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/dao/lane/LaneDao.scala
@@ -33,17 +33,17 @@ class LaneDao(){
     def apply(r: PositionedResult) = {
       val expired = r.nextBoolean()
       val value = r.nextInt()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
 
-      LightLane(value, expired, sideCode)
+      LightLane(value, expired, sideCode.getOrElse(99))
     }
   }
 
   implicit val getLaneAsset: GetResult[LaneRow] = new GetResult[LaneRow] {
     def apply(r: PositionedResult) : LaneRow = {
       val id = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val startMeasure = r.nextDouble()
       val endMeasure = r.nextDouble()
       val createdBy = r.nextStringOption()
@@ -61,7 +61,7 @@ class LaneDao(){
       val expiredBy = r.nextStringOption()
       val expiredDate = r.nextTimestampOption().map(timestamp => new DateTime(timestamp))
 
-      LaneRow(id, linkId, sideCode, value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate,
+      LaneRow(id, linkId, sideCode.getOrElse(99), value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate,
         expiredBy, expiredDate, expired, timeStamp, municipalityCode, laneCode, geomModifiedDate)
     }
   }

diff --git a/digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/dao/lane/LaneHistoryDao.scala b/digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/dao/lane/LaneHistoryDao.scala
@@ -28,7 +28,7 @@ class LaneHistoryDao() {
       val newId = r.nextLong()
       val oldId = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val startMeasure = r.nextDouble()
       val endMeasure = r.nextDouble()
       val createdBy = r.nextStringOption()
@@ -47,7 +47,7 @@ class LaneHistoryDao() {
       val historyCreatedBy = r.nextString()
       val changeEventOrderNumber = r.nextIntOption()
 
-      LaneHistoryRow(id, newId, oldId, linkId, sideCode, value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate,
+      LaneHistoryRow(id, newId, oldId, linkId, sideCode.getOrElse(99), value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate,
         expired, timeStamp, municipalityCode, laneCode, geomModifiedDate, historyCreatedDate, historyCreatedBy, changeEventOrderNumber)
     }
   }

diff --git a/...e/src/main/scala/fi/liikennevirasto/digiroad2/dao/linearasset/PostGISLinearAssetDao.scala b/...e/src/main/scala/fi/liikennevirasto/digiroad2/dao/linearasset/PostGISLinearAssetDao.scala
@@ -37,7 +37,7 @@ class PostGISLinearAssetDao() {
 
       val id = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val prohibitionId = r.nextLong()
       val prohibitionType = r.nextInt()
       val validityPeridoType = r.nextIntOption()
@@ -62,7 +62,7 @@ class PostGISLinearAssetDao() {
       val informationSource = r.nextIntOption()
       val isSuggested = r.nextBoolean()
 
-      ProhibitionsRow(id, linkId, sideCode, prohibitionId, prohibitionType, validityPeridoType, validityPeridoStartHour, validityPeridoEndHour,
+      ProhibitionsRow(id, linkId, sideCode.getOrElse(99), prohibitionId, prohibitionType, validityPeridoType, validityPeridoStartHour, validityPeridoEndHour,
                       exceptionType, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate, expired, timeStamp,
                       geomModifiedDate, validityPeridoStartMinute, validityPeridoEndMinute, prohibitionAdditionalInfo, linkSource,
                       verifiedBy, verifiedDate, informationSource, isSuggested)
@@ -74,7 +74,7 @@ class PostGISLinearAssetDao() {
     def apply(r: PositionedResult) : PersistedLinearAsset = {
       val id = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val value = r.nextIntOption().map(NumericValue)
       val startMeasure = r.nextDouble()
       val endMeasure = r.nextDouble()
@@ -92,7 +92,7 @@ class PostGISLinearAssetDao() {
       val informationSource = r.nextIntOption()
 
 
-      PersistedLinearAsset(id, linkId, sideCode, value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate, expired, typeId, timeStamp, geomModifiedDate,
+      PersistedLinearAsset(id, linkId, sideCode.getOrElse(99), value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate, expired, typeId, timeStamp, geomModifiedDate,
         linkSource, verifiedBy, verifiedDate, informationSource.map(info => InformationSource.apply(info)))
     }
   }
@@ -101,7 +101,7 @@ class PostGISLinearAssetDao() {
     def apply(r: PositionedResult) = {
       val id = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val value = r.nextIntOption().map(NumericValue)
       val startMeasure = r.nextDouble()
       val endMeasure = r.nextDouble()
@@ -124,8 +124,8 @@ class PostGISLinearAssetDao() {
       val administrativeClass = AdministrativeClass(r.nextInt())
 
       val geometry = Seq(Point(startPoint_x, startPoint_y), Point(endPoint_x, endPoint_y))
-      PieceWiseLinearAsset(id, linkId, SideCode(sideCode), value, geometry, expired, startMeasure, endMeasure,
-                           geometry.toSet, modifiedBy, modifiedDate, createdBy, createdDate, typeId, SideCode.toTrafficDirection(SideCode(sideCode)), timeStamp,
+      PieceWiseLinearAsset(id, linkId, SideCode(sideCode.getOrElse(99)), value, geometry, expired, startMeasure, endMeasure,
+                           geometry.toSet, modifiedBy, modifiedDate, createdBy, createdDate, typeId, SideCode.toTrafficDirection(SideCode(sideCode.getOrElse(99))), timeStamp,
                            geomModifiedDate, linkSource, administrativeClass, verifiedBy = verifiedBy, verifiedDate = verifiedDate, informationSource = informationSource.map(info => InformationSource.apply(info)))
 
 
@@ -142,8 +142,8 @@ class PostGISLinearAssetDao() {
       val endPoint_x = r.nextDouble()
       val endPoint_y = r.nextDouble()
       val geometry = Seq(Point(startPoint_x, startPoint_y), Point(endPoint_x, endPoint_y))
-      val sideCode = r.nextInt()
-      LightLinearAsset(geometry, value, expired, typeId, sideCode)
+      val sideCode = r.nextIntOption()
+      LightLinearAsset(geometry, value, expired, typeId, sideCode.getOrElse(99))
     }
   }
 

diff --git a/...e/src/main/scala/fi/liikennevirasto/digiroad2/dao/linearasset/PostGISMaintenanceDao.scala b/...e/src/main/scala/fi/liikennevirasto/digiroad2/dao/linearasset/PostGISMaintenanceDao.scala
@@ -63,7 +63,7 @@ class PostGISMaintenanceDao() {
     def apply(r: PositionedResult) : DynamicAssetRow = {
       val id = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val startMeasure = r.nextDouble()
       val endMeasure = r.nextDouble()
 
@@ -89,7 +89,7 @@ class PostGISMaintenanceDao() {
       val verifiedDate = r.nextTimestampOption().map(timestamp => new DateTime(timestamp))
       val informationSource = r.nextIntOption()
 
-      DynamicAssetRow(id, linkId, sideCode, value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate, expired, typeId, timeStamp, geomModifiedDate, linkSource, verifiedBy, verifiedDate, informationSource)
+      DynamicAssetRow(id, linkId, sideCode.getOrElse(99), value, startMeasure, endMeasure, createdBy, createdDate, modifiedBy, modifiedDate, expired, typeId, timeStamp, geomModifiedDate, linkSource, verifiedBy, verifiedDate, informationSource)
     }
   }
 

diff --git a/...le/src/main/scala/fi/liikennevirasto/digiroad2/dao/linearasset/PostGISSpeedLimitDao.scala b/...le/src/main/scala/fi/liikennevirasto/digiroad2/dao/linearasset/PostGISSpeedLimitDao.scala
@@ -33,7 +33,7 @@ class PostGISSpeedLimitDao(val roadLinkService: RoadLinkService) extends Dynamic
     def apply(r: PositionedResult) : SpeedLimitRow = {
       val id = r.nextLong()
       val linkId = r.nextString()
-      val sideCode = r.nextInt()
+      val sideCode = r.nextIntOption()
       val value = r.nextIntOption()
       val startMeasure = r.nextDouble()
       val endMeasure = r.nextDouble()
@@ -47,7 +47,7 @@ class PostGISSpeedLimitDao(val roadLinkService: RoadLinkService) extends Dynamic
       val linkSource = r.nextInt()
       val publicId = r.nextString()
 
-      SpeedLimitRow(id, linkId, SideCode(sideCode), value, startMeasure, endMeasure, modifiedBy, modifiedDateTime, createdBy, createdDateTime, timeStamp, geomModifiedDate, expired, linkSource = LinkGeomSource(linkSource), publicId)
+      SpeedLimitRow(id, linkId, SideCode(sideCode.getOrElse(99)), value, startMeasure, endMeasure, modifiedBy, modifiedDateTime, createdBy, createdDateTime, timeStamp, geomModifiedDate, expired, linkSource = LinkGeomSource(linkSource), publicId)
     }
   }
 

diff --git a/.../scala/fi/liikennevirasto/digiroad2/dao/pointasset/PostGISDirectionalTrafficSignDao.scala b/.../scala/fi/liikennevirasto/digiroad2/dao/pointasset/PostGISDirectionalTrafficSignDao.scala
@@ -133,7 +133,7 @@ object PostGISDirectionalTrafficSignDao {
         propertyRequired = propertyRequired,
         propertyValue = propertyValue.getOrElse(propertyDisplayValue.getOrElse("")).toString,
         propertyDisplayValue = propertyDisplayValue.orNull)
-      val validityDirection = r.nextInt()
+      val validityDirection = r.nextIntOption()
       val createdBy = r.nextStringOption()
       val createdDateTime = r.nextTimestampOption().map(timestamp => new DateTime(timestamp))
       val modifiedBy = r.nextStringOption()
@@ -142,7 +142,7 @@ object PostGISDirectionalTrafficSignDao {
       val linkSource = r.nextInt()
       val externalId = r.nextStringOption()
 
-      DirectionalTrafficSignRow(id, linkId, point.x, point.y, mValue, floating, timeStamp, municipalityCode, property, validityDirection,
+      DirectionalTrafficSignRow(id, linkId, point.x, point.y, mValue, floating, timeStamp, municipalityCode, property, validityDirection.getOrElse(99),
         bearing, createdBy, createdDateTime, modifiedBy, modifiedDateTime, linkSource = LinkGeomSource(linkSource), externalId = externalId)
     }
   }

diff --git a/...le/src/main/scala/fi/liikennevirasto/digiroad2/dao/pointasset/PostGISTrafficSignDao.scala b/...le/src/main/scala/fi/liikennevirasto/digiroad2/dao/pointasset/PostGISTrafficSignDao.scala
@@ -227,7 +227,7 @@ object PostGISTrafficSignDao {
       val modifiedAt = r.nextTimestampOption().map(timestamp => new DateTime(timestamp))
       val linkSource = r.nextInt()
       val bearing = r.nextIntOption()
-      val validityDirection = r.nextInt()
+      val validityDirection = r.nextIntOption()
       val optPanelType = r.nextIntOption()
       val panelValue = r.nextStringOption()
       val panelInfo = r.nextStringOption()
@@ -244,7 +244,7 @@ object PostGISTrafficSignDao {
       val externalId = r.nextStringOption()
 
       TrafficSignRow(id, linkId, point.x, point.y, mValue, floating, timeStamp, municipalityCode, property,
-        validityDirection, bearing, createdBy, createdAt, modifiedBy, modifiedAt, LinkGeomSource(linkSource),
+        validityDirection.getOrElse(99), bearing, createdBy, createdAt, modifiedBy, modifiedAt, LinkGeomSource(linkSource),
         additionalPanel, expired, externalId)
     }
   }