added test refs #14422, #21

tests/tools/import/MATSim/coordinates_preferred/matsim_plans.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE population SYSTEM "http://www.matsim.org/files/dtd/population_v6.dtd">
+
+<population desc="population written from streaming">
+
+	<attributes>
+		<attribute name="coordinateReferenceSystem" class="java.lang.String">     
+            EPSG:25832
+        </attribute>
+	</attributes>
+
+
+<!-- ====================================================================== -->
+
+	<person id="0">
+		<plan selected="yes">
+			<activity type="home" link="1234" x="739896.49" y="5689000.22" end_time="07:33:00"/>
+			<leg mode="ride" />
+			<activity type="work" link="5678" x="731549.1" y="5689956.9" start_time="08:05:00" end_time="13:27:00" />
+			<leg mode="car" dep_time="08:00:00" trav_time="00:04:00">
+				<route type="links" start_link="13758" end_link="14465" trav_time="00:04:00" distance="8019.0">13758 14271 14269 14273 14468 14267 14465</route>
+			</leg>
+			<activity type="home" x="739896.49" y="5689000.22" start_time="14:05:00" />
+		</plan>
+	</person>
+
+<!-- ====================================================================== -->
+
+    <person id="freight_0">
+		<plan selected="yes">
+			<activity type="freight_start" x="760794.59" y="5697135.14" end_time="05:00:00" />
+			<leg mode="freight" />
+			<activity type="freight_end" x="755362.54" y="5671822.01" />
+		</plan>
+	</person>
+
+
+<!-- ====================================================================== -->
+
+</population>

tests/tools/import/MATSim/coordinates_preferred/options.tools

@@ -0,0 +1,2 @@
+ --prefer-coordinate
+ --plan-file matsim_plans.xml -o out.rou.xml tools/import/matsim/matsim_importPlans.py

tests/tools/import/MATSim/coordinates_preferred/routes.tools

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-02-29 10:47:44.391507 by matsim_importPlans.py v1_19_0+1085-630fe6e6a6f
+  options: <doubleminus>plan-file matsim_plans.xml -o out.rou.xml
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vType id="car" vClass="passenger"/>
+    <vType id="bicycle" vClass="bicycle"/>
+
+    <trip id="0_0" depart="triggered" from="1234" to="5678"/>
+    <vehicle id="0_1" depart="triggered" type="car">
+        <route edges="13758 14271 14269 14273 14468 14267 14465"/>
+    </vehicle>
+    <person id="0" depart="0:0:0">
+        <stop edge="1234" until="07:33:00" actType="home"/>
+        <ride lines="0_0" to="5678"/>
+        <stop edge="5678" until="08:00:00" actType="work"/>
+        <ride lines="0_1" toLonLat="12.441623766883094,51.30168303457315"/>
+        <stop lon="12.441623766883094" lat="51.30168303457315" until="24:0:0" actType="home"/>
+    </person>
+    <trip id="freight_0_0" depart="triggered" fromLonLat="12.74672784602896,51.36549012982353" toLonLat="12.650802871087379,51.14080387506128"/>
+    <person id="freight_0" depart="0:0:0">
+        <stop lon="12.74672784602896" lat="51.36549012982353" until="05:00:00" actType="freight_start"/>
+        <ride lines="freight_0_0" toLonLat="12.650802871087379,51.14080387506128"/>
+        <stop lon="12.650802871087379" lat="51.14080387506128" until="24:0:0" actType="freight_end"/>
+    </person>
+</routes>

tests/tools/import/MATSim/testsuite.tools

@@ -11,5 +11,8 @@ bikes_walks
 # import coordinates instead of edge ids
 coordinates
 
+# import coordinates despite having edge ids
+coordinates_preferred
+
 # import activity end times
 activity