From 50063fb9f3e307def3f29e5656e373037e48d201 Mon Sep 17 00:00:00 2001
From: rakow <rakow@vsp.tu-berlin.de>
Date: Thu, 7 Nov 2024 20:21:50 +0100
Subject: [PATCH] update matsim and remove to detailed links from network again

---
 Makefile                                                      | 4 ++--
 input/v6.4/berlin-v6.4.config.xml                             | 1 +
 pom.xml                                                       | 2 +-
 .../java/org/matsim/prepare/counts/CreateCountsFromVMZ.java   | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4682d278..6fc7a2f4 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ input/network.osm: input/brandenburg.osm.pbf
 
 	# Detailed network includes bikes as well
 	$(osmosis) --rb file=$<\
-	 --tf accept-ways bicycle=yes,designated highway=motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary_link,secondary,tertiary,motorway_junction,residential,living_street,unclassified,cycleway\
+	 --tf accept-ways bicycle=designated highway=motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary_link,secondary,tertiary,motorway_junction,residential,living_street,unclassified,cycleway\
 	 --bounding-polygon file="$p/area/area.poly"\
 	 --used-node --wb input/network-detailed.osm.pbf
 
@@ -90,7 +90,7 @@ input/sumo.net.xml: input/network.osm
 	 --output.original-names --output.street-names\
 	 --osm.lane-access false --osm.bike-access false\
 	 --osm.all-attributes\
-	 --osm.extra-attributes smoothness,surface,crossing,tunnel,traffic_sign,bus:lanes,bus:lanes:forward,bus:lanes:backward,cycleway,cycleway:right,cycleway:left\
+	 --osm.extra-attributes smoothness,surface,crossing,tunnel,traffic_sign,bus:lanes,bus:lanes:forward,bus:lanes:backward,cycleway,cycleway:right,cycleway:left,bicycle\
 	 --proj "+proj=utm +zone=32 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs"\
 	 --osm-files $< -o=$@
 
diff --git a/input/v6.4/berlin-v6.4.config.xml b/input/v6.4/berlin-v6.4.config.xml
index e9c19411..12139510 100644
--- a/input/v6.4/berlin-v6.4.config.xml
+++ b/input/v6.4/berlin-v6.4.config.xml
@@ -58,6 +58,7 @@
 		<param name="endTime" value="36:00:00"/>
 		<param name="stuckTime" value="30.0"/>
 		<param name="trafficDynamics" value="kinematicWaves"/>
+		<param name="linkDynamics" value="PassingQ"/>
 		<param name="vehiclesSource" value="modeVehicleTypesFromVehiclesData"/>
 		<param name="insertingWaitingVehiclesBeforeDrivingVehicles" value="true"/>
 		<param name="usePersonIdForMissingVehicleId" value="false"/>
diff --git a/pom.xml b/pom.xml
index 9bde51b1..ab41dca4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 		<artifactId>matsim-all</artifactId>
 
 		<!-- PR-labelled release -->
-		<version>2025.0-PR3541</version>
+		<version>2025.0-PR3549</version>
 
 		<!-- snapshot == not recommended: rather use PR-labelled release!-->
 <!--		<version>2025.0-SNAPSHOT</version>-->
diff --git a/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java b/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java
index eb94a627..1a45714f 100644
--- a/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java
+++ b/src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java
@@ -93,6 +93,7 @@ private void matchWithNetwork(Path network) throws TransformException, IOExcepti
 			// Some links can not be matched
 			manager.addLinkFilter(l -> !l.getId().toString().startsWith("pt_"));
 			manager.addLinkFilter(l -> !NetworkUtils.getHighwayType(l).equals("service"));
+			manager.addLinkFilter(l -> !NetworkUtils.getHighwayType(l).equals("living_street"));
 
 			net = manager.applyFilters();
 		}