do not output GEOMETRYCOLLECTION geometry for relations which are are…

…as (#65)
ad-freiburg · Jan 12, 2024 · 42eb3f4 · 42eb3f4
1 parent 13599c6
commit 42eb3f4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/include/osm2rdf/osm/Relation.h b/include/osm2rdf/osm/Relation.h
@@ -45,6 +45,7 @@ class Relation {
       const noexcept;
   [[nodiscard]] const osm2rdf::osm::TagList& tags() const noexcept;
   [[nodiscard]] bool hasCompleteGeometry() const noexcept;
+  [[nodiscard]] bool isArea() const noexcept;
 #if BOOST_VERSION >= 107800
   [[nodiscard]] bool hasGeometry() const noexcept;
   [[nodiscard]] const osm2rdf::geometry::Box& envelope() const noexcept;

diff --git a/src/osm/FactHandler.cpp b/src/osm/FactHandler.cpp
@@ -203,7 +203,7 @@ void osm2rdf::osm::FactHandler<W>::relation(
   }
 
 #if BOOST_VERSION >= 107800
-  if (relation.hasGeometry()) {
+  if (relation.hasGeometry() && !relation.isArea()) {
     if (!_config.hasGeometryAsWkt) {
       const std::string& geomObj = _writer->generateIRI(
           NAMESPACE__OSM2RDF_GEOM, "relation_" + std::to_string(relation.id()));

diff --git a/src/osm/Relation.cpp b/src/osm/Relation.cpp
@@ -56,6 +56,15 @@ const osm2rdf::osm::TagList& osm2rdf::osm::Relation::tags() const noexcept {
   return _tags;
 }
 
+// ____________________________________________________________________________
+bool osm2rdf::osm::Relation::isArea() const noexcept {
+  const auto& typeTag = _tags.find("type");
+  if (typeTag != _tags.end()) {
+    return typeTag->second == "multipolygon" || typeTag->second == "boundary";
+  }
+  return false;
+}
+
 // ____________________________________________________________________________
 const std::vector<osm2rdf::osm::RelationMember>&
 osm2rdf::osm::Relation::members() const noexcept {