can now locate by name. refs #5270

src/guisim/GUIBaseVehicle.cpp

@@ -295,6 +295,13 @@ GUIBaseVehicle::getCenteringBoundary() const {
     return b;
 }
 
+
+const std::string
+GUIBaseVehicle::getOptionalName() const {
+    return myVehicle.getParameter().getParameter("name", "");
+}
+
+
 void
 GUIBaseVehicle::drawOnPos(const GUIVisualizationSettings& s, const Position& pos, const double angle) const {
     glPushName(getGlID());

src/guisim/GUIBaseVehicle.h

@@ -162,6 +162,8 @@ class GUIBaseVehicle : public GUIGlObject {
      */
     Boundary getCenteringBoundary() const;
 
+    /// @brief Returns the value for generic parameter 'name' or ''
+    const std::string getOptionalName() const;
 
     /** @brief Draws the object on the specified position with the specified angle
      * @param[in] s The settings for the current view (may influence drawing)

src/guisim/GUIBusStop.cpp

@@ -200,6 +200,11 @@ GUIBusStop::getCenteringBoundary() const {
     return b;
 }
 
+const std::string
+GUIBusStop::getOptionalName() const {
+    return myName;
+}
+
 Position
 GUIBusStop::getWaitPosition(MSTransportable* t) const {
     Position result = MSStoppingPlace::getWaitPosition(t);

src/guisim/GUIBusStop.h

@@ -116,6 +116,8 @@ class GUIBusStop : public MSStoppingPlace, public GUIGlObject_AbstractAdd {
      */
     Boundary getCenteringBoundary() const;
 
+    /// @brief Returns the street name
+    const std::string getOptionalName() const;
 
     /** @brief Draws the object
      * @param[in] s The settings for the current view (may influence drawing)

src/guisim/GUIChargingStation.cpp

@@ -187,4 +187,9 @@ GUIChargingStation::drawGL(const GUIVisualizationSettings& s) const {
     drawName(getCenteringBoundary().getCenter(), s.scale, s.addName, s.angle);
 }
 
+const std::string
+GUIChargingStation::getOptionalName() const {
+    return myName;
+}
+
 /****************************************************************************/

src/guisim/GUIChargingStation.h

@@ -112,6 +112,9 @@ class GUIChargingStation : public MSChargingStation, public GUIGlObject_Abstract
      */
     Boundary getCenteringBoundary() const;
 
+    /// @brief Returns the stopping place name
+    const std::string getOptionalName() const;
+
     /** @brief Draws the object
      * @param[in] s The settings for the current view (may influence drawing)
      * @see GUIGlObject::drawGL

src/guisim/GUIContainerStop.cpp

@@ -176,6 +176,11 @@ GUIContainerStop::getCenteringBoundary() const {
     return b;
 }
 
+const std::string
+GUIContainerStop::getOptionalName() const {
+    return myName;
+}
+
 
 
 /****************************************************************************/

src/guisim/GUIContainerStop.h

@@ -113,6 +113,8 @@ class GUIContainerStop : public MSStoppingPlace, public GUIGlObject_AbstractAdd
      */
     Boundary getCenteringBoundary() const;
 
+    /// @brief Returns the stopping place name
+    const std::string getOptionalName() const;
 
     /** @brief Draws the object
      * @param[in] s The settings for the current view (may influence drawing)

src/guisim/GUIEdge.cpp

@@ -203,6 +203,10 @@ GUIEdge::getCenteringBoundary() const {
     return b;
 }
 
+const std::string
+GUIEdge::getOptionalName() const {
+    return myStreetName;
+}
 
 void
 GUIEdge::drawGL(const GUIVisualizationSettings& s) const {

src/guisim/GUIEdge.h

@@ -124,6 +124,8 @@ class GUIEdge : public MSEdge, public GUIGlObject {
      */
     Boundary getCenteringBoundary() const;
 
+    /// @brief Returns the street name
+    const std::string getOptionalName() const;
 
     /** @brief Draws the object
      * @param[in] s The settings for the current view (may influence drawing)

src/guisim/GUIParkingArea.cpp

@@ -217,6 +217,10 @@ GUIParkingArea::getCenteringBoundary() const {
 }
 
 
+const std::string
+GUIParkingArea::getOptionalName() const {
+    return myName;
+}
 
 /****************************************************************************/
 

src/guisim/GUIParkingArea.h

@@ -119,6 +119,9 @@ class GUIParkingArea : public MSParkingArea, public GUIGlObject_AbstractAdd {
      */
     Boundary getCenteringBoundary() const;
 
+    /// @brief Returns the stopping place name
+    const std::string getOptionalName() const;
+
     /// @brief extend boundary
     void addLotEntry(double x, double y, double z,
                      double width, double length, double angle);

src/utils/gui/globjects/GUIGlObject.cpp

@@ -147,6 +147,10 @@ GUIGlObject::getMicrosimID() const {
     return myMicrosimID;
 }
 
+const std::string
+GUIGlObject::getOptionalName() const {
+    return "";
+}
 
 void
 GUIGlObject::setMicrosimID(const std::string& newID) {

src/utils/gui/globjects/GUIGlObject.h

@@ -127,6 +127,9 @@ class GUIGlObject {
     /// @brief Returns the id of the object as known to microsim
     virtual const std::string& getMicrosimID() const;
 
+    /// @brief Returns the name of the object (default "")
+    virtual const std::string getOptionalName() const;
+
     /// @brief Changes the microsimID of the object
     /// @note happens in NETEDIT
     virtual void setMicrosimID(const std::string& newID);

src/utils/gui/windows/GUIAppEnum.h

@@ -461,6 +461,8 @@ enum {
     MID_CHOOSEN_DESELECT,
     /// @brief Deselect selected items
     MID_CHOOSEN_INVERT,
+    /// @brief Deselect selected items
+    MID_CHOOSEN_NAME,
     /// @}
 
     /// NETEDIT

src/utils/gui/windows/GUIDialog_GLObjChooser.cpp

@@ -50,6 +50,7 @@ FXDEFMAP(GUIDialog_GLObjChooser) GUIDialog_GLObjChooserMap[] = {
     FXMAPFUNC(SEL_KEYPRESS, MID_CHOOSER_LIST,   GUIDialog_GLObjChooser::onListKeyPress),
     FXMAPFUNC(SEL_COMMAND,  MID_CHOOSER_FILTER, GUIDialog_GLObjChooser::onCmdFilter),
     FXMAPFUNC(SEL_COMMAND,  MID_CHOOSEN_INVERT,  GUIDialog_GLObjChooser::onCmdToggleSelection),
+    FXMAPFUNC(SEL_COMMAND,  MID_CHOOSEN_NAME,  GUIDialog_GLObjChooser::onCmdLocateByName),
 };
 
 FXIMPLEMENT(GUIDialog_GLObjChooser, FXMainWindow, GUIDialog_GLObjChooserMap, ARRAYNUMBER(GUIDialog_GLObjChooserMap))
@@ -60,7 +61,9 @@ FXIMPLEMENT(GUIDialog_GLObjChooser, FXMainWindow, GUIDialog_GLObjChooserMap, ARR
 // ===========================================================================
 GUIDialog_GLObjChooser::GUIDialog_GLObjChooser(GUIGlChildWindow* parent, FXIcon* icon, const FXString& title, const std::vector<GUIGlID>& ids, GUIGlObjectStorage& /*glStorage*/) :
     FXMainWindow(parent->getApp(), title, icon, nullptr, GUIDesignChooserDialog),
-    myParent(parent) {
+    myParent(parent),
+    myLocateByName(false)
+{
     FXHorizontalFrame* hbox = new FXHorizontalFrame(this, GUIDesignAuxiliarFrame);
     // build the list
     FXVerticalFrame* layoutLeft = new FXVerticalFrame(hbox, GUIDesignChooserLayoutLeft);
@@ -80,6 +83,7 @@ GUIDialog_GLObjChooser::GUIDialog_GLObjChooser(GUIGlChildWindow* parent, FXIcon*
     new FXHorizontalSeparator(layoutRight, GUIDesignHorizontalSeparator);
     new FXButton(layoutRight, "&Hide Unselected\t\t", GUIIconSubSys::getIcon(ICON_FLAG), this, MID_CHOOSER_FILTER, GUIDesignChooserButtons);
     new FXButton(layoutRight, "&Select/deselect\tSelect/deselect current object\t", GUIIconSubSys::getIcon(ICON_FLAG), this, MID_CHOOSEN_INVERT, GUIDesignChooserButtons);
+    new FXButton(layoutRight, "By Name\tLocate item by name\t", nullptr, this, MID_CHOOSEN_NAME, GUIDesignChooserButtons);
     new FXHorizontalSeparator(layoutRight, GUIDesignHorizontalSeparator);
     new FXButton(layoutRight, "&Close\t\t", GUIIconSubSys::getIcon(ICON_NO), this, MID_CANCEL, GUIDesignChooserButtons);
 
@@ -199,7 +203,11 @@ GUIDialog_GLObjChooser::onCmdFilter(FXObject*, FXSelector, void*) {
 
 std::string
 GUIDialog_GLObjChooser::getObjectName(GUIGlObject* o) const {
-    return o->getMicrosimID();
+    if (myLocateByName) {
+        return o->getOptionalName();
+    } else {
+        return o->getMicrosimID();
+    }
 }
 
 void
@@ -239,6 +247,25 @@ GUIDialog_GLObjChooser::onCmdToggleSelection(FXObject*, FXSelector, void*) {
 }
 
 
+long
+GUIDialog_GLObjChooser::onCmdLocateByName(FXObject*, FXSelector, void*) {
+    std::vector<GUIGlID> selectedGlIDs;
+    myLocateByName = true;
+    const int numItems = myList->getNumItems();
+    for (int i = 0; i < numItems; i++) {
+        GUIGlID glID = *static_cast<GUIGlID*>(myList->getItemData(i));
+        GUIGlObject* o = GUIGlObjectStorage::gIDStorage.getObjectBlocking(glID);
+        const std::string& name = getObjectName(o);
+        if (name != "") {
+            selectedGlIDs.push_back(glID);
+        }
+        GUIGlObjectStorage::gIDStorage.unblockObject(glID);
+    }
+    refreshList(selectedGlIDs);
+    return 1;
+}
+
+
 void
 GUIDialog_GLObjChooser::toggleSelection(int listIndex) {
     GUIGlID* glID = static_cast<GUIGlID*>(myList->getItemData(listIndex));

src/utils/gui/windows/GUIDialog_GLObjChooser.h

@@ -104,6 +104,9 @@ class GUIDialog_GLObjChooser : public FXMainWindow {
 
     /// @brief Callback: Toggle selection status of current object
     long onCmdToggleSelection(FXObject*, FXSelector, void*);
+
+    /// @brief Callback: Toggle locator by name
+    long onCmdLocateByName(FXObject*, FXSelector, void*);
     /// @}
 
     /// @brief sets the focus after the window is created to work-around bug in libfox
@@ -143,6 +146,8 @@ class GUIDialog_GLObjChooser : public FXMainWindow {
     //volatile pointers to GUIGlObject
     std::set<GUIGlID> myIDs;
 
+    /// @brief whether to locate by object name instead of id
+    bool myLocateByName;
 
 protected:
     /// FOX needs this