Add country if it is needed and is missing in hierarchy

Author: rinigus

importer/src/config.h

@@ -1,6 +1,8 @@
 #ifndef GEOCODER_CONFIG_H
 #define GEOCODER_CONFIG_H
 
+#include <cstdint>
+
 #define TEMPORARY "TEMPORARY" // set to empty if need to debug import
 
 /// if there are more expansions that specified, this object will be dropped from normalization
@@ -14,7 +16,7 @@
 
 #define GEOCODER_IMPORTER_POSTGRES "GEOCODER_IMPORTER_POSTGRES"
 
-typedef unsigned long hindex;
+typedef uint64_t hindex;
 typedef long long int sqlid; /// type used by IDs in SQLite
 
-#endif
+#endif

importer/src/hierarchy.cpp

@@ -79,7 +79,13 @@ void Hierarchy::cleanup()
 void Hierarchy::set_country(const std::string &country, hindex id)
 {
   if (!m_items.count(id))
-    std::cout << "Missing country in the database: " << country << "\n";
+    {
+      std::cout << "Missing country in the database: " << country << " / " << id << "\n";
+      for (auto item : root_items())
+	if (item->country() == country)
+	  item->print_branch(0);
+    }
+
 
   auto parent = m_items[id];
   for (auto root_iter = m_root.begin(); root_iter != m_root.end(); ++root_iter)
@@ -91,7 +97,7 @@ void Hierarchy::set_country(const std::string &country, hindex id)
             parent->add_child(item);
             remove.insert(item);
           }
-      std::cout << "Relocated to country: " << remove.size() << "\n";
+      std::cout << "Relocated to country: " << country << " - " << remove.size() << "\n";
       for (auto item : remove)
         root_iter->second.erase(item);
     }
@@ -150,6 +156,11 @@ std::set<std::string> Hierarchy::get_root_countries() const
   return missing;
 }
 
+bool Hierarchy::has_item(hindex id) const
+{
+  return m_items.count(id);
+}
+
 void Hierarchy::print(bool full) const
 {
   std::set<hindex> root_ids;

importer/src/hierarchy.h

@@ -27,6 +27,7 @@ class Hierarchy
 
   size_t get_missing_count() const { return m_root.size(); }
   size_t get_root_count() const;
+  bool   has_item(hindex id) const;
 
   hindex                get_next_nonzero_root_parent() const;
   std::set<std::string> get_root_countries() const;
@@ -42,4 +43,4 @@ class Hierarchy
   std::deque<std::shared_ptr<HierarchyItem> >                  m_root_finalized;
 };
 
-#endif
+#endif

importer/src/hierarchyitem.cpp

@@ -21,6 +21,7 @@ HierarchyItem::HierarchyItem(const pqxx::row &row)
   m_postcode    = row["postcode"].as<std::string>("");
   m_latitude    = row["latitude"].as<float>(0);
   m_longitude   = row["longitude"].as<float>(0);
+  m_osm_id      = row["osm_id"].as<uint64_t>(0);
 
   m_data_name  = parse_to_map(row["name"].as<std::string>(""));
   m_data_extra = parse_to_map(row["extra"].as<std::string>(""));
@@ -272,8 +273,8 @@ void HierarchyItem::print_branch(unsigned int offset) const
     std::cout << "house " << m_housenumber << " ";
   for (const auto &i : m_data_name)
     std::cout << i.first << ": " << i.second << " ";
-  std::cout << "(" << m_my_index << " " << m_last_child_index - m_my_index << ": " << m_parent_id
-            << ", " << m_country << ")\n";
+  std::cout << "(" << m_my_index << " " << m_last_child_index << ": " << m_last_child_index - m_my_index << ": " << m_parent_id
+            << ", " << m_country <<", osmid=" << m_osm_id << ")\n";
   if (m_children.size())
     std::cout << std::string(offset + 2, ' ') << "|\n";
   for (auto c : m_children)

importer/src/hierarchyitem.h

@@ -52,6 +52,7 @@ class HierarchyItem
   std::string m_type;
   float       m_latitude;
   float       m_longitude;
+  uint64_t    m_osm_id;
   std::string m_country;
   std::string m_postcode;
   std::string m_housenumber;
@@ -67,4 +68,4 @@ class HierarchyItem
   static std::set<std::string> s_skip_types;
 };
 
-#endif
+#endif