From 862cd930e532aaff1962f6226cad7566960f3754 Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Wed, 13 Oct 2010 16:36:21 +0000
Subject: [PATCH] UTF8 for Coordinate Conversion

---
 .../parser/location/CoordinateConverter.java         |  2 +-
 .../parser/location/CoordinateConverterTest.java     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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 5d8c70930e..f9c52e838b 100644
--- 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 {
 
             //do some further replacing
             //Replace degree symbol
-            str = str.replaceAll("(\u00B0|\u00B0|D|d)", ":");
+            str = str.replaceAll("(\u00B0|\u00BA|D|d)", ":");
             
             //remove minute symbol
             str = str.replaceAll("(\u02B9|'|M|m)", "");
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 a98f8799e9..f3e55f7281 100644
--- 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 {
 	 */
 	@Test
 	public void testTryConvert() {
-		ConversionResults conversionResults = coordinateConverter.tryConvert("35°34'20\"S");
+		ConversionResults conversionResults = coordinateConverter.tryConvert("35\u00B034'20\"S");
 		Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);
 		Assert.assertTrue("Southern must be negative", conversionResults.convertedCoord < 0);
 		Assert.assertFalse("Southern must be latitude", conversionResults.isLongitude);
 
-		conversionResults = coordinateConverter.tryConvert("35°34.744");
+		conversionResults = coordinateConverter.tryConvert("35\u00BA34.744"); 
 		Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);
 		Assert.assertNull("Longitude must be undefined", conversionResults.isLongitude);
 
-		conversionResults = coordinateConverter.tryConvert("95°34.744");
+		conversionResults = coordinateConverter.tryConvert("95\u00B034.744");
 		Assert.assertTrue("Longitude must be defined", conversionResults.isLongitude);
 
 		
-		conversionResults = coordinateConverter.tryConvert("-35°34'55.67S");
+		conversionResults = coordinateConverter.tryConvert("-35\u00B034'55.67S");
 		Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);
 
-		conversionResults = coordinateConverter.tryConvert("35°11'34.744SN");
+		conversionResults = coordinateConverter.tryConvert("35\u00B011'34.744SN");
 		Assert.assertTrue(conversionResults.conversionComments, conversionResults.patternRecognised);
 
-		conversionResults = coordinateConverter.tryConvert("35°11'34.744SW");
+		conversionResults = coordinateConverter.tryConvert("35\u00B011'34.744SW");
 		Assert.assertTrue("Western must be longitude", conversionResults.isLongitude);
 		
 		conversionResults = coordinateConverter.tryConvert("35D11M34.744S");
-- 
2.34.1