also add option --no-untagged-areas for completeness

ad-freiburg · Nov 26, 2024 · 19e6a3b · 19e6a3b
1 parent c9a59e8
commit 19e6a3b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/include/osm2rdf/config/Constants.h b/include/osm2rdf/config/Constants.h
@@ -199,6 +199,14 @@ const static inline std::string NO_UNTAGGED_RELATIONS_OPTION_LONG =
 const static inline std::string NO_UNTAGGED_RELATIONS_OPTION_HELP =
     "Do not output untagged relations";
 
+const static inline std::string NO_UNTAGGED_AREAS_INFO =
+    "Do not output untagged areas";
+const static inline std::string NO_UNTAGGED_AREAS_OPTION_SHORT = "";
+const static inline std::string NO_UNTAGGED_AREAS_OPTION_LONG =
+    "no-untagged-areas";
+const static inline std::string NO_UNTAGGED_AREAS_OPTION_HELP =
+    "Do not output untagged areas";
+
 const static inline std::string ADD_AREA_WAY_LINESTRINGS_INFO =
     "Adding linestrings for ways which form areas";
 const static inline std::string ADD_AREA_WAY_LINESTRINGS_OPTION_SHORT = "";

diff --git a/src/config/Config.cpp b/src/config/Config.cpp
@@ -99,6 +99,10 @@ std::string osm2rdf::config::Config::getInfo(std::string_view prefix) const {
       oss << "\n"
           << prefix << osm2rdf::config::constants::NO_UNTAGGED_RELATIONS_INFO;
     }
+    if (!addUntaggedAreas) {
+      oss << "\n"
+          << prefix << osm2rdf::config::constants::NO_UNTAGGED_AREAS_INFO;
+    }
     if (simplifyWKT > 0) {
       oss << "\n" << prefix << osm2rdf::config::constants::SIMPLIFY_WKT_INFO;
       oss << "\n"
@@ -294,6 +298,12 @@ void osm2rdf::config::Config::fromArgs(int argc, char** argv) {
           osm2rdf::config::constants::NO_UNTAGGED_RELATIONS_OPTION_LONG,
           osm2rdf::config::constants::NO_UNTAGGED_RELATIONS_OPTION_HELP);
 
+  auto noUntaggedAreasOp =
+      parser.add<popl::Switch, popl::Attribute::expert>(
+          osm2rdf::config::constants::NO_UNTAGGED_AREAS_OPTION_SHORT,
+          osm2rdf::config::constants::NO_UNTAGGED_AREAS_OPTION_LONG,
+          osm2rdf::config::constants::NO_UNTAGGED_AREAS_OPTION_HELP);
+
   auto addWayMetadataOp = parser.add<popl::Switch>(
       osm2rdf::config::constants::ADD_WAY_METADATA_OPTION_SHORT,
       osm2rdf::config::constants::ADD_WAY_METADATA_OPTION_LONG,
@@ -475,6 +485,7 @@ void osm2rdf::config::Config::fromArgs(int argc, char** argv) {
     addUntaggedNodes = !noUntaggedNodesOp->is_set();
     addUntaggedWays = !noUntaggedWaysOp->is_set();
     addUntaggedRelations = !noUntaggedRelationsOp->is_set();
+    addUntaggedAreas = !noUntaggedAreasOp->is_set();
 
     addWayNodeOrder |= addWayNodeSpatialMetadata;