Corrects a nasty bug with the new pick merging logic that was causing AP picks to not be cleared correctly in all circumstances.

justinbarno · justinbarno · commit 7e3fe1f78b7b · 2022-08-16T10:04:05.000-07:00
diff --git a/calibration-gui/pom.xml b/calibration-gui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<artifactId>calibration-gui</artifactId>
diff --git a/calibration-service/calibration-application/.gitignore b/calibration-service/calibration-application/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/calibration-service/calibration-application/pom.xml b/calibration-service/calibration-application/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-model/.gitignore b/calibration-service/calibration-model/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/calibration-service/calibration-model/pom.xml b/calibration-service/calibration-model/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
         <artifactId>calibration-service</artifactId>
-        <version>1.0.18.2</version>
+        <version>1.0.18.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/common/model/domain/Waveform.java b/calibration-service/calibration-model/src/main/java/gov/llnl/gnem/apps/coda/common/model/domain/Waveform.java
@@ -430,6 +430,13 @@ public Waveform mergeNonNullOrEmptyFields(Waveform waveformOverlay) {
                     p.setWaveform(null);
                 }
             }
+
+            if (!waveformOverlay.getAssociatedPicks().stream().anyMatch(p -> PICK_TYPES.AP.getPhase().equals(p.getPickName()))) {
+                WaveformPick p = picksByName.remove(PICK_TYPES.AP.getPhase());
+                if (p != null) {
+                    p.setWaveform(null);
+                }
+            }
             this.setAssociatedPicks(new ArrayList<>(picksByName.values()));
         }
         if (waveformOverlay.isActive() != null) {
diff --git a/calibration-service/calibration-repository/.gitignore b/calibration-service/calibration-repository/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/calibration-service/calibration-repository/pom.xml b/calibration-service/calibration-repository/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-service-api/.gitignore b/calibration-service/calibration-service-api/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/calibration-service/calibration-service-api/pom.xml b/calibration-service/calibration-service-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 	
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/calibration-service-impl/.gitignore b/calibration-service/calibration-service-impl/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/calibration-service/calibration-service-impl/pom.xml b/calibration-service/calibration-service-impl/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-service/pom.xml b/calibration-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/calibration-standalone/.gitignore b/calibration-standalone/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/calibration-standalone/pom.xml b/calibration-standalone/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
diff --git a/common-gui/.gitignore b/common-gui/.gitignore
diff --git a/externals/pom.xml b/externals/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<artifactId>externals</artifactId>
diff --git a/mapping/pom.xml b/mapping/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.18.2</version>
+		<version>1.0.18.3</version>
 	</parent>
 
 	<groupId>gov.llnl.gnem.apps.coda.common</groupId>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 	<artifactId>coda-calibration</artifactId>
-	<version>1.0.18.2</version>
+	<version>1.0.18.3</version>
 	<name>coda-calibration</name>
 
 	<packaging>pom</packaging>

Original file line number	Diff line number	Diff line change
`@@ -430,6 +430,13 @@ public Waveform mergeNonNullOrEmptyFields(Waveform waveformOverlay) {`
`430`	`430`	`p.setWaveform(null);`
`431`	`431`	`}`
`432`	`432`	`}`
	`433`	`+`
	`434`	`+ if (!waveformOverlay.getAssociatedPicks().stream().anyMatch(p -> PICK_TYPES.AP.getPhase().equals(p.getPickName()))) {`
	`435`	`+ WaveformPick p = picksByName.remove(PICK_TYPES.AP.getPhase());`
	`436`	`+ if (p != null) {`
	`437`	`+ p.setWaveform(null);`
	`438`	`+ }`
	`439`	`+ }`
`433`	`440`	`this.setAssociatedPicks(new ArrayList<>(picksByName.values()));`
`434`	`441`	`}`
`435`	`442`	`if (waveformOverlay.isActive() != null) {`