Skip to content

Commit

Permalink
Updated generateDemandElementID(). Refs #13311
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Jun 20, 2023
1 parent 3ca58ec commit af1ac28
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/netedit/GNENetHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1422,7 +1422,7 @@ GNENetHelper::AttributeCarriers::generateDemandElementID(SumoXMLTag tag) const {
prefix = neteditOptions.getString("vType-prefix");
} else if (tag == SUMO_TAG_VTYPE_DISTRIBUTION) {
prefix = neteditOptions.getString("vTypeDistribution-prefix");
} else if ((tag == SUMO_TAG_TRIP) || (tag == GNE_TAG_TRIP_JUNCTIONS)) {
} else if ((tag == SUMO_TAG_TRIP) || (tag == GNE_TAG_TRIP_JUNCTIONS) || (tag == GNE_TAG_TRIP_TAZS)) {
prefix = neteditOptions.getString("trip-prefix");
} else if (tagProperty.isVehicle() && !tagProperty.isFlow()) {
prefix = neteditOptions.getString("vehicle-prefix");
Expand Down Expand Up @@ -1473,10 +1473,12 @@ GNENetHelper::AttributeCarriers::generateDemandElementID(SumoXMLTag tag) const {
(retrieveDemandElement(SUMO_TAG_TRIP, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(GNE_TAG_VEHICLE_WITHROUTE, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(GNE_TAG_TRIP_JUNCTIONS, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(GNE_TAG_TRIP_TAZS, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(GNE_TAG_FLOW_ROUTE, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(SUMO_TAG_FLOW, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(GNE_TAG_FLOW_WITHROUTE, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(GNE_TAG_FLOW_JUNCTIONS, prefix + "_" + toString(counter), false) != nullptr)) {
(retrieveDemandElement(GNE_TAG_FLOW_JUNCTIONS, prefix + "_" + toString(counter), false) != nullptr) ||
(retrieveDemandElement(GNE_TAG_FLOW_TAZS, prefix + "_" + toString(counter), false) != nullptr)) {
counter++;
}
// return new vehicle ID
Expand Down

0 comments on commit af1ac28

Please sign in to comment.