2.4.1 release, fixes and closes #304

AtlasOfLivingAustralia · Jan 8, 2019 · dda875f · dda875f
1 parent 58bc7ba
commit dda875f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
     <groupId>au.org.ala</groupId>
     <artifactId>biocache-store</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.4.1</version>
     <url>https://biocache.ala.org.au</url>
     <issueManagement>
         <system>GitHub</system>

diff --git a/src/main/scala/au/org/ala/biocache/processor/LocationProcessor.scala b/src/main/scala/au/org/ala/biocache/processor/LocationProcessor.scala
@@ -415,7 +415,7 @@ class LocationProcessor extends Processor {
       var sourceEpsgCode = GridUtil.lookupEpsgCode(datum)
 
       //if empty - try verbatim SRS
-      if (!sourceEpsgCode.isEmpty && verbatimSRS != null) {
+      if (sourceEpsgCode.isEmpty && verbatimSRS != null) {
         val matchedVerbatimSRS = GeodeticDatum.matchTerm(verbatimSRS)
         val srs = if(!matchedVerbatimSRS.isEmpty){
           matchedVerbatimSRS.get.canonical

diff --git a/src/test/scala/au/org/ala/biocache/ProcessLocationTest.scala b/src/test/scala/au/org/ala/biocache/ProcessLocationTest.scala
@@ -932,4 +932,31 @@ class ProcessLocationTest extends ConfigFunSuite with BeforeAndAfterAll {
       qas.find(_.getName == "locationNotSupplied").get.qaStatus
     }
   }
+
+  test("Check verbatimDatum does not override the geodeticDatum") {
+    val raw = new FullRecord
+    val processed = new FullRecord
+    processed.classification.setScientificName("Macropus rufus")
+    processed.classification.setTaxonRankID("7000")
+    raw.location.decimalLatitude = "-43.36697"
+    raw.location.decimalLongitude = "145.78746"
+    raw.location.geodeticDatum = "WGS84"
+
+    raw.location.verbatimLatitude = "43°22'06\" S"
+    raw.location.verbatimLongitude = "145°47'11\" E"
+    raw.location.verbatimSRS = "EPSG:4202"
+    raw.rowKey = "test"
+
+    val assertions = (new LocationProcessor).process("test", raw, processed)
+
+    expectResult("EPSG:4326") {
+      processed.location.geodeticDatum
+    }
+    expectResult("-43.36697") {
+      processed.location.decimalLatitude
+    }
+    expectResult("145.78746") {
+      processed.location.decimalLongitude
+    }
+  }
 }