Skip to content

Commit

Permalink
marking attribute as virtual. refs #14296
Browse files Browse the repository at this point in the history
  • Loading branch information
@namdre
namdre committed Mar 5, 2024
1 parent 429ddc1 commit efc59c3
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 40 deletions.
6 changes: 3 additions & 3 deletions src/netedit/elements/GNEAttributeCarrier.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6582,19 +6582,19 @@ GNEAttributeCarrier::fillPlanParentAttributes(SumoXMLTag currentTag) {
myTagProperties[currentTag].addAttribute(attrProperty);
}
if (tagProperty.planFromBusStop()) {
attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM_BUSSTOP,
attrProperty = GNEAttributeProperties(GNE_ATTR_FROM_BUSSTOP,
GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE,
TL("BuStop start ID"));
myTagProperties[currentTag].addAttribute(attrProperty);
}
if (tagProperty.planFromTrainStop()) {
attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM_TRAINSTOP,
attrProperty = GNEAttributeProperties(GNE_ATTR_FROM_TRAINSTOP,
GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE,
TL("TrainStop start ID"));
myTagProperties[currentTag].addAttribute(attrProperty);
}
if (tagProperty.planFromContainerStop()) {
attrProperty = GNEAttributeProperties(SUMO_ATTR_FROM_CONTAINERSTOP,
attrProperty = GNEAttributeProperties(GNE_ATTR_FROM_CONTAINERSTOP,
GNEAttributeProperties::STRING | GNEAttributeProperties::UNIQUE,
TL("ContainerStop start ID"));
myTagProperties[currentTag].addAttribute(attrProperty);
Expand Down
14 changes: 7 additions & 7 deletions src/netedit/elements/demand/GNEDemandElementPlan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,11 @@ GNEDemandElementPlan::writePlanAttributes(OutputDevice& device) const {
} else if (tagProperty.planFromJunction()) {
device.writeAttr(SUMO_ATTR_FROM_JUNCTION, myPlanElement->getParentJunctions().front()->getID());
} else if (tagProperty.planFromBusStop()) {
device.writeAttr(SUMO_ATTR_FROM_BUSSTOP, myPlanElement->getParentAdditionals().front()->getID());
device.writeAttr(GNE_ATTR_FROM_BUSSTOP, myPlanElement->getParentAdditionals().front()->getID());
} else if (tagProperty.planFromTrainStop()) {
device.writeAttr(SUMO_ATTR_FROM_TRAINSTOP, myPlanElement->getParentAdditionals().front()->getID());
device.writeAttr(GNE_ATTR_FROM_TRAINSTOP, myPlanElement->getParentAdditionals().front()->getID());
} else if (tagProperty.planFromContainerStop()) {
device.writeAttr(SUMO_ATTR_FROM_CONTAINERSTOP, myPlanElement->getParentAdditionals().front()->getID());
device.writeAttr(GNE_ATTR_FROM_CONTAINERSTOP, myPlanElement->getParentAdditionals().front()->getID());
}
}
// continue writting to attribute
Expand Down Expand Up @@ -643,8 +643,8 @@ GNEDemandElementPlan::getPlanAttribute(SumoXMLAttr key) const {
case SUMO_ATTR_FROM_JUNCTION:
return myPlanElement->getParentJunctions().front()->getID();
case SUMO_ATTR_FROM_TAZ:
case SUMO_ATTR_FROM_BUSSTOP:
case SUMO_ATTR_FROM_TRAINSTOP:
case GNE_ATTR_FROM_BUSSTOP:
case GNE_ATTR_FROM_TRAINSTOP:
return myPlanElement->getParentAdditionals().front()->getID();
// to elements
case SUMO_ATTR_TO:
Expand Down Expand Up @@ -888,8 +888,8 @@ GNEDemandElementPlan::isPlanAttributeEnabled(SumoXMLAttr key) const {
case SUMO_ATTR_FROM:
case SUMO_ATTR_FROM_JUNCTION:
case SUMO_ATTR_FROM_TAZ:
case SUMO_ATTR_FROM_BUSSTOP:
case SUMO_ATTR_FROM_TRAINSTOP:
case GNE_ATTR_FROM_BUSSTOP:
case GNE_ATTR_FROM_TRAINSTOP:
// to
case SUMO_ATTR_TO:
case SUMO_ATTR_TO_JUNCTION:
Expand Down
48 changes: 24 additions & 24 deletions src/utils/handlers/RouteHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) {
obj->getStringAttribute(SUMO_ATTR_FROM),
obj->getStringAttribute(SUMO_ATTR_FROM_TAZ),
obj->getStringAttribute(SUMO_ATTR_FROM_JUNCTION),
obj->getStringAttribute(SUMO_ATTR_FROM_BUSSTOP),
obj->getStringAttribute(SUMO_ATTR_FROM_TRAINSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_BUSSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_TRAINSTOP),
obj->getStringAttribute(SUMO_ATTR_TO),
obj->getStringAttribute(SUMO_ATTR_TO_TAZ),
obj->getStringAttribute(SUMO_ATTR_TO_JUNCTION),
Expand All @@ -322,8 +322,8 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) {
case SUMO_TAG_RIDE:
buildRide(obj,
obj->getStringAttribute(SUMO_ATTR_FROM),
obj->getStringAttribute(SUMO_ATTR_FROM_BUSSTOP),
obj->getStringAttribute(SUMO_ATTR_FROM_TRAINSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_BUSSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_TRAINSTOP),
obj->getStringAttribute(SUMO_ATTR_TO),
obj->getStringAttribute(SUMO_ATTR_BUS_STOP),
obj->getStringAttribute(SUMO_ATTR_TRAIN_STOP),
Expand All @@ -335,8 +335,8 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) {
obj->getStringAttribute(SUMO_ATTR_FROM),
obj->getStringAttribute(SUMO_ATTR_FROM_TAZ),
obj->getStringAttribute(SUMO_ATTR_FROM_JUNCTION),
obj->getStringAttribute(SUMO_ATTR_FROM_BUSSTOP),
obj->getStringAttribute(SUMO_ATTR_FROM_TRAINSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_BUSSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_TRAINSTOP),
obj->getStringAttribute(SUMO_ATTR_TO),
obj->getStringAttribute(SUMO_ATTR_TO_TAZ),
obj->getStringAttribute(SUMO_ATTR_TO_JUNCTION),
Expand All @@ -359,7 +359,7 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) {
case SUMO_TAG_TRANSPORT:
buildTransport(obj,
obj->getStringAttribute(SUMO_ATTR_FROM),
obj->getStringAttribute(SUMO_ATTR_FROM_CONTAINERSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_CONTAINERSTOP),
obj->getStringAttribute(SUMO_ATTR_TO),
obj->getStringAttribute(SUMO_ATTR_CONTAINER_STOP),
obj->getStringListAttribute(SUMO_ATTR_LINES),
Expand All @@ -368,7 +368,7 @@ RouteHandler::parseSumoBaseObject(CommonXMLStructure::SumoBaseObject* obj) {
case SUMO_TAG_TRANSHIP:
buildTranship(obj,
obj->getStringAttribute(SUMO_ATTR_FROM),
obj->getStringAttribute(SUMO_ATTR_FROM_CONTAINERSTOP),
obj->getStringAttribute(GNE_ATTR_FROM_CONTAINERSTOP),
obj->getStringAttribute(SUMO_ATTR_TO),
obj->getStringAttribute(SUMO_ATTR_CONTAINER_STOP),
obj->getStringListAttribute(SUMO_ATTR_EDGES),
Expand Down Expand Up @@ -742,9 +742,9 @@ RouteHandler::parsePersonTrip(const SUMOSAXAttributes& attrs) {
const std::string toTAZ = attrs.getOpt<std::string>(SUMO_ATTR_TO_TAZ, "", parsedOk, "");
const std::string fromJunction = attrs.getOpt<std::string>(SUMO_ATTR_FROM_JUNCTION, "", parsedOk, "");
const std::string toJunction = attrs.getOpt<std::string>(SUMO_ATTR_TO_JUNCTION, "", parsedOk, "");
const std::string fromBusStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_BUSSTOP, "", parsedOk, "");
const std::string fromBusStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_BUSSTOP, "", parsedOk, "");
const std::string toBusStop = attrs.getOpt<std::string>(SUMO_ATTR_BUS_STOP, "", parsedOk, "");
const std::string fromTrainStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_TRAINSTOP, "", parsedOk, "");
const std::string fromTrainStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_TRAINSTOP, "", parsedOk, "");
const std::string toTrainStop = attrs.getOpt<std::string>(SUMO_ATTR_TRAIN_STOP, "", parsedOk, "");
const std::vector<std::string> via = attrs.getOpt<std::vector<std::string> >(SUMO_ATTR_VIA, "", parsedOk);
const std::vector<std::string> vTypes = attrs.getOpt<std::vector<std::string> >(SUMO_ATTR_VTYPES, "", parsedOk);
Expand All @@ -769,9 +769,9 @@ RouteHandler::parsePersonTrip(const SUMOSAXAttributes& attrs) {
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO_TAZ, toTAZ);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_JUNCTION, fromJunction);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO_JUNCTION, toJunction);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_BUSSTOP, fromBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_BUSSTOP, fromBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_BUS_STOP, toBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_TRAINSTOP, fromTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_TRAINSTOP, fromTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TRAIN_STOP, toTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_VTYPES, vTypes);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_MODES, modes);
Expand All @@ -795,9 +795,9 @@ RouteHandler::parseWalk(const SUMOSAXAttributes& attrs) {
const std::string toTAZ = attrs.getOpt<std::string>(SUMO_ATTR_TO_TAZ, "", parsedOk, "");
const std::string fromJunction = attrs.getOpt<std::string>(SUMO_ATTR_FROM_JUNCTION, "", parsedOk, "");
const std::string toJunction = attrs.getOpt<std::string>(SUMO_ATTR_TO_JUNCTION, "", parsedOk, "");
const std::string fromBusStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_BUSSTOP, "", parsedOk, "");
const std::string fromBusStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_BUSSTOP, "", parsedOk, "");
const std::string toBusStop = attrs.getOpt<std::string>(SUMO_ATTR_BUS_STOP, "", parsedOk, "");
const std::string fromTrainStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_TRAINSTOP, "", parsedOk, "");
const std::string fromTrainStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_TRAINSTOP, "", parsedOk, "");
const std::string toTrainStop = attrs.getOpt<std::string>(SUMO_ATTR_TRAIN_STOP, "", parsedOk, "");
const double duration = attrs.getOpt<double>(SUMO_ATTR_DURATION, "", parsedOk, 0);
const double speed = attrs.getOpt<double>(SUMO_ATTR_SPEED, "", parsedOk, 0);
Expand All @@ -816,9 +816,9 @@ RouteHandler::parseWalk(const SUMOSAXAttributes& attrs) {
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO_TAZ, toTAZ);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_JUNCTION, fromJunction);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO_JUNCTION, toJunction);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_BUSSTOP, fromBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_BUSSTOP, fromBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_BUS_STOP, toBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_TRAINSTOP, fromTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_TRAINSTOP, fromTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TRAIN_STOP, toTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DURATION, duration);
myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed);
Expand All @@ -836,9 +836,9 @@ RouteHandler::parseRide(const SUMOSAXAttributes& attrs) {
// optional attributes
const std::string fromEdge = attrs.getOpt<std::string>(SUMO_ATTR_FROM, "", parsedOk, "");
const std::string toEdge = attrs.getOpt<std::string>(SUMO_ATTR_TO, "", parsedOk, "");
const std::string fromBusStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_BUSSTOP, "", parsedOk, "");
const std::string fromBusStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_BUSSTOP, "", parsedOk, "");
const std::string toBusStop = attrs.getOpt<std::string>(SUMO_ATTR_BUS_STOP, "", parsedOk, "");
const std::string fromTrainStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_TRAINSTOP, "", parsedOk, "");
const std::string fromTrainStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_TRAINSTOP, "", parsedOk, "");
const std::string toTrainStop = attrs.getOpt<std::string>(SUMO_ATTR_TRAIN_STOP, "", parsedOk, "");
const std::vector<std::string> lines = attrs.getOpt<std::vector<std::string> >(SUMO_ATTR_LINES, "", parsedOk);
const double arrivalPos = attrs.getOpt<double>(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1);
Expand All @@ -848,9 +848,9 @@ RouteHandler::parseRide(const SUMOSAXAttributes& attrs) {
// add all attributes
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM, fromEdge);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO, toEdge);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_BUSSTOP, fromBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_BUSSTOP, fromBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_BUS_STOP, toBusStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_TRAINSTOP, fromTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_TRAINSTOP, fromTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TRAIN_STOP, toTrainStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_LINES, lines);
myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos);
Expand Down Expand Up @@ -895,7 +895,7 @@ RouteHandler::parseTransport(const SUMOSAXAttributes& attrs) {
// optional attributes
const std::string fromEdge = attrs.getOpt<std::string>(SUMO_ATTR_FROM, "", parsedOk, "");
const std::string toEdge = attrs.getOpt<std::string>(SUMO_ATTR_TO, "", parsedOk, "");
const std::string fromContainerStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_CONTAINERSTOP, "", parsedOk, "");
const std::string fromContainerStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_CONTAINERSTOP, "", parsedOk, "");
const std::string toContainerStop = attrs.getOpt<std::string>(SUMO_ATTR_CONTAINER_STOP, "", parsedOk, "");
const std::vector<std::string> lines = attrs.getOpt<std::vector<std::string> >(SUMO_ATTR_LINES, "", parsedOk);
const double arrivalPos = attrs.getOpt<double>(SUMO_ATTR_ARRIVALPOS, "", parsedOk, -1);
Expand All @@ -905,7 +905,7 @@ RouteHandler::parseTransport(const SUMOSAXAttributes& attrs) {
// add all attributes
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM, fromEdge);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO, toEdge);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_CONTAINERSTOP, fromContainerStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_CONTAINERSTOP, fromContainerStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_CONTAINER_STOP, toContainerStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_LINES, lines);
myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_ARRIVALPOS, arrivalPos);
Expand All @@ -921,7 +921,7 @@ RouteHandler::parseTranship(const SUMOSAXAttributes& attrs) {
const std::vector<std::string> edges = attrs.getOpt<std::vector<std::string> >(SUMO_ATTR_EDGES, "", parsedOk);
const std::string fromEdge = attrs.getOpt<std::string>(SUMO_ATTR_FROM, "", parsedOk, "");
const std::string toEdge = attrs.getOpt<std::string>(SUMO_ATTR_TO, "", parsedOk, "");
const std::string fromContainerStop = attrs.getOpt<std::string>(SUMO_ATTR_FROM_CONTAINERSTOP, "", parsedOk, "");
const std::string fromContainerStop = attrs.getOpt<std::string>(GNE_ATTR_FROM_CONTAINERSTOP, "", parsedOk, "");
const std::string toContainerStop = attrs.getOpt<std::string>(SUMO_ATTR_CONTAINER_STOP, "", parsedOk, "");
const double speed = attrs.getOpt<double>(SUMO_ATTR_SPEED, "", parsedOk, 1.39);
const double departPos = attrs.getOpt<double>(SUMO_ATTR_DEPARTPOS, "", parsedOk, -1);
Expand All @@ -933,7 +933,7 @@ RouteHandler::parseTranship(const SUMOSAXAttributes& attrs) {
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringListAttribute(SUMO_ATTR_EDGES, edges);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM, fromEdge);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_TO, toEdge);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_FROM_CONTAINERSTOP, fromContainerStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(GNE_ATTR_FROM_CONTAINERSTOP, fromContainerStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addStringAttribute(SUMO_ATTR_CONTAINER_STOP, toContainerStop);
myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_SPEED, speed);
myCommonXMLStructure.getCurrentSumoBaseObject()->addDoubleAttribute(SUMO_ATTR_DEPARTPOS, departPos);
Expand Down
7 changes: 4 additions & 3 deletions src/utils/xml/SUMOXMLDefinitions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,9 +844,6 @@ StringBijection<int>::Entry SUMOXMLDefinitions::attrs[] = {
{ "trainStop", SUMO_ATTR_TRAIN_STOP },
{ "containerStop", SUMO_ATTR_CONTAINER_STOP },
{ "parkingArea", SUMO_ATTR_PARKING_AREA },
{ "fromBusStop", SUMO_ATTR_FROM_BUSSTOP },
{ "fromTrainStop", SUMO_ATTR_FROM_TRAINSTOP },
{ "fromContainerStop", SUMO_ATTR_FROM_CONTAINERSTOP },
{ "roadsideCapacity", SUMO_ATTR_ROADSIDE_CAPACITY },
{ "onRoad", SUMO_ATTR_ONROAD },
{ "chargingStation", SUMO_ATTR_CHARGING_STATION },
Expand Down Expand Up @@ -1066,6 +1063,10 @@ StringBijection<int>::Entry SUMOXMLDefinitions::attrs[] = {
{ "planGeometryEndPos", GNE_ATTR_PLAN_GEOMETRY_ENDPOS },
{ "fromLaneID", GNE_ATTR_FROM_LANEID },
{ "toLaneID", GNE_ATTR_TO_LANEID },
// mapped to additioanl elements on writing
{ "fromBusStop", GNE_ATTR_FROM_BUSSTOP },
{ "fromTrainStop", GNE_ATTR_FROM_TRAINSTOP },
{ "fromContainerStop", GNE_ATTR_FROM_CONTAINERSTOP },

{ "carriageLength", SUMO_ATTR_CARRIAGE_LENGTH },
{ "locomotiveLength", SUMO_ATTR_LOCOMOTIVE_LENGTH },
Expand Down
8 changes: 5 additions & 3 deletions src/utils/xml/SUMOXMLDefinitions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1211,9 +1211,6 @@ enum SumoXMLAttr {
SUMO_ATTR_TRAIN_STOP,
SUMO_ATTR_CONTAINER_STOP,
SUMO_ATTR_PARKING_AREA,
SUMO_ATTR_FROM_BUSSTOP,
SUMO_ATTR_FROM_TRAINSTOP,
SUMO_ATTR_FROM_CONTAINERSTOP,
SUMO_ATTR_ROADSIDE_CAPACITY,
SUMO_ATTR_ONROAD,
SUMO_ATTR_CHARGING_STATION,
Expand Down Expand Up @@ -1518,6 +1515,11 @@ enum SumoXMLAttr {
GNE_ATTR_FROM_LANEID,
/// @brief to lane ID (used in GNEConnection)
GNE_ATTR_TO_LANEID,

// virtual attributes for easier UI
GNE_ATTR_FROM_BUSSTOP,
GNE_ATTR_FROM_TRAINSTOP,
GNE_ATTR_FROM_CONTAINERSTOP,
// @}

/// @name train parameters
Expand Down

0 comments on commit efc59c3

Please sign in to comment.