Skip to content

Commit

Permalink
Updated netedit tests. Refs #3045
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Sep 27, 2024
1 parent 1b85725 commit 9de533d
Show file tree
Hide file tree
Showing 45 changed files with 1,811 additions and 806 deletions.
4 changes: 3 additions & 1 deletion tests/netedit/attributesEnum.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class inspect:
stopOffset = 15
stopOffsetExceptionButton = 16
stopOffsetException = 17
parameters = 20
parameters = 18

class inspectSelection:
speed = 1
Expand Down Expand Up @@ -3611,6 +3611,7 @@ class inspectSelection:
lines = 2
group = 3


class walk:
class edge:
class edge:
Expand Down Expand Up @@ -3759,6 +3760,7 @@ class inspectSelection:
speed = 2
duration = 3


class walkEdges:
class create:
arrivalPos = 8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-07-31 15:29:13 by Eclipse SUMO netedit Version v1_20_0+1585-7f20689389f
<!-- generated on 2024-09-27 13:45:56 by Eclipse SUMO netedit Version v1_20_0+2172-1b857258f91
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
Expand All @@ -14,4 +14,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-->

<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">
<interval id="newDataSet" begin="0.00" end="3600.00">
<edge id="Edge0" keyFinal1="1" keyFinal2="2" keyFinal3="3"/>
</interval>
</data>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Warning: Invalid format of attribute (dummyGenericParameters)
Warning: Invalid format of attribute (key1)
Warning: Invalid format of attribute (keyInvalid.;%>%$$=1)
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2022-03-04 10:59:49 by Eclipse SUMO netedit Version v1_12_0+1137-e9106068858
<!-- generated on 2024-09-27 10:43:52 by Eclipse SUMO netedit Version v1_20_0+2172-1b857258f91
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
-->

<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
<!-- StoppingPlaces -->
<busStop id="busStop1" lane="gneE0_0" startPos="10.00" endPos="15.00" friendlyPos="true"/>
<busStop id="busStop2" lane="gneE1_0" startPos="3.00" endPos="13.00" friendlyPos="true"/>
<busStop id="busStop3" lane="gneE2_0" endPos="30.00" friendlyPos="true"/>
<busStop id="busStop4" lane="gneE2_1" startPos="25.00" friendlyPos="true"/>
<busStop id="busStop5" lane="gneE3_0" startPos="3.00" endPos="13.00" friendlyPos="true"/>
<busStop id="busStop6" lane="gneE3_1" startPos="3.00" endPos="13.00" friendlyPos="true"/>
<busStop id="bs_0" lane="E0_0" startPos="40.00" endPos="50.00" friendlyPos="true"/>
<busStop id="bs_1" lane="E1_0" startPos="25.00" endPos="35.00" friendlyPos="true"/>
<busStop id="bs_2" lane="-E2_0" startPos="25.00" endPos="35.00" friendlyPos="true"/>
<chargingStation id="cs_0" lane="-E1_0" startPos="25.00" endPos="35.00" friendlyPos="true"/>
<chargingStation id="cs_1" lane="E2_0" startPos="25.00" endPos="35.00" friendlyPos="true"/>
<!-- Detectors -->
<inductionLoop id="e1_0" lane="E0_0" pos="15.00" period="300.00" file="e1_0.xml" friendlyPos="1"/>
</additional>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-09-27 10:43:52 by Eclipse SUMO netedit Version v1_20_0+2172-1b857258f91
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
-->

