Changed return type of encode() to list of tuples.

Author: erikbos

README.md

@@ -119,15 +119,16 @@ a territory code can be provide to encode for just that territory.
 
 ```python
 print mapcode.encode(52.376514, 4.908542)
-[['49.4V', 'NLD'], ['G9.VWG', 'NLD'], ['DL6.H9L', 'NLD'], ['P25Z.N3Z', 'NLD'], ['VHXGB.1J9J', 'AAA']]
+[('49.4V', 'NLD'), ('G9.VWG', 'NLD'), ('DL6.H9L', 'NLD'), ('P25Z.N3Z', 'NLD'), ('VHXGB.1J9J', 'AAA')]
 ```
 
 A territory code can be provide to encode for just that territory.
 
 ```python
 print mapcode.encode(52.376514, 4.908542, 'NLD')
+[('49.4V', 'NLD'), ('G9.VWG', 'NLD'), ('DL6.H9L', 'NLD'), ('P25Z.N3Z', 'NLD')]
 print mapcode.encode(39.609999,45.949999, 'AZE')
-[['XLT.HWB', 'AZE'], ['2Z.05XL', 'AZE'], ['6N49.HHV', 'AZE']]
+[('XLT.HWB', 'AZE'), ('2Z.05XL', 'AZE'), ('6N49.HHV', 'AZE')]
 ```
 
 ## Decoding

examples/test geocoder.py

@@ -45,8 +45,8 @@ def read_boundary_file(filename, debug=False):
             #     print header_line.strip()
 
             # Do geocode ourself, change format to match fileformat, store in set
-            mapcodes = mapcode.encode(float(lat), float(lon), None)
-            mapcodes_geocoded = set(m_country + ' ' + m_code for m_code, m_country in zip(mapcodes[::2], mapcodes[1::2]))
+            mapcodes = mapcode.encode(float(lat), float(lon))
+            mapcodes_geocoded = set(m_territory + ' ' + m_code for m_code, m_territory in mapcodes)
 
             if mapcodes_in_file != mapcodes_geocoded:
                 print "Geocodes did not match!", header_line, mapcodes_in_file, mapcodes_geocoded

mapcodemodule.c

@@ -32,7 +32,7 @@ static PyObject *version(PyObject *self, PyObject *args)
 static char isvalid_doc[] = 
  "isvalid()\n\
 \n\
-Verify if the provided string has the right mapcode syntax.\n";
+Verify if the provided mapcode has the right syntax.\n";
 
 static PyObject *isvalid(PyObject *self, PyObject *args)
 {
@@ -111,12 +111,11 @@ static PyObject *encode(PyObject *self, PyObject *args)
 
     char *mapcode_results[MAX_NR_OF_MAPCODE_RESULTS];
     int n = encodeLatLonToMapcodes(mapcode_results, latitude, longitude, territorycode, extra_digits);
-//    printf("encode: count %d\n", n);
     if (n > 0) {
         result = PyList_New(n);
         while (n--) {
             // printf("debug: %d: %s - %s\n", n, mapcode_results[n * 2], mapcode_results[(n * 2) + 1]);
-            PyList_SetItem(result, n, Py_BuildValue("[ss]", (mapcode_results[n * 2]), mapcode_results[(n * 2) + 1]));            
+            PyList_SetItem(result, n, Py_BuildValue("(ss)", (mapcode_results[n * 2]), mapcode_results[(n * 2) + 1]));            
         }
         return result;
     }