New data added

Author: rijnb

README.md

@@ -119,6 +119,14 @@ This produces the following help text:
 
 # Release Notes
 
+### 2.3.1
+
+* Minor fixes to prevent compiler warnings.
+
+* Minor fixes to prevent multiple inclusion of `.h` files.
+
+* Minor data fix for Gansu Province, China (mountain range extending further west).
+
 ### 2.3.0
 
 * Arabic script added. 

mapcodelib/basics.h

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
+#ifndef __BASICS_H__
+#define __BASICS_H__
 
-// *** GENERATED FILE, DO NOT CHANGE OR PRETTIFY ***
 
-// TODO: Missing multiple header inclusion prevention: #ifndef __FILE_H__ #define __FILE_H__ etc.
+// *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 
-#define mapcode_dataversion "2.2" // coords 2.0.2
+#define mapcode_dataversion "2.3.0" // coords 2.0.2
 
 static const char *ALIASES =
   "2UK=2UT,2CG=2CT,1GU=GUM,1UM=UMI,1VI=VIR,1AS=ASM,1MP=MNP,4CX=CXR,4CC=CCK,4NF=NFK,4HM=HMD,COL=5CL,"
@@ -16449,7 +16450,7 @@ static const mminforec mminfo[NR_RECS+1] = {
   {  99663928, 37426995, 103030311, 40108185, 0x001000d},
   {  96267754, 38767590,  99663928, 41448780, 0x0010015},
   {  89350000, 31535000, 108740000, 42800000, 0x3060016},
-  {  92750000, 32560000, 108740000, 42800000, 0x0020217},
+  {  92290000, 32560000, 108740000, 42800000, 0x0020217},
   { 101693766, 36588138, 101816182, 36666629, 0x01b000a}, // 8QH
   { 101463360, 36352880, 102041448, 36843920, 0x001000c},
   { 102040000, 36411010, 102338819, 36535000, 0x782044b},
@@ -16593,3 +16594,5 @@ static const mminforec mminfo[NR_RECS+1] = {
 };
 #endif // MAKE_SOURCE_DIGITAL
 
+#endif // __BASICS_H__
+

mapcodelib/mapcode_countrynames.h

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-// *** GENERATED FILE, DO NOT CHANGE OR PRETTIFY ***
-
-// TODO: Missing multiple header inclusion prevention: #ifndef __FILE_H__ #define __FILE_H__ etc.
+#ifndef __MAPCODE_COUNTRYNAMES_H__
+#define __MAPCODE_COUNTRYNAMES_H__
 
+// *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 const char *isofullname[] = {
 "Vatican City State (Holy See)",
 "Monaco (Principality of _)",
@@ -553,3 +553,4 @@ const char *isofullname[] = {
 "International (Worldwide) (Earth)",
 "?"};
 
+#endif

mapcodelib/mapcode_countrynames_short.h

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-// *** GENERATED FILE, DO NOT CHANGE OR PRETTIFY ***
-
-// TODO: Missing multiple header inclusion prevention: #ifndef __FILE_H__ #define __FILE_H__ etc.
+#ifndef __MAPCODE_COUNTRYNAMES_H__
+#define __MAPCODE_COUNTRYNAMES_H__
 
+// *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 const char *isofullname[] = {
 "Vatican City State (Holy See)",
 "Monaco",
@@ -553,3 +553,4 @@ const char *isofullname[] = {
 "International (Worldwide) (Earth)",
 "?"};
 
+#endif

mapcodelib/mapcode_fast_encode.h

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-// *** GENERATED FILE, DO NOT CHANGE OR PRETTIFY ***
+#ifndef __MAPCODE_FAST_ENCODE_H__
+#define __MAPCODE_FAST_ENCODE_H__
 
-// TODO: Missing multiple header inclusion prevention: #ifndef __FILE_H__ #define __FILE_H__ etc.
+// *** GENERATED FILE (dividemaps.cpp), DO NOT CHANGE OR PRETTIFY ***
 
-static int redivar[2924] = {
+#define REDIVAR_SIZE 2924
+static int redivar[REDIVAR_SIZE] = {
         27984500, 1383,
         2537718, 676,
         12842450, 332,
@@ -717,3 +719,4 @@ static int redivar[2924] = {
         7, 468, 469, 476, 478, 485, 494, 496,
         8, 393, 410, 486, 487, 488, 492, 494, 496,
         0}; // 2924 records, data version 2.2
+#endif // __MAPCODE_FAST_ENCODE_H__

mapcodelib/mapcode_fastalpha.h

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-// TODO: Missing multiple header inclusion prevention: #ifndef __FILE_H__ #define __FILE_H__ etc.
-
+#ifndef __MAPCODE_FASTALPHA_H__
+#define __MAPCODE_FASTALPHA_H__
 // *** GENERATED FILE, DO NOT CHANGE OR PRETTIFY ***
 
 static const char parentletter[MAX_CCODE + 1] =
@@ -985,4 +985,5 @@ static const alphaRec alphaSearch[NRTERREC] = {
         {"ZWE",  185}
 };
 
-// produced by fast_territories.cpp
+// produced by dividemaps.cpp : fast_territories.cpp
+#endif // __MAPCODE_FASTALPHA_H__

mapcodelib/mapcoder.c

@@ -2499,15 +2499,15 @@ static char *convertToAbjad(char *str, const char *source, int maxlen) {
     }
     repack_if_alldigits(str, 0);
     if (rest) {
-        int totalLen = (int) strlen(str);
+        int len = (int) strlen(str);
         int needed = (int) strlen(rest);
-        int tocopy = maxlen - totalLen - 1;
+        int tocopy = maxlen - len - 1;
         if (tocopy > needed) {
             tocopy = needed;
         }
         if (tocopy > 0) {
-            memcpy(str + totalLen, rest, tocopy);
-            str[totalLen + tocopy] = 0;
+            memcpy(str + len, rest, tocopy);
+            str[len + tocopy] = 0;
         }
     }
     return str;