Skip to content

Commit

Permalink
Now entire solution uses NamespaceIDs. Refs #13690
Browse files Browse the repository at this point in the history
  • Loading branch information
@palvarezlopez
palvarezlopez committed Aug 4, 2023
1 parent c2e26ba commit 5d773b7
Show file tree
Hide file tree
Showing 22 changed files with 81 additions and 69 deletions.
45 changes: 21 additions & 24 deletions src/netedit/GNENetHelper.cpp
View file
Expand Up @@ -44,6 +44,7 @@
#include <utils/gui/div/GUIGlobalSelection.h>
#include <utils/gui/globjects/GUIGlObjectStorage.h>
#include <utils/options/OptionsCont.h>
#include <utils/xml/NamespaceIDs.h>

#include "GNENetHelper.h"

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
11 changes: 6 additions & 5 deletions src/netedit/GNEViewParent.cpp
View file
Expand Up @@ -53,6 +53,7 @@
#include <netedit/frames/network/GNETLSEditorFrame.h>
#include <utils/foxtools/MFXMenuButtonTooltip.h>
#include <utils/gui/div/GUIDesigns.h>
#include <utils/xml/NamespaceIDs.h>

#include "GNEApplicationWindow.h"
#include "GNEViewNet.h"
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion src/netedit/elements/GNEAttributeCarrier.cpp
View file
Expand Up @@ -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;


// ===========================================================================
Expand Down
4 changes: 0 additions & 4 deletions src/netedit/elements/GNEAttributeCarrier.h
View file
Expand Up @@ -24,7 +24,6 @@
#include <netedit/GNEReferenceCounter.h>

#include "GNETagProperties.h"
#include "GNENamespaces.h"


// ===========================================================================
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/netedit/elements/additional/GNEAccess.cpp
View file
Expand Up @@ -28,6 +28,7 @@
#include <utils/gui/div/GLHelper.h>
#include <utils/gui/globjects/GLIncludes.h>
#include <utils/gui/div/GUIGlobalPostDrawing.h>
#include <utils/xml/NamespaceIDs.h>

#include "GNEAccess.h"
#include "GNEAdditionalHandler.h"
Expand Down Expand Up @@ -358,7 +359,7 @@ GNEAccess::isValid(SumoXMLAttr key, const std::string& value) {
case SUMO_ATTR_FRIENDLY_POS:
return canParse<bool>(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<bool>(value);
case GNE_ATTR_PARAMETERS:
Expand Down
24 changes: 13 additions & 11 deletions src/netedit/elements/additional/GNEAdditionalHandler.cpp
View file
Expand Up @@ -18,10 +18,12 @@
// Builds trigger objects for netedit
/****************************************************************************/
#include <config.h>

#include <netedit/changes/GNEChange_Additional.h>
#include <netedit/GNEViewNet.h>
#include <netedit/GNEUndoList.h>
#include <netedit/GNENet.h>
#include <utils/xml/NamespaceIDs.h>

#include "GNEAdditionalHandler.h"
#include "GNEAccess.h"
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/netedit/elements/additional/GNEBusStop.cpp
View file
Expand Up @@ -28,6 +28,7 @@
#include <utils/gui/div/GLHelper.h>
#include <utils/vehicle/SUMORouteHandler.h>
#include <utils/gui/div/GUIGlobalPostDrawing.h>
#include <utils/xml/NamespaceIDs.h>

#include "GNEBusStop.h"

Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/netedit/elements/additional/GNECalibrator.cpp
View file
Expand Up @@ -25,6 +25,7 @@
#include <utils/gui/div/GLHelper.h>
#include <utils/gui/globjects/GLIncludes.h>
#include <utils/gui/div/GUIGlobalPostDrawing.h>
#include <utils/xml/NamespaceIDs.h>

#include "GNECalibrator.h"

Expand Down Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/netedit/elements/additional/GNECalibratorFlow.cpp
View file
Expand Up @@ -24,6 +24,7 @@
#include <utils/gui/globjects/GLIncludes.h>
#include <utils/gui/div/GLHelper.h>
#include <utils/common/StringTokenizer.h>
#include <utils/xml/NamespaceIDs.h>

#include "GNECalibratorFlow.h"

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5d773b7

Please sign in to comment.