From 249d86dff9888ffc3ee71668b2275f9496e4fa6c Mon Sep 17 00:00:00 2001
From: rakow <rakow@vsp.tu-berlin.de>
Date: Wed, 27 Mar 2024 21:21:42 +0100
Subject: [PATCH] update config and network

---
 Makefile                          |  4 +++-
 input/v6.2/berlin-v6.2.config.xml | 18 +++++++++---------
 pom.xml                           |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 4e381351..2ec2f8df 100644
--- a/Makefile
+++ b/Makefile
@@ -79,12 +79,14 @@ input/sumo.net.xml: input/network.osm
 	 --remove-edges.by-vclass hov,tram,rail,rail_urban,rail_fast,pedestrian\
 	 --output.original-names --output.street-names\
 	 --osm.lane-access true	--osm.bike-access true\
+	 --osm.all-attributes\
+	 --osm.extra-attributes bus:lanes,bus:lanes:forward,bus:lanes:backward,cycleway,cycleway:right,cycleway:left\
 	 --proj "+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"\
 	 --osm-files $< -o=$@
 
 
 $p/berlin-$V-network.xml.gz: input/sumo.net.xml
-	$(sc) prepare network-from-sumo $< --target-crs $(CRS) --output $@
+	$(sc) prepare network-from-sumo $< --target-crs $(CRS) --lane-restrictions REDUCE_CAR_LANES --output $@
 
 	$(sc) prepare clean-network $@ --output $@ --modes car,ride,truck
 
diff --git a/input/v6.2/berlin-v6.2.config.xml b/input/v6.2/berlin-v6.2.config.xml
index 34b38b27..e100a3d6 100644
--- a/input/v6.2/berlin-v6.2.config.xml
+++ b/input/v6.2/berlin-v6.2.config.xml
@@ -8,8 +8,8 @@
 	<module name="controller">
 		<param name="lastIteration" value="500"/>
 		<param name="overwriteFiles" value="failIfDirectoryExists"/>
-		<param name="runId" value="berlin-v6.1"/>
-		<param name="outputDirectory" value="./output/berlin-v6.1-10pct"/>
+		<param name="runId" value="berlin-v6.2"/>
+		<param name="outputDirectory" value="./output/berlin-v6.2-10pct"/>
 		<param name="writeEventsInterval" value="100"/>
 		<param name="writePlansInterval" value="100"/>
 		<param name="routingAlgorithmType" value="SpeedyALT"/>
@@ -20,24 +20,24 @@
 		<param name="numberOfThreads" value="16"/>
 	</module>
 	<module name="network">
-		<param name="inputNetworkFile" value="./berlin-v6.1-network-with-pt.xml.gz"/>
+		<param name="inputNetworkFile" value="./berlin-v6.2-network-with-pt.xml.gz"/>
 	</module>
 	<module name="plans">
-		<param name="inputPlansFile" value="./berlin-v6.1-25pct.plans-initial.xml.gz"/>
+		<param name="inputPlansFile" value="./berlin-v6.2-25pct.plans-initial.xml.gz"/>
 		<param name="removingUnnecessaryPlanAttributes" value="true"/>
 	</module>
 	<module name="vehicles">
 		<param name="vehiclesFile"
-			   value="./berlin-v6.1-vehicleTypes.xml"/>
+			   value="./berlin-v6.2-vehicleTypes.xml"/>
 	</module>
 	<module name="transit">
-		<param name="transitScheduleFile" value="./berlin-v6.1-transitSchedule.xml.gz"/>
+		<param name="transitScheduleFile" value="./berlin-v6.2-transitSchedule.xml.gz"/>
 		<param name="useTransit" value="true"/>
-		<param name="vehiclesFile" value="./berlin-v6.1-transitVehicles.xml.gz"/>
+		<param name="vehiclesFile" value="./berlin-v6.2-transitVehicles.xml.gz"/>
 	</module>
 	<module name="facilities">
 		<param name="facilitiesSource" value="fromFile"/>
-		<param name="inputFacilitiesFile" value="./berlin-v6.1-facilities.xml.gz"/>
+		<param name="inputFacilitiesFile" value="./berlin-v6.2-facilities.xml.gz"/>
 	</module>
 	<module name="routing">
 		<param name="networkModes" value="car,truck,freight,ride"/>
@@ -186,7 +186,7 @@
 	</module>
 
 	<module name="counts">
-		<param name="inputCountsFile" value="./berlin-v6.1-counts-vmz.xml.gz"/>
+		<param name="inputCountsFile" value="./berlin-v6.2-counts-vmz.xml.gz"/>
 		<param name="countsScaleFactor" value="0.1"/>
 	</module>
 
diff --git a/pom.xml b/pom.xml
index a0e2ce41..878aa4b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,10 +6,10 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-<!--		<version>16.0-PR3186</version>-->
+		<version>16.0-PR3191</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
-		<version>16.0-SNAPSHOT</version>
+<!--		<version>16.0-SNAPSHOT</version>-->
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>