patching expected results after reducing warnings. refs #12

eclipse-sumo · Mar 18, 2024 · 895bd20 · 895bd20
1 parent fc64f76
commit 895bd20
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/tests/tools/import/OSM/build_passenger/errors.tools b/tests/tools/import/OSM/build_passenger/errors.tools
@@ -5,7 +5,6 @@ Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|hi
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.unclassified' (first occurrence for edge '81096583').
 Warning: Discarding unknown compound 'cycleway.track' in type 'cycleway.track|highway.unclassified' (first occurrence for edge '135777011').
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.secondary' (first occurrence for edge '143308535').
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '190461577').
 Warning: Removing pt stop '1704693343' on non existing edge '158236729#0'.
 Warning: Removing pt stop '1704693369' on non existing edge '220198810#3'.
 Warning: Removing pt stop '1704693381' on non existing edge '220198810#0'.

diff --git a/tests/tools/import/OSM/taxiStop/fleet0_1/errors.tools b/tests/tools/import/OSM/taxiStop/fleet0_1/errors.tools
@@ -8,7 +8,6 @@ Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|high
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.secondary' (first occurrence for edge '4612961').
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.primary' (first occurrence for edge '4613110').
 Warning: Ambiguous railway kilometrage direction for way '25946680' (assuming forward)
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '25959781').
 Warning: Discarding unusable type 'waterway.stream' (first occurrence for edge '31112384').
 Warning: Discarding unusable type 'waterway.weir' (first occurrence for edge '31560876').
 Warning: Ambiguous railway kilometrage direction for way '32572620' (assuming forward)
@@ -17,6 +16,9 @@ Warning: Ambiguous railway kilometrage direction for way '32590429' (assuming fo
 Warning: Ambiguous railway kilometrage direction for way '32590435' (assuming forward)
 Warning: Discarding unusable type 'railway.platform' (first occurrence for edge '43185748').
 Warning: Discarding unusable type 'waterway.river' (first occurrence for edge '59683399').
+Warning: Discarding unusable type 'waterway.canal' (first occurrence for edge '145662520').
+Warning: Removing pt stop '1257007152' on non existing edge '71326270'.
+Warning: Removing pt stop '587624704' on non existing edge '71326270'.
 Warning: PT line in relation 114255 with no stops ignored. Probably OSM file is incomplete.
 Warning: PT line in relation 374676 with no stops ignored. Probably OSM file is incomplete.
 Warning: direction of restriction relation could not be determined
@@ -94,7 +96,7 @@ Warning: 17 total messages of type: Ambiguous railway kilometrage direction for
 Warning: 16 total messages of type: Converting invalid rail_crossing to priority junction '%'.
 Warning: 10 total messages of type: Could not re-assign PT stop '%', probably broken osm file.
 Warning: 13 total messages of type: Discarding unknown compound '%' in type '%' (first occurrence for edge '%').
-Warning: 17 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
+Warning: 15 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
 Warning: 9 total messages of type: Found sharp turn with radius % at the % of edge '%'.
 Warning: 15 total messages of type: No way found for reference '%' in relation '%'
 Warning: 7 total messages of type: Not joining junctions % (%).

diff --git a/tests/tools/import/OSM/taxiStop/fleet1/errors.tools b/tests/tools/import/OSM/taxiStop/fleet1/errors.tools
@@ -8,7 +8,6 @@ Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|high
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.secondary' (first occurrence for edge '4612961').
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.primary' (first occurrence for edge '4613110').
 Warning: Ambiguous railway kilometrage direction for way '25946680' (assuming forward)
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '25959781').
 Warning: Discarding unusable type 'waterway.stream' (first occurrence for edge '31112384').
 Warning: Discarding unusable type 'waterway.weir' (first occurrence for edge '31560876').
 Warning: Ambiguous railway kilometrage direction for way '32572620' (assuming forward)
