2 files changed, 15 insertions, 3 deletions
diff --git a/main/src/cgeo/geocaching/connector/ec/ECApi.java b/main/src/cgeo/geocaching/connector/ec/ECApi.java
index 9f758b0..94936e4 100644
--- a/main/src/cgeo/geocaching/connector/ec/ECApi.java
+++ b/main/src/cgeo/geocaching/connector/ec/ECApi.java
@@ -40,12 +40,12 @@ public class ECApi {
 
     private static final FastDateFormat LOG_DATE_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss.SSSZ", TimeZone.getTimeZone("UTC"), Locale.US);
 
-    public static String cleanCode(String geocode) {
-        return geocode.replace("EC", "");
+    public static String getIdFromGeocode(final String geocode) {
+        return StringUtils.removeStartIgnoreCase(geocode, "EC");
     }
 
     public static Geocache searchByGeoCode(final String geocode) {
-        final Parameters params = new Parameters("id", cleanCode(geocode));
+        final Parameters params = new Parameters("id", getIdFromGeocode(geocode));
         final HttpResponse response = apiRequest("gpx.php", params);
 
         final Collection<Geocache> caches = importCachesFromGPXResponse(response);
diff --git a/tests/src/cgeo/geocaching/connector/ec/ECApiTest.java b/tests/src/cgeo/geocaching/connector/ec/ECApiTest.java
new file mode 100644
index 0000000..9f9e99c
--- /dev/null
+++ b/tests/src/cgeo/geocaching/connector/ec/ECApiTest.java
@@ -0,0 +1,12 @@
+package cgeo.geocaching.connector.ec;
+
+import junit.framework.TestCase;
+
+public class ECApiTest extends TestCase {
+
+    public static void testGetIdFromGeocode() throws Exception {
+        assertEquals("242", ECApi.getIdFromGeocode("EC242"));
+        assertEquals("242", ECApi.getIdFromGeocode("ec242"));
+    }
+
+}