adding arrivalPos "center" and making it the default for personTrip d…

…estinations, refs #3843
eclipse-sumo · Feb 27, 2018 · 428b50a · 428b50a
1 parent 8006ddc
commit 428b50a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/microsim/MSBaseVehicle.cpp b/src/microsim/MSBaseVehicle.cpp
@@ -411,7 +411,10 @@ MSBaseVehicle::calculateArrivalParams() {
             }
             break;
         case ARRIVAL_POS_RANDOM:
-            myArrivalPos = RandHelper::rand(0., lastLaneLength);
+            myArrivalPos = RandHelper::rand(lastLaneLength);
+            break;
+        case ARRIVAL_POS_CENTER:
+            myArrivalPos = lastLaneLength / 2.;
             break;
         default:
             myArrivalPos = lastLaneLength;

diff --git a/src/microsim/MSRouteHandler.cpp b/src/microsim/MSRouteHandler.cpp
@@ -1021,7 +1021,7 @@ MSRouteHandler::parseWalkPositions(const SUMOSAXAttributes& attrs, const std::st
             arrivalPos = SUMOVehicleParserHelper::parseWalkPos(SUMO_ATTR_ARRIVALPOS, description, toEdge->getLength(),
                          attrs.get<std::string>(SUMO_ATTR_ARRIVALPOS, description.c_str(), ok), &myParsingRNG);
         } else {
-            arrivalPos = 0.;
+            arrivalPos = toEdge->getLength() / 2.;
         }
     }
 }
@@ -1136,7 +1136,7 @@ MSRouteHandler::addPersonTrip(const SUMOSAXAttributes& attrs) {
                     for (std::vector<MSNet::MSIntermodalRouter::TripItem>::iterator it = result.begin(); it != result.end(); ++it) {
                         if (!it->edges.empty()) {
                             bs = MSNet::getInstance()->getStoppingPlace(it->destStop, SUMO_TAG_BUS_STOP);
-                            double localArrivalPos = bs != 0 ? bs->getAccessPos(it->edges.back()) : it->edges.back()->getLength();
+                            double localArrivalPos = bs != 0 ? bs->getAccessPos(it->edges.back()) : it->edges.back()->getLength() / 2.;
                             if (it + 1 == result.end() && attrs.hasAttribute(SUMO_ATTR_ARRIVALPOS)) {
                                 localArrivalPos = arrivalPos;
                             }

diff --git a/src/utils/vehicle/SUMOVehicleParameter.cpp b/src/utils/vehicle/SUMOVehicleParameter.cpp
@@ -222,6 +222,9 @@ SUMOVehicleParameter::write(OutputDevice& dev, const OptionsCont& oc, const Sumo
             case ARRIVAL_POS_RANDOM:
                 val = "random";
                 break;
+            case ARRIVAL_POS_CENTER:
+                val = "center";
+                break;
             case ARRIVAL_POS_MAX:
                 val = "max";
                 break;
@@ -517,6 +520,8 @@ SUMOVehicleParameter::parseArrivalPos(const std::string& val, const std::string&
     bool ok = true;
     if (val == "random") {
         apd = ARRIVAL_POS_RANDOM;
+    } else if (val == "center") {
+        apd = ARRIVAL_POS_CENTER;
     } else if (val == "max") {
         apd = ARRIVAL_POS_MAX;
     } else {

diff --git a/src/utils/vehicle/SUMOVehicleParameter.h b/src/utils/vehicle/SUMOVehicleParameter.h
@@ -221,6 +221,8 @@ enum ArrivalPosDefinition {
     ARRIVAL_POS_GIVEN,
     /// @brief The arrival position is chosen randomly
     ARRIVAL_POS_RANDOM,
+    /// @brief Half the road length
+    ARRIVAL_POS_CENTER,
     /// @brief The maximum arrival position is used
     ARRIVAL_POS_MAX,
     /// @brief Tag for the last element in the enum for safe int casting

diff --git a/src/utils/xml/SUMOVehicleParserHelper.cpp b/src/utils/xml/SUMOVehicleParserHelper.cpp
@@ -768,6 +768,8 @@ SUMOVehicleParserHelper::parseWalkPos(SumoXMLAttr attr, const std::string& id, d
     }
     if (proc == ARRIVAL_POS_RANDOM) {
         result = RandHelper::rand(maxPos, rng);
+    } else if (proc == ARRIVAL_POS_CENTER) {
+        result = maxPos / 2.;
     } else if (proc == ARRIVAL_POS_MAX) {
         result = maxPos;
     }