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-4151 Remove mergeMunicipalities, remove pertunmaa from insert_m… #3357

Merged
merged 1 commit into from
Dec 11, 2024
Merged

DROTH-4151 Remove mergeMunicipalities, remove pertunmaa from insert_m… #3357

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
3 changes: 1 addition & 2 deletions digiroad2-oracle/sql/insert_municipalities.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,7 @@ INSERT INTO municipality (id,name_fi,name_sv,ely_nro,road_maintainer_id,geometry
(564,'Oulu','Uleåborg',13,12,'SRID=3067;POINT (441764.231197278 7225946.21207637)'::geometry,5),
(309,'Outokumpu','Outokumpu',8,8,'SRID=3067;POINT (599871.776893653 6956108.68054279)'::geometry,5),
(854,'Pello','Pello',15,14,'SRID=3067;POINT (381297.914478349 7409155.7812528)'::geometry,5),
(584,'Perho','Perho',11,10,'SRID=3067;POINT (372507.461451162 7016684.11767525)'::geometry,5),
(588,'Pertunmaa','Pertunmaa',8,8,'SRID=3067;POINT (469991.42700425 6818553.57791074)'::geometry,5);
(584,'Perho','Perho',11,10,'SRID=3067;POINT (372507.461451162 7016684.11767525)'::geometry,5);
INSERT INTO municipality (id,name_fi,name_sv,ely_nro,road_maintainer_id,geometry,zoom) VALUES
(592,'Petäjävesi','Petäjävesi',10,9,'SRID=3067;POINT (407660.378178971 6907776.38607199)'::geometry,5),
(593,'Pieksämäki','Pieksämäki',8,8,'SRID=3067;POINT (510514.118554209 6906719.03858473)'::geometry,5),
Expand Down
10 changes: 0 additions & 10 deletions digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/dao/queries.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,16 +441,6 @@ object Queries {
def apply(rs: PositionedResult) = rs.nextBytes()
}

def mergeMunicipalities(municipalityToDelete: Int, municipalityToMerge: Int): Unit = {
sqlu"""UPDATE ASSET SET MUNICIPALITY_CODE = $municipalityToMerge, MODIFIED_DATE = current_timestamp, MODIFIED_BY = 'batch_process_municipality_merge' WHERE MUNICIPALITY_CODE = $municipalityToDelete""".execute
sqlu"""UPDATE UNKNOWN_SPEED_LIMIT SET MUNICIPALITY_CODE = $municipalityToMerge WHERE MUNICIPALITY_CODE = $municipalityToDelete""".execute
sqlu"""UPDATE INACCURATE_ASSET SET MUNICIPALITY_CODE = $municipalityToMerge WHERE MUNICIPALITY_CODE = $municipalityToDelete""".execute
sqlu"""UPDATE INCOMPLETE_LINK SET MUNICIPALITY_CODE = $municipalityToMerge WHERE MUNICIPALITY_CODE = $municipalityToDelete""".execute
sqlu"""DELETE FROM MUNICIPALITY_VERIFICATION WHERE MUNICIPALITY_ID = $municipalityToDelete""".execute
sqlu"""DELETE FROM DASHBOARD_INFO WHERE MUNICIPALITY_ID = $municipalityToDelete""".execute
sqlu"""DELETE FROM MUNICIPALITY WHERE ID = $municipalityToDelete""".execute
}

def deleteAdditionalGroupedAsset(assetId: Long, groupedId: Long): Unit = {
sqlu"""delete from number_property_value where asset_id = $assetId and grouped_id = $groupedId""".execute
sqlu"""delete from text_property_value where asset_id = $assetId and grouped_id = $groupedId""".execute
Expand Down
18 changes: 0 additions & 18 deletions digiroad2-oracle/src/main/scala/fi/liikennevirasto/digiroad2/util/DataFixture.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,22 +1656,6 @@ object DataFixture {
}
}

def mergeMunicipalities(): Unit = {
val municipalityToDelete = 99
val municipalityToMerge = 214

println(s"\nStart process of merging municipality $municipalityToDelete into $municipalityToMerge")
println(DateTime.now())
println("")

PostGISDatabase.withDynTransaction{
Queries.mergeMunicipalities(municipalityToDelete, municipalityToMerge)
}

println("")
println("Complete at time: " + DateTime.now())
}

def updateLastModifiedAssets(): Unit = {
println("\nUpdating last modified assets information")
println(DateTime.now())
Expand Down Expand Up @@ -2019,8 +2003,6 @@ object DataFixture {
getStateRoadWithFunctionalClassUndefined()
case Some("add_obstacles_shapefile") =>
addObstaclesShapefile()
case Some("merge_municipalities") =>
mergeMunicipalities()
case Some("transform_lorry_parking_into_datex2") =>
transformLorryParkingIntoDatex2()
case Some("update_last_modified_assets_info") =>
Expand Down