fix #14697

eclipse-sumo · Apr 11, 2024 · d338a9b · d338a9b
1 parent 143cddf
commit d338a9b
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/src/netedit/elements/network/GNELane.cpp b/src/netedit/elements/network/GNELane.cpp
@@ -1158,6 +1158,15 @@ GNELane::drawMarkingsAndBoundings(const GUIVisualizationSettings& s) const {
             // get change left and right for passengers
             const bool changeLeft = myParentEdge->getNBEdge()->allowsChangingLeft(myIndex - 1, SVC_PASSENGER);
             const bool changeRight = myParentEdge->getNBEdge()->allowsChangingRight(myIndex, SVC_PASSENGER);
+            // draw orange background under the lane and under the lane markings to highlight change prohibitions
+            if (!(changeLeft && changeRight)) {
+                GLHelper::pushMatrix();
+                glTranslated(0, 0, -0.1);
+                GLHelper::setColor(RGBColor::ORANGE);
+                GUIGeometry::drawGeometry(myDrawingConstants->getDetail(), myLaneGeometry,
+                                          myDrawingConstants->getDrawingWidth(), myDrawingConstants->getOffset());
+                GLHelper::popMatrix();
+            }
             // if permissions are similar and we aren't drawing in spread mode, draw markings. In other case, draw a separator
             if (!s.spreadSuperposed && (permissionsA & permissionsB)) {
                 GLHelper::drawInverseMarkings(myLaneGeometry.getShape(), myLaneGeometry.getShapeRotations(), myLaneGeometry.getShapeLengths(),
@@ -1166,20 +1175,6 @@ GNELane::drawMarkingsAndBoundings(const GUIVisualizationSettings& s) const {
                 GUIGeometry::drawGeometry(myDrawingConstants->getDetail(), myLaneGeometry,
                                           separatorWidth, myDrawingConstants->getOffset() + myDrawingConstants->getDrawingWidth() + separatorWidth);
             }
-            // check if we have change prohibitions
-            if (!(changeLeft && changeRight)) {
-                // push prohibitions matrix
-                GLHelper::pushMatrix();
-                // move top
-                glTranslated(0, 0, 0.05);
-                // set color
-                GLHelper::setColor(RGBColor::ORANGE);
-                // higlight prohibition
-                GUIGeometry::drawGeometry(myDrawingConstants->getDetail(), myLaneGeometry,
-                                          myDrawingConstants->getDrawingWidth(), myDrawingConstants->getOffset());
-                // pop prohibitionsmatrix
-                GLHelper::popMatrix();
-            }
         }
         // check if draw last separator
         if (myIndex == (myParentEdge->getNBEdge()->getNumLanes() - 1)) {