created version 6.2

matsim-scenarios · Mar 26, 2024 · 2981f2f · 2981f2f
1 parent 15f4490
commit 2981f2f
Show file tree

Hide file tree

Showing 22 changed files with 629 additions and 50 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 
 
 JAR := matsim-berlin-*.jar
-V := v6.1
+V := v6.2
 CRS := EPSG:25832
 
 p := input/$V
@@ -10,7 +10,6 @@ berlin := ../public-svn/matsim/scenarios/countries/de/berlin/berlin-$V
 
 MEMORY ?= 20G
 REGIONS := brandenburg
-SHP_FILES=$(patsubst %, input/shp/%-latest-free.shp.zip, $(REGIONS))
 
 osmosis := osmosis/bin/osmosis
 
@@ -22,22 +21,13 @@ sc := java -Xmx$(MEMORY) -XX:+UseParallelGC -cp $(JAR) org.matsim.prepare.RunOpe
 $(JAR):
 	mvn package
 
-${SHP_FILES}:
-	mkdir -p input/shp
-	curl https://download.geofabrik.de/europe/germany/$(@:input/shp/%=%) -o $@
-
 input/brandenburg.osm.pbf:
 	curl https://download.geofabrik.de/europe/germany/brandenburg-230101.osm.pbf -o $@
 
 
 $(germany)/RegioStaR-Referenzdateien.xlsx:
 	curl https://mcloud.de/downloads/mcloud/536149D1-2902-4975-9F7D-253191C0AD07/RegioStaR-Referenzdateien.xlsx -o $@
 
-input/landuse.shp: ${SHP_FILES}
-	mkdir -p input/landuse
-	$(sc) prepare create-landuse-shp $^\
-	 --target-crs ${CRS}\
-	 --output $@
 
 input/facilities.shp: input/brandenburg.osm.pbf
 	$(sc) prepare facility-shp\
@@ -92,35 +82,7 @@ input/sumo.net.xml: input/network.osm
 	 --osm-files $< -o=$@
 
 
-$p/berlin-v6.1-network.xml.gz:
-	# Use 5.x network
-	$(sc) prepare reproject-network\
-	 --input $(berlin)/../berlin-v5.5-10pct/input/berlin-v5.5-network.xml.gz\
-	 --transit-schedule $(berlin)/../berlin-v5.5-10pct/input/berlin-v5.5-transit-schedule.xml.gz\
-	 --output $@\
- 	 --output-transit $p/berlin-v6.1-transitSchedule.xml.gz\
-	 --input-crs EPSG:31468\
-	 --mode freight=truck\
-	 --target-crs $(CRS)
-
- 	# Apply v5 fixes
-	$(sc) prepare fix-network-v5 --input $@ --output $@
-
-
-$p/berlin-v6.1-network-with-pt.xml.gz: $p/berlin-v6.1-network.xml.gz
-	# Copy 5.x network stuff
-	cp $< $@
-
-	cp $(berlin)/../berlin-v5.5-10pct/input/berlin-v5.5-transit-vehicles.xml.gz $p/berlin-v6.1-transitVehicles.xml.gz
-
-$p/berlin-v6.1-counts-vmz.xml.gz:
-	$(sc) prepare counts-from-vmz-old\
-	 --csv ../shared-svn/projects/matsim-berlin/berlin-v5.5/original_data/vmz_counts_2018/CountsId_to_linkId_v2.csv\
-	 --excel ../shared-svn/projects/matsim-berlin/berlin-v5.5/original_data/vmz_counts_2018/Datenexport_2018_TU_Berlin.xlsx\
- 	 --output $@
-
-# TODO: Not part of 6.0 release, but planned for future versions
-$p/berlin-v6.2-network.xml.gz: input/sumo.net.xml
+$p/berlin-$V-network.xml.gz: input/sumo.net.xml
 	$(sc) prepare network-from-sumo $< --target-crs $(CRS) --output $@
 
 	$(sc) prepare clean-network $@ --output $@ --modes car
@@ -132,13 +94,13 @@ $p/berlin-v6.2-network.xml.gz: input/sumo.net.xml
 
 	$(sc) prepare network-freespeed --network $@ --params input/network-params.json --output $@
 
-$p/berlin-v6.2-network-with-pt.xml.gz: $p/berlin-v6.2-network.xml.gz
+$p/berlin-$V-network-with-pt.xml.gz: $p/berlin-$V-network.xml.gz
 	$(sc) prepare transit-from-gtfs --network $< --output=$p\
 	 --name berlin-$V --date "2023-06-07" --target-crs $(CRS) \
 	 $(germany)/gtfs/complete-pt-2023-06-06.zip\
 	 --shp $p/pt-area/pt-area.shp
 
-$p/berlin-v6.2-counts-vmz.xml.gz: $p/berlin-v6.1-network.xml.gz
+$p/berlin-$V-counts-vmz.xml.gz: $p/berlin-$V-network.xml.gz
 	$(sc) prepare counts-from-vmz\
 	 --excel ../shared-svn/projects/matsim-berlin/berlin-v5.5/original_data/vmz_counts_2018/Datenexport_2018_TU_Berlin.xlsx\
 	 --network $<\

diff --git a/input/activity_mapping.json b/input/activity_mapping.json
@@ -25,7 +25,8 @@
     "university": ["edu_higher", "work"],
     "college": ["edu_higher", "work"],
     "sports_hall": ["leisure", "work"],
