Updated reference files to 1.81-nohp

Author: rijnb

src/main/java/com/mapcode/Point.java

@@ -118,7 +118,7 @@ public static Point fromUniformlyDistributedRandomPoints(@Nonnull final Random r
         assert !Double.isNaN(lonRad);
         final double lat = latRad * (180.0 / Math.PI);
         final double lon = lonRad * (180.0 / Math.PI);
-        return fromMicroDeg(degToMicroDeg(lat), degToMicroDeg(lon));
+        return fromDeg(lat, lon);
     }
 
     /**
@@ -242,11 +242,21 @@ static Point fromMicroDeg(final int latMicroDeg, final int lonMicroDeg) {
         return new Point(microDegToDeg(latMicroDeg), microDegToDeg(lonMicroDeg), false);
     }
 
+    /**
+     * Get latitude as micro-degrees. Note that this looses precision beyond microdegrees!
+     *
+     * @return Latitude in microdegrees (may loose precision if latitude has higher precision than microdegrees).
+     */
     int getLatMicroDeg() {
         assert defined;
         return degToMicroDeg(latDeg);
     }
 
+    /**
+     * Get longitude as micro-degrees. Note that this looses precision beyond microdegrees!
+     *
+     * @return Longitude in microdegrees (may loose precision if longitude has higher precision than microdegrees).
+     */
     int getLonMicroDeg() {
         assert defined;
         return degToMicroDeg(lonDeg);

src/main/java/com/mapcode/SubArea.java

@@ -102,7 +102,7 @@ class SubArea {
                 }
             }
         }
-        LOG.info("SubArea: sub-areas initialized: aslat=[{}, {}], lon=[{}, {}]",
+        LOG.info("SubArea: sub-areas initialized: lat=[{}, {}], lon=[{}, {}]",
                 Point.microDegToDeg(LAT_MAP.firstKey()), Point.microDegToDeg(LAT_MAP.lastKey()),
                 Point.microDegToDeg(LON_MAP.firstKey()), Point.microDegToDeg(LON_MAP.lastKey()));
     }

src/test/java/com/mapcode/ReferenceFileTest.java

@@ -128,6 +128,7 @@ private static void checkFile(@Nonnull final String baseFileName) throws Excepti
                     LOG.debug("checkFile: lat/lon  = {}", reference.point);
                     LOG.debug("checkFile: expected = #{}: {}", reference.mapcodes.size(), GSON.toJson(reference.mapcodes));
                 }
+                ++i;
 
                 // Encode lat/lon to series of mapcodes and check the resulting mapcodes.
                 final List<Mapcode> results = MapcodeCodec.encode(
@@ -172,53 +173,43 @@ private static void checkFile(@Nonnull final String baseFileName) throws Excepti
                 }
 
                 // For every mapcode in the result set, check if it is contained in the reference set.
+                int precision = 0;
                 for (final Mapcode result : results) {
                     boolean found = false;
                     for (final MapcodeRec referenceMapcodeRec : reference.mapcodes) {
+                        precision = (referenceMapcodeRec.mapcode.lastIndexOf('-') > 4) ? 2 : 0;
+
                         if (referenceMapcodeRec.territory.equals(result.getTerritory())) {
-                            if (referenceMapcodeRec.mapcode.lastIndexOf('-') > 4) {
-                                if (referenceMapcodeRec.mapcode.equals(result.getCode(2))) {
-                                    found = true;
-                                    break;
-                                }
-                            } else {
-                                if (referenceMapcodeRec.mapcode.equals(result.getCode())) {
-                                    found = true;
-                                    break;
-                                }
+                            if (referenceMapcodeRec.mapcode.equals(result.getCode(precision))) {
+                                found = true;
+                                break;
                             }
                         }
                     }
                     if (!found) {
 
                         // This does not fail the test, but rather produces an ERROR in the log file.
                         // It indicates a discrepancy in the C and Java implementations.
-                        LOG.error("checkFile: Mapcode '{}' at {} is not in the reference file!",
-                                result, reference.point);
+                        LOG.error("checkFile: Created '{}' at {} which is not present in the reference file!\nref={}\nresult={}",
+                                result.getCode(precision), reference.point, GSON.toJson(reference), GSON.toJson(result));
                         ++error;
                     }
                 }
 
                 // For every Mapcode in the reference set, check if it is contained in the result set.
                 for (final MapcodeRec referenceMapcodeRec : reference.mapcodes) {
+                    precision = (referenceMapcodeRec.mapcode.lastIndexOf('-') > 4) ? 2 : 0;
                     boolean found = false;
                     for (final Mapcode result : results) {
                         if (referenceMapcodeRec.territory.equals(result.getTerritory())) {
-                            if (referenceMapcodeRec.mapcode.lastIndexOf('-') > 4) {
-                                if (referenceMapcodeRec.mapcode.equals(result.getCode(2))) {
-                                    found = true;
-                                    break;
-                                }
-                            } else {
-                                if (referenceMapcodeRec.mapcode.equals(result.getCode())) {
-                                    found = true;
-                                    break;
-                                }
+                            if (referenceMapcodeRec.mapcode.equals(result.getCode(precision))) {
+                                found = true;
+                                break;
                             }
                         }
                     }
                     if (!found) {
-                        LOG.error("checkFile: Mapcode '{} {}' at {} is not produced by the decoder!",
+                        LOG.error("checkFile: Found   '{} {}' at {} in reference file, not produced by new decoder!",
                                 referenceMapcodeRec.territory, referenceMapcodeRec.mapcode, reference.point);
                         ++error;
                     }
@@ -246,11 +237,6 @@ private static void checkFile(@Nonnull final String baseFileName) throws Excepti
                         ++error;
                     }
                 }
-
-                if (showLogLine) {
-                    LOG.debug("");
-                }
-                ++i;
             }
         } catch (final EOFException e) {
             // OK.