Merge pull request #934 from lonvia/gazeteer-unnamed-downgrade

gazetteer: handle updates of unnamed places

Author: lonvia

gazetteer-style.cpp

@@ -51,7 +51,15 @@ void gazetteer_style_t::clear()
 bool gazetteer_style_t::has_place(std::string const &cls) const
 {
     return std::any_of(m_main.begin(), m_main.end(), [&](pmaintag_t const &e) {
-        return strcmp(std::get<0>(e), cls.c_str()) == 0;
+        if (strcmp(std::get<0>(e), cls.c_str()) == 0) {
+            if (std::get<2>(e) & SF_MAIN_NAMED)
+                return !m_names.empty();
+            // XXX should handle SF_MAIN_NAMED_KEY as well
+
+            return true;
+        }
+
+        return false;
     });
 }
 
@@ -381,7 +389,7 @@ void gazetteer_style_t::process_tags(osmium::OSMObject const &o)
     }
 }
 
-void gazetteer_style_t::copy_out(osmium::OSMObject const &o,
+bool gazetteer_style_t::copy_out(osmium::OSMObject const &o,
                                  std::string const &geom, db_copy_mgr_t &buffer)
 {
     bool any = false;
@@ -391,14 +399,17 @@ void gazetteer_style_t::copy_out(osmium::OSMObject const &o,
         }
     }
 
-    if (!any) {
-        for (auto const &main : m_main) {
-            if ((std::get<2>(main) & SF_MAIN_FALLBACK) &&
-                copy_out_maintag(main, o, geom, buffer)) {
-                break;
-            }
+    if (any)
+        return true;
+
+    for (auto const &main : m_main) {
+        if ((std::get<2>(main) & SF_MAIN_FALLBACK) &&
+            copy_out_maintag(main, o, geom, buffer)) {
+            return true;
         }
     }
+
+    return false;
 }
 
 bool gazetteer_style_t::copy_out_maintag(pmaintag_t const &tag,

gazetteer-style.hpp

@@ -61,7 +61,7 @@ class gazetteer_style_t
 public:
     void load_style(std::string const &filename);
     void process_tags(osmium::OSMObject const &o);
-    void copy_out(osmium::OSMObject const &o, std::string const &geom,
+    bool copy_out(osmium::OSMObject const &o, std::string const &geom,
                   db_copy_mgr_t &buffer);
     bool has_place(std::string const &cls) const;
 

output-gazetteer.cpp

@@ -146,7 +146,8 @@ int output_gazetteer_t::process_node(osmium::Node const &node)
     /* Are we interested in this item? */
     if (m_style.has_data()) {
         auto wkb = m_builder.get_wkb_node(node.location());
-        m_style.copy_out(node, wkb, m_copy);
+        if (!m_style.copy_out(node, wkb, m_copy))
+            delete_unused_full("N", node.id());
     }
 
     return 0;
@@ -178,7 +179,8 @@ int output_gazetteer_t::process_way(osmium::Way *way)
             geom = wkbs[0];
         }
 
-        m_style.copy_out(*way, geom, m_copy);
+        if (!m_style.copy_out(*way, geom, m_copy))
+            delete_unused_full("W", way->id());
     }
 
     return 0;
@@ -229,7 +231,8 @@ int output_gazetteer_t::process_relation(osmium::Relation const &rel)
                      : m_builder.get_wkb_multipolygon(rel, osmium_buffer);
 
     if (!geoms.empty()) {
-        m_style.copy_out(rel, geoms[0], m_copy);
+        if (!m_style.copy_out(rel, geoms[0], m_copy))
+            delete_unused_full("R", rel.id());
     }
 
     return 0;