Refactored GNELane. Refs #13894

eclipse-sumo · Dec 19, 2023 · b7e1388 · b7e1388
1 parent 5866b6f
commit b7e1388
Show file tree

Hide file tree

Showing 6 changed files with 274 additions and 262 deletions.
diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp
@@ -5414,7 +5414,7 @@ GNEViewNet::drawTemporalSplitJunction() const {
         const auto laneDrawingConstants = GNELane::LaneDrawingConstants(*myVisualizationSettings, lane);
         auto shape = lane->getLaneShape();
         // move shape to side
-        shape.move2side(laneDrawingConstants.halfWidth * -1);
+        shape.move2side(laneDrawingConstants.width * -1);
         const auto offset = shape.nearest_offset_to_point2D(snapToActiveGrid(getPositionInformation()));
         const auto splitPosition = shape.positionAtOffset2D(offset);
         // get junction exaggeration

diff --git a/src/netedit/elements/GNEContour.cpp b/src/netedit/elements/GNEContour.cpp
@@ -335,14 +335,14 @@ GNEContour::buildDottedContourEdge(const GUIVisualizationSettings& s, const GNEE
     GNELane::LaneDrawingConstants laneDrawingConstantsBot(s, botLane);
     // check shapes and widths
     if ((myCachedShapes->at(0) != topLane->getLaneGeometry().getShape()) ||
-        (myCachedDoubles->at(0) != (laneDrawingConstantsTop.halfWidth * laneDrawingConstantsTop.exaggeration)) ||
+        (myCachedDoubles->at(0) != (laneDrawingConstantsTop.width * laneDrawingConstantsTop.exaggeration)) ||
         (myCachedShapes->at(1) != botLane->getLaneGeometry().getShape()) ||
-        (myCachedDoubles->at(1) != (laneDrawingConstantsBot.halfWidth * laneDrawingConstantsBot.exaggeration))) {
+        (myCachedDoubles->at(1) != (laneDrawingConstantsBot.width * laneDrawingConstantsBot.exaggeration))) {
         // update cached values
         myCachedShapes->at(0) = topLane->getLaneGeometry().getShape();
-        myCachedDoubles->at(0) = (laneDrawingConstantsTop.halfWidth * laneDrawingConstantsTop.exaggeration);
+        myCachedDoubles->at(0) = (laneDrawingConstantsTop.width * laneDrawingConstantsTop.exaggeration);
         myCachedShapes->at(1) = botLane->getLaneGeometry().getShape();
-        myCachedDoubles->at(1) = (laneDrawingConstantsBot.halfWidth * laneDrawingConstantsBot.exaggeration);
+        myCachedDoubles->at(1) = (laneDrawingConstantsBot.width * laneDrawingConstantsBot.exaggeration);
         // create top and bot geometries
         myDottedGeometries->at(0) = GUIDottedGeometry(s, myCachedShapes->at(0), false, true);
         myDottedGeometries->at(2) = GUIDottedGeometry(s, myCachedShapes->at(1).reverse(), false, true);

diff --git a/src/netedit/elements/demand/GNEStopPlan.cpp b/src/netedit/elements/demand/GNEStopPlan.cpp
@@ -165,11 +165,11 @@ GNEStopPlan::updateGeometry() {
         GNELane::LaneDrawingConstants laneDrawingConstantsFront(myNet->getViewNet()->getVisualisationSettings(), frontLane);
         GNELane::LaneDrawingConstants laneDrawingConstantBack(myNet->getViewNet()->getVisualisationSettings(), backLane);
         // calculate front position
-        const Position frontPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), laneDrawingConstantsFront.halfWidth);
+        const Position frontPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), laneDrawingConstantsFront.width);
         // calulate length between both shapes
         const double length = backLane->getLaneShape().distance2D(frontPosition, true);
         // calculate back position
-        const Position backPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), (length + laneDrawingConstantBack.halfWidth - laneDrawingConstantsFront.halfWidth) * -1);
+        const Position backPosition = frontLane->getLaneShape().positionAtOffset2D(getAttributeDouble(GNE_ATTR_PLAN_GEOMETRY_ENDPOS), (length + laneDrawingConstantBack.width - laneDrawingConstantsFront.width) * -1);
         // update demand element geometry using both positions
         myDemandElementGeometry.updateGeometry({frontPosition, backPosition});
     }

diff --git a/src/netedit/elements/network/GNEEdge.cpp b/src/netedit/elements/network/GNEEdge.cpp
@@ -2672,7 +2672,7 @@ GNEEdge::drawLaneStopOffset(const GUIVisualizationSettings& s, GUIVisualizationS
         }
         if (myNBEdge->myEdgeStopOffset.isDefined() && (myNBEdge->myEdgeStopOffset.getPermissions() & SVC_PASSENGER) != 0) {
             for (const auto& lane : getLanes()) {
-                lane->drawLaneStopOffset(s, myNBEdge->myEdgeStopOffset.getOffset());
+                lane->drawLaneStopOffset(s, d);
             }
         }
         // Push stopOffset matrix
@@ -2764,7 +2764,7 @@ GNEEdge::drawTAZElements(const GUIVisualizationSettings& s) const {
                 }
                 // draw as box lines
                 GUIGeometry::drawGeometry(s, myNet->getViewNet()->getPositionInformation(),
-                                          lane->getLaneGeometry(), laneDrawingConstants.halfWidth);
+                                          lane->getLaneGeometry(), laneDrawingConstants.width);
                 // Pop layer matrix
                 GLHelper::popMatrix();
             }