fix #14801

eclipse-sumo · May 1, 2024 · 7a9d32b · 7a9d32b
1 parent 766b994
commit 7a9d32b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 14 deletions.
diff --git a/src/netedit/GNEViewNetHelper.cpp b/src/netedit/GNEViewNetHelper.cpp
@@ -500,6 +500,15 @@ GNEViewNetHelper::ViewObjectsSelector::getEdges() const {
     return myViewObjects.edges;
 }
 
+const std::vector<GNETAZ*>&
+GNEViewNetHelper::ViewObjectsSelector::getTAZs() const {
+    return myViewObjects.TAZs;
+}
+
+const std::vector<GNEAdditional*>&
+GNEViewNetHelper::ViewObjectsSelector::getAdditionals() const {
+    return myViewObjects.additionals;
+}
 
 const std::vector<GNEDemandElement*>&
 GNEViewNetHelper::ViewObjectsSelector::getDemandElements() const {

diff --git a/src/netedit/GNEViewNetHelper.h b/src/netedit/GNEViewNetHelper.h
@@ -309,6 +309,12 @@ struct GNEViewNetHelper {
         /// @brief get vector with edges
         const std::vector<GNEEdge*>& getEdges() const;
 
+        /// @brief get vector with TAZs
+        const std::vector<GNETAZ*>& getTAZs() const;
+
+        /// @brief get vector with additionals
+        const std::vector<GNEAdditional*>& getAdditionals() const;
+
         /// @brief get vector with Demand Elements
         const std::vector<GNEDemandElement*>& getDemandElements() const;
 

diff --git a/src/netedit/frames/demand/GNEPersonFrame.cpp b/src/netedit/frames/demand/GNEPersonFrame.cpp
@@ -102,7 +102,6 @@ GNEPersonFrame::addPerson(const GNEViewNetHelper::ViewObjectsSelector& viewObjec
     }
     // obtain tags (only for improve code legibility)
     SumoXMLTag personTag = myPersonTagSelector->getCurrentTemplateAC()->getTagProperty().getTag();
-    SumoXMLTag clickedACTag = viewObjects.getAttributeCarrierFront()->getTagProperty().getTag();
     // first check that current selected person is valid
     if (personTag == SUMO_TAG_NOTHING) {
         myViewNet->setStatusBarText(TL("Current selected person isn't valid."));
@@ -118,20 +117,26 @@ GNEPersonFrame::addPerson(const GNEViewNetHelper::ViewObjectsSelector& viewObjec
         myViewNet->setStatusBarText(TL("Current selected person plan isn't valid."));
         return false;
     }
-    // add elements to path creator
-    if (clickedACTag == SUMO_TAG_LANE) {
-        return myPlanCreator->addEdge(viewObjects.getLaneFront());
-    } else if (viewObjects.getAttributeCarrierFront()->getTagProperty().isStoppingPlace()) {
-        return myPlanCreator->addStoppingPlace(viewObjects.getAdditionalFront());
-    } else if (clickedACTag == SUMO_TAG_ROUTE) {
-        return myPlanCreator->addRoute(viewObjects.getDemandElementFront());
-    } else if (clickedACTag == SUMO_TAG_JUNCTION) {
-        return myPlanCreator->addJunction(viewObjects.getJunctionFront());
-    } else if (clickedACTag == SUMO_TAG_TAZ) {
-        return myPlanCreator->addTAZ(viewObjects.getTAZFront());
-    } else {
-        return false;
+    for (GNEAdditional* o : viewObjects.getAdditionals()) {
+        if (o->getTagProperty().isStoppingPlace()) {
+            return myPlanCreator->addStoppingPlace(o);
+        }
+    }
+    for (GNEDemandElement* o : viewObjects.getDemandElements()) {
+        if (o->getTagProperty().getTag() == SUMO_TAG_ROUTE) {
+            return myPlanCreator->addRoute(o);
+        }
     }
+    for (GNELane* o : viewObjects.getLanes()) {
+        return myPlanCreator->addEdge(o);
+    }
+    for (GNEJunction* o : viewObjects.getJunctions()) {
+        return myPlanCreator->addJunction(o);
+    }
+    for (GNETAZ* o : viewObjects.getTAZs()) {
+        return myPlanCreator->addTAZ(o);
+    }
+    return false;
 }