Skip to content

Commit 8854378

Browse files
committed
removed duplicate file refs #12
1 parent b9bf379 commit 8854378

File tree

64 files changed

+100
-57898
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+100
-57898
lines changed
File renamed without changes.
File renamed without changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--no-internal-links --osm-files osm2.xml -v --proj.utm --output.street-names --plain-output-prefix plain --proj.plain-geo --output net.net.xml
2+
--tls.red.time 10

tests/netconvert/import/OSM/adlershof_dlr/output.netconvert renamed to tests/netconvert/import/OSM/adlershof/adlershof_dlr/output.netconvert

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
2-
Parsing nodes from osm-file 'osm.xml' ... done (14ms).
3-
Parsing edges from osm-file 'osm.xml' ... done (5ms).
2+
Parsing nodes from osm-file 'osm2.xml' ... done (7ms).
3+
Parsing edges from osm-file 'osm2.xml' ... done (2ms).
44
Removing duplicate edges ... done.
5-
Parsing relations from osm-file 'osm.xml' ...
6-
done (2ms).
5+
Parsing relations from osm-file 'osm2.xml' ...
6+
done (12ms).
77
Import done:
88
94 nodes loaded.
99
36 types loaded.
@@ -13,20 +13,20 @@ Removing self-loops ... done (0ms).
1313
Removing empty nodes ... done (0ms).
1414
7 nodes removed.
1515
Moving network to origin ... done (0ms).
16-
Computing turning directions ... done (1ms).
16+
Computing turning directions ... done (0ms).
1717
Assigning nodes to traffic lights ... done (0ms).
1818
Sorting nodes' edges ... done (0ms).
19-
Computing node shapes ... done (4ms).
20-
Computing edge shapes ... done (2ms).
19+
Computing node shapes ... done (2ms).
20+
Computing edge shapes ... done (23ms).
2121
Computing node types ... done (0ms).
22-
Computing priorities ... done (0ms).
22+
Computing priorities ... done (1ms).
2323
Computing approached edges ... done (0ms).
2424
Guessing and setting roundabouts ... done (0ms).
25-
Computing approaching lanes ... done (1ms).
25+
Computing approaching lanes ... done (0ms).
2626
Dividing of lanes on approached lanes ... done (0ms).
2727
Processing turnarounds ... done (0ms).
2828
Rechecking of lane endings ... done (0ms).
29-
Computing traffic light control information ... done (1ms).
29+
Computing traffic light control information ... done (0ms).
3030
Computing node logics ... done (1ms).
3131
Computing traffic light logics ...
3232
done (0ms).
@@ -44,5 +44,5 @@ Summary:
4444
Applied offset : -399345.66,-5809365.64
4545
Converted boundary : 0.00,0.00,1737.68,767.39
4646
-----------------------------------------------------
47-
Writing network ... done (12ms).
47+
Writing network ... done (54ms).
4848
Success.

tests/netconvert/import/OSM/adlershof_dlr/plain_cfg.netconvert renamed to tests/netconvert/import/OSM/adlershof/adlershof_dlr/plain_cfg.netconvert

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<!-- generated on 2024-12-19 21:45:46 by Eclipse SUMO netconvert Version v1_21_0+1513-0dbf85cfa30
3+
<!-- generated on 2025-02-12 18:11:09 by Eclipse SUMO netconvert Version v1_22_0+0192-5d52d709b2d
44
This data file and the accompanying materials
55
are made available under the terms of the Eclipse Public License v2.0
66
which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
2121
<connection-files value="plain.con.xml"/>
2222
<tllogic-files value="plain.tll.xml"/>
2323
<type-files value="plain.typ.xml"/>
24-
<osm-files value="osm.xml"/>
24+
<osm-files value="osm2.xml"/>
2525
</input>
2626

2727
<output>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)