@@ -17,6 +16,9 @@ Warning: Ambiguous railway kilometrage direction for way '32590429' (assuming fo
 Warning: Ambiguous railway kilometrage direction for way '32590435' (assuming forward)
 Warning: Discarding unusable type 'railway.platform' (first occurrence for edge '43185748').
 Warning: Discarding unusable type 'waterway.river' (first occurrence for edge '59683399').
+Warning: Discarding unusable type 'waterway.canal' (first occurrence for edge '145662520').
+Warning: Removing pt stop '1257007152' on non existing edge '71326270'.
+Warning: Removing pt stop '587624704' on non existing edge '71326270'.
 Warning: PT line in relation 114255 with no stops ignored. Probably OSM file is incomplete.
 Warning: PT line in relation 374676 with no stops ignored. Probably OSM file is incomplete.
 Warning: direction of restriction relation could not be determined
@@ -94,7 +96,7 @@ Warning: 17 total messages of type: Ambiguous railway kilometrage direction for
 Warning: 16 total messages of type: Converting invalid rail_crossing to priority junction '%'.
 Warning: 10 total messages of type: Could not re-assign PT stop '%', probably broken osm file.
 Warning: 13 total messages of type: Discarding unknown compound '%' in type '%' (first occurrence for edge '%').
-Warning: 17 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
+Warning: 15 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
 Warning: 9 total messages of type: Found sharp turn with radius % at the % of edge '%'.
 Warning: 15 total messages of type: No way found for reference '%' in relation '%'
 Warning: 7 total messages of type: Not joining junctions % (%).

diff --git a/tests/tools/import/OSM/taxiStop/gz/errors.tools b/tests/tools/import/OSM/taxiStop/gz/errors.tools
@@ -3,7 +3,6 @@ Warning: Discarding unusable type 'railway.platform' (first occurrence for edge
 Warning: Discarding unusable type 'railway.platform_edge' (first occurrence for edge '165415453').
 Warning: Discarding unknown compound 'usage.main' in type 'railway.light_rail|usage.main' (first occurrence for edge '230976793').
 Warning: Ambiguous railway kilometrage direction for way '230976793' (assuming forward)
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '507023458').
 Warning: No way found for reference '318915602' in relation '5475034'
 Warning: Ignoring restriction relation '5475034' with unknown from-way.
 Warning: Could not find corresponding edge or compatible lane for free-floating pt stop '1074960894' (Paul-Löbe-Haus/Reichstag). Thus, it will be removed!

diff --git a/tests/tools/import/OSM/taxiStop/plain/errors.tools b/tests/tools/import/OSM/taxiStop/plain/errors.tools
@@ -8,7 +8,6 @@ Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|high
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.secondary' (first occurrence for edge '4612961').
 Warning: Discarding unknown compound 'cycleway.lane' in type 'cycleway.lane|highway.primary' (first occurrence for edge '4613110').
 Warning: Ambiguous railway kilometrage direction for way '25946680' (assuming forward)
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '25959781').
 Warning: Discarding unusable type 'waterway.stream' (first occurrence for edge '31112384').
 Warning: Discarding unusable type 'waterway.weir' (first occurrence for edge '31560876').
 Warning: Ambiguous railway kilometrage direction for way '32572620' (assuming forward)
