Moved a constant in the train helper.

eclipse-sumo · Feb 19, 2024 · 435e440 · 435e440
1 parent 737f97c
commit 435e440
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/microsim/MSTrainHelper.cpp b/src/microsim/MSTrainHelper.cpp
@@ -24,6 +24,9 @@
 #include <microsim/MSVehicle.h>
 #include "MSTrainHelper.h"
 
+
+const double MSTrainHelper::DEFAULT_CARRIAGE_DOOR_WIDTH = 1.5;
+
 // ===========================================================================
 // method definitions
 // ===========================================================================

diff --git a/src/microsim/MSTrainHelper.h b/src/microsim/MSTrainHelper.h
@@ -120,6 +120,8 @@ class MSTrainHelper {
 
     // Compute the rectangles from the front and back positions.
     std::vector<PositionVector> getCarriageShapes(void);
+
+    static const double DEFAULT_CARRIAGE_DOOR_WIDTH;
 
 private:
     const MSVehicle* myTrain;

diff --git a/src/microsim/transportables/MSStageDriving.cpp b/src/microsim/transportables/MSStageDriving.cpp
@@ -43,8 +43,6 @@
 #include <microsim/transportables/MSPerson.h>
 
 
-#define DEFAULT_CARRIAGE_DOOR_WIDTH 1.5
-
 // ===========================================================================
 // method definitions
 // ===========================================================================
@@ -441,7 +439,7 @@ MSStageDriving::setArrived(MSNet* net, MSTransportable* transportable, SUMOTime
                     // Jitter the position before projection because of possible train curvature.
                     Position direction = randomCarriage->front - randomCarriage->back;
                     direction.norm2D();
-                    randomDoor.add(direction * RandHelper::rand(-0.5 * DEFAULT_CARRIAGE_DOOR_WIDTH, 0.5 * DEFAULT_CARRIAGE_DOOR_WIDTH));
+                    randomDoor.add(direction * RandHelper::rand(-0.5 * MSTrainHelper::DEFAULT_CARRIAGE_DOOR_WIDTH, 0.5 * MSTrainHelper::DEFAULT_CARRIAGE_DOOR_WIDTH));
                     // Project onto the lane.
                     myArrivalPos = myVehicle->getLane()->getShape().nearest_offset_to_point2D(randomDoor);
                     myArrivalPos = myVehicle->getLane()->interpolateGeometryPosToLanePos(myArrivalPos);