persistent cache: move try-catch further out

Catch not-found exceptions further out when looping over nodes. Allows the compiler to optimize the code better.
osm2pgsql-dev · Jan 7, 2017 · a940c98 · a940c98
1 parent 8bbef6a
commit a940c98
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/node-persistent-cache.cpp b/node-persistent-cache.cpp
@@ -33,14 +33,18 @@ size_t node_persistent_cache::get_list(nodelist_t &out,
     out.reserve(nds.size());
 
     for (auto const &n : nds) {
-        /* Check cache first */
-        auto loc = m_ram_cache->get(n.ref());
-        if (!loc.valid()) {
-            loc = get(n.ref());
-        }
-        if (loc.valid()) {
-            auto coord = proj->reproject(loc);
-            out.emplace_back(coord.x, coord.y);
+        try {
+            /* Check cache first */
+            auto loc = m_ram_cache->get(n.ref());
+            if (!loc.valid() && n.ref() >= 0) {
+                loc = m_index->get(
+                    static_cast<osmium::unsigned_object_id_type>(n.ref()));
+            }
+            if (loc.valid()) {
+                auto coord = proj->reproject(loc);
+                out.emplace_back(coord.x, coord.y);
+            }
+        } catch (osmium::not_found const &) {
         }
     }