reseting lateral speed after completing continous lane change and before the next angle computation. refs #11882, alternativ to fix #12139

Author: namdre

src/microsim/MSLaneChanger.cpp

@@ -293,7 +293,6 @@ MSLaneChanger::change() {
     if (vehicle->getLaneChangeModel().isChangingLanes() && !vehicle->getLaneChangeModel().alreadyChanged()) {
         return continueChange(vehicle, myCandi);
     }
-    vehicle->getLaneChangeModel().setSpeedLat(0);
     if (!myAllowsChanging || vehicle->getLaneChangeModel().alreadyChanged() || vehicle->isStoppedOnLane()) {
         registerUnchanged(vehicle);
         if (vehicle->isStoppedOnLane()) {

src/microsim/MSLaneChangerSublane.cpp

@@ -281,6 +281,7 @@ MSLaneChangerSublane::abortLCManeuver(MSVehicle* vehicle) {
     vehicle->getLaneChangeModel().setSpeedLat(0);
     vehicle->getLaneChangeModel().setManeuverDist(0.);
     vehicle->getLaneChangeModel().updateTargetLane();
+    //vehicle->computeAngle();
 }
 
 

src/microsim/MSVehicle.cpp

@@ -4308,6 +4308,8 @@ MSVehicle::executeMove() {
         if (myType->getVehicleClass() == SVC_EMERGENCY) {
             setEmergencyBlueLight(MSNet::getInstance()->getCurrentTimeStep());
         }
+        // must be done before angle computation
+        myLaneChangeModel->resetSpeedLat();
         // State needs to be reset for all vehicles before the next call to MSEdgeControl::changeLanes
         if (myActionStep) {
             // check (#2681): Can this be skipped?

src/microsim/lcmodels/MSAbstractLaneChangeModel.cpp

@@ -426,6 +426,15 @@ MSAbstractLaneChangeModel::setSpeedLat(double speedLat) {
     mySpeedLat = speedLat;
 }
 
+
+void
+MSAbstractLaneChangeModel::resetSpeedLat() {
+    if (MSGlobals::gLaneChangeDuration > 0 && !isChangingLanes()) {
+        setSpeedLat(0);
+    }
+}
+
+
 bool
 MSAbstractLaneChangeModel::updateCompletion() {
     const bool pastBefore = pastMidpoint();

src/microsim/lcmodels/MSAbstractLaneChangeModel.h

@@ -560,6 +560,10 @@ class MSAbstractLaneChangeModel {
         return mySpeedLat;
     }
 
+    /* @brief reset the angle (in case no lane changing happens in this step
+     * and the maneuver was finished in the previous step) */
+    virtual void resetSpeedLat();
+
     /// @brief return the lateral speed of the current lane change maneuver
     double getAccelerationLat() const {
         return myAccelerationLat;

src/microsim/lcmodels/MSLCM_LC2013.cpp

@@ -1076,6 +1076,7 @@ MSLCM_LC2013::prepareStep() {
             scaledDelta = deltaPosLat * myVehicle.getSpeed() / myVehicle.getLane()->getSpeedLimit();
         }
         myVehicle.setLateralPositionOnLane(oldPosLat + scaledDelta);
+        setSpeedLat(DIST2SPEED(scaledDelta));
     }
 }