diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2015-07-10 09:51:50 -0700 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2015-07-10 09:51:50 -0700 |
commit | bda482a30a7ee526cb381bb3583f87fe86b7845f (patch) | |
tree | 985b9adfa376f605e0bb03421c83107414733763 /taxonomy.h | |
parent | a0f88e4c9fe5a7881dffb15d8ec4878a81d563b1 (diff) | |
download | subsurface-bda482a30a7ee526cb381bb3583f87fe86b7845f.tar.gz |
Geo taxonomy: add higher level notion of city
This renames the local name for the location as town and adds the concept
of a city as the level 3 admin category. In some regions (e.g. at times in
Italy) the local hamlet name is shown as toponymName but the name of the
actual city is given as adminName3.
With this change "city" will always reflect our best guess: adminName3 if
it exists, otherwise the toponymName. Whereas "town" is always the
toponymName.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'taxonomy.h')
-rw-r--r-- | taxonomy.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/taxonomy.h b/taxonomy.h index b6a062a08..9831cfe19 100644 --- a/taxonomy.h +++ b/taxonomy.h @@ -12,6 +12,7 @@ enum taxonomy_category { TC_ADMIN_L1, TC_ADMIN_L2, TC_LOCALNAME, + TC_ADMIN_L3, TC_NR_CATEGORIES }; @@ -21,7 +22,7 @@ extern char *taxonomy_api_names[TC_NR_CATEGORIES]; struct taxonomy { int category; /* the category for this tag: ocean, country, admin_l1, admin_l2, localname, etc */ const char *value; /* the value returned, parsed, or manually entered for that category */ - enum { GEOCODED, PARSED, MANUAL } origin; + enum { GEOCODED, PARSED, MANUAL, COPIED } origin; }; /* the data block contains 3 taxonomy structures - unused ones have a tag value of NONE */ |