From 5d773b7626e13081ca87a40e662bdfff2edeb1f3 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 4 Aug 2023 14:58:29 +0200 Subject: [PATCH] Now entire solution uses NamespaceIDs. Refs #13690 --- src/netedit/GNENetHelper.cpp | 45 +++++++++---------- src/netedit/GNEViewParent.cpp | 11 ++--- src/netedit/elements/GNEAttributeCarrier.cpp | 1 - src/netedit/elements/GNEAttributeCarrier.h | 4 -- src/netedit/elements/additional/GNEAccess.cpp | 3 +- .../additional/GNEAdditionalHandler.cpp | 24 +++++----- .../elements/additional/GNEBusStop.cpp | 3 +- .../elements/additional/GNECalibrator.cpp | 3 +- .../elements/additional/GNECalibratorFlow.cpp | 5 ++- .../additional/GNELaneAreaDetector.cpp | 3 +- src/netedit/elements/additional/GNEPOI.cpp | 3 +- src/netedit/elements/additional/GNEPoly.cpp | 3 +- .../additional/GNERouteProbReroute.cpp | 3 +- src/netedit/elements/additional/GNETAZ.cpp | 3 +- src/netedit/elements/demand/GNEContainer.cpp | 5 ++- src/netedit/elements/demand/GNEPerson.cpp | 5 ++- .../elements/demand/GNERouteDistribution.cpp | 3 +- src/netedit/elements/demand/GNEVType.cpp | 3 +- .../elements/demand/GNEVTypeDistribution.cpp | 3 +- src/netedit/elements/demand/GNEVehicle.cpp | 5 ++- .../frames/common/GNESelectorFrame.cpp | 7 +-- src/utils/handlers/RouteHandler.cpp | 5 ++- 22 files changed, 81 insertions(+), 69 deletions(-) diff --git a/src/netedit/GNENetHelper.cpp b/src/netedit/GNENetHelper.cpp index 6ad4faf14d8..f3fa5d9a5e2 100644 --- a/src/netedit/GNENetHelper.cpp +++ b/src/netedit/GNENetHelper.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include "GNENetHelper.h" @@ -1154,8 +1155,6 @@ GNENetHelper::AttributeCarriers::clearAdditionals() { std::string GNENetHelper::AttributeCarriers::generateAdditionalID(SumoXMLTag tag) const { - // get GNENamespaces - const auto &namepaces = GNEAttributeCarrier::Namespaces; // obtain option container const auto& neteditOptions = OptionsCont::getOptions(); // get prefix @@ -1211,24 +1210,24 @@ GNENetHelper::AttributeCarriers::generateAdditionalID(SumoXMLTag tag) const { } int counter = 0; // check namespaces - if (std::find(namepaces.busStops.begin(), namepaces.busStops.end(), tag) != namepaces.busStops.end()) { - while (retrieveAdditionals(namepaces.busStops, prefix + "_" + toString(counter), false) != nullptr) { + if (std::find(NamespaceIDs::busStops.begin(), NamespaceIDs::busStops.end(), tag) != NamespaceIDs::busStops.end()) { + while (retrieveAdditionals(NamespaceIDs::busStops, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.calibrators.begin(), namepaces.calibrators.end(), tag) != namepaces.calibrators.end()) { - while (retrieveAdditionals(namepaces.calibrators, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::calibrators.begin(), NamespaceIDs::calibrators.end(), tag) != NamespaceIDs::calibrators.end()) { + while (retrieveAdditionals(NamespaceIDs::calibrators, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.polygons.begin(), namepaces.polygons.end(), tag) != namepaces.polygons.end()) { - while (retrieveAdditionals(namepaces.polygons, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::polygons.begin(), NamespaceIDs::polygons.end(), tag) != NamespaceIDs::polygons.end()) { + while (retrieveAdditionals(NamespaceIDs::polygons, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.POIs.begin(), namepaces.POIs.end(), tag) != namepaces.POIs.end()) { - while (retrieveAdditionals(namepaces.POIs, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::POIs.begin(), NamespaceIDs::POIs.end(), tag) != NamespaceIDs::POIs.end()) { + while (retrieveAdditionals(NamespaceIDs::POIs, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.laneAreaDetectors.begin(), namepaces.laneAreaDetectors.end(), tag) != namepaces.laneAreaDetectors.end()) { - while (retrieveAdditionals(namepaces.laneAreaDetectors, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::laneAreaDetectors.begin(), NamespaceIDs::laneAreaDetectors.end(), tag) != NamespaceIDs::laneAreaDetectors.end()) { + while (retrieveAdditionals(NamespaceIDs::laneAreaDetectors, prefix + "_" + toString(counter), false) != nullptr) { counter++; } } else { @@ -1532,8 +1531,6 @@ GNENetHelper::AttributeCarriers::generateDemandElementID(SumoXMLTag tag) const { const auto& neteditOptions = OptionsCont::getOptions(); // get tag property const auto tagProperty = GNEAttributeCarrier::getTagProperty(tag); - // get GNENamespaces - const auto &namepaces = GNEAttributeCarrier::Namespaces; // get prefix std::string prefix; if (tag == SUMO_TAG_ROUTE) { @@ -1565,24 +1562,24 @@ GNENetHelper::AttributeCarriers::generateDemandElementID(SumoXMLTag tag) const { } // declare counter int counter = 0; - if (std::find(namepaces.types.begin(), namepaces.types.end(), tag) != namepaces.types.end()) { - while (retrieveDemandElements(namepaces.types, prefix + "_" + toString(counter), false) != nullptr) { + if (std::find(NamespaceIDs::types.begin(), NamespaceIDs::types.end(), tag) != NamespaceIDs::types.end()) { + while (retrieveDemandElements(NamespaceIDs::types, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.routes.begin(), namepaces.routes.end(), tag) != namepaces.routes.end()) { - while (retrieveDemandElements(namepaces.routes, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::routes.begin(), NamespaceIDs::routes.end(), tag) != NamespaceIDs::routes.end()) { + while (retrieveDemandElements(NamespaceIDs::routes, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.persons.begin(), namepaces.persons.end(), tag) != namepaces.persons.end()) { - while (retrieveDemandElements(namepaces.persons, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::persons.begin(), NamespaceIDs::persons.end(), tag) != NamespaceIDs::persons.end()) { + while (retrieveDemandElements(NamespaceIDs::persons, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.containers.begin(), namepaces.containers.end(), tag) != namepaces.containers.end()) { - while (retrieveDemandElements(namepaces.containers, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::containers.begin(), NamespaceIDs::containers.end(), tag) != NamespaceIDs::containers.end()) { + while (retrieveDemandElements(NamespaceIDs::containers, prefix + "_" + toString(counter), false) != nullptr) { counter++; } - } else if (std::find(namepaces.vehicles.begin(), namepaces.vehicles.end(), tag) != namepaces.vehicles.end()) { - while (retrieveDemandElements(namepaces.vehicles, prefix + "_" + toString(counter), false) != nullptr) { + } else if (std::find(NamespaceIDs::vehicles.begin(), NamespaceIDs::vehicles.end(), tag) != NamespaceIDs::vehicles.end()) { + while (retrieveDemandElements(NamespaceIDs::vehicles, prefix + "_" + toString(counter), false) != nullptr) { counter++; } } else { diff --git a/src/netedit/GNEViewParent.cpp b/src/netedit/GNEViewParent.cpp index e3e8dbd81c5..49132cb3049 100644 --- a/src/netedit/GNEViewParent.cpp +++ b/src/netedit/GNEViewParent.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include "GNEApplicationWindow.h" #include "GNEViewNet.h" @@ -546,7 +547,7 @@ GNEViewParent::onCmdLocate(FXObject*, FXSelector sel, void*) { chooserLoc = &myACChoosers.ACChooserVehicles; locateTitle = TL("Vehicle Chooser"); // fill ACsToLocate with all vehicles - for (const auto &vehicleTag : GNEAttributeCarrier::Namespaces.vehicles) { + for (const auto &vehicleTag : NamespaceIDs::vehicles) { for (const auto& flowTAZ : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(vehicleTag)) { ACsToLocate.push_back(flowTAZ); } @@ -557,7 +558,7 @@ GNEViewParent::onCmdLocate(FXObject*, FXSelector sel, void*) { chooserLoc = &myACChoosers.ACChooserPersons; locateTitle = TL("Person Chooser"); // fill ACsToLocate with all vehicles - for (const auto &personTag : GNEAttributeCarrier::Namespaces.persons) { + for (const auto &personTag : NamespaceIDs::persons) { for (const auto& flowTAZ : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(personTag)) { ACsToLocate.push_back(flowTAZ); } @@ -574,7 +575,7 @@ GNEViewParent::onCmdLocate(FXObject*, FXSelector sel, void*) { chooserLoc = &myACChoosers.ACChooserStops; locateTitle = TL("Stop Chooser"); // fill ACsToLocate with all vehicles - for (const auto &stopTag : GNEAttributeCarrier::Namespaces.stops) { + for (const auto &stopTag : NamespaceIDs::stops) { for (const auto& flowTAZ : viewNet->getNet()->getAttributeCarriers()->getDemandElements().at(stopTag)) { ACsToLocate.push_back(flowTAZ); } @@ -608,7 +609,7 @@ GNEViewParent::onCmdLocate(FXObject*, FXSelector sel, void*) { chooserLoc = &myACChoosers.ACChooserPOI; locateTitle = TL("POI Chooser"); // fill ACsToLocate with all POIs - for (const auto &POITag : GNEAttributeCarrier::Namespaces.POIs) { + for (const auto &POITag : NamespaceIDs::POIs) { for (const auto& flowTAZ : viewNet->getNet()->getAttributeCarriers()->getAdditionals().at(POITag)) { ACsToLocate.push_back(flowTAZ); } @@ -618,7 +619,7 @@ GNEViewParent::onCmdLocate(FXObject*, FXSelector sel, void*) { chooserLoc = &myACChoosers.ACChooserPolygon; locateTitle = TL("Poly Chooser"); // fill ACsToLocate with all polygons - for (const auto &polygonTag : GNEAttributeCarrier::Namespaces.polygons) { + for (const auto &polygonTag : NamespaceIDs::polygons) { for (const auto& flowTAZ : viewNet->getNet()->getAttributeCarriers()->getAdditionals().at(polygonTag)) { ACsToLocate.push_back(flowTAZ); } diff --git a/src/netedit/elements/GNEAttributeCarrier.cpp b/src/netedit/elements/GNEAttributeCarrier.cpp index 06ee5ad05da..593b46d2391 100644 --- a/src/netedit/elements/GNEAttributeCarrier.cpp +++ b/src/netedit/elements/GNEAttributeCarrier.cpp @@ -44,7 +44,6 @@ const size_t GNEAttributeCarrier::MAXNUMBEROFATTRIBUTES = 128; const Parameterised::Map GNEAttributeCarrier::PARAMETERS_EMPTY; const std::string GNEAttributeCarrier::True = toString(true); const std::string GNEAttributeCarrier::False = toString(false); -const GNENamespaces GNEAttributeCarrier::Namespaces; // =========================================================================== diff --git a/src/netedit/elements/GNEAttributeCarrier.h b/src/netedit/elements/GNEAttributeCarrier.h index 11bdc2dc822..3480d510169 100644 --- a/src/netedit/elements/GNEAttributeCarrier.h +++ b/src/netedit/elements/GNEAttributeCarrier.h @@ -24,7 +24,6 @@ #include #include "GNETagProperties.h" -#include "GNENamespaces.h" // =========================================================================== @@ -288,9 +287,6 @@ class GNEAttributeCarrier : public GNEReferenceCounter { /// @brief true value in string format(used for comparing boolean values in getAttribute(...)) static const std::string False; - /// @brief namespaces - static const GNENamespaces Namespaces; - protected: /// @brief reference to tagProperty associated with this attribute carrier const GNETagProperties& myTagProperty; diff --git a/src/netedit/elements/additional/GNEAccess.cpp b/src/netedit/elements/additional/GNEAccess.cpp index adb2d40ea6f..d085375c213 100644 --- a/src/netedit/elements/additional/GNEAccess.cpp +++ b/src/netedit/elements/additional/GNEAccess.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "GNEAccess.h" #include "GNEAdditionalHandler.h" @@ -358,7 +359,7 @@ GNEAccess::isValid(SumoXMLAttr key, const std::string& value) { case SUMO_ATTR_FRIENDLY_POS: return canParse(value); case GNE_ATTR_PARENT: - return (myNet->getAttributeCarriers()->retrieveAdditionals(Namespaces.busStops, value, false) != nullptr); + return (myNet->getAttributeCarriers()->retrieveAdditionals(NamespaceIDs::busStops, value, false) != nullptr); case GNE_ATTR_SELECTED: return canParse(value); case GNE_ATTR_PARAMETERS: diff --git a/src/netedit/elements/additional/GNEAdditionalHandler.cpp b/src/netedit/elements/additional/GNEAdditionalHandler.cpp index 8f6254692e0..89410cd3512 100644 --- a/src/netedit/elements/additional/GNEAdditionalHandler.cpp +++ b/src/netedit/elements/additional/GNEAdditionalHandler.cpp @@ -18,10 +18,12 @@ // Builds trigger objects for netedit /****************************************************************************/ #include + #include #include #include #include +#include #include "GNEAdditionalHandler.h" #include "GNEAccess.h" @@ -1298,7 +1300,7 @@ GNEAdditionalHandler::buildTAZ(const CommonXMLStructure::SumoBaseObject* sumoBas // check TAZ if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(SUMO_TAG_TAZ, id); - } else if (!checkDuplicatedID(GNEAttributeCarrier::Namespaces.polygons, id)) { + } else if (!checkDuplicatedID(NamespaceIDs::polygons, id)) { writeErrorDuplicated(SUMO_TAG_TAZ, id); } else if (TAZShape.size() == 0) { writeError(TLF("Could not build TAZ with ID '%' in netedit; Invalid Shape.", id)); @@ -1597,7 +1599,7 @@ GNEAdditionalHandler::buildPolygon(const CommonXMLStructure::SumoBaseObject* sum buildJpsSink(sumoBaseObject, id, shape, name, parameters); } else if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(SUMO_TAG_POLY, id); - } else if (!checkDuplicatedID(GNEAttributeCarrier::Namespaces.polygons, id)) { + } else if (!checkDuplicatedID(NamespaceIDs::polygons, id)) { writeErrorDuplicated(SUMO_TAG_POLY, id); } else if (lineWidth < 0) { writeErrorInvalidNegativeValue(SUMO_TAG_POLY, id, SUMO_ATTR_LINEWIDTH); @@ -1636,7 +1638,7 @@ GNEAdditionalHandler::buildPOI(const CommonXMLStructure::SumoBaseObject* sumoBas writeErrorInvalidNegativeValue(SUMO_TAG_POI, id, SUMO_ATTR_HEIGHT); } else if (!SUMOXMLDefinitions::isValidFilename(imgFile)) { writeErrorInvalidFilename(SUMO_TAG_POI, id); - } else if (checkDuplicatedID(GNEAttributeCarrier::Namespaces.POIs, id)) { + } else if (checkDuplicatedID(NamespaceIDs::POIs, id)) { // get netedit parameters NeteditParameters neteditParameters(sumoBaseObject); // create POI @@ -1671,7 +1673,7 @@ GNEAdditionalHandler::buildPOILane(const CommonXMLStructure::SumoBaseObject* sum writeErrorInvalidNegativeValue(SUMO_TAG_POI, id, SUMO_ATTR_HEIGHT); } else if (!SUMOXMLDefinitions::isValidFilename(imgFile)) { writeErrorInvalidFilename(SUMO_TAG_POI, id); - } else if (checkDuplicatedID(GNEAttributeCarrier::Namespaces.POIs, id)) { + } else if (checkDuplicatedID(NamespaceIDs::POIs, id)) { // get netedit parameters NeteditParameters neteditParameters(sumoBaseObject); // get lane @@ -1718,7 +1720,7 @@ GNEAdditionalHandler::buildPOIGeo(const CommonXMLStructure::SumoBaseObject* sumo writeErrorInvalidFilename(SUMO_TAG_POI, id); } else if (GeoConvHelper::getFinal().getProjString() == "!") { writeError(TLF("Could not build POI with ID '%' in netedit", id) + std::string("; ") + TL("Network requires a geo projection.")); - } else if (checkDuplicatedID(GNEAttributeCarrier::Namespaces.POIs, id)) { + } else if (checkDuplicatedID(NamespaceIDs::POIs, id)) { // get netedit parameters NeteditParameters neteditParameters(sumoBaseObject); // create POIGEO @@ -1746,7 +1748,7 @@ GNEAdditionalHandler::buildJpsWalkableArea(const CommonXMLStructure::SumoBaseObj // check conditions if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(GNE_TAG_JPS_WALKABLEAREA, id); - } else if (!checkDuplicatedID(GNEAttributeCarrier::Namespaces.polygons, id)) { + } else if (!checkDuplicatedID(NamespaceIDs::polygons, id)) { writeErrorDuplicated(GNE_TAG_JPS_WALKABLEAREA, id); } else { // get netedit parameters @@ -1774,7 +1776,7 @@ GNEAdditionalHandler::buildJpsObstacle(const CommonXMLStructure::SumoBaseObject* // check conditions if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(GNE_TAG_JPS_OBSTACLE, id); - } else if (!checkDuplicatedID(GNEAttributeCarrier::Namespaces.polygons, id)) { + } else if (!checkDuplicatedID(NamespaceIDs::polygons, id)) { writeErrorDuplicated(GNE_TAG_JPS_OBSTACLE, id); } else { // get netedit parameters @@ -1802,7 +1804,7 @@ GNEAdditionalHandler::buildJpsWaitingArea(const CommonXMLStructure::SumoBaseObje // check conditions if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(GNE_TAG_JPS_OBSTACLE, id); - } else if (!checkDuplicatedID(GNEAttributeCarrier::Namespaces.polygons, id)) { + } else if (!checkDuplicatedID(NamespaceIDs::polygons, id)) { writeErrorDuplicated(GNE_TAG_JPS_WAITINGAREA, id); } else { // get netedit parameters @@ -1830,7 +1832,7 @@ GNEAdditionalHandler::buildJpsSource(const CommonXMLStructure::SumoBaseObject* s // check conditions if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(GNE_TAG_JPS_OBSTACLE, id); - } else if (!checkDuplicatedID(GNEAttributeCarrier::Namespaces.polygons, id)) { + } else if (!checkDuplicatedID(NamespaceIDs::polygons, id)) { writeErrorDuplicated(GNE_TAG_JPS_WAITINGAREA, id); } else { // get netedit parameters @@ -1858,7 +1860,7 @@ GNEAdditionalHandler::buildJpsSink(const CommonXMLStructure::SumoBaseObject* sum // check conditions if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(GNE_TAG_JPS_OBSTACLE, id); - } else if (!checkDuplicatedID(GNEAttributeCarrier::Namespaces.polygons, id)) { + } else if (!checkDuplicatedID(NamespaceIDs::polygons, id)) { writeErrorDuplicated(GNE_TAG_JPS_WAITINGAREA, id); } else { // get netedit parameters @@ -1886,7 +1888,7 @@ GNEAdditionalHandler::buildJpsWaypoint(const CommonXMLStructure::SumoBaseObject* // check conditions if (!SUMOXMLDefinitions::isValidAdditionalID(id)) { writeInvalidID(GNE_TAG_JPS_WAYPOINT, id); - } else if (checkDuplicatedID(GNEAttributeCarrier::Namespaces.POIs, id)) { + } else if (checkDuplicatedID(NamespaceIDs::POIs, id)) { // get netedit parameters NeteditParameters neteditParameters(sumoBaseObject); // create POI diff --git a/src/netedit/elements/additional/GNEBusStop.cpp b/src/netedit/elements/additional/GNEBusStop.cpp index 8ca3f94d7bb..87562df099c 100644 --- a/src/netedit/elements/additional/GNEBusStop.cpp +++ b/src/netedit/elements/additional/GNEBusStop.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "GNEBusStop.h" @@ -297,7 +298,7 @@ bool GNEBusStop::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidAdditionalID(Namespaces.busStops, value); + return isValidAdditionalID(NamespaceIDs::busStops, value); case SUMO_ATTR_LANE: if (myNet->getAttributeCarriers()->retrieveLane(value, false) != nullptr) { return true; diff --git a/src/netedit/elements/additional/GNECalibrator.cpp b/src/netedit/elements/additional/GNECalibrator.cpp index 4288f189a46..4f4ed6fa587 100644 --- a/src/netedit/elements/additional/GNECalibrator.cpp +++ b/src/netedit/elements/additional/GNECalibrator.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include "GNECalibrator.h" @@ -359,7 +360,7 @@ bool GNECalibrator::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidAdditionalID(Namespaces.calibrators, value); + return isValidAdditionalID(NamespaceIDs::calibrators, value); case SUMO_ATTR_EDGE: if (myNet->getAttributeCarriers()->retrieveEdge(value, false) != nullptr) { return true; diff --git a/src/netedit/elements/additional/GNECalibratorFlow.cpp b/src/netedit/elements/additional/GNECalibratorFlow.cpp index 7661878fd8b..082bfd72baa 100644 --- a/src/netedit/elements/additional/GNECalibratorFlow.cpp +++ b/src/netedit/elements/additional/GNECalibratorFlow.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include "GNECalibratorFlow.h" @@ -371,9 +372,9 @@ GNECalibratorFlow::isValid(SumoXMLAttr key, const std::string& value) { case SUMO_ATTR_ID: return isValidAdditionalID(value); case SUMO_ATTR_TYPE: - return (myNet->getAttributeCarriers()->retrieveDemandElements(Namespaces.types, value, false) == nullptr); + return (myNet->getAttributeCarriers()->retrieveDemandElements(NamespaceIDs::types, value, false) == nullptr); case SUMO_ATTR_ROUTE: - return (myNet->getAttributeCarriers()->retrieveDemandElements(Namespaces.routes, value, false) == nullptr); + return (myNet->getAttributeCarriers()->retrieveDemandElements(NamespaceIDs::routes, value, false) == nullptr); case SUMO_ATTR_VEHSPERHOUR: if (value.empty()) { // speed and vehsPerHour cannot be empty at the same time diff --git a/src/netedit/elements/additional/GNELaneAreaDetector.cpp b/src/netedit/elements/additional/GNELaneAreaDetector.cpp index e2001e43583..1cfaf54758f 100644 --- a/src/netedit/elements/additional/GNELaneAreaDetector.cpp +++ b/src/netedit/elements/additional/GNELaneAreaDetector.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include "GNELaneAreaDetector.h" #include "GNEAdditionalHandler.h" @@ -646,7 +647,7 @@ bool GNELaneAreaDetector::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidDetectorID(Namespaces.laneAreaDetectors, value); + return isValidDetectorID(NamespaceIDs::laneAreaDetectors, value); case SUMO_ATTR_LANE: if (value.empty()) { return false; diff --git a/src/netedit/elements/additional/GNEPOI.cpp b/src/netedit/elements/additional/GNEPOI.cpp index 3a87f96d8c8..a3c2e39edfa 100644 --- a/src/netedit/elements/additional/GNEPOI.cpp +++ b/src/netedit/elements/additional/GNEPOI.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "GNEPOI.h" #include "GNEAdditionalHandler.h" @@ -541,7 +542,7 @@ bool GNEPOI::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidAdditionalID(Namespaces.POIs, value); + return isValidAdditionalID(NamespaceIDs::POIs, value); case SUMO_ATTR_COLOR: return canParse(value); case SUMO_ATTR_LANE: diff --git a/src/netedit/elements/additional/GNEPoly.cpp b/src/netedit/elements/additional/GNEPoly.cpp index 293ed63d36d..15c7d22e6da 100644 --- a/src/netedit/elements/additional/GNEPoly.cpp +++ b/src/netedit/elements/additional/GNEPoly.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include "GNEPoly.h" @@ -690,7 +691,7 @@ bool GNEPoly::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidAdditionalID(Namespaces.polygons, value); + return isValidAdditionalID(NamespaceIDs::polygons, value); case SUMO_ATTR_SHAPE: case SUMO_ATTR_GEOSHAPE: // empty shapes AREN'T allowed diff --git a/src/netedit/elements/additional/GNERouteProbReroute.cpp b/src/netedit/elements/additional/GNERouteProbReroute.cpp index fd421459a36..ed4d120a8d3 100644 --- a/src/netedit/elements/additional/GNERouteProbReroute.cpp +++ b/src/netedit/elements/additional/GNERouteProbReroute.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "GNERouteProbReroute.h" @@ -187,7 +188,7 @@ GNERouteProbReroute::isValid(SumoXMLAttr key, const std::string& value) { case SUMO_ATTR_ID: return isValidAdditionalID(value); case SUMO_ATTR_ROUTE: - return (myNet->getAttributeCarriers()->retrieveDemandElements(Namespaces.routes, value, false) == nullptr); + return (myNet->getAttributeCarriers()->retrieveDemandElements(NamespaceIDs::routes, value, false) == nullptr); case SUMO_ATTR_PROB: return canParse(value); case GNE_ATTR_SELECTED: diff --git a/src/netedit/elements/additional/GNETAZ.cpp b/src/netedit/elements/additional/GNETAZ.cpp index e6e6ecf94cc..a48b8d32a7b 100644 --- a/src/netedit/elements/additional/GNETAZ.cpp +++ b/src/netedit/elements/additional/GNETAZ.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include "GNETAZ.h" @@ -553,7 +554,7 @@ bool GNETAZ::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidAdditionalID(Namespaces.polygons, value); + return isValidAdditionalID(NamespaceIDs::polygons, value); case SUMO_ATTR_SHAPE: if (value.empty()) { return false; diff --git a/src/netedit/elements/demand/GNEContainer.cpp b/src/netedit/elements/demand/GNEContainer.cpp index 3c2dd58038f..59f77eda0d0 100644 --- a/src/netedit/elements/demand/GNEContainer.cpp +++ b/src/netedit/elements/demand/GNEContainer.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include "GNEContainer.h" #include "GNERouteHandler.h" @@ -588,9 +589,9 @@ GNEContainer::isValid(SumoXMLAttr key, const std::string& value) { std::string error; switch (key) { case SUMO_ATTR_ID: - return isValidDemandElementID(Namespaces.containers, value); + return isValidDemandElementID(NamespaceIDs::containers, value); case SUMO_ATTR_TYPE: - return (myNet->getAttributeCarriers()->retrieveDemandElements(Namespaces.types, value, false) == nullptr); + return (myNet->getAttributeCarriers()->retrieveDemandElements(NamespaceIDs::types, value, false) == nullptr); case SUMO_ATTR_COLOR: return canParse(value); case SUMO_ATTR_DEPARTPOS: { diff --git a/src/netedit/elements/demand/GNEPerson.cpp b/src/netedit/elements/demand/GNEPerson.cpp index d02ed3799f1..5589b70b3f1 100644 --- a/src/netedit/elements/demand/GNEPerson.cpp +++ b/src/netedit/elements/demand/GNEPerson.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include "GNEPerson.h" #include "GNERouteHandler.h" @@ -599,9 +600,9 @@ GNEPerson::isValid(SumoXMLAttr key, const std::string& value) { std::string error; switch (key) { case SUMO_ATTR_ID: - return isValidDemandElementID(Namespaces.persons, value); + return isValidDemandElementID(NamespaceIDs::persons, value); case SUMO_ATTR_TYPE: - return (myNet->getAttributeCarriers()->retrieveDemandElements(Namespaces.types, value, false) == nullptr); + return (myNet->getAttributeCarriers()->retrieveDemandElements(NamespaceIDs::types, value, false) == nullptr); case SUMO_ATTR_COLOR: return canParse(value); case SUMO_ATTR_DEPARTPOS: { diff --git a/src/netedit/elements/demand/GNERouteDistribution.cpp b/src/netedit/elements/demand/GNERouteDistribution.cpp index a1cf4a87283..9b5060b03a7 100644 --- a/src/netedit/elements/demand/GNERouteDistribution.cpp +++ b/src/netedit/elements/demand/GNERouteDistribution.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "GNERouteDistribution.h" @@ -257,7 +258,7 @@ bool GNERouteDistribution::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidDemandElementID(Namespaces.routes, value); + return isValidDemandElementID(NamespaceIDs::routes, value); case SUMO_ATTR_DETERMINISTIC: if (value == "-1" || value.empty()) { return true; diff --git a/src/netedit/elements/demand/GNEVType.cpp b/src/netedit/elements/demand/GNEVType.cpp index ea398417c69..35cec8fb96f 100644 --- a/src/netedit/elements/demand/GNEVType.cpp +++ b/src/netedit/elements/demand/GNEVType.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include "GNEVType.h" #include "GNEVTypeDistribution.h" @@ -709,7 +710,7 @@ GNEVType::isValid(SumoXMLAttr key, const std::string& value) { } switch (key) { case SUMO_ATTR_ID: - return isValidDemandElementID(Namespaces.types, value); + return isValidDemandElementID(NamespaceIDs::types, value); // CFM Attributes case SUMO_ATTR_SIGMA: return canParse(value) && (parse(value) >= 0) && (parse(value) <= 1); diff --git a/src/netedit/elements/demand/GNEVTypeDistribution.cpp b/src/netedit/elements/demand/GNEVTypeDistribution.cpp index 27ee3a5789f..c5e2c7a906b 100644 --- a/src/netedit/elements/demand/GNEVTypeDistribution.cpp +++ b/src/netedit/elements/demand/GNEVTypeDistribution.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include "GNEVTypeDistribution.h" @@ -257,7 +258,7 @@ bool GNEVTypeDistribution::isValid(SumoXMLAttr key, const std::string& value) { switch (key) { case SUMO_ATTR_ID: - return isValidDemandElementID(Namespaces.types, value); + return isValidDemandElementID(NamespaceIDs::types, value); case SUMO_ATTR_DETERMINISTIC: if (value == "-1" || value.empty()) { return true; diff --git a/src/netedit/elements/demand/GNEVehicle.cpp b/src/netedit/elements/demand/GNEVehicle.cpp index 158999de266..f4a8c4b935b 100644 --- a/src/netedit/elements/demand/GNEVehicle.cpp +++ b/src/netedit/elements/demand/GNEVehicle.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "GNEVehicle.h" #include "GNERouteHandler.h" @@ -1596,9 +1597,9 @@ GNEVehicle::isValid(SumoXMLAttr key, const std::string& value) { std::string error; switch (key) { case SUMO_ATTR_ID: - return isValidDemandElementID(Namespaces.vehicles, value); + return isValidDemandElementID(NamespaceIDs::vehicles, value); case SUMO_ATTR_TYPE: - return (myNet->getAttributeCarriers()->retrieveDemandElements(Namespaces.types, value, false) == nullptr); + return (myNet->getAttributeCarriers()->retrieveDemandElements(NamespaceIDs::types, value, false) == nullptr); case SUMO_ATTR_COLOR: return canParse(value); case SUMO_ATTR_DEPARTLANE: { diff --git a/src/netedit/frames/common/GNESelectorFrame.cpp b/src/netedit/frames/common/GNESelectorFrame.cpp index 08765595f74..0e4615d4643 100644 --- a/src/netedit/frames/common/GNESelectorFrame.cpp +++ b/src/netedit/frames/common/GNESelectorFrame.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include "GNESelectorFrame.h" #include "GNEElementSet.h" @@ -827,7 +828,7 @@ GNESelectorFrame::SelectionOperation::processDemandElementSelection(const bool o } // invert vehicles if (ignoreLocking || !locks.isObjectLocked(GLO_VEHICLE, false)) { - for (const auto& vehicleTag : GNEAttributeCarrier::Namespaces.vehicles) { + for (const auto& vehicleTag : NamespaceIDs::vehicles) { for (const auto& vehicle : demandElements.at(vehicleTag)) { if (onlyCount) { return true; @@ -844,7 +845,7 @@ GNESelectorFrame::SelectionOperation::processDemandElementSelection(const bool o } // invert persons if (ignoreLocking || !locks.isObjectLocked(GLO_PERSON, false)) { - for (const auto& personTag : GNEAttributeCarrier::Namespaces.persons) { + for (const auto& personTag : NamespaceIDs::persons) { for (const auto& person : demandElements.at(personTag)) { if (onlyCount) { return true; @@ -981,7 +982,7 @@ GNESelectorFrame::SelectionOperation::processDemandElementSelection(const bool o } // invert container if (ignoreLocking || !locks.isObjectLocked(GLO_TRANSPORT, false)) { - for (const auto& containerTag : GNEAttributeCarrier::Namespaces.containers) { + for (const auto& containerTag : NamespaceIDs::containers) { for (const auto& container : demandElements.at(containerTag)) { if (onlyCount) { return true; diff --git a/src/utils/handlers/RouteHandler.cpp b/src/utils/handlers/RouteHandler.cpp index de461690ff5..1a2dca0ad83 100644 --- a/src/utils/handlers/RouteHandler.cpp +++ b/src/utils/handlers/RouteHandler.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include "RouteHandler.h" @@ -659,8 +660,8 @@ RouteHandler::parseStop(const SUMOSAXAttributes& attrs) { SUMOVehicleParameter::Stop stop; // get parents std::vector stopParents; - stopParents.insert(stopParents.end(), GNEAttributeCarrier::Namespaces.vehicles.begin(), GNEAttributeCarrier::Namespaces.vehicles.end()); - stopParents.insert(stopParents.end(), GNEAttributeCarrier::Namespaces.routes.begin(), GNEAttributeCarrier::Namespaces.routes.end()); + stopParents.insert(stopParents.end(), NamespaceIDs::vehicles.begin(), NamespaceIDs::vehicles.end()); + stopParents.insert(stopParents.end(), NamespaceIDs::routes.begin(), NamespaceIDs::routes.end()); // check parents checkParent(SUMO_TAG_STOP, stopParents, parsedOk); // parse stop