Fixed upper/lowercase

Author: rijnb

src/main/java/com/mapcode/Mapcode.java

@@ -64,13 +64,14 @@ public Mapcode(
                     "the regular expression for the mapcode syntax is: " + REGEX_MAPCODE_FORMAT);
         }
 
-        this.mapcodePrecision2 = mapcode;
-        if (mapcode.contains("-")) {
-            this.mapcodePrecision0 = mapcode.substring(0, mapcode.length() - 3);
-            this.mapcodePrecision1 = mapcode.substring(0, mapcode.length() - 1);
+        final String mapcodeUppercase = mapcode.toUpperCase();
+        this.mapcodePrecision2 = mapcodeUppercase;
+        if (mapcodeUppercase.contains("-")) {
+            this.mapcodePrecision0 = mapcodeUppercase.substring(0, mapcodeUppercase.length() - 3);
+            this.mapcodePrecision1 = mapcodeUppercase.substring(0, mapcodeUppercase.length() - 1);
         } else {
-            this.mapcodePrecision0 = mapcode;
-            this.mapcodePrecision1 = mapcode;
+            this.mapcodePrecision0 = mapcodeUppercase;
+            this.mapcodePrecision1 = mapcodeUppercase;
         }
         this.territory = territory;
     }
@@ -223,7 +224,7 @@ public enum MapcodeFormatType {
     public static MapcodeFormatType getMapcodeFormatType(@Nonnull final String mapcode) {
 
         // First, decode to ASCII.
-        final String decodedMapcode = convertToAscii(mapcode);
+        final String decodedMapcode = convertToAscii(mapcode.toUpperCase());
 
         // Syntax needs to be OK.
         if (!PATTERN_MAPCODE_FORMAT.matcher(decodedMapcode).matches()) {
@@ -251,7 +252,7 @@ public static MapcodeFormatType getMapcodeFormatType(@Nonnull final String mapco
      * mapcode representing a location on Earth.
      */
     public static boolean isValidMapcodeFormat(@Nonnull final String mapcode) {
-        return getMapcodeFormatType(mapcode) != MapcodeFormatType.MAPCODE_TYPE_INVALID;
+        return getMapcodeFormatType(mapcode.toUpperCase()) != MapcodeFormatType.MAPCODE_TYPE_INVALID;
     }
 
     /**
@@ -262,7 +263,7 @@ public static boolean isValidMapcodeFormat(@Nonnull final String mapcode) {
      */
     @Nonnull
     public static String convertToAscii(@Nonnull final String mapcode) {
-        return Decoder.decodeUTF16(mapcode);
+        return Decoder.decodeUTF16(mapcode.toUpperCase());
     }
 
     /**

src/main/java/com/mapcode/MapcodeCodec.java

@@ -208,7 +208,7 @@ public static Mapcode encodeToInternational(
     public static Point decode(
             @Nonnull final String mapcode) throws UnknownMapcodeException, IllegalArgumentException {
         checkNonnull("mapcode", mapcode);
-        String mapcodeTrimmed = mapcode.trim();
+        String mapcodeTrimmed = mapcode.trim().toUpperCase();
         final int space = mapcodeTrimmed.indexOf(' ');
         final Territory territory;
         if ((space > 0) && (mapcodeTrimmed.length() > space)) {
@@ -249,7 +249,7 @@ public static Point decode(
             @Nonnull final Territory territoryContext) throws UnknownMapcodeException, IllegalArgumentException {
         checkNonnull("mapcode", mapcode);
         checkNonnull("territoryContext", territoryContext);
-        final String mapcodeTrimmed = mapcode.trim();
+        final String mapcodeTrimmed = mapcode.trim().toUpperCase();
         if (!Mapcode.isValidMapcodeFormat(mapcodeTrimmed)) {
             throw new IllegalArgumentException(mapcode + " is not a correctly formatted mapcode; " +
                     "the regular expression for the mapcode syntax is: " + Mapcode.REGEX_MAPCODE_FORMAT);

src/site/apt/ReleaseNotes.apt.vm

@@ -9,6 +9,12 @@ Release Notes (Version ${project.version})
     In any case, never depend on them for your own non-<<<SNAPSHOT>>> releases.
 #end
 
+* 1.42.2
+
+    * Upper- and lowercase mapcodes always allowed.
+
+    []
+
 * 1.42.1
 
     * Cleaned up source. Removed all pending IntelliJ IDEA inspection warnings and reformatted code

src/test/java/com/mapcode/DecoderTest.java

@@ -34,6 +34,22 @@ public void decodeMapcodeWithTerritory() throws Exception {
         assertEquals("decode longitude", 4908542, point.getLonMicroDeg());
     }
 
+    @Test
+    public void decodeUpperLowercaseMapcode() throws Exception {
+        LOG.info("decodeUpperLowercaseMapcode");
+        final Point point1 = MapcodeCodec.decode("XXXXX.1234");
+        assertEquals("decode latitude", 59596312, point1.getLatMicroDeg());
+        assertEquals("decode longitude", 155931892, point1.getLonMicroDeg());
+
+        final Point point2 = MapcodeCodec.decode("Xxxxx.1234");
+        assertEquals("decode latitude", 59596312, point2.getLatMicroDeg());
+        assertEquals("decode longitude", 155931892, point2.getLonMicroDeg());
+
+        final Point point3 = MapcodeCodec.decode("xxxxx.1234");
+        assertEquals("decode latitude", 59596312, point3.getLatMicroDeg());
+        assertEquals("decode longitude", 155931892, point3.getLonMicroDeg());
+    }
+
     @Test
     public void decodeFullMapcode() throws Exception {
         LOG.info("decodeFullMapcode");