Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DROTH-3484 clean generated unknown(id=0) adjustments and redundant mV… #2319

Merged
merged 1 commit into from
Nov 18, 2022
Merged

DROTH-3484 clean generated unknown(id=0) adjustments and redundant mV… #2319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ...e/src/main/scala/fi/liikennevirasto/digiroad2/service/linearasset/SpeedLimitService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,17 +243,17 @@ class SpeedLimitService(eventbus: DigiroadEventBus, roadLinkService: RoadLinkSer
}

def adjustSpeedLimitsAndGenerateUnknowns(roadLinksFiltered: Seq[RoadLink], speedLimits: Map[String, Seq[SpeedLimit]],
changeSet:Option[ChangeSet] = None, geometryChanged: Boolean, counter: Int = 1): Seq[SpeedLimit] = {
val (filledTopology, adjustmentsChangeSet) = fillTopology(roadLinksFiltered, speedLimits, changeSet, geometryChanged)
val generatedFilteredFromChangeSet = adjustmentsChangeSet.filterGeneratedAssets
changeSet:Option[ChangeSet] = None, geometryChanged: Boolean, counter: Int = 1): Seq[SpeedLimit] = {
val (filledTopology, changedSet) = fillTopology(roadLinksFiltered, speedLimits, changeSet, geometryChanged)
val cleanedChangeSet = speedLimitUpdater.cleanRedundantMValueAdjustments(changedSet, speedLimits.values.flatten.toSeq).filterGeneratedAssets

generatedFilteredFromChangeSet.isEmpty match {
cleanedChangeSet.isEmpty match {
case true => filledTopology
case false if counter > 3 =>
speedLimitUpdater.updateChangeSet(generatedFilteredFromChangeSet)
speedLimitUpdater.updateChangeSet(cleanedChangeSet)
filledTopology
case false if counter <= 3 =>
speedLimitUpdater.updateChangeSet(generatedFilteredFromChangeSet)
speedLimitUpdater.updateChangeSet(cleanedChangeSet)
adjustSpeedLimitsAndGenerateUnknowns(roadLinksFiltered, filledTopology.groupBy(_.linkId), None, geometryChanged, counter + 1)
}
}
Expand Down
22 changes: 16 additions & 6 deletions ...cle/src/main/scala/fi/liikennevirasto/digiroad2/util/assetUpdater/SpeedLimitUpdater.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ class SpeedLimitUpdater(eventbus: DigiroadEventBus, roadLinkService: RoadLinkSer
}
}

//TODO Remove after bug in combine and fuse operations is fixed
def cleanRedundantMValueAdjustments(changeSet: ChangeSet, originalAssets: Seq[SpeedLimit]): ChangeSet = {
val redundantFiltered = changeSet.adjustedMValues.filterNot(adjustment => {
val originalAsset = originalAssets.find(_.id == adjustment.assetId).get
originalAsset.startMeasure == adjustment.startMeasure && originalAsset.endMeasure == adjustment.endMeasure
})
changeSet.copy(adjustedMValues = redundantFiltered)
}

def updateByRoadLinks(municipality: Int, roadLinks: Seq[RoadLink], changes: Seq[ChangeInfo]) = {
val (speedLimitLinks, topology) = dao.getSpeedLimitLinksByRoadLinks(roadLinks.filter(_.isCarTrafficRoad))
val mappedChanges = LinearAssetUtils.getMappedChanges(changes)
Expand Down Expand Up @@ -58,25 +67,26 @@ class SpeedLimitUpdater(eventbus: DigiroadEventBus, roadLinkService: RoadLinkSer

def handleChangesAndUnknowns(topology: Seq[RoadLink], speedLimits: Map[String, Seq[SpeedLimit]],
changeSet:Option[ChangeSet] = None, oldRoadLinkIds: Seq[String], geometryChanged: Boolean, counter: Int = 1): Seq[SpeedLimit] = {
val (filledTopology, adjustmentsChangeSet) = fillTopology(topology, speedLimits, changeSet, geometryChanged)
val (filledTopology, changedSet) = fillTopology(topology, speedLimits, changeSet, geometryChanged)
val cleanedChangeSet = cleanRedundantMValueAdjustments(changedSet, speedLimits.values.flatten.toSeq).filterGeneratedAssets
val roadLinksByLinkId = topology.groupBy(_.linkId).mapValues(_.head)
val newSpeedLimitsWithValue = filledTopology.filter(sl => sl.id <= 0 && sl.value.nonEmpty)
val unknownLimits = createUnknownLimits(filledTopology, roadLinksByLinkId)

adjustmentsChangeSet.isEmpty match {
cleanedChangeSet.isEmpty match {
case true =>
persistProjectedLimit(newSpeedLimitsWithValue)
persistUnknown(unknownLimits)
filledTopology
case false if counter > 3 =>
updateChangeSet(adjustmentsChangeSet)
updateChangeSet(cleanedChangeSet)
persistProjectedLimit(newSpeedLimitsWithValue)
purgeUnknown(adjustmentsChangeSet.adjustedMValues.map(_.linkId).toSet, oldRoadLinkIds)
purgeUnknown(cleanedChangeSet.adjustedMValues.map(_.linkId).toSet, oldRoadLinkIds)
persistUnknown(unknownLimits)
filledTopology
case false if counter <= 3 =>
updateChangeSet(adjustmentsChangeSet)
purgeUnknown(adjustmentsChangeSet.adjustedMValues.map(_.linkId).toSet, oldRoadLinkIds)
updateChangeSet(cleanedChangeSet)
purgeUnknown(cleanedChangeSet.adjustedMValues.map(_.linkId).toSet, oldRoadLinkIds)
handleChangesAndUnknowns(topology, filledTopology.groupBy(_.linkId), None ,oldRoadLinkIds, geometryChanged, counter + 1)
}
}
Expand Down