fix #14733

eclipse-sumo · Apr 18, 2024 · 94d8ea7 · 94d8ea7
1 parent 3140f93
commit 94d8ea7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/netedit/elements/GNETagProperties.cpp b/src/netedit/elements/GNETagProperties.cpp
@@ -349,6 +349,10 @@ GNETagProperties::isType() const {
     return (myTagType & VTYPE) != 0;
 }
 
+bool
+GNETagProperties::isTypeDist() const {
+    return myTag == SUMO_TAG_VTYPE_DISTRIBUTION;
+}
 
 bool
 GNETagProperties::isVehicle() const {

diff --git a/src/netedit/elements/GNETagProperties.h b/src/netedit/elements/GNETagProperties.h
@@ -254,6 +254,9 @@ class GNETagProperties {
     /// @brief return true if tag correspond to a vehicle/person/container type element
     bool isType() const;
 
+    /// @brief return true if tag correspond to a type distribution element
+    bool isTypeDist() const;
+
     /// @brief return true if tag correspond to a vehicle element
     bool isVehicle() const;
 

diff --git a/src/netedit/elements/demand/GNEDemandElement.cpp b/src/netedit/elements/demand/GNEDemandElement.cpp
@@ -407,7 +407,8 @@ GNEDemandElement*
 GNEDemandElement::getTypeParent() const {
     if (getParentDemandElements().size() < 1) {
         throw InvalidArgument("This demand element doesn't have a type parent");
-    } else if (!getParentDemandElements().at(0)->getTagProperty().isType()) {
+    } else if (!getParentDemandElements().at(0)->getTagProperty().isType()
+            && !getParentDemandElements().at(0)->getTagProperty().isTypeDist()) {
         throw InvalidArgument("The first parent isn't a type");
     } else if (getParentDemandElements().at(0)->getTagProperty().getTag() == SUMO_TAG_VTYPE) {
         return getParentDemandElements().at(0);