Handle: place=locality

diff --git a/src/osm.c b/src/osm.c
index 66a16bd926bb5af35f94727b7dd46f57007c1e48..1a5f6bea760d1e07d53fbf1bcf0b2acfba11f663 100644 (file)
--- a/src/osm.c
+++ b/src/osm.c
@@ -288,6 +288,7 @@ struct _nodeinfo {
        { "place", "town",                      NODE_PLACE_TOWN },
        { "place", "village",           NODE_PLACE_VILLAGE },
        { "place", "hamlet",            NODE_PLACE_HAMLET },
+       { "place", "locality",          NODE_PLACE_LOCALITY },
        { "place", "suburb",            NODE_PLACE_SUBURB },
        { "place", "island",            NODE_PLACE_ISLAND },
 
@@ -1081,6 +1082,7 @@ while (*place!=NULL) {
                        return t->id;
        break;
        case NODE_PLACE_SUBURB:
+       case NODE_PLACE_LOCALITY:
                t=g_hash_table_lookup(osm_place_city, ps);
                if (t)
                        return t->id;
@@ -1125,6 +1127,7 @@ switch (nt) {
        case NODE_PLACE_TOWN:
        case NODE_PLACE_VILLAGE:
        case NODE_PLACE_HAMLET:
+       case NODE_PLACE_LOCALITY:
                t=g_hash_table_lookup(osm_place_city, ps);
                if (t)
                        return t->id;
@@ -1493,6 +1496,7 @@ switch (t) {
                                break;
                                case NODE_PLACE_VILLAGE:
                                case NODE_PLACE_HAMLET:
+                               case NODE_PLACE_LOCALITY:
                                        g_hash_table_insert(osm_place_village, cnode->data->name, cnode);
                                break;
                                case NODE_PLACE_ISLAND:

diff --git a/src/osm.h b/src/osm.h
index 84cb1f1fcee9b7979d28f58796b65bde12f9484d..c416ad9bc4aa7cace7eb064c445fa4ce0ac36720 100644 (file)
--- a/src/osm.h
+++ b/src/osm.h
@@ -133,7 +133,8 @@ typedef enum {
        NODE_POI_END=999,
        /* Places */
        NODE_PLACE_START=1000,
-       NODE_PLACE_SUBURB=1001,
+       NODE_PLACE_SUBURB=1001, /* http://wiki.openstreetmap.org/index.php/Proposed_features/Suburb */
+       NODE_PLACE_LOCALITY=1002, /* http://wiki.openstreetmap.org/index.php/Proposed_features/Locality */
        NODE_PLACE_HAMLET=1049,
        NODE_PLACE_VILLAGE=1050,
        NODE_PLACE_ISLAND=1051,