Separate reader for node/way/area and relation to fix missing relation geometries (ad-freiburg#129)

Adds separate readers for nwa (node/way/area) and relation to fix an issue where way member geometries may not have been seen at the time a relation arrives at the RelationHandler when using multiple threads.

Fixes ad-freiburg#128.

On the side, add hasCompleteGeometry true triples to relation areas for consistency (because the same triple is present for non-area relations) (fixes ad-freiburg#130), and fix a subtle issue with the area classification for ways. Because of this issue, untagged closed ways (of which there are few, if any, in OSM) had no geometry object. Fixes ad-freiburg#131, see there for details.

Author: patrickbr

include/osm2rdf/osm/OsmiumHandler.h

@@ -88,6 +88,8 @@ class OsmiumHandler : public osmium::handler::Handler {
   void handleBuffers(
       osmium::memory::Buffer& buffer,
       osmium::area::MultipolygonManager<osmium::area::Assembler>& mp_manager);
+  void handleRelBuffers(
+      osmium::memory::Buffer& buffer);
   void handleAreaBuffers(osmium::memory::Buffer& areaBuffer);
 };
 }  // namespace osm2rdf::osm

src/osm/FactHandler.cpp

@@ -161,6 +161,16 @@ void osm2rdf::osm::FactHandler<W>::area(const osm2rdf::osm::Area& area) {
   _writer->writeLiteralTripleUnsafe(
       subj, _areaIRI, ::util::formatFloat(area.geomArea(), AREA_PRECISION),
       _iriXSDDouble);
+
+  if (!area.fromWay()) {
+    // for areas from relations, always write hasCompleteGeometry true for
+    // consistency with non-area relations
+    _writer->writeTriple(
+        subj,
+        _writer->generateIRIUnsafe(NAMESPACE__OSM2RDF, "hasCompleteGeometry"),
+            osm2rdf::ttl::constants::LITERAL__TRUE
+            );
+  }
 }
 
 // ____________________________________________________________________________

src/osm/OsmiumHandler.cpp

@@ -138,7 +138,7 @@ void osm2rdf::osm::OsmiumHandler<W>::handle() {
       prepReader.close();
       _locationHandler->finalizeNodes();
 
-      osmium::io::Reader dumpReader{input_file, osmium::osm_entity_bits::object,
+      osmium::io::Reader dumpReader{input_file, osmium::osm_entity_bits::nwa,
                                     osmium::io::read_meta::yes};
 
 #pragma omp parallel
@@ -153,6 +153,21 @@ void osm2rdf::osm::OsmiumHandler<W>::handle() {
 
       dumpReader.close();
 
+      osmium::io::Reader relReader{input_file, osmium::osm_entity_bits::relation,
+                                    osmium::io::read_meta::yes};
+
+#pragma omp parallel
+      {
+#pragma omp single
+        {
+          while (auto buf = relReader.read()) {
+            handleRelBuffers(buf);
+          }
+        }
+      }
+
+      relReader.close();
+
       delete _locationHandler;
       _progressBar.done();
 
@@ -219,6 +234,17 @@ void osm2rdf::osm::OsmiumHandler<W>::handleBuffers(
                 }));
 }
 
+// ____________________________________________________________________________
+template <typename W>
+void osm2rdf::osm::OsmiumHandler<W>::handleRelBuffers(
+    osmium::memory::Buffer& buffer) {
+  // handlers which do not care about the order in which the
+  // elements are given to them
+  const auto buff = std::make_shared<osmium::memory::Buffer>(std::move(buffer));
+#pragma omp task
+  { osmium::apply(*buff, _relationHandler, *this); }
+}
+
 // ____________________________________________________________________________
 template <typename W>
 void osm2rdf::osm::OsmiumHandler<W>::handleAreaBuffers(

src/osm/Way.cpp

@@ -19,6 +19,8 @@
 
 #include "osm2rdf/osm/Way.h"
 
+#include <osmium/tags/taglist.hpp>
+#include <osmium/tags/tags_filter.hpp>
 #include <vector>
 
 #include "osm2rdf/osm/Box.h"
@@ -104,6 +106,13 @@ bool osm2rdf::osm::Way::isArea() const noexcept {
   if (!closed()) {
     return false;
   }
-  auto areaTag = _w->tags()["area"];
-  return areaTag == nullptr || strcmp(areaTag, "no") != 0;
+  if (_w->tags().has_tag("area", "no")) {
+    return false;
+  }
+
+  if (osmium::tags::match_none_of(_w->tags(), osmium::TagsFilter{true})) {
+    return false;
+  }
+
+  return true;
 }

tests/issues/Issue24.cpp

@@ -131,7 +131,8 @@ TEST(Issue24, areaFromRelationHasGeometryAsGeoSPARQL) {
       "osmrel:10 geo:hasGeometry osm2rdfgeom:osmrel_10 "
       ".\nosm2rdfgeom:osmrel_10 geo:asWKT \"POLYGON((48 7.5,48 "
       "7.6,48.1 7.6,48.1 7.5,48 7.5))\"^^geo:wktLiteral .\nosmrel:10 "
-      "osm2rdf:area \"122568687.4654\"^^xsd:double .\n",
+      "osm2rdf:area \"122568687.4654\"^^xsd:double .\nosmrel:10 "
+      "osm2rdf:hasCompleteGeometry \"true\"^^xsd:boolean .\n",
       buffer.str());
 
   // Cleanup

tests/osm/FactHandler.cpp

@@ -164,7 +164,7 @@ TEST(OSM_FactHandler, areaFromRelation) {
       "osm2rdfgeom:obb \"POLYGON((48.1 7.5,48.1 7.6,48 7.6,48 7.5,48.1 "
       "7.5))\"^^geo:wktLiteral .\nosmrel:10 osm2rdf:area "
       "\"122568687.4654\"^^xsd:double "
-      ".\n",
+      ".\nosmrel:10 osm2rdf:hasCompleteGeometry \"true\"^^xsd:boolean .\n",
       buffer.str());
 
   // Cleanup

tests/osm/Way.cpp

@@ -200,7 +200,7 @@ TEST(OSM_Way, isAreaFalseForOpenWay) {
 }
 
 // ____________________________________________________________________________
-TEST(OSM_Way, isAreaTrueForTriangle) {
+TEST(OSM_Way, isAreaFalseForTriangleWithoutTags) {
   // Create osmium object
   const size_t initial_buffer_size = 10000;
   osmium::memory::Buffer buffer{initial_buffer_size,
@@ -217,6 +217,28 @@ TEST(OSM_Way, isAreaTrueForTriangle) {
   osm2rdf::osm::Way w{buffer.get<osmium::Way>(0)};
   ASSERT_TRUE(w.closed());
 
+  ASSERT_FALSE(w.isArea());
+}
+
+// ____________________________________________________________________________
+TEST(OSM_Way, isAreaFTrueForTriangleWithTags) {
+  // Create osmium object
+  const size_t initial_buffer_size = 10000;
+  osmium::memory::Buffer buffer{initial_buffer_size,
+                                osmium::memory::Buffer::auto_grow::yes};
+  osmium::builder::add_way(buffer, osmium::builder::attr::_id(42),
+                           osmium::builder::attr::_nodes({
+                               {1, {48.0, 7.51}},
+                               {2, {48.0, 7.61}},
+                               {1, {48.1, 7.61}},
+                               {1, {48.0, 7.51}},
+                           }),
+                           osmium::builder::attr::_tag("some", "tag"));
+
+  // Create osm2rdf object from osmium object
+  const osm2rdf::osm::Way w{buffer.get<osmium::Way>(0)};
+  ASSERT_TRUE(w.closed());
+
   ASSERT_TRUE(w.isArea());
 }