patching expected results refs #4392, #21

tests/netconvert/import/OSM/adlershof_dlr_sidewalks/errors.netconvert

@@ -31,6 +31,7 @@ Warning: Found sharp turn with radius 7.22 at the start of edge '-133858467#2'.
 Warning: Found sharp turn with radius 4.30 at the start of edge '133858467#1'.
 Warning: Found sharp turn with radius 4.73 at the start of edge '143308685#1'.
 Warning: Found sharp turn with radius 6.42 at the start of edge '47765615#1'.
+Warning: Shape for junction '158710676' has distance 21.60 to its given position.
 Warning: Could not find edge for parkingArea '46039050#2'.
 Warning: Could not find edge for parkingArea '46039050#3'.
 Warning: Could not find edge for parkingArea '46039050#5'.

tests/netconvert/import/OSM/adlershof_dlr_sidewalks/output.netconvert

@@ -1,51 +1,52 @@
-Parsing types from 'D:\Repos\sumo\/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
 Parsing types from 'input_types.typ.xml' ... done.
-Parsing nodes from osm-file 'osm.xml' ... done (542ms).
-Parsing edges from osm-file 'osm.xml' ... done (613ms).
+Parsing nodes from osm-file 'osm.xml' ... done (54ms).
+Parsing edges from osm-file 'osm.xml' ... done (52ms).
 Removing duplicate edges ... done.
 Parsing relations from osm-file 'osm.xml' ... 
-done (233ms).
+done (24ms).
  Removed 30 traffic lights before loading plain-XML
  Import done:
    468 nodes loaded.
    34 types loaded.
    882 edges loaded.
 Proj projection parameters used: '+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
-Removing self-loops ... done (3ms).
-Processing public transport stops ... done (18ms).
+Removing self-loops ... done (0ms).
+Processing public transport stops ... done (1ms).
 Revising public transport stops based on pt lines ... 
-done (27ms).
+done (0ms).
 Align pt stop id signs with corresponding edge id signs ... done (0ms).
 Joining junction clusters ... 
-done (170ms).
+done (4ms).
  Joined 20 junction cluster(s).
-Removing empty nodes and geometry nodes ... done (120ms).
-   81 nodes removed.
-Moving network to origin ... done (1448ms).
-Computing turning directions ... done (27ms).
-Assigning nodes to traffic lights ... done (67ms).
-Sorting nodes' edges ... done (49ms).
-Computing node shapes ... done (1360ms).
-Computing edge shapes ... done (631ms).
-Computing node types ... done (26ms).
-Computing priorities ... done (25ms).
-Computing approached edges ... done (49ms).
-Guessing and setting roundabouts ... done (2ms).
-Computing approaching lanes ... done (352ms).
-Dividing of lanes on approached lanes ... done (173ms).
-Processing turnarounds ... done (30ms).
-Rechecking of lane endings ... done (16ms).
-Computing traffic light control information ... done (8ms).
-Computing node logics ... done (981ms).
-Computing traffic light logics ... done (39ms).
+Removing empty nodes and geometry nodes ... done (2ms).
+   79 nodes removed.
+Moving network to origin ... done (15ms).
+Computing turning directions ... done (1ms).
+Assigning nodes to traffic lights ... done (1ms).
+Sorting nodes' edges ... done (1ms).
+Computing node shapes ... 
+done (16ms).
+Computing edge shapes ... done (9ms).
+Computing node types ... done (1ms).
+Computing priorities ... done (0ms).
+Computing approached edges ... done (0ms).
+Guessing and setting roundabouts ... done (1ms).
+Computing approaching lanes ... done (3ms).
+Dividing of lanes on approached lanes ... done (1ms).
+Processing turnarounds ... done (1ms).
+Rechecking of lane endings ... done (0ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (7ms).
+Computing traffic light logics ... done (1ms).
  4 traffic light(s) computed.
-Find accesses for pt rail stops ... done (26ms).
+Find accesses for pt rail stops ... done (0ms).
 -----------------------------------------------------
 Summary:
  Node type statistics:
   Unregulated junctions       : 0
   Dead-end junctions          : 66
-  Priority junctions          : 212
+  Priority junctions          : 214
   Right-before-left junctions : 64
   Traffic light junctions      : 4
   Rail signal junctions      : 1
@@ -55,5 +56,5 @@ Summary:
   Converted boundary : 0.00,0.00,5580.65,3531.77
 -----------------------------------------------------
 Writing network ... 
-done (1499ms).
+done (55ms).
 Success.

tests/netconvert/import/OSM/adlershof_dlr_sidewalks_option/errors.netconvert

@@ -33,6 +33,7 @@ Warning: Found angle of 138.43 degrees at edge '-71960638#0', segment 0.
 Warning: Found sharp turn with radius 4.30 at the start of edge '133858467#1'.
 Warning: Found sharp turn with radius 4.73 at the start of edge '143308685#1'.
 Warning: Found angle of 138.43 degrees at edge '71960638#0', segment 5.
+Warning: Shape for junction '158710676' has distance 21.60 to its given position.
 Warning: 9 total messages of type: Discarding unknown compound '%' in type '%' (first occurrence for edge '%').
 Warning: 8 total messages of type: Found sharp turn with radius % at the % of edge '%'.
 Warning: 10 total messages of type: PT line '%' in relation % seems to be split, only keeping first part.