Merge pull request #1724 from joto/middle-get-node-location

Add get_node_location() function to middle

Author: lonvia

src/middle-pgsql.cpp

@@ -345,6 +345,38 @@ std::size_t middle_query_pgsql_t::get_way_node_locations_flatnodes(
     return count;
 }
 
+osmium::Location middle_query_pgsql_t::get_node_location_db(osmid_t id) const
+{
+    auto const res =
+        m_sql_conn.exec_prepared("get_node_list", "{{{}}}"_format(id));
+    if (res.num_tuples() == 0) {
+        return osmium::Location{};
+    }
+
+    return osmium::Location{(int)strtol(res.get_value(0, 1), nullptr, 10),
+                            (int)strtol(res.get_value(0, 2), nullptr, 10)};
+}
+
+osmium::Location
+middle_query_pgsql_t::get_node_location_flatnodes(osmid_t id) const
+{
+    if (id >= 0) {
+        return m_persistent_cache->get(id);
+    }
+    return osmium::Location{};
+}
+
+osmium::Location middle_query_pgsql_t::get_node_location(osmid_t id) const
+{
+    auto const loc = m_cache->get(id);
+    if (loc.valid()) {
+        return loc;
+    }
+
+    return m_persistent_cache ? get_node_location_flatnodes(id)
+                              : get_node_location_db(id);
+}
+
 size_t middle_query_pgsql_t::nodes_get_list(osmium::WayNodeList *nodes) const
 {
     return m_persistent_cache ? get_way_node_locations_flatnodes(nodes)

src/middle-pgsql.hpp

@@ -37,6 +37,8 @@ class middle_query_pgsql_t : public middle_query_t
         std::string const &conninfo, std::shared_ptr<node_locations_t> cache,
         std::shared_ptr<node_persistent_cache> persistent_cache);
 
+    osmium::Location get_node_location(osmid_t id) const override;
+
     size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
 
     bool way_get(osmid_t id, osmium::memory::Buffer *buffer) const override;
@@ -51,6 +53,8 @@ class middle_query_pgsql_t : public middle_query_t
     void exec_sql(std::string const &sql_cmd) const;
 
 private:
+    osmium::Location get_node_location_flatnodes(osmid_t id) const;
+    osmium::Location get_node_location_db(osmid_t id) const;
     std::size_t get_way_node_locations_flatnodes(osmium::WayNodeList *nodes) const;
     std::size_t get_way_node_locations_db(osmium::WayNodeList *nodes) const;
 

src/middle-ram.cpp

@@ -184,6 +184,11 @@ void middle_ram_t::relation(osmium::Relation const &relation)
     }
 }
 
+osmium::Location middle_ram_t::get_node_location(osmid_t id) const
+{
+    return m_node_locations.get(id);
+}
+
 std::size_t middle_ram_t::nodes_get_list(osmium::WayNodeList *nodes) const
 {
     assert(nodes);

src/middle-ram.hpp

@@ -54,6 +54,8 @@ class middle_ram_t : public middle_t, public middle_query_t
     void way(osmium::Way const &way) override;
     void relation(osmium::Relation const &) override;
 
+    osmium::Location get_node_location(osmid_t id) const override;
+
     std::size_t nodes_get_list(osmium::WayNodeList *nodes) const override;
 
     bool way_get(osmid_t id, osmium::memory::Buffer *buffer) const override;

src/middle.hpp

@@ -28,6 +28,11 @@ struct middle_query_t : std::enable_shared_from_this<middle_query_t>
 {
     virtual ~middle_query_t() = 0;
 
+    /**
+     * Retrieves node location for the given id.
+     */
+    virtual osmium::Location get_node_location(osmid_t id) const = 0;
+
     /**
      * Retrieves node locations for the given node list.
      *

tests/test-middle.cpp

@@ -28,10 +28,10 @@ static testing::pg::tempdb_t db;
 
 namespace {
 
-void expect_location(osmium::Location loc, osmium::Node const &expected)
+void check_locations_are_equal(osmium::Location a, osmium::Location b)
 {
-    CHECK(loc.lat() == Approx(expected.location().lat()));
-    CHECK(loc.lon() == Approx(expected.location().lon()));
+    CHECK(a.lat() == Approx(b.lat()));
+    CHECK(a.lon() == Approx(b.lon()));
 }
 
 } // namespace
@@ -136,11 +136,18 @@ TEMPLATE_TEST_CASE("middle import", "", options_slim_default,
 
         // get it back
         REQUIRE(mid_q->nodes_get_list(&nodes) == nodes.size());
-        expect_location(nodes[0].location(), node);
+        check_locations_are_equal(nodes[0].location(), node.location());
 
         // other nodes are not retrievable
         auto &n2 = buffer.add_way("w3 Nn1,n2,n1235").nodes();
         REQUIRE(mid_q->nodes_get_list(&n2) == 0);
+
+        // check the same thing again using get_node_location() function
+        check_locations_are_equal(mid_q->get_node_location(1234),
+                                  node.location());
+        CHECK_FALSE(mid_q->get_node_location(1).valid());
+        CHECK_FALSE(mid_q->get_node_location(2).valid());
+        CHECK_FALSE(mid_q->get_node_location(1235).valid());
     }
 
     SECTION("Set and retrieve a single way")