Merge pull request #2132 from joto/check-cmdline-options

Add more checks of command line options

Author: lonvia

src/command-line-parser.cpp

@@ -27,6 +27,7 @@
 #endif
 
 #include <algorithm>
+#include <array>
 #include <cstdio>
 #include <cstring>
 #include <stdexcept>
@@ -128,24 +129,65 @@ void print_version()
 #endif
 }
 
-static void check_options(options_t *options)
+static void check_options_non_slim(CLI::App const &app)
 {
-    if (options->append && options->create) {
-        throw std::runtime_error{"--append and --create options can not be "
-                                 "used at the same time!"};
+    std::array<std::string, 7> const slim_options = {
+        "--flat-nodes",
+        "--middle-database-format",
+        "--middle-schema",
+        "--middle-with-nodes",
+        "--middle-way-node-index-id-shift",
+        "--tablespace-slim-data",
+        "--tablespace-slim-index"};
+
+    for (auto const &opt : slim_options) {
+        if (app.count(opt) > 0) {
+            log_warn("Ignoring option {}. Can only be used in --slim mode.",
+                     app.get_option(opt)->get_name(false, true));
+        }
     }
+}
 
-    if (options->append && !options->slim) {
-        throw std::runtime_error{"--append can only be used with slim mode!"};
+static void check_options_output_flex(CLI::App const &app)
+{
+    auto const ignored_options = app.get_options([](CLI::Option const *option) {
+        return option->get_group() == "Pgsql output options" ||
+               option->get_name() == "--tablespace-main-data" ||
+               option->get_name() == "--tablespace-main-index";
+    });
+
+    for (auto const *opt : ignored_options) {
+        if (opt->count()) {
+            log_warn("Ignoring option {} for 'flex' output",
+                     opt->get_name(false, true));
+        }
     }
+}
 
-    if (options->droptemp && !options->slim) {
-        throw std::runtime_error{"--drop only makes sense with --slim."};
+static void check_options_output_null(CLI::App const &app)
+{
+    auto const ignored_options = app.get_options([](CLI::Option const *option) {
+        return option->get_group() == "Pgsql output options" ||
+               option->get_group() == "Expire options" ||
+               option->get_name() == "--style" ||
+               option->get_name() == "--disable-parallel-indexing" ||
+               option->get_name() == "--number-processes";
+    });
+
+    for (auto const *opt : ignored_options) {
+        if (opt->count()) {
+            log_warn("Ignoring option {} for 'null' output",
+                     opt->get_name(false, true));
+        }
     }
+}
 
-    if (options->append && options->middle_database_format != 1) {
-        throw std::runtime_error{
-            "Do not use --middle-database-format with --append."};
+static void check_options_output_pgsql(CLI::App const &app, options_t *options)
+{
+    if (app.count("--latlong") + app.count("--merc") + app.count("--proj") >
+        1) {
+        throw std::runtime_error{"You can only use one of --latlong, -l, "
+                                 "--merc, -m, --proj, and -E"};
     }
 
     if (options->hstore_mode == hstore_column::none &&
@@ -162,6 +204,27 @@ static void check_options(options_t *options)
                  "ignored.");
         options->enable_hstore_index = false;
     }
+}
+
+static void check_options(options_t *options)
+{
+    if (options->append && options->create) {
+        throw std::runtime_error{"--append and --create options can not be "
+                                 "used at the same time!"};
+    }
+
+    if (options->append && !options->slim) {
+        throw std::runtime_error{"--append can only be used with slim mode!"};
+    }
+
+    if (options->droptemp && !options->slim) {
+        throw std::runtime_error{"--drop only makes sense with --slim."};
+    }
+
+    if (options->append && options->middle_database_format != 1) {
+        throw std::runtime_error{
+            "Do not use --middle-database-format with --append."};
+    }
 
     if (options->cache < 0) {
         options->cache = 0;
@@ -178,12 +241,11 @@ static void check_options(options_t *options)
                      "processing a lot.");
         }
     }
+}
 
-    if (!options->slim && !options->flat_node_file.empty()) {
-        log_warn("Ignoring --flat-nodes/-F setting in non-slim mode");
-    }
-
-    // zoom level 31 is the technical limit because we use 32-bit integers for the x and y index of a tile ID
+static void check_options_expire(options_t *options) {
+    // Zoom level 31 is the technical limit because we use 32-bit integers for
+    // the x and y index of a tile ID.
     if (options->expire_tiles_zoom_min > 31) {
         options->expire_tiles_zoom_min = 31;
         log_warn("Minimum zoom level for tile expiry is too "
@@ -202,11 +264,6 @@ static void check_options(options_t *options)
                  "target SRS is not Mercator (EPSG:3857). Expire disabled!");
         options->expire_tiles_zoom = 0;
     }
-
-    if (options->output_backend == "gazetteer") {
-        log_warn(
-            "The 'gazetteer' output is deprecated and will soon be removed.");
-    }
 }
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
@@ -646,6 +703,22 @@ options_t parse_command_line(int argc, char *argv[])
         return options;
     }
 
+    if (!options.slim) {
+        check_options_non_slim(app);
+    }
+
+    if (options.output_backend == "flex") {
+        check_options_output_flex(app);
+    } else if (options.output_backend == "gazetteer") {
+        log_warn(
+            "The 'gazetteer' output is deprecated and will soon be removed.");
+    } else if (options.output_backend == "null") {
+        check_options_output_null(app);
+    } else if (options.output_backend == "pgsql" ||
+               options.output_backend.empty()) {
+        check_options_output_pgsql(app, &options);
+    }
+
     if (options.input_format == "auto") {
         options.input_format.clear();
     }
@@ -686,6 +759,8 @@ options_t parse_command_line(int argc, char *argv[])
         options.projection = reprojection::create_projection(PROJ_SPHERE_MERC);
     }
 
+    check_options_expire(&options);
+
     check_options(&options);
 
     options.connection_params = app.connection_params();