2.2 Solved 1-microdegree gap in a few spots on Earth, noticable now extreme precision is possible

Author: mapcodefoundation

src/main/java/com/mapcode/DataAccess.java

@@ -62,22 +62,25 @@ class DataAccess {
                     final byte[] bytes = outputStream.toByteArray();
                     assert total == bytes.length;
 
-                    // read array sizes
-                    assert total > 4;
-                    nrTerritoryRecords = (bytes[0] & 255) + ((bytes[1] & 255) << 8);
-                    nrTerritories = (bytes[2] & 255) + ((bytes[3] & 255) << 8);
-                    LOG.info("nrTerritories={} nrTerritoryRecords={}",nrTerritories,nrTerritoryRecords);
-                    assert (2 + 2 + ((nrTerritories + 1) * 2) + (nrTerritoryRecords * 20) == total);
-
-                    // read DATA+START array
+                    // read 8-byte header: SIGNATURE "MC", VERSION, NR TERRITORIES, NR RECTRANGLE RECORD
+                    assert total > 8;
+                    assert (char) bytes[0] == 'M';
+                    assert (char) bytes[1] == 'C';
+                    final int dataVersion = (bytes[2] & 255) + ((bytes[3] & 255) << 8);
+                    nrTerritoryRecords = (bytes[4] & 255) + ((bytes[5] & 255) << 8);
+                    nrTerritories = (bytes[6] & 255) + ((bytes[7] & 255) << 8);
+                    LOG.info("version={} nrTerritories={} nrTerritoryRecords={}",dataVersion,nrTerritories,nrTerritoryRecords);
+                    assert (8 + ((nrTerritories + 1) * 2) + (nrTerritoryRecords * 20) == total);
+
+                    // read DATA+START array (2 bytes per territory, plus closing record)
                     DATA_START = new int[nrTerritories + 1];
-                    int i = 4;
+                    int i = 8;
                     for (int k=0; k <= nrTerritories; k++) {
                         DATA_START[k] = (bytes[i] & 255) + ((bytes[i + 1] & 255) << 8);
                         i += 2;
                     }
 
-                    // read territory rectangle data (mminfo)
+                    // read territory rectangle data (5 longs per record)
                     FILE_DATA = new int[nrTerritoryRecords * 5];
                     for (int k=0; k < nrTerritoryRecords * 5; k++) {
                         FILE_DATA[k] = ((bytes[i] & 255)) + 

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

@@ -9,6 +9,15 @@
     In any case, never depend on them for your own non-<<<SNAPSHOT>>> releases.
 #end
 
+* 2.2.0
+
+    * Solved 1-microdegree gap in a few spots on Earth, noticable now extreme precision is possible;
+
+    * Replaced floating point by fixed point math; Improved speed;
+
+    * Enforce encode(decode(M))=M, except at territory border corners;
+
+    * Cleaned up source; moved hard-coded data into mminfo.dat;
 
 * 2.1.0
 

src/site/apt/ReleaseNotes.apt.vm

@@ -226,7 +226,7 @@ public void encodeToShortest4() throws Exception {
     @Test
     public void legalArguments() {
         LOG.info("legalArguments");
-        assertEquals(MapcodeCodec.encode(-90, 0).size(), 2); // ATA and AAA
+        assertEquals(MapcodeCodec.encode(-90, 0).size(), 3); // 2 x ATA and AAA
         assertEquals(MapcodeCodec.encode(-60, 0).size(), 2); // ATA and AAA
         assertEquals(MapcodeCodec.encode(90, 0).size(), 1); // AAA only
         assertEquals(MapcodeCodec.encode(0, -180),MapcodeCodec.encode(0, 180));

src/test/java/com/mapcode/EncoderTest.java

@@ -301,7 +301,7 @@ private static ReferenceRec getNextReferenceRecord(@Nonnull final ChunkedFile ch
                 (args.length == 3) || (args.length == 6));
 
         final int count = Integer.parseInt(args[0]);
-        assertTrue("Expecting between 1 and 21 mapcodes", (1 <= count) && (count <= 21));
+        assertTrue("Expecting between 1 and 22 mapcodes", (1 <= count) && (count <= 22));
 
         // Read lat/lon.
         final double latDeg = Double.parseDouble(args[1]);