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

Author: mapcodefoundation

README.md

@@ -59,6 +59,10 @@ decode Mapcodes.
 
 # Release Notes
 
+* 2.2
+
+    Solved 1-microdegree gap in a few spots on Earth, noticable now extreme precision is possible
+
 * 2.1.5
 
     Added stricter unit tests

mapcodelib/basics.h

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+// *** GENERATED FILE, DO NOT CHANGE OR PRETTIFY ***
 static int redivar[2924] = {
         27984500, 1383,
         2537718, 676,
@@ -712,4 +713,4 @@ static int redivar[2924] = {
         125763055, 2914,
         7, 468, 469, 476, 478, 485, 494, 496,
         8, 393, 410, 486, 487, 488, 492, 494, 496,
-        0}; //2924
+        0}; // 2924 records, data version 2.2

mapcodelib/mapcode_fast_encode.h

@@ -1346,10 +1346,8 @@ static void encoderEngine(const int ccode, const encodeRec *enc, const int stop_
     from = firstrec(ccode);
     upto = lastrec(ccode);
 
-    if (ccode != ccode_earth) {
-        if (!fitsInside(&enc->coord32, upto)) {
-            return;
-        }
+    if (!fitsInside(&enc->coord32, upto)) {
+        return;
     }
 
     ///////////////////////////////////////////////////////////
@@ -1393,7 +1391,7 @@ static void encoderEngine(const int ccode, const encodeRec *enc, const int stop_
 
                     if (requiredEncoder < 0 || requiredEncoder == i) {
                         const int cc = (ccode_override >= 0 ? ccode_override : ccode);
-                        if (*result && enc->mapcodes && enc->mapcodes->count < MAX_NR_OF_MAPCODE_RESULTS) {
+                        if (*result && enc->mapcodes && (enc->mapcodes->count < MAX_NR_OF_MAPCODE_RESULTS)) {
                             char *s = enc->mapcodes->mapcode[enc->mapcodes->count++];
                             if (cc == ccode_earth) {
                                 strcpy(s, result);
@@ -1584,11 +1582,7 @@ static int decoderEngine(decodeRec *dec) {
                         err = decodeGrid(dec, i, 0);
 
                         // first of all, make sure the zone fits the country
-                        if ((err == 0) && (ccode != ccode_earth)) {
-                            if (!restrictZoneTo(&dec->zone, &dec->zone, boundaries(upto))) {
-                                err = -2999;
-                            }
-                        }
+                        restrictZoneTo(&dec->zone, &dec->zone, boundaries(upto));
 
                         if ((err == 0) && isRestricted(i)) {
                             int nrZoneOverlaps = 0;
@@ -1659,9 +1653,7 @@ static int decoderEngine(decodeRec *dec) {
         } // for
     }
 
-    if (ccode != ccode_earth) {
-        restrictZoneTo(&dec->zone, &dec->zone, boundaries(lastrec(ccode)));
-    }
+    restrictZoneTo(&dec->zone, &dec->zone, boundaries(lastrec(ccode)));
 
     if (isEmpty(&dec->zone)) {
         err = -2222;
@@ -1990,24 +1982,23 @@ static int encodeLatLonToMapcodes_internal(char **v, Mapcodes *mapcodes, double
     if (tc <= 0) // ALL results?
     {
 #ifdef FAST_ENCODE
-        int HOR = 1;
+        const int sum =  enc.coord32.lon + enc.coord32.lat;
+        int coord = enc.coord32.lon;
         int i = 0; // pointer into redivar
         for (; ;) {
-            const int v2 = redivar[i++];
-            HOR = 1 - HOR;
-            if (v2 >= 0 && v2 < 1024) { // leaf?
+            const int r = redivar[i++];            
+            if (r >= 0 && r < 1024) { // leaf?
                 int j;
-                const int nr = v2;
-                for (j = 0; j <= nr; j++) {
-                    int ctry = (j == nr ? ccode_earth : redivar[i + j]);
+                for (j = 0; j <= r; j++) {
+                    const int ctry = (j == r ? ccode_earth : redivar[i + j]);
                     encoderEngine(ctry, &enc, stop_with_one_result, extraDigits, requiredEncoder, -1);
                     if ((stop_with_one_result || requiredEncoder >= 0) && enc.mapcodes->count > 0) { break; }
                 }
                 break;
             }
             else {
-                const int coord = (HOR ? enc.coord32.lon : enc.coord32.lat);
-                if (coord > v2) {
+                coord = sum - coord;
+                if (coord > r) {
                     i = redivar[i];
                 }
                 else {

mapcodelib/mapcoder.c

@@ -18,15 +18,15 @@
 extern "C" {
 #endif
 
-#define mapcode_cversion "2.1.5"
+#define mapcode_cversion "2.2"
 
 #define UWORD                               unsigned short int  // 2-byte unsigned integer.
 
 #define SUPPORT_FOREIGN_ALPHABETS           // Define to support additional alphabets.
 #define SUPPORT_HIGH_PRECISION              // Define to enable high-precision extension logic.
 #define FORCE_RECODE                        // Define to enforce that encode(decode(M)) generates M
 
-#define MAX_NR_OF_MAPCODE_RESULTS           21          // Max. number of results ever returned by encoder (e.g. for 26.904899, 95.138515).
+#define MAX_NR_OF_MAPCODE_RESULTS           22          // Max. number of results ever returned by encoder (e.g. for 26.904899, 95.138515).
 #define MAX_PROPER_MAPCODE_LEN              10          // Max. number of characters in a proper mapcode (including the dot).
 #define MAX_PRECISION_DIGITS                8           // Max. number of extension characters (excluding the hyphen). Must be even.
 #define MAX_PRECISION_FACTOR                810000      // 30 to the power (MAX_PRECISION_DIGITS/2)