@@ -17,6 +16,9 @@ Warning: Ambiguous railway kilometrage direction for way '32590429' (assuming fo
 Warning: Ambiguous railway kilometrage direction for way '32590435' (assuming forward)
 Warning: Discarding unusable type 'railway.platform' (first occurrence for edge '43185748').
 Warning: Discarding unusable type 'waterway.river' (first occurrence for edge '59683399').
+Warning: Discarding unusable type 'waterway.canal' (first occurrence for edge '145662520').
+Warning: Removing pt stop '1257007152' on non existing edge '71326270'.
+Warning: Removing pt stop '587624704' on non existing edge '71326270'.
 Warning: PT line in relation 114255 with no stops ignored. Probably OSM file is incomplete.
 Warning: PT line in relation 374676 with no stops ignored. Probably OSM file is incomplete.
 Warning: direction of restriction relation could not be determined
@@ -94,7 +96,7 @@ Warning: 17 total messages of type: Ambiguous railway kilometrage direction for
 Warning: 16 total messages of type: Converting invalid rail_crossing to priority junction '%'.
 Warning: 10 total messages of type: Could not re-assign PT stop '%', probably broken osm file.
 Warning: 13 total messages of type: Discarding unknown compound '%' in type '%' (first occurrence for edge '%').
-Warning: 17 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
+Warning: 15 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
 Warning: 9 total messages of type: Found sharp turn with radius % at the % of edge '%'.
 Warning: 15 total messages of type: No way found for reference '%' in relation '%'
 Warning: 7 total messages of type: Not joining junctions % (%).

diff --git a/tests/tools/import/OSM/webWizard/errors.tools b/tests/tools/import/OSM/webWizard/errors.tools
@@ -5,17 +5,19 @@ Warning: Ignoring track count 2 for edge '321754197'.
 Warning: Discarding unknown compound 'usage.main' in type 'railway.light_rail|usage.main' (first occurrence for edge '4471817').
 Warning: Discarding unknown compound 'usage.main' in type 'railway.rail|usage.main' (first occurrence for edge '23809674').
 Warning: Ambiguous railway kilometrage direction for way '25946680' (assuming forward)
-Warning: Discarding unusable type 'highway.construction' (first occurrence for edge '25959781').
 Warning: Discarding unusable type 'waterway.stream' (first occurrence for edge '31112384').
 Warning: Discarding unusable type 'waterway.weir' (first occurrence for edge '31560876').
 Warning: Ambiguous railway kilometrage direction for way '32572620' (assuming forward)
 Warning: Ambiguous railway kilometrage direction for way '32572624' (assuming forward)
 Warning: Ambiguous railway kilometrage direction for way '32590429' (assuming forward)
 Warning: Ambiguous railway kilometrage direction for way '32590435' (assuming forward)
 Warning: Discarding unusable type 'railway.platform' (first occurrence for edge '43185748').
-Warning: Discarding unusable type 'railway.construction' (first occurrence for edge '71326270').
+Warning: Discarding unusable type 'railway.disused' (first occurrence for edge '165411077').
+Warning: Discarding unusable type 'railway.abandoned' (first occurrence for edge '165411079').
 Warning: Discarding unknown compound 'railway.proposed' in type 'railway.proposed|usage.main' (first occurrence for edge '199425789').
 Warning: Discarding unknown compound 'usage.main' in type 'railway.proposed|usage.main' (first occurrence for edge '199425789').
+Warning: Removing pt stop '1257007152' on non existing edge '71326270'.
+Warning: Removing pt stop '587624704' on non existing edge '71326270'.
 Warning: PT line in relation 114255 with no stops ignored. Probably OSM file is incomplete.
 Warning: PT line in relation 374676 with no stops ignored. Probably OSM file is incomplete.
 Warning: direction of restriction relation could not be determined
@@ -106,7 +108,7 @@ Warning: 17 total messages of type: Ambiguous railway kilometrage direction for
 Warning: 12 total messages of type: Connection '%_%->%_%' is only %m short.
 Warning: 15 total messages of type: Converting invalid rail_crossing to priority junction '%'.
 Warning: 10 total messages of type: Could not re-assign PT stop '%', probably broken osm file.
-Warning: 15 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
+Warning: 13 total messages of type: Discarding unusable type '%' (first occurrence for edge '%').
 Warning: 14 total messages of type: Found sharp turn with radius % at the % of edge '%'.
 Warning: 15 total messages of type: No way found for reference '%' in relation '%'
 Warning: 17 total messages of type: PT line in relation % with no stops ignored. Probably OSM file is incomplete.