Updated all updateCenteringBoundary() additional functions. Refs #13894

eclipse-sumo · Dec 19, 2023 · e3aa453 · e3aa453
1 parent 3f8431d
commit e3aa453
Show file tree

Hide file tree

Showing 28 changed files with 31 additions and 100 deletions.
diff --git a/src/netedit/elements/additional/GNEAccess.cpp b/src/netedit/elements/additional/GNEAccess.cpp
@@ -95,11 +95,7 @@ GNEAccess::getPositionInView() const {
 
 void
 GNEAccess::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNEAdditional.cpp b/src/netedit/elements/additional/GNEAdditional.cpp
@@ -141,7 +141,11 @@ GNEAdditional::getExaggeration(const GUIVisualizationSettings& s) const {
 
 Boundary
 GNEAdditional::getCenteringBoundary() const {
-    return myAdditionalBoundary;
+    if (myAdditionalBoundary.isInitialised()) {
+        return myAdditionalBoundary;
+    } else {
+        return myContour.getContourBoundary();
+    }
 }
 
 

diff --git a/src/netedit/elements/additional/GNEBusStop.cpp b/src/netedit/elements/additional/GNEBusStop.cpp
@@ -54,8 +54,6 @@ GNEBusStop::GNEBusStop(SumoXMLTag tag, const std::string& id, GNELane* lane, GNE
     myPersonCapacity(personCapacity),
     myParkingLength(parkingLength),
     myColor(color) {
-    // update centering boundary without updating grid
-    updateCenteringBoundary(false);
 }
 
 

diff --git a/src/netedit/elements/additional/GNECalibrator.cpp b/src/netedit/elements/additional/GNECalibrator.cpp
@@ -205,11 +205,7 @@ GNECalibrator::getPositionInView() const {
 
 void
 GNECalibrator::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNECalibratorFlow.cpp b/src/netedit/elements/additional/GNECalibratorFlow.cpp
@@ -142,9 +142,7 @@ GNECalibratorFlow::getPositionInView() const {
 
 void
 GNECalibratorFlow::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNEClosingLaneReroute.cpp b/src/netedit/elements/additional/GNEClosingLaneReroute.cpp
@@ -113,9 +113,7 @@ GNEClosingLaneReroute::getPositionInView() const {
 
 void
 GNEClosingLaneReroute::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNEClosingReroute.cpp b/src/netedit/elements/additional/GNEClosingReroute.cpp
@@ -113,9 +113,7 @@ GNEClosingReroute::getPositionInView() const {
 
 void
 GNEClosingReroute::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNEDestProbReroute.cpp b/src/netedit/elements/additional/GNEDestProbReroute.cpp
@@ -106,9 +106,7 @@ GNEDestProbReroute::getPositionInView() const {
 
 void
 GNEDestProbReroute::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNEDetector.cpp b/src/netedit/elements/additional/GNEDetector.cpp
@@ -99,11 +99,7 @@ GNEDetector::getPositionInView() const {
 
 void
 GNEDetector::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to update
 }
 
 void

diff --git a/src/netedit/elements/additional/GNELaneAreaDetector.cpp b/src/netedit/elements/additional/GNELaneAreaDetector.cpp
@@ -63,8 +63,6 @@ myTimeThreshold(timeThreshold),
 mySpeedThreshold(speedThreshold),
 myJamThreshold(jamThreshold),
 myTrafficLight(trafficLight) {
-    // update centering boundary without updating grid
-    updateCenteringBoundary(false);
 }
 
 
@@ -78,8 +76,6 @@ GNELaneAreaDetector::GNELaneAreaDetector(const std::string& id, std::vector<GNEL
     mySpeedThreshold(speedThreshold),
     myJamThreshold(jamThreshold),
     myTrafficLight(trafficLight) {
-    // update centering boundary without updating grid
-    updateCenteringBoundary(false);
 }
 
 
@@ -268,8 +264,6 @@ GNELaneAreaDetector::updateGeometry() {
     } else {
         // Cut shape using as delimitators fixed start position and fixed end position
         myAdditionalGeometry.updateGeometry(getParentLanes().front()->getLaneShape(), getStartGeometryPositionOverLane(), getEndGeometryPositionOverLane(), myMoveElementLateralOffset);
-        // update centering boundary without updating grid
-        updateCenteringBoundary(false);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp b/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp
@@ -158,12 +158,8 @@ GNEMultiEntryExitDetector::updateCenteringBoundary(const bool updateGrid) {
     updateGeometry();
     // add shape boundary
     myAdditionalBoundary = myAdditionalGeometry.getShape().getBoxBoundary();
-    // add positions of all childrens
-    for (const auto& additionalChildren : getChildAdditionals()) {
-        myAdditionalBoundary.add(additionalChildren->getPositionInView());
-    }
     // grow
-    myAdditionalBoundary.grow(10);
+    myAdditionalBoundary.grow(5);
     // add additional into RTREE again
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNEOverheadWire.cpp b/src/netedit/elements/additional/GNEOverheadWire.cpp
@@ -207,11 +207,7 @@ GNEOverheadWire::getPositionInView() const {
 
 void
 GNEOverheadWire::updateCenteringBoundary(const bool /* updateGrid */) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNEPOI.cpp b/src/netedit/elements/additional/GNEPOI.cpp
@@ -279,7 +279,7 @@ GNEPOI::updateCenteringBoundary(const bool updateGrid) {
     // add position (this POI)
     myAdditionalBoundary.add(*this);
     // grow boundary
-    myAdditionalBoundary.grow(10 + std::max(getWidth() * 0.5, getHeight() * 0.5));
+    myAdditionalBoundary.grow(5 + std::max(getWidth() * 0.5, getHeight() * 0.5));
     // add object into net
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNEParkingAreaReroute.cpp b/src/netedit/elements/additional/GNEParkingAreaReroute.cpp
@@ -111,9 +111,7 @@ GNEParkingAreaReroute::getPositionInView() const {
 
 void
 GNEParkingAreaReroute::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to update
 }
 
 

diff --git a/src/netedit/elements/additional/GNEParkingSpace.cpp b/src/netedit/elements/additional/GNEParkingSpace.cpp
@@ -177,7 +177,7 @@ GNEParkingSpace::updateCenteringBoundary(const bool updateGrid) {
     myAdditionalBoundary.grow(myShapeLength.length2D());
     myAdditionalBoundary.grow(myShapeWidth.length2D());
     // grow
-    myAdditionalBoundary.grow(10);
+    myAdditionalBoundary.grow(5);
     // add additional into RTREE again
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNEPoly.cpp b/src/netedit/elements/additional/GNEPoly.cpp
@@ -187,7 +187,7 @@ GNEPoly::updateCenteringBoundary(const bool updateGrid) {
     // use shape as boundary
     myAdditionalBoundary = myShape.getBoxBoundary();
     // grow boundary
-    myAdditionalBoundary.grow(10);
+    myAdditionalBoundary.grow(5);
     // add object into net
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNERerouter.cpp b/src/netedit/elements/additional/GNERerouter.cpp
@@ -157,12 +157,12 @@ GNERerouter::updateCenteringBoundary(const bool updateGrid) {
             myAdditionalBoundary.add(rerouterElement->getPositionInView());
             // special case for parking area rerouter
             if (rerouterElement->getTagProperty().getTag() == SUMO_TAG_PARKING_AREA_REROUTE) {
-                myAdditionalBoundary.add(rerouterElement->getParentAdditionals().at(1)->getPositionInView());
+                myAdditionalBoundary.add(rerouterElement->getParentAdditionals().at(1)->getCenteringBoundary());
             }
         }
     }
     // grow
-    myAdditionalBoundary.grow(10);
+    myAdditionalBoundary.grow(5);
     // add additional into RTREE again
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNERerouterInterval.cpp b/src/netedit/elements/additional/GNERerouterInterval.cpp
@@ -131,9 +131,7 @@ GNERerouterInterval::getPositionInView() const {
 
 void
 GNERerouterInterval::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to do
 }
 
 

diff --git a/src/netedit/elements/additional/GNERerouterSymbol.cpp b/src/netedit/elements/additional/GNERerouterSymbol.cpp
@@ -113,11 +113,7 @@ GNERerouterSymbol::getPositionInView() const {
 
 void
 GNERerouterSymbol::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to do
 }
 
 

diff --git a/src/netedit/elements/additional/GNERouteProbReroute.cpp b/src/netedit/elements/additional/GNERouteProbReroute.cpp
@@ -94,9 +94,7 @@ GNERouteProbReroute::updateGeometry() {
 
 void
 GNERouteProbReroute::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to do
 }
 
 

diff --git a/src/netedit/elements/additional/GNERouteProbe.cpp b/src/netedit/elements/additional/GNERouteProbe.cpp
@@ -119,11 +119,7 @@ GNERouteProbe::getPositionInView() const {
 
 void
 GNERouteProbe::updateCenteringBoundary(const bool /*pdateGrid*/) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to do
 }
 
 

diff --git a/src/netedit/elements/additional/GNEStoppingPlace.cpp b/src/netedit/elements/additional/GNEStoppingPlace.cpp
@@ -165,18 +165,7 @@ GNEStoppingPlace::getPositionInView() const {
 
 void
 GNEStoppingPlace::updateCenteringBoundary(const bool /*updateGrid*/) {
-    if (!isTemplate()) {
-        // update geometry
-        updateGeometry();
-        // add shape boundary
-        myAdditionalBoundary = myAdditionalGeometry.getShape().getBoxBoundary();
-        // grow with "width"
-        if (myTagProperty.hasAttribute(SUMO_ATTR_WIDTH)) {
-            myAdditionalBoundary.grow(getAttributeDouble(SUMO_ATTR_WIDTH));
-        }
-        // grow
-        myAdditionalBoundary.grow(10);
-    }
+    // nothing to do
 }
 
 

diff --git a/src/netedit/elements/additional/GNETAZ.cpp b/src/netedit/elements/additional/GNETAZ.cpp
@@ -240,7 +240,7 @@ GNETAZ::updateCenteringBoundary(const bool updateGrid) {
         myAdditionalBoundary.add(myTAZCenter);
     }
     // grow boundary
-    myAdditionalBoundary.grow(10);
+    myAdditionalBoundary.grow(5);
     // add object into net
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNETractionSubstation.cpp b/src/netedit/elements/additional/GNETractionSubstation.cpp
@@ -121,7 +121,7 @@ GNETractionSubstation::updateCenteringBoundary(const bool updateGrid) {
     // add shape boundary
     myAdditionalBoundary = myAdditionalGeometry.getShape().getBoxBoundary();
     // grow
-    myAdditionalBoundary.grow(10);
+    myAdditionalBoundary.grow(5);
     // add additional into RTREE again
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNEVaporizer.cpp b/src/netedit/elements/additional/GNEVaporizer.cpp
@@ -113,11 +113,7 @@ GNEVaporizer::getPositionInView() const {
 
 void
 GNEVaporizer::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to do
 }
 
 

diff --git a/src/netedit/elements/additional/GNEVariableSpeedSign.cpp b/src/netedit/elements/additional/GNEVariableSpeedSign.cpp
@@ -135,11 +135,9 @@ GNEVariableSpeedSign::updateCenteringBoundary(const bool updateGrid) {
     // add positions of all childrens (symbols and steps)
     for (const auto& additionalChildren : getChildAdditionals()) {
         myAdditionalBoundary.add(additionalChildren->getPositionInView());
-        // also update centering boundary
-        additionalChildren->updateCenteringBoundary(false);
     }
     // grow
-    myAdditionalBoundary.grow(10);
+    myAdditionalBoundary.grow(5);
     // add additional into RTREE again
     if (updateGrid) {
         myNet->addGLObjectIntoGrid(this);

diff --git a/src/netedit/elements/additional/GNEVariableSpeedSignStep.cpp b/src/netedit/elements/additional/GNEVariableSpeedSignStep.cpp
@@ -111,9 +111,7 @@ GNEVariableSpeedSignStep::getPositionInView() const {
 
 void
 GNEVariableSpeedSignStep::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    myAdditionalBoundary.add(getPositionInView());
-    myAdditionalBoundary.grow(5);
+    // nothing to do
 }
 
 

diff --git a/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp b/src/netedit/elements/additional/GNEVariableSpeedSignSymbol.cpp
@@ -89,11 +89,7 @@ GNEVariableSpeedSignSymbol::updateGeometry() {
 
 void
 GNEVariableSpeedSignSymbol::updateCenteringBoundary(const bool /*updateGrid*/) {
-    myAdditionalBoundary.reset();
-    // add center
-    myAdditionalBoundary.add(getPositionInView());
-    // grow
-    myAdditionalBoundary.grow(10);
+    // nothing to do
 }