Merge pull request #1255 from joto/check-for-style-option

lonvia · web-flow · commit 79cd536ff610 · 2020-07-24T22:10:28.000+02:00
Check that -S/--style option is used for flex/gazetteer backends
diff --git a/src/options.cpp b/src/options.cpp
@@ -658,4 +658,11 @@ void options_t::check_options()
         fprintf(stderr, "WARNING: maximum zoom level for tile expiry is too "
                         "large and has been set to 31.\n\n");
     }
+
+    if (output_backend == "flex" || output_backend == "gazetteer") {
+        if (style == DEFAULT_STYLE) {
+            throw std::runtime_error{
+                "You have to set the config file with the -S|--style option."};
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -658,4 +658,11 @@ void options_t::check_options()`
`658`	`658`	`fprintf(stderr, "WARNING: maximum zoom level for tile expiry is too "`
`659`	`659`	`"large and has been set to 31.\n\n");`
`660`	`660`	`}`
	`661`	`+`
	`662`	`+ if (output_backend == "flex" \|\| output_backend == "gazetteer") {`
	`663`	`+ if (style == DEFAULT_STYLE) {`
	`664`	`+ throw std::runtime_error{`
	`665`	`+ "You have to set the config file with the -S\|--style option."};`
	`666`	`+ }`
	`667`	`+ }`
`661`	`668`	`}`