Merge pull request #12 from mapcode-foundation/dev-1.50.1

Dev 1.50.1

Author: rijnb

pom.xml

@@ -8,7 +8,7 @@
     <artifactId>mapcode</artifactId>
 
     <packaging>jar</packaging>
-    <version>1.50.0</version>
+    <version>1.50.1</version>
 
     <name>Mapcode Java Library</name>
     <description>

src/main/resources/com/mapcode/mminfo.dat

@@ -9,6 +9,10 @@ Release Notes (Version ${project.version})
     In any case, never depend on them for your own non-<<<SNAPSHOT>>> releases.
 #end
 
+* 1.50.1
+
+    * Bugfix for mapcodes in IN-DD (in India).
+
 * 1.50
 
     * Major release. This version is not backwards compatible with mapcode 1.4x: is has dropped support for

src/site/apt/ReleaseNotes.apt.vm

@@ -35,17 +35,17 @@ public class EncodeDecodeTest {
             new GsonBuilder().serializeSpecialFloatingPointValues().create();
 
     private static final int NUMBER_OF_POINTS = 5000;
-    private static final int LOG_LINE_EVERY = 100;
+    private static final int LOG_LINE_EVERY = 500;
 
     @Test
     public void encodeDecodeTestFixedSeed() throws Exception {
-        LOG.info("encodeDecodeTestFixedSeed");
-        doEncodeDecode(1431977987367L);
+        final long seed = 1431977987367L;
+        LOG.info("encodeDecodeTestFixedSeed: seed={}", seed);
+        doEncodeDecode(seed);
     }
 
     @Test
     public void encodeDecodeTestRandomSeed() throws Exception {
-        LOG.info("encodeDecodeTestRandomSeed");
         final long seed = System.currentTimeMillis();
         LOG.info("encodeDecodeTestRandomSeed: seed={}", seed);
         doEncodeDecode(seed);
@@ -81,10 +81,6 @@ private static void doEncodeDecode(final long seed) throws UnknownMapcodeExcepti
                 final List<Mapcode> resultsLimited = MapcodeCodec.encode(latDeg, lonDeg, territory);
                 for (final Mapcode mapcode : resultsLimited) {
                     found = true;
-                    if (showLogLine) {
-                        LOG.info("encodeDecodeTest: #{}/{}, encode={}, {} {} --> results={}",
-                                i, NUMBER_OF_POINTS, latDeg, lonDeg, territory, GSON.toJson(resultsLimited));
-                    }
 
                     // Check if the territory matches.
                     assertEquals(territory, mapcode.getTerritory());
@@ -127,14 +123,13 @@ private static void doEncodeDecode(final long seed) throws UnknownMapcodeExcepti
                                         "lat={}, lon={}; delta={}", i, NUMBER_OF_POINTS,
                                 mapcode, codePrecision0, territory.getFullName(), decodeLocationPrecision0.getLatDeg(),
                                 decodeLocationPrecision0.getLonDeg(), distancePrecision0Meters);
-                        LOG.info("");
                     }
                     showLogLine = false;
                 }
             }
             assertTrue(found);
         }
-        LOG.info("encodeDecodeTest: maximum distances, precision 0, 1, 2: {}, {}, {} meters, ",
+        LOG.debug("encodeDecodeTest: maximum distances, precision 0, 1, 2: {}, {}, {} meters, ",
                 maxDistancePrecision0Meters, maxDistancePrecision1Meters, maxDistancePrecision2Meters);
     }
 }

src/test/java/com/mapcode/EncodeDecodeTest.java

@@ -124,16 +124,16 @@ private static void checkFile(@Nonnull final String baseFileName) throws Excepti
 
                 final boolean showLogLine = ((i % LOG_LINE_EVERY) == 0);
                 if (showLogLine) {
-                    LOG.info("checkFile: #{}, file={}", i, chunkedFile.fileName);
-                    LOG.info("checkFile: lat/lon  = {}", reference.point);
-                    LOG.info("checkFile: expected = {}", GSON.toJson(reference.mapcodes));
+                    LOG.debug("checkFile: #{}, file={}", i, chunkedFile.fileName);
+                    LOG.debug("checkFile: lat/lon  = {}", reference.point);
+                    LOG.debug("checkFile: expected = #{}: {}", reference.mapcodes.size(), GSON.toJson(reference.mapcodes));
                 }
 
                 // Encode lat/lon to series of mapcodes and check the resulting mapcodes.
                 final List<Mapcode> results = MapcodeCodec.encode(
                         reference.point.getLatDeg(), reference.point.getLonDeg());
                 if (showLogLine) {
-                    LOG.info("checkFile: actual   = {}", GSON.toJson(results));
+                    LOG.debug("checkFile: actual   = #{}: {}", results.size(), GSON.toJson(results));
                 }
 
                 // Check the number of mapcodes.
@@ -154,15 +154,20 @@ private static void checkFile(@Nonnull final String baseFileName) throws Excepti
 
                 // Check the size of the results.
                 if (reference.mapcodes.size() != results.size()) {
+                    final ArrayList<MapcodeRec> resultsConverted = new ArrayList<>(results.size());
+                    for (final Mapcode mapcode : results) {
+                        resultsConverted.add(new MapcodeRec(mapcode.getCode(2), mapcode.getTerritory()));
+                    }
                     LOG.error("checkFile: Encode #{} incorrect number of results:" +
                                     "\n  lat/lon  = {}" +
-                                    "\n  expected = {} results," +
-                                    "\n  actual   = {} results",
+                                    "\n  expected = #{}: {} results," +
+                                    "\n  actual   = #{}: {} results\n",
                             i,
                             reference.point,
                             reference.mapcodes.size(),
                             GSON.toJson(reference.mapcodes),
-                            GSON.toJson(results));
+                            results.size(),
+                            GSON.toJson(resultsConverted));
                     ++error;
                 }
 
@@ -243,7 +248,7 @@ private static void checkFile(@Nonnull final String baseFileName) throws Excepti
                 }
 
                 if (showLogLine) {
-                    LOG.info("");
+                    LOG.debug("");
                 }
                 ++i;
             }
@@ -252,7 +257,7 @@ private static void checkFile(@Nonnull final String baseFileName) throws Excepti
         } finally {
             chunkedFile.close();
         }
-        LOG.info("checkFile: Maximum delta for this testset = {}", maxdelta);
+        LOG.debug("checkFile: Maximum delta for this testset = {}", maxdelta);
         assertEquals("Found errors", 0, error);
     }