Automatic merge of T1.5-111-g71c1114b7 and 14 pull requests

openrails-bot · openrails-bot · commit e009ff58b287 · 2022-11-21T10:21:41.000Z
- Pull request #652 at 918fdb1: Add button functions to Raildriver - Pull request #706 at 570ab21: Extended door functionality - Pull request #713 at 6ca89da: https://blueprints.launchpad.net/or/+spec/cruise-control - Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries) - Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor - Pull request #732 at 9cffa6d: Improvements for air brakes - Pull request #733 at 72947b0: Fixed battery switch sound being repeted - Pull request #734 at 8f8484c: Fixed battery switch timer not working properly - Pull request #740 at b3e66ca: Refactored the circuit breaker and the traction cut-off relay in order to use the same design pattern as the C# signal scripts (compatible with current scripts) - Pull request #741 at 2dd56ad: Fixed brake controller script not being loaded in timetable mode - Pull request #744 at 3c2dc07: Fixed and improved cabview control conditions related to power supply state - Pull request #746 at 0857d9b: Website release 1.5 - Pull request #748 at 4f0e878: latitude/longitude fix for bug 1393111 - Pull request #749 at a086ac7: OpenRailway Map
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/Map/index.js b/Source/RunActivity/Viewer3D/WebServices/Web/Map/index.js
@@ -55,7 +55,7 @@ function ApiMap() {
                     MapInit(latLong);
                 }
 
-                if ((latLong[0] != latLongPrev[0]) && (latLong[1] != latLongPrev[1])) {
+                if ((latLong[0] != latLongPrev[0]) || (latLong[1] != latLongPrev[1])) {
                     if (typeof locomotivMarker !== 'undefined') {
                         locomotivMarker.removeFrom(map);
                     }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function ApiMap() {`
`55`	`55`	`MapInit(latLong);`
`56`	`56`	`}`
`57`	`57`
`58`		`- if ((latLong[0] != latLongPrev[0]) && (latLong[1] != latLongPrev[1])) {`
	`58`	`+ if ((latLong[0] != latLongPrev[0]) \|\| (latLong[1] != latLongPrev[1])) {`
`59`	`59`	`if (typeof locomotivMarker !== 'undefined') {`
`60`	`60`	`locomotivMarker.removeFrom(map);`
`61`	`61`	`}`