diff --git a/src/geonames_fields.h b/src/geonames_fields.h index fb7e1331..52cc9711 100644 --- a/src/geonames_fields.h +++ b/src/geonames_fields.h @@ -5,22 +5,24 @@ enum geonames_fields { GEONAMES_BOUNDARY_TYPE=3, GEONAMES_HAS_WIKIPEDIA_ENTRY=4, GEONAMES_ISO_LANGUAGE=5, - GEONAMES_IS_PREFERRED_NAME=6, - GEONAMES_IS_SHORT_NAME=7, - GEONAMES_IS_COLLOQUIAL=8, - GEONAMES_IS_HISTORICAL=9, - GEONAMES_POPULATION=10, - GEONAMES_LATITUDE=11, - GEONAMES_LONGITUDE=12, - GEONAMES_FEATURE_CODE=13, - GEONAMES_COUNTRY_CODE=14, - GEONAMES_ADMIN1_CODE=15, - GEONAMES_ADMIN1_ID=16, - GEONAMES_ADMIN2_CODE=17, - GEONAMES_ADMIN2_ID=18, - GEONAMES_ADMIN3_CODE=19, - GEONAMES_ADMIN3_ID=20, - GEONAMES_ADMIN4_CODE=21, - GEONAMES_ADMIN4_ID=22, + GEONAMES_LANGUAGE_PRIORITY=6, + GEONAMES_IS_PREFERRED_NAME=7, + GEONAMES_IS_SHORT_NAME=8, + GEONAMES_IS_COLLOQUIAL=9, + GEONAMES_IS_HISTORICAL=10, + GEONAMES_POPULATION=11, + GEONAMES_LATITUDE=12, + GEONAMES_LONGITUDE=13, + GEONAMES_FEATURE_CODE=14, + GEONAMES_COUNTRY_CODE=15, + GEONAMES_COUNTRY_ID=16, + GEONAMES_ADMIN1_CODE=17, + GEONAMES_ADMIN1_ID=18, + GEONAMES_ADMIN2_CODE=19, + GEONAMES_ADMIN2_ID=20, + GEONAMES_ADMIN3_CODE=21, + GEONAMES_ADMIN3_ID=22, + GEONAMES_ADMIN4_CODE=23, + GEONAMES_ADMIN4_ID=24, NUM_GEONAMES_FIELDS }; diff --git a/src/postal_fields.h b/src/postal_fields.h index 32e15a88..f86a4714 100644 --- a/src/postal_fields.h +++ b/src/postal_fields.h @@ -1,9 +1,11 @@ enum gn_postal_fields { GN_POSTAL_CODE=0, GN_POSTAL_COUNTRY_CODE=1, - GN_POSTAL_CONTAINING_GEONAME_ID=2, - GN_POSTAL_ADMIN1_IDS=3, - GN_POSTAL_ADMIN2_IDS=4, - GN_POSTAL_ADMIN3_IDS=5, + GN_POSTAL_COUNTRY_GEONAMES_ID=2, + GN_POSTAL_COUNTRY_POPULATION=3, + GN_POSTAL_CONTAINING_GEONAME_ID=4, + GN_POSTAL_ADMIN1_IDS=5, + GN_POSTAL_ADMIN2_IDS=6, + GN_POSTAL_ADMIN3_IDS=7, NUM_POSTAL_FIELDS };