Skip to content

Commit

Permalink
added test refs #21, #14625
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Apr 1, 2024
1 parent 99c04f3 commit ee53151
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 0 deletions.
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>


<edges version="1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/edges_file.xsd">
<edge id="E0" from="J0" to="J1" type="a" allow="all"/>
<edge id="-E0" from="J1" to="J0" type="a"/>
</edges>
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-01-05 08:36:48 by Eclipse SUMO netedit Version v1_11_0+0781-81dfa3c
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<sumo-net-file value="net.netconvert"/>
</input>
<output>
<output-file value="net.netconvert"/>
<plain-output-prefix value="/home/erdm_ja/scr1/sumo/tests/netconvert/import/XML/types/overwrite_type/input_plain"/>
</output>
<processing>
<geometry.min-radius.fix.railways value="false"/>
<geometry.max-grade.fix value="false"/>
<offset.disable-normalization value="true"/>
<lefthand value="false"/>
</processing>
<junctions>
<no-turnarounds value="true"/>
<junctions.corner-detail value="5"/>
<junctions.limit-turn-speed value="5.5"/>
<rectangular-lane-cut value="false"/>
</junctions>
<pedestrian>
<walkingareas value="false"/>
</pedestrian>
<report>
<aggregate-warnings value="5"/>
</report>
</configuration>
-->

<nodes version="1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
<location netOffset="500.00,500.00" convBoundary="400.00,500.00,500.00,500.00" origBoundary="-500.00,-500.00,500.00,500.00" projParameter="!"/>

<node id="J0" x="400.00" y="500.00" type="dead_end"/>
<node id="J1" x="500.00" y="500.00" type="dead_end"/>
</nodes>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<types version="1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/types_file.xsd">
<type id="a" allow="passenger"/>

</types>
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-01 18:15:10 by Eclipse SUMO netconvert Version v1_19_0+1606-99c04f3f043
This data file and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v20.html
This file may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the Eclipse
Public License 2.0 are satisfied: GNU General Public License, version 2
or later which is available at
https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
<input>
<node-files value="input_plain.nod.xml"/>
<edge-files value="input_plain.edg.xml"/>
<type-files value="input_plain.typ.xml"/>
</input>
<output>
<write-license value="true"/>
<output-file value="net.net.xml"/>
</output>
<junctions>
<no-internal-links value="true"/>
<no-turnarounds value="true"/>
</junctions>
<report>
<xml-validation value="never"/>
</report>
</configuration>
-->

<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="100.00,0.00" convBoundary="0.00,0.00,100.00,0.00" origBoundary="-500.00,-500.00,500.00,500.00" projParameter="!"/>

<type id="a" allow="passenger"/>

<edge id="-E0" from="J1" to="J0" priority="-1" type="a">
<lane id="-E0_0" index="0" speed="13.89" length="100.00" shape="100.00,1.60 0.00,1.60"/>
</edge>
<edge id="E0" from="J0" to="J1" priority="-1" type="a">
<lane id="E0_0" index="0" speed="13.89" length="100.00" shape="0.00,-1.60 100.00,-1.60"/>
</edge>

<junction id="J0" type="dead_end" x="0.00" y="0.00" incLanes="-E0_0" intLanes="" shape="0.00,0.00 0.00,3.20 0.00,0.00"/>
<junction id="J1" type="dead_end" x="100.00" y="0.00" incLanes="E0_0" intLanes="" shape="100.00,0.00 100.00,-3.20 100.00,0.00"/>

</net>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
--edge-files=input_plain.edg.xml --node-files=input_plain.nod.xml
--type-files=input_plain.typ.xml --output=net.net.xml
--no-turnarounds
--no-internal-links
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Success.
3 changes: 3 additions & 0 deletions tests/netconvert/import/XML/types/testsuite.netconvert
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ cross_default_invalid

# load two type files, values from the second file should overwrite the first
overwrite_type

# make sure that allow="all" is written when this is not the edge type default (#14625)
allow_all_type_disallows

0 comments on commit ee53151

Please sign in to comment.