Extended power of getTerritoryCode

Author: mapcodefoundation

mapcodelib/mapcoder.c

@@ -1494,14 +1494,14 @@ static int decoderEngine(decodeRec *dec) {
         if (s) {
             *s++ = 0;
             while (*s > 0 && *s <= 32) { s++; }
-            ccode = convertTerritoryIsoNameToCode(w, dec->context - 1) - 1;
+            ccode = getTerritoryCode(w, dec->context - 1) - 1;
         }
         else {
             ccode = dec->context - 1;
             s = w;
         }
         if (ccode == ccode_mex && len < 8) {
-            ccode = convertTerritoryIsoNameToCode("5MX", -1) - 1;
+            ccode = getTerritoryCode("5MX", -1) - 1;
         } // special case for mexico country vs state
         if ((*s == 'u') || (*s == 'U')) {
             strcpy(s, s + 1);
@@ -2074,14 +2074,20 @@ static int cmp_alphacode(const void *e1, const void *e2) {
 static int binfindmatch(const int parentcode, const char *str) {
     // build a 4-letter uppercase search term
     char tmp[5];
+    const char *r = str;
+    int len = 0;
+
     if (parentcode < 0) { return -1; }
     if (parentcode > 0) {
-        tmp[0] = (char) ('0' + parentcode);
-        memcpy(tmp + 1, str, 3);
-    } else {
-        memcpy(tmp, str, 4);
+        tmp[len++] = (char) ('0' + parentcode);
     }
-    tmp[4] = 0;
+    while ((len < 4) && (*r > 32)) {
+        tmp[len++] = *r++;
+    }
+    if (*r > 32) {
+        return -1;
+    }
+    tmp[len] = 0;
     makeupper(tmp);
     { // binary-search the result
         const alphaRec *p;
@@ -2101,20 +2107,20 @@ static int binfindmatch(const int parentcode, const char *str) {
 
 // PUBLIC - returns territoryCode of string (or negative if not found).
 // optional_tc: context territoryCode to handle ambiguities (pass <=0 if unknown).
-int convertTerritoryIsoNameToCode(const char *string, int optional_tc) 
+int getTerritoryCode(const char *string, int optional_tc) 
 {
-    const int ccode = optional_tc - 1;
     if (string == NULL) { return -1; }
     while (*string > 0 && *string <= 32) { string++; } // skip leading whitespace
 
     if (string[0] && string[1]) {
+        const int ccode = optional_tc - 1;
         if (string[2] == '-') {
             return binfindmatch(getParentcode(string, 2), string + 3);
         } else if (string[2] && string[3] == '-') {
             return binfindmatch(getParentcode(string, 3), string + 4);
-        } else if (optional_tc > 0) {
-            int parentcode = parentnumber[ccode];
-            int b = binfindmatch(parentcode, string);
+        } else {
+            const int parentcode = ccode<0 ? 0 : ((parentnumber[ccode] > 0) ? parentnumber[ccode] : parentnumber[ParentTerritoryOf(ccode)]);
+            const int b = binfindmatch(parentcode, string);
             if (b > 0) {
                 return b;
             } //
@@ -2144,11 +2150,15 @@ int decodeMapcodeToLatLon(double *lat, double *lon, const char *input,
     }
 }
 
-// PUBLIC - encode lat,lon for (optional) TerritoryCode tc to a mapcode with extraDigits accuracy
+// PUBLIC - encode lat,lon for TerritoryCode tc to a mapcode with extraDigits accuracy
 int encodeLatLonToSingleMapcode(char *result, double lat, double lon, int tc, int extraDigits) {
     char *v[2];
     Mapcodes rlocal;
-    const int ret = encodeLatLonToMapcodes_internal(v, &rlocal, lat, lon, tc, 1, debugStopAt, extraDigits);
+    int ret;
+    if (tc <= 0) {
+        return 0;
+    }
+    ret = encodeLatLonToMapcodes_internal(v, &rlocal, lat, lon, tc, 1, debugStopAt, extraDigits);
     *result = 0;
     if (ret <= 0) { // no solutions?
         return -1;

mapcodelib/mapcoder.h

@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#define mapcode_cversion "2.2"
+#define mapcode_cversion "2.2.1"
 
 #define UWORD                               unsigned short int  // 2-byte unsigned integer.
 
@@ -52,7 +52,7 @@ typedef struct {
  *      mapcodes        - a pointer to an Mapcodes, allocated by the caller.
  *      lat             - Latitude, in degrees. Range: -90..90.
  *      lon             - Longitude, in degrees. Range: -180..180.
- *      territoryCode   - Territory code (obtained from convertTerritoryIsoNameToCode), used as encoding context.
+ *      territoryCode   - Territory code (obtained from getTerritoryCode), used as encoding context.
  *                        Pass 0 to get Mapcodes for all territories.
  *      extraDigits     - Number of extra "digits" to add to the generated mapcode. The preferred default is 0.
  *                        Other valid values are 1 and 2, which will add extra letters to the mapcodes to
@@ -84,7 +84,7 @@ int encodeLatLonToMapcodes(
  *                        by the next call to this method!
  *      lat             - Latitude, in degrees. Range: -90..90.
  *      lon             - Longitude, in degrees. Range: -180..180.
- *      territoryCode   - Territory code (obtained from convertTerritoryIsoNameToCode), used as encoding context.
+ *      territoryCode   - Territory code (obtained from getTerritoryCode), used as encoding context.
  *                        Pass 0 to get Mapcodes for all territories.
  *      extraDigits     - Number of extra "digits" to add to the generated mapcode. The preferred default is 0.
  *                        Other valid values are 1 and 2, which will add extra letters to the mapcodes to
@@ -113,8 +113,7 @@ int encodeLatLonToMapcodes_Deprecated(     // Warning: this method is deprecated
  *                        The caller should allocate at least MAX_MAPCODE_RESULT_LEN characters for the string.
  *      lat             - Latitude, in degrees. Range: -90..90.
  *      lon             - Longitude, in degrees. Range: -180..180.
- *      territoryCode   - Territory code (obtained from convertTerritoryIsoNameToCode), used as encoding context.
- *                        Pass 0 to get the shortest Mapcode for all territories.
+ *      territoryCode   - Territory code (obtained from getTerritoryCode), used as encoding context.
  *      extraDigits     - Number of extra "digits" to add to the generated mapcode. The preferred default is 0.
  *                        Other valid values are 1 and 2, which will add extra letters to the mapcodes to
  *                        make them represent the coordinate more accurately.
@@ -136,7 +135,7 @@ int encodeLatLonToSingleMapcode(
  *      lat             - Decoded latitude, in degrees. Range: -90..90.
  *      lon             - Decoded longitude, in degrees. Range: -180..180.
  *      mapcode         - Mapcode to decode.
- *      territoryCode   - Territory code (obtained from convertTerritoryIsoNameToCode), used as decoding context.
+ *      territoryCode   - Territory code (obtained from getTerritoryCode), used as decoding context.
  *                        Pass 0 if not available.
  *
  * Returns:
@@ -169,14 +168,14 @@ int compareWithMapcodeFormat(
  * Convert a territory name to a territory code.
  *
  * Arguments:
- *      isoNam               - Territory name to convert.
+ *      string               - String starting with ISO code of territory (e.g. "USA" or "US-CA").
  *      parentTerritoryCode  - Parent territory code, or 0 if not available.
  *
  * Returns:
  *      Territory code >0 if succeeded, or <0 if failed.
  */
-int convertTerritoryIsoNameToCode(
-        const char *isoName,
+int getTerritoryCode(
+        const char *string,
         int parentTerritoryCode);
 
 /**
@@ -250,7 +249,7 @@ double maxErrorInMeters(int extraDigits);
  * Arguments:
  *      lat             - Latitude, in degrees. Range: -90..90.
  *      lon             - Longitude, in degrees. Range: -180..180.
- *      territoryCode   - Territory code (obtained from convertTerritoryIsoNameToCode)
+ *      territoryCode   - Territory code (obtained from getTerritoryCode)
  *
  * returns nonzero if coordinate is near more than one territory border
  *
@@ -332,11 +331,12 @@ const UWORD *encodeToAlphabet(const char *string, int alphabet);
 /**
  * List of #defines to support legacy systems.
  */
+#define convertTerritoryIsoNameToCode getTerritoryCode
 #define coord2mc(results, lat, lon, territoryCode)  encodeLatLonToMapcodes_Deprecated(results, lat, lon,territoryCode, 0)
 #define coord2mc1(results, lat, lon, territoryCode) encodeLatLonToSingleMapcode(results, lat, lon, territoryCode, 0)
 #define mc2coord decodeMapcodeToLatLon
 #define lookslikemapcode compareWithMapcodeFormat
-#define text2tc convertTerritoryIsoNameToCode
+#define text2tc getTerritoryCode
 #define tc2text convertTerritoryCodeToIsoName
 #define tccontext getCountryOrParentCountry
 #define tcparent getParentCountryOf