-    "stadium": ["leisure", "work"]
+    "stadium": ["leisure", "work"],
+    "apartments": ["resident"]
   },
   "amenity": {
     "bar": ["leisure", "work", "delivery", "dining"],
@@ -79,7 +80,8 @@
     "depot": ["depot"],
     "port": ["depot"],
     "quary": ["depot"],
-    "religious": ["religious"]
+    "religious": ["religious"],
+    "residential": ["resident"]
   },
   "leisure": {
     "adult_gaming_centre": ["leisure", "work"],

diff --git a/input/v6.2/area/area.dbf b/input/v6.2/area/area.dbf
diff --git a/input/v6.2/area/area.poly b/input/v6.2/area/area.poly
@@ -0,0 +1,13 @@
+area
+1
+    13.219000451630821     52.804645826658245
+    13.563415935578835     52.7636439833311
+    13.762958239770938     52.64337190957148
+    13.816260636096226     52.400094305830414
+    13.644052894122218     52.18278453619655
+    13.0713938156531     52.178684351863836
+    12.744745797146848     52.345425181394226
+    12.983923216555192     52.79644545799282
+    13.219000451630821     52.804645826658245
+END
+END
diff --git a/input/v6.2/area/area.prj b/input/v6.2/area/area.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
diff --git a/input/v6.2/area/area.shp b/input/v6.2/area/area.shp
diff --git a/input/v6.2/area/area.shx b/input/v6.2/area/area.shx
diff --git a/input/v6.2/berlin-v6.2-vehicleTypes.xml b/input/v6.2/berlin-v6.2-vehicleTypes.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<vehicleDefinitions xmlns="http://www.matsim.org/files/dtd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.matsim.org/files/dtd http://www.matsim.org/files/dtd/vehicleDefinitions_v2.0.xsd">
+
+	<!-- Mode types -->
+
+	<vehicleType id="car">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="ride">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="freight">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="15.0"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="3.5"/>
+		<networkMode networkMode="truck"/>
+	</vehicleType>
+
+	<vehicleType id="truck">
+		<attributes>
+			<attribute name="accessTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+			<attribute name="doorOperationMode" class="org.matsim.vehicles.VehicleType$DoorOperationMode">serial</attribute>
+			<attribute name="egressTimeInSecondsPerPerson" class="java.lang.Double">1</attribute>
+		</attributes>
+		<length meter="15.0"/>
+		<width meter="1.0"/>
+		<passengerCarEquivalents pce="3.5"/>
+		<networkMode networkMode="truck"/>
+	</vehicleType>
+
+	<!-- Specific types for commercial traffic -->
+
+	<vehicleType id="golf1.4">
+
+		<description>Golf 1.4 Trendline</description>
+		<capacity seats="4" standingRoomInPersons="0" other="0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="38.89"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">PASSENGER_CAR</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">petrol (4S)</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="31.07" costsPerMeter="1.5E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="1.0"/>
+		<networkMode networkMode="car"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="vwCaddy">
+
+		<description>VW Caddy 2.0 Maxi TDI</description>
+		<capacity seats="4" standingRoomInPersons="0" other="0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="38.89"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">PASSENGER_CAR</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="27.27" costsPerMeter="1.7E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="1.0"/>
+		<networkMode networkMode="car"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="mercedes313">
+
+		<description>Mercedes 313 CDI</description>
+		<capacity seats="1" standingRoomInPersons="0" other="0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="38.89"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">LIGHT_COMMERCIAL_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="36.42" costsPerMeter="2.6E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="1.0"/>
+		<networkMode networkMode="car"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="light8t">
+
+		<description>Light Vehicle 7.5t</description>
+		<capacity seats="1" standingRoomInPersons="0" other="10.0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="22.22"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">LIGHT_COMMERCIAL_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="63.49" costsPerMeter="4.0E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="2.0"/>
+		<networkMode networkMode="truck"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+
+	<vehicleType id="medium18t">
+
+		<description>Medium Vehicle 18t</description>
+		<capacity seats="1" standingRoomInPersons="0" other="16.0"/>
+		<length meter="7.5"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="22.22"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="80.47" costsPerMeter="5.3E-4" costsPerSecond="0.0049">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.0049</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.0049</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="3.0"/>
+		<networkMode networkMode="truck"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+	<vehicleType id="heavy40t">
+
+		<description>Heavy Vehicle 40t</description>
+		<capacity seats="1" standingRoomInPersons="0" other="33.0"/>
+		<length meter="15"/>
+		<width meter="1.0"/>
+		<maximumVelocity meterPerSecond="22.22"/>
+		<engineInformation>
+			<attributes>
+				<attribute name="HbefaVehicleCategory" class="java.lang.String">HEAVY_GOODS_VEHICLE</attribute>
+				<attribute name="HbefaTechnology" class="java.lang.String">average</attribute>
+				<attribute name="HbefaSizeClass" class="java.lang.String">average</attribute>
+				<attribute name="HbefaEmissionsConcept" class="java.lang.String">diesel</attribute>
+			</attributes>
+		</engineInformation>
+		<costInformation fixedCostsPerDay="126.58" costsPerMeter="6.9E-4" costsPerSecond="0.00559">
+			<attributes>
+				<attribute name="costsPerSecondInService" class="java.lang.Double">0.00559</attribute>
+				<attribute name="costsPerSecondWaiting" class="java.lang.Double">0.00559</attribute>
+			</attributes>
+		</costInformation>
+		<passengerCarEquivalents pce="4.0"/>
+		<networkMode networkMode="truck"/>
+		<flowEfficiencyFactor factor="1.0"/>
+	</vehicleType>
+</vehicleDefinitions>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]