Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

eclipse-sumo · Aug 30, 2024 · 92d5632 · 92d5632
2 parents 5dcdffa + b07f72c
commit 92d5632
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/data/xsd/routeTypes.xsd b/data/xsd/routeTypes.xsd
@@ -1046,6 +1046,10 @@
                 <xsd:complexType>
                     <xsd:attribute name="from" type="xsd:string"/>
                     <xsd:attribute name="to" type="xsd:string"/>
+                    <xsd:attribute name="fromTaz" type="xsd:string"/>
+                    <xsd:attribute name="toTaz" type="xsd:string"/>
+                    <xsd:attribute name="fromJunction" type="xsd:string"/>
+                    <xsd:attribute name="toJunction" type="xsd:string"/>
                     <xsd:attribute name="busStop" type="xsd:string"/>
                     <xsd:attribute name="trainStop" type="xsd:string"/>
                     <xsd:attribute name="parkingArea" type="xsd:string"/>
@@ -1068,6 +1072,10 @@
                     <xsd:attribute name="edges" type="xsd:string"/>
                     <xsd:attribute name="from" type="xsd:string"/>
                     <xsd:attribute name="to" type="xsd:string"/>
+                    <xsd:attribute name="fromTaz" type="xsd:string"/>
+                    <xsd:attribute name="toTaz" type="xsd:string"/>
+                    <xsd:attribute name="fromJunction" type="xsd:string"/>
+                    <xsd:attribute name="toJunction" type="xsd:string"/>
                     <xsd:attribute name="busStop" type="xsd:string"/>
                     <xsd:attribute name="trainStop" type="xsd:string"/>
                     <xsd:attribute name="parkingArea" type="xsd:string"/>

diff --git a/src/netedit/elements/additional/GNEAdditionalHandler.cpp b/src/netedit/elements/additional/GNEAdditionalHandler.cpp
@@ -1432,7 +1432,6 @@ GNEAdditionalHandler::buildTAZSource(const CommonXMLStructure::SumoBaseObject* s
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 TAZSource->setAttribute(SUMO_ATTR_WEIGHT, toString(departWeight), nullptr);
-                TAZSource->incRef("buildTAZSource");
             }
         }
     }
@@ -1505,7 +1504,6 @@ GNEAdditionalHandler::buildTAZSink(const CommonXMLStructure::SumoBaseObject* sum
                 myNet->getViewNet()->getUndoList()->end();
             } else {
                 TAZSink->setAttribute(SUMO_ATTR_WEIGHT, toString(arrivalWeight), nullptr);
-                TAZSink->incRef("buildTAZSink");
             }
         }
     }