Added parseMapcodeString

Author: rijnb

mapcodelib/mapcoder.c

@@ -1557,7 +1557,7 @@ static int decoderEngine(decodeRec *dec) {
     dec->context = ccode;
     dec->mapcode = dec->mapcodeFormat.properMapcode;
     dec->extension = dec->mapcodeFormat.precisionExtension;
-    codex = dec->mapcodeFormat.indexOfDot * 9 + dec->mapcodeFormat.properMapcodeLength - 1;
+    codex = dec->mapcodeFormat.indexOfDot * 9 + (int) strlen(dec->mapcodeFormat.properMapcode) - 1;
     s = dec->mapcodeFormat.properMapcode;
 
     if (strchr(s, 'A') || strchr(s, 'E') || strchr(s, 'U')) {
@@ -2060,9 +2060,9 @@ int parseMapcodeString(MapcodeElements *mapcodeFormat, const char *asciiString,
                 }
                 // end of proper mapcode
                 if (mapcodeFormat) {
-                    mapcodeFormat->properMapcodeLength = (int) (asciiString - mcStart);
-                    memcpy(mapcodeFormat->properMapcode, mcStart, mapcodeFormat->properMapcodeLength);
-                    mapcodeFormat->properMapcode[mapcodeFormat->properMapcodeLength] = 0;
+                    int properMapcodeLength = (int) (asciiString - mcStart);
+                    memcpy(mapcodeFormat->properMapcode, mcStart, properMapcodeLength);
+                    mapcodeFormat->properMapcode[properMapcodeLength] = 0;
                     makeupper(mapcodeFormat->properMapcode);
                 }
             } else if (newstate >= 64) { // end of territory
@@ -2089,7 +2089,7 @@ int parseMapcodeString(MapcodeElements *mapcodeFormat, const char *asciiString,
                 } else {
                     mapcodeFormat->territoryCode = territoryCode;
                 }
-                if (mapcodeFormat->territoryCode == (ccode_mex + 1) && (mapcodeFormat->properMapcodeLength < 8)) {
+                if (mapcodeFormat->territoryCode == (ccode_mex + 1) && (strlen(mapcodeFormat->properMapcode) < 8)) {
                     mapcodeFormat->territoryCode = getTerritoryCode("5MX", -1);
                 }
             }

mapcodelib/mapcoder.h

@@ -54,7 +54,6 @@ typedef struct {
     char territoryISO[MAX_ISOCODE_LEN + 1];            // The (trimmed and uppercased) candidate territory.
     int territoryCode;                                 // The territory, as recognised and disambiguated, same as from getTerritoryCode().
     char properMapcode[MAX_PROPER_MAPCODE_LEN + 1];    // The (trimmed and uppercased) proper mapcode (excluding territory and precision extension).
-    int properMapcodeLength;                           // Length of proper mapcode.
     int indexOfDot;                                    // Position of dot in properMapcode (a value between 2 and 5).
     char precisionExtension[MAX_PRECISION_DIGITS + 1]; // The (trimmed and uppercased) precision extension including hyphen; empty if precision 0.
 } MapcodeElements;
@@ -180,7 +179,8 @@ int compareWithMapcodeFormat(
         int includesTerritory);
 
 /**
- * Parses a string into its mapcode components (returns nonzero in case the string is not a valid mapcode).
+ * Parses a string into its mapcode components, separating the territory, the 'proper' mapcode (without the
+ * territory and the precision extension) and the precision extension.
  *
  * Arguments:
  *      mapcodeFormat       - If not NULL, filled with analysis of the 'check' string if it was a correct mapcode.

unittest/unittest.c

@@ -399,7 +399,7 @@ static int test_mapcode_formats(void) {
                     mapcodeFormat.properMapcode,
                     *mapcodeFormat.precisionExtension ? "-" : "",
                     mapcodeFormat.precisionExtension,
-                    (mapcodeFormat.indexOfDot * 9) + mapcodeFormat.properMapcodeLength - 1);
+                    (mapcodeFormat.indexOfDot * 9) + (int) strlen(mapcodeFormat.properMapcode) - 1);
             if (strcmp(str, testpairs[i + 1]) != 0) {
                 found_error();
                 printf("*** ERROR *** compareWithMapcodeFormat(\"%s\") succeeded with \"%s\"\n", testpairs[i], str);