Operations, don't allow local move to tracks with similar names

JMRI · Jun 5, 2021 · 93960e0 · 93960e0
1 parent 50fa711
commit 93960e0
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/java/src/jmri/jmrit/operations/trains/TrainBuilder.java b/java/src/jmri/jmrit/operations/trains/TrainBuilder.java
@@ -3571,6 +3571,11 @@ private boolean findFinalDestinationForCarLoad(Car car) throws BuildFailedExcept
             if (car.getTrack() == track || track.getSchedule() == null) {
                 continue;
             }
+            // don't allow local move to track with a "similar" name
+            if (splitString(car.getLocationName()).equals(splitString(track.getLocation().getName())) &&
+                    splitString(car.getTrackName()).equals(splitString(track.getName()))) {
+                continue;
+            }
             if (locationsNotServiced.contains(track.getLocation())) {
                 continue;
             }
@@ -3662,6 +3667,11 @@ private boolean sendCarToDestinationSpur(Car car, Track track) {
         if (car.getTrack() == track) {
             return false;
         }
+        // don't allow local move to track with a "similar" name
+        if (splitString(car.getLocationName()).equals(splitString(track.getLocation().getName())) &&
+                splitString(car.getTrackName()).equals(splitString(track.getName()))) {
+            return false;
+        }
         // is the car's destination the terminal and is that allowed?
         if (!checkThroughCarsAllowed(car, track.getLocation().getName())) {
             return false;
@@ -3774,6 +3784,11 @@ private boolean sendCarToDestinationTrack(Car car, Track track) {
         if (car.getTrack() == track) {
             return false;
         }
+        // don't allow local move to track with a "similar" name
+        if (splitString(car.getLocationName()).equals(splitString(track.getLocation().getName())) &&
+                splitString(car.getTrackName()).equals(splitString(track.getName()))) {
+            return false;
+        }
         if (track.isStaging() && car.getLocation() == track.getLocation()) {
             return false; // don't use same staging location
         }

diff --git a/java/test/jmri/jmrit/operations/trains/TrainBuilderTest.java b/java/test/jmri/jmrit/operations/trains/TrainBuilderTest.java
@@ -14322,7 +14322,7 @@ public void testCarOrderLIFO() {
     }
 
     /**
-     * Confirms that car with custom load in staging get routed to the correct spur
+     * Confirms that car with custom load gets routed to the correct spur
      * that has a schedule demanding the car's type and load.
      */
     @Test
@@ -14521,6 +14521,8 @@ public void testFindFinalDestinationForCarLoadD() {
         Location eastend = lmanager.newLocation("Eastend");
 
         Track westendSpur1 = westend.getTrackByName("Westend spur 1", null);
+        Track westendSpur2 = westend.addTrack("Westend spur 1-2", Track.SPUR);
+        westendSpur2.setLength(200);
         Track westendInterchange1 = westend.getTrackByName("Westend interchange 1", null);
         Track midtownSpur1 = midtown.getTrackByName("Midtown spur 1", null);
         Track midtownSpur2 = midtown.getTrackByName("Midtown spur 2", null);
@@ -14542,6 +14544,7 @@ public void testFindFinalDestinationForCarLoadD() {
         // program
         Schedule sch1 = smanager.getScheduleByName("Schedule for car load");
         westendSpur1.setSchedule(sch1); // now all spurs have schedules
+        westendSpur2.setSchedule(sch1);
 
         new TrainBuilder().build(train);
         Assert.assertTrue(train.isBuilt());
@@ -14551,6 +14554,7 @@ public void testFindFinalDestinationForCarLoadD() {
 
         // confirm track move counts are correct
         Assert.assertEquals("Westend spur 1", 1, westendSpur1.getMoves());
+        Assert.assertEquals("Westend spur 2", 0, westendSpur2.getMoves());
         Assert.assertEquals("Midtown spur 1", 20, midtownSpur1.getMoves());
         Assert.assertEquals("Midtown spur 2", 40, midtownSpur2.getMoves());
         Assert.assertEquals("Eastend spur 1", 60, eastendSpur1.getMoves());
@@ -14567,9 +14571,28 @@ public void testFindFinalDestinationForCarLoadD() {
 
         // confirm track move counts are correct
         Assert.assertEquals("Westend spur 1", 1, westendSpur1.getMoves());
+        Assert.assertEquals("Westend spur 2", 0, westendSpur2.getMoves());
         Assert.assertEquals("Midtown spur 1", 21, midtownSpur1.getMoves());
         Assert.assertEquals("Midtown spur 2", 40, midtownSpur2.getMoves());
         Assert.assertEquals("Eastend spur 1", 60, eastendSpur1.getMoves());
+
+        // allow local moves, place car on spur with "Similar" name
+        train.reset();
+        train.setAllowLocalMovesEnabled(true);
+        c1.setLocation(westend, westendSpur1);
+
+        new TrainBuilder().build(train);
+        Assert.assertTrue(train.isBuilt());
+
+        // confirm that car destination is correct
+        Assert.assertEquals("car destination is midtown spur 1", midtownSpur1, c1.getDestinationTrack());
+
+        // confirm track move counts are correct
+        Assert.assertEquals("Westend spur 1", 1, westendSpur1.getMoves());
+        Assert.assertEquals("Westend spur 2", 0, westendSpur2.getMoves());
+        Assert.assertEquals("Midtown spur 1", 22, midtownSpur1.getMoves());
+        Assert.assertEquals("Midtown spur 2", 40, midtownSpur2.getMoves());
+        Assert.assertEquals("Eastend spur 1", 60, eastendSpur1.getMoves());
 
         JUnitOperationsUtil.checkOperationsShutDownTask();
     }