gazetteer: recognise fallback flag on postcodes

Author: lonvia

gazetteer-style.cpp

@@ -269,6 +269,7 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
     bool address_point = false;
     bool interpolation = false;
     bool admin_boundary = false;
+    bool postcode_fallback = false;
 
     for (auto const &item : o.tags()) {
         char const *k = item.key();
@@ -346,6 +347,9 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
 
         if ((flag & SF_POSTCODE) && !postcode) {
             postcode = v;
+            if (flag & SF_MAIN_FALLBACK) {
+                postcode_fallback = true;
+            }
         }
 
         if ((flag & SF_COUNTRY) && !country && std::strlen(v) == 2) {
@@ -377,7 +381,7 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
     }
     if (address_point) {
         m_main.emplace_back("place", "house", SF_MAIN | SF_MAIN_FALLBACK);
-    } else if (postcode) {
+    } else if (postcode_fallback && postcode) {
         m_main.emplace_back("place", "postcode", SF_MAIN | SF_MAIN_FALLBACK);
     }
 }

tests/regression-test.py

@@ -32,18 +32,18 @@
     ( 11, 'Absence of way table', 'SELECT count(*) FROM pg_tables WHERE tablename = \'planet_osm_ways\'', 0),
     ( 12, 'Absence of rel line', 'SELECT count(*) FROM pg_tables WHERE tablename = \'planet_osm_rels\'', 0),
     ( 13, 'Basic polygon area', 'SELECT round(sum(cast(ST_Area(way) as numeric)),0) FROM planet_osm_polygon;', 1247245186),
-    ( 14, 'Gazetteer place count', 'SELECT count(*) FROM place', 2836),
+    ( 14, 'Gazetteer place count', 'SELECT count(*) FROM place', 2826),
     ( 15, 'Gazetteer place node count', 'SELECT count(*) FROM place WHERE osm_type = \'N\'', 759),
-    ( 16, 'Gazetteer place way count', 'SELECT count(*) FROM place WHERE osm_type = \'W\'', 2059),
+    ( 16, 'Gazetteer place way count', 'SELECT count(*) FROM place WHERE osm_type = \'W\'', 2049),
     ( 17, 'Gazetteer place rel count', 'SELECT count(*) FROM place WHERE osm_type = \'R\'', 18),
-    ( 18, 'Gazetteer post-diff place count', 'SELECT count(*) FROM place', 2877),
+    ( 18, 'Gazetteer post-diff place count', 'SELECT count(*) FROM place', 2867),
     ( 19, 'Gazetteer post-diff place node count', 'SELECT count(*) FROM place WHERE osm_type = \'N\'', 764),
-    ( 20, 'Gazetteer post-diff place way count', 'SELECT count(*) FROM place WHERE osm_type = \'W\'', 2095),
+    ( 20, 'Gazetteer post-diff place way count', 'SELECT count(*) FROM place WHERE osm_type = \'W\'', 2085),
     ( 21, 'Gazetteer post-diff place rel count', 'SELECT count(*) FROM place WHERE osm_type = \'R\'', 18),
     ( 22, 'Gazetteer housenumber count', "SELECT count(*) FROM place WHERE address ? 'housenumber'", 199),
     ( 23, 'Gazetteer post-diff housenumber count count', "SELECT count(*) FROM place WHERE address ? 'housenumber'", 199),
-    ( 24, 'Gazetteer address count', 'SELECT count(*) FROM place WHERE address is not null', 319),
-    ( 25, 'Gazetteer post-diff address count', 'SELECT count(*) FROM place WHERE address is not null', 319),
+    ( 24, 'Gazetteer address count', 'SELECT count(*) FROM place WHERE address is not null', 309),
+    ( 25, 'Gazetteer post-diff address count', 'SELECT count(*) FROM place WHERE address is not null', 309),
     ( 26, 'removed', 'really', 0),
     ( 27, 'Multipolygon basic case (Tags from relation)',
       'SELECT round(ST_Area(way)) FROM planet_osm_polygon WHERE osm_id = -1 and landuse = \'residential\' and name = \'Name_rel\'', 12895),