<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">
<interval id="dataSet" begin="0.00" end="3600.00">
<edge id="E0"/>
<edgeRelation from="E1" to="-E1"/>
<edgeRelation from="-E2" to="E2"/>
</interval>
</data>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<viewsettings>
<scheme name="testing">
<opengl dither="0" fps="0" drawBoundaries="0" disableDottedContours="0" forceDrawRectangleSelection="0" geometryIndices_show="0" geometryIndices_size="50.00" geometryIndices_color="255,0,128" geometryIndices_bgColor="128,0,0,0" geometryIndices_constantSize="1" geometryIndices_onlySelected="0"/>
<background backgroundColor="white" showGrid="1" gridXSize="2.00" gridYSize="2.00"/>
<edges laneEdgeMode="0" scaleMode="0" laneShowBorders="0" showBikeMarkings="1" showLinkDecals="1" realisticLinkRules="0" showLinkRules="1" showRails="1" secondaryShape="0" hideConnectors="0" widthExaggeration="1.00" minSize="0.00" showDirection="0" showSublanes="1" spreadSuperposed="0" edgeParam="EDGE_KEY" laneParam="LANE_KEY" vehicleParam="PARAM_NUMERICAL" vehicleScaleParam="PARAM_NUMERICAL" vehicleTextParam="PARAM_TEXT" edgeData="speed" edgeDataID="" edgeDataScaling="" edgeValueHideCheck="0" edgeValueHideThreshold="0.00" edgeValueHideCheck2="0" edgeValueHideThreshold2="200.00"
<opengl dither="0" fps="0" trueZ="0" drawBoundaries="0" disableDottedContours="0" forceDrawRectangleSelection="0" geometryIndices_show="0" geometryIndices_size="50.00" geometryIndices_color="255,0,128" geometryIndices_bgColor="128,0,0,0" geometryIndices_constantSize="1" geometryIndices_onlySelected="0"/>
<background backgroundColor="white" showGrid="1" gridXSize="5.00" gridYSize="5.00"/>
<edges laneEdgeMode="0" scaleMode="0" laneShowBorders="0" showBikeMarkings="1" showLinkDecals="1" realisticLinkRules="0" showLinkRules="1" showRails="1" secondaryShape="0" hideConnectors="0" widthExaggeration="1.00" minSize="0.00" showDirection="0" showSublanes="1" spreadSuperposed="0" disableHideByZoom="0" edgeParam="EDGE_KEY" laneParam="LANE_KEY" vehicleParam="PARAM_NUMERICAL" vehicleScaleParam="PARAM_NUMERICAL" vehicleTextParam="PARAM_TEXT" edgeData="speed" edgeDataID="" edgeDataScaling="" edgeValueHideCheck="0" edgeValueHideThreshold="0.00" edgeValueHideCheck2="0" edgeValueHideThreshold2="200.00" edgeValueSetNeutral="0" edgeValueNeutralThreshold="0.00" edgeValueFixRange="0"
edgeName_show="0" edgeName_size="60.00" edgeName_color="orange" edgeName_bgColor="128,0,0,0" edgeName_constantSize="1" edgeName_onlySelected="0"
internalEdgeName_show="0" internalEdgeName_size="45.00" internalEdgeName_color="128,64,0" internalEdgeName_bgColor="128,0,0,0" internalEdgeName_constantSize="1" internalEdgeName_onlySelected="0"
cwaEdgeName_show="0" cwaEdgeName_size="60.00" cwaEdgeName_color="magenta" cwaEdgeName_bgColor="128,0,0,0" cwaEdgeName_constantSize="1" cwaEdgeName_onlySelected="0"
Expand All @@ -21,6 +21,7 @@
<entry color="green" name="connector"/>
<entry color="orange" name="forbidden"/>
<entry color="145,145,145" name="data mode"/>
<entry color="200,240,240" name="airway"/>
</colorScheme>
<colorScheme name="by selection">
<entry color="grey" name="unselected"/>
Expand All @@ -35,10 +36,10 @@
<entry color="80,80,80" threshold="2080.00" name="pedestrian_delivery"/>
<entry color="192,66,44" threshold="65536.00" name="bicycle"/>
<entry color="150,200,200" threshold="8388608.00" name="waterway"/>
<entry color="255,206,0" threshold="50495455.00" name="motorway"/>
<entry color="black" threshold="50593759.00" name="disallow_pedestrian"/>
<entry color="black" threshold="50593791.00" name="normal_road"/>
<entry color="green" threshold="67108863.00" name="all"/>
<entry color="255,206,0" threshold="7247921119.00" name="motorway"/>
<entry color="black" threshold="7248019423.00" name="disallow_pedestrian"/>
<entry color="black" threshold="7248019455.00" name="normal_road"/>
<entry color="green" threshold="8589934591.00" name="all"/>
</colorScheme>
<colorScheme name="by allowed speed (lanewise)" interpolated="1">
<entry color="red" threshold="0.00"/>
Expand Down Expand Up @@ -119,7 +120,7 @@
<entry color="1.00" name="uniform"/>
</scalingScheme>
</edges>
<vehicles vehicleMode="0" vehicleScaleMode="0" vehicleQuality="0" vehicle_minSize="1.00" vehicle_exaggeration="1.00" vehicle_constantSize="0" vehicle_constantSizeSelected="0" showBlinker="1" drawMinGap="0" drawBrakeGap="0" showBTRange="0" showRouteIndex="0" scaleLength="1" drawReversed="0" showParkingInfo="0"
<vehicles vehicleMode="0" vehicleScaleMode="0" vehicleQuality="0" vehicle_minSize="1.00" vehicle_exaggeration="1.00" vehicle_constantSize="0" vehicle_constantSizeSelected="0" showBlinker="1" drawMinGap="0" drawBrakeGap="0" showBTRange="0" showRouteIndex="0" scaleLength="1" drawReversed="0" showParkingInfo="0" showChargingInfo="0"
vehicleName_show="0" vehicleName_size="60.00" vehicleName_color="204,153,0" vehicleName_bgColor="128,0,0,0" vehicleName_constantSize="1" vehicleName_onlySelected="0"
vehicleValue_show="0" vehicleValue_size="80.00" vehicleValue_color="cyan" vehicleValue_bgColor="128,0,0,0" vehicleValue_constantSize="1" vehicleValue_onlySelected="0"
vehicleScaleValue_show="0" vehicleScaleValue_size="80.00" vehicleScaleValue_color="grey" vehicleScaleValue_bgColor="128,0,0,0" vehicleScaleValue_constantSize="1" vehicleScaleValue_onlySelected="0"
Expand Down Expand Up @@ -151,7 +152,7 @@
junctionName_show="0" junctionName_size="60.00" junctionName_color="192,255,128" junctionName_bgColor="128,0,0,0" junctionName_constantSize="1" junctionName_onlySelected="0"
internalJunctionName_show="0" internalJunctionName_size="50.00" internalJunctionName_color="0,204,128" internalJunctionName_bgColor="128,0,0,0" internalJunctionName_constantSize="1" internalJunctionName_onlySelected="0"
tlsPhaseIndex_show="0" tlsPhaseIndex_size="150.00" tlsPhaseIndex_color="yellow" tlsPhaseIndex_bgColor="128,0,0,0" tlsPhaseIndex_constantSize="1" tlsPhaseIndex_onlySelected="0" tlsPhaseName_show="0" tlsPhaseName_size="150.00" tlsPhaseName_color="orange" tlsPhaseName_bgColor="128,0,0,0" tlsPhaseName_constantSize="1" tlsPhaseName_onlySelected="0"
showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="0">
showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="0" junctionValueHideCheck="0" junctionValueHideThreshold="0.00" junctionValueHideCheck2="0" junctionValueHideThreshold2="100.00" junctionValueSetNeutral="0" junctionValueNeutralThreshold="0.00" junctionValueFixRange="0">
<colorScheme name="uniform">
<entry color="102,0,0"/>
<entry color="204,0,0" name="junction bubble"/>
Expand Down Expand Up @@ -220,5 +221,5 @@
<view3D show3DTLSLinkMarkers="1" show3DTLSDomes="1" show3DHeadUpDisplay="1" generate3DTLSModels="0" ambient3DLight="32,32,32" diffuse3DLight="64,64,64"/>
<legend showSizeLegend="1" showColorLegend="0" showVehicleColorLegend="0"/>
</scheme>
<viewport zoom="100.00" x="25.00" y="10.00" angle="0.00"/>
<viewport zoom="140.00" x="0.00" y="0.00" angle="0.00"/>
</viewsettings>
16 changes: 16 additions & 0 deletions tests/netedit/network/edges/inspect_selected/shapeend/log.netedit
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Warning: Found angle of 152.66 degrees at edge '-E2', segment 1.
Warning: Found angle of 101.10 degrees at edge 'EdgeExternTop', segment 5.
Warning: Shape for junction 'J4' has distance 73.03 to its given position.
Warning: Shape for junction 'J5' has distance 39.38 to its given position.
Warning: Invalid endOffset 6.00 at lane 'E2_0' with length 0.20 (startOffset 0.00).
Warning: Invalid endOffset 6.00 at lane 'E2_1' with length 0.20 (startOffset 0.00).
Warning: Speed of straight connection 'EdgeExternTop_0->EdgeExternBot_0' reduced by 9.96 due to turning radius of 2.80 (length=2.69, angle=90.00).
Warning: Found angle of 135.72 degrees at edge '-E1', segment 0.
Warning: Found sharp turn with radius 5.32 at the start of edge '-E1'.
Warning: Found angle of 152.66 degrees at edge '-E2', segment 1.
Warning: Found angle of 101.10 degrees at edge 'EdgeExternTop', segment 5.
Warning: Shape for junction 'J4' has distance 73.03 to its given position.
Warning: Shape for junction 'J5' has distance 39.38 to its given position.
Warning: Invalid endOffset 6.00 at lane 'E2_0' with length 0.20 (startOffset 0.00).
Warning: Invalid endOffset 6.00 at lane 'E2_1' with length 0.20 (startOffset 0.00).
Warning: Speed of straight connection 'EdgeExternTop_0->EdgeExternBot_0' reduced by 9.96 due to turning radius of 2.80 (length=2.69, angle=90.00).
Loading

0 comments on commit 9de533d

Please sign in to comment.