fix illuminate same survey designation

when from and to station have different designation
jedwards1211 · Dec 17, 2017 · 63c8c8d · 63c8c8d
1 parent a23e401
commit 63c8c8d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/breakout-main/src/main/java/org/breakout/model/Survey3dModel.java b/breakout-main/src/main/java/org/breakout/model/Survey3dModel.java
@@ -2321,11 +2321,11 @@ private void addAffectedShot3ds(CalcStation station, Set<Shot3d> affectedShot3ds
 
 	private void addGlowForSameSurveyDesignation(CalcShot origShot, final Map<StationKey, Float> glowAtStations,
 			Set<Shot3d> affectedShot3ds, final Task<?> task) {
+		String fromSurveyDesignation = getSurveyDesignation(origShot.fromStation.name);
 		String fromCaveName = or(origShot.fromStation.cave, origShot.trip.cave.name, "");
 		CalcCave fromCave = project.caves.get(fromCaveName);
 		if (fromCave != null) {
-			for (CalcStation station : fromCave.stationsBySurveyDesignation
-					.get(getSurveyDesignation(origShot.fromStation.name))) {
+			for (CalcStation station : fromCave.stationsBySurveyDesignation.get(fromSurveyDesignation)) {
 				if (task.isCanceled()) {
 					break;
 				}
@@ -2334,11 +2334,11 @@ private void addGlowForSameSurveyDesignation(CalcShot origShot, final Map<Statio
 			}
 		}
 
+		String toSurveyDesignation = getSurveyDesignation(origShot.toStation.name);
 		String toCaveName = or(origShot.toStation.cave, origShot.trip.cave.name, "");
 		CalcCave toCave = project.caves.get(toCaveName);
-		if (toCave != null && toCave != fromCave) {
-			for (CalcStation station : toCave.stationsBySurveyDesignation
-					.get(getSurveyDesignation(origShot.toStation.name))) {
+		if (toCave != null && (toCave != fromCave) || !fromSurveyDesignation.equals(toSurveyDesignation)) {
+			for (CalcStation station : toCave.stationsBySurveyDesignation.get(toSurveyDesignation)) {
 				if (task.isCanceled()) {
 					break;
 				}