[JuPedSim] Updated names in netedit.

eclipse-sumo · Feb 6, 2024 · db0fa61 · db0fa61
1 parent 64ddfc4
commit db0fa61
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/src/utils/gui/globjects/GUIGlObject.cpp b/src/utils/gui/globjects/GUIGlObject.cpp
@@ -102,8 +102,8 @@ StringBijection<GUIGlObjectType>::Entry GUIGlObject::GUIGlObjectTypeNamesInitial
     {"polygon",                 GLO_POLYGON},
     {"poi",                     GLO_POI},
     //
-    {"jps.walkableArea",        GLO_JPS_WALKABLEAREA},
-    {"jps.obstacle",            GLO_JPS_OBSTACLE},
+    {"jupedsim.walkable_area",  GLO_JPS_WALKABLEAREA},
+    {"jupedsim.obstacle",       GLO_JPS_OBSTACLE},
     //
     {"routeElement",            GLO_ROUTEELEMENT},
     {"vType",                   GLO_VTYPE},

diff --git a/src/utils/xml/SUMOXMLDefinitions.cpp b/src/utils/xml/SUMOXMLDefinitions.cpp
@@ -262,8 +262,8 @@ StringBijection<int>::Entry SUMOXMLDefinitions::tags[] = {
     { "internalLane",                           GNE_TAG_INTERNAL_LANE },
     { "poiLane",                                GNE_TAG_POILANE },
     { "poiGeo",                                 GNE_TAG_POIGEO },
-    { "jps.walkableArea",                       GNE_TAG_JPS_WALKABLEAREA },
-    { "jps.obstacle",                           GNE_TAG_JPS_OBSTACLE },
+    { "jupedsim.walkable_area",                 GNE_TAG_JPS_WALKABLEAREA },
+    { "jupedsim.obstacle",                      GNE_TAG_JPS_OBSTACLE },
     { "flowRoute",                              GNE_TAG_FLOW_ROUTE },
     { "flowWithRoute",                          GNE_TAG_FLOW_WITHROUTE },
     // GNE waypoints

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/close_line/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/close_line/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to shape mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create close line polygon (area 0)
 netedit.createLineShape(referencePosition, 210, 136, 200, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/default/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/default/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to shape mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create polygon with default values
 netedit.createSquaredShape(referencePosition, 210, 136, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/open/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/open/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to shape mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create open polygon
 netedit.createSquaredShape(referencePosition, 210, 136, 200, False)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/open_line/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/create/default/open_line/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to shape mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create open line polygon (area 0)
 netedit.createLineShape(referencePosition, 210, 136, 200, 200, False)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/create/id/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/create/id/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to shape mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create polygon
 netedit.createSquaredShape(referencePosition, 210, 136, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/create/name/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/create/name/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to shape mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # change layer (invalid)
 netedit.changeDefaultValue(netedit.attrs.jpsWalkableArea.create.name, "%%%%%%$$$$")

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/delete/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/delete/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to shape mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create polygon with default values
 netedit.createSquaredShape(referencePosition, 210, 136, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/id/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/id/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to poly mode and select poly
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create first polygon
 netedit.createSquaredShape(referencePosition, 116, 139, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/name/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/name/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to poly mode and select poly
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create first polygon
 netedit.createSquaredShape(referencePosition, 116, 139, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/parameters/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/parameters/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to poly mode and select poly
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create first polygon
 netedit.createSquaredShape(referencePosition, 116, 139, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/shape/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/inspect/shape/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to poly mode and select poly
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create first polygon
 netedit.createSquaredShape(referencePosition, 116, 139, 200, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/move/vertex_existent/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/move/vertex_existent/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to additional mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create Shape
 netedit.createSquaredShape(referencePosition, 500, 331, 600, True)

diff --git a/tests/netedit/shapeelements/jupedsim/walkablearea/move/vertex_new/test.py b/tests/netedit/shapeelements/jupedsim/walkablearea/move/vertex_new/test.py
@@ -32,7 +32,7 @@
 netedit.shapeMode()
 
 # go to additional mode
-netedit.changeElement("jps.walkableArea")
+netedit.changeElement("jupedsim.walkable_area")
 
 # create Shape
 netedit.createSquaredShape(referencePosition, 500, 331, 600, True)