Cleaned up interface

Author: rijnb

mapcodelib/internal_territory_names_en.h

@@ -21,6 +21,7 @@ extern "C" {
 #endif
 
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
+
 static const char *TERRITORY_FULL_NAME_EN[] = {
 #ifdef MAPCODE_SUPPORT_LANGUAGE_EN
         "Vatican|Holy See",

mapcodelib/internal_territory_names_hi.h

@@ -23,6 +23,7 @@ extern "C" {
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 
 static const char *TERRITORY_FULL_NAME_HI[] = {
+#ifdef MAPCODE_SUPPORT_LANGUAGE_HI
         /*     VAT */ "वेटिकन सिटी|पवित्र देखें",
         /*     MCO */ "मोनाको",
         /*     GIB */ "जिब्राल्टर",
@@ -556,6 +557,9 @@ static const char *TERRITORY_FULL_NAME_HI[] = {
         /*     CPT */ "क्लिपरटन द्वीप",
         /*     ATA */ "अंटार्कटिका",
         /*     AAA */ "अंतरराष्ट्रीय|अंतरराष्ट्रीय|पृथ्वी"
+#else // MAPCODE_SUPPORT_LANGUAGE_HI
+        NULL
+#endif // MAPCODE_SUPPORT_LANGUAGE_HI
 };
 
 #ifdef __cplusplus

mapcodelib/internal_territory_names_local.h

@@ -22,7 +22,6 @@ extern "C" {
 
 // *** GENERATED FILE (coords.cpp), DO NOT CHANGE OR PRETTIFY ***
 static const char *TERRITORY_FULL_NAME_LOCAL[] = {
-#ifdef MAPCODE_SUPPORT_LANGUAGE_LOCAL
         "Sancta Sedes|Holy See",
         "Monaco",
         "Gibraltar",
@@ -555,10 +554,7 @@ static const char *TERRITORY_FULL_NAME_LOCAL[] = {
         "United States Minor Outlying Islands|USMOI",
         "Île de Clipperton|Isla de la Pasión",
         "Antarctica",
-        "Earth",
-#else // MAPCODE_SUPPORT_LANGUAGE_LOCAL
-        NULL
-#endif // MAPCODE_SUPPORT_LANGUAGE_LOCAL
+        "Earth"
 };
 
 #ifdef __cplusplus

mapcodelib/mapcode_legacy.c

@@ -18,8 +18,7 @@
 #include <stdio.h>
 
 #include "mapcode_legacy.h"
-#include "mapcoder.h"
-#include "internal_alphabet_recognizer.h"
+
 
 /**
  * Include global legacy buffers. These are not thread-safe!

mapcodelib/mapcode_legacy.h

@@ -50,6 +50,11 @@ extern "C" {
 
 #define COMPARE_MAPCODE_MISSING_CHARACTERS      ERR_MAPCODE_INCOMPLETE
 
+#define MAX_PROPER_MAPCODE_LEN                  MAX_PROPER_MAPCODE_ASCII_LEN
+#define MAX_ISOCODE_LEN                         MAX_ISOCODE_ASCII_LEN
+#define MAX_CLEAN_MAPCODE_LEN                   MAX_CLEAN_MAPCODE_ASCII_LEN
+#define MAX_MAPCODE_RESULT_LEN                  MAX_MAPCODE_RESULT_ASCII_LEN
+
 #define MAX_LANGUAGES                           _ALPHABET_MAX
 #define MAPCODE_LANGUAGE_ROMAN                  ALPHABET_ROMAN
 #define MAPCODE_LANGUAGE_GREEK                  ALPHABET_GREEK