UTF8 for Coordinate Conversion

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverter.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverter.java
index 5d8c70930ee4a0e75aa9308181c44b23b235a86c..f9c52e838b2b5855fec929fc99d56e6e976e04d0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverter.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverter.java
@@ -454,7 +454,7 @@ public class CoordinateConverter {
 \r
             //do some further replacing\r
             //Replace degree symbol\r
-            str = str.replaceAll("(\u00B0|\u00B0|D|d)", ":");\r
+            str = str.replaceAll("(\u00B0|\u00BA|D|d)", ":");\r
             \r
             //remove minute symbol\r
             str = str.replaceAll("(\u02B9|'|M|m)", "");\r

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverterTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverterTest.java
index a98f8799e9e8364ec8ca0fc60624aab9347d5e1c..f3e55f7281efd88f1e48723e893968eadcd74029 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverterTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverterTest.java
@@ -58,26 +58,26 @@ public class CoordinateConverterTest {
         */\r
        @Test\r
        public void testTryConvert() {\r
-               ConversionResults conversionResults = coordinateConverter.tryConvert("35°34'20\"S");\r
+               ConversionResults conversionResults = coordinateConverter.tryConvert("35\u00B034'20\"S");\r
                Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);\r
                Assert.assertTrue("Southern must be negative", conversionResults.convertedCoord < 0);\r
                Assert.assertFalse("Southern must be latitude", conversionResults.isLongitude);\r
 \r
-               conversionResults = coordinateConverter.tryConvert("35°34.744");\r
+               conversionResults = coordinateConverter.tryConvert("35\u00BA34.744"); \r
                Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);\r
                Assert.assertNull("Longitude must be undefined", conversionResults.isLongitude);\r
 \r
-               conversionResults = coordinateConverter.tryConvert("95°34.744");\r
+               conversionResults = coordinateConverter.tryConvert("95\u00B034.744");\r
                Assert.assertTrue("Longitude must be defined", conversionResults.isLongitude);\r
 \r
                \r
-               conversionResults = coordinateConverter.tryConvert("-35°34'55.67S");\r
+               conversionResults = coordinateConverter.tryConvert("-35\u00B034'55.67S");\r
                Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);\r
 \r
-               conversionResults = coordinateConverter.tryConvert("35°11'34.744SN");\r
+               conversionResults = coordinateConverter.tryConvert("35\u00B011'34.744SN");\r
                Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);\r
 \r
-               conversionResults = coordinateConverter.tryConvert("35°11'34.744SW");\r
+               conversionResults = coordinateConverter.tryConvert("35\u00B011'34.744SW");\r
                Assert.assertTrue("Western must be longitude", conversionResults.isLongitude);\r
                \r
                conversionResults = coordinateConverter.tryConvert("35D11M34.744S");\r