Skip to content

Commit 6c949b0

Browse files
jotojoto
committed
Remove gazetteer output and --with-forward-dependencies option
1 parent c7578ac commit 6c949b0

24 files changed

Lines changed: 17 additions & 2414 deletions

‎man/osm2pgsql.1‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,12 @@ too.
224224
.TP
225225
-O, --output=OUTPUT
226226
Specifies the output to use.
227-
Currently osm2pgsql supports \f[B]pgsql\f[R], \f[B]flex\f[R],
228-
\f[B]gazetteer\f[R] and \f[B]null\f[R].
227+
Currently osm2pgsql supports \f[B]pgsql\f[R], \f[B]flex\f[R], and
228+
\f[B]null\f[R].
229229
\f[B]pgsql\f[R] is the default output still available for backwards
230230
compatibility.
231231
New setups should use the \f[B]flex\f[R] output which allows for a much
232232
more flexible configuration.
233-
The \f[B]gazetteer\f[R] output is intended for geocoding with Nominatim
234-
only.
235233
The \f[B]null\f[R] output does not write anything and is only useful for
236234
testing or with \f[B]--slim\f[R] for creating slim tables.
237235
.TP
@@ -346,11 +344,6 @@ index after the other.
346344
.TP
347345
--number-processes=THREADS
348346
Specifies the number of parallel threads used for certain operations.
349-
.TP
350-
--with-forward-dependencies=BOOL
351-
Propagate changes from nodes to ways and node/way members to relations
352-
(Default: \f[V]true\f[R]).
353-
This option is deprecated.
354347
.SH SEE ALSO
355348
.IP \[bu] 2
356349
osm2pgsql website (https://osm2pgsql.org)

‎man/osm2pgsql.md‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,12 +195,11 @@ mandatory for short options too.
195195

196196
-O, \--output=OUTPUT
197197
: Specifies the output to use. Currently osm2pgsql supports **pgsql**,
198-
**flex**, **gazetteer** and **null**. **pgsql** is
199-
the default output still available for backwards compatibility. New
200-
setups should use the **flex** output which allows for a much more flexible
201-
configuration. The **gazetteer** output is intended for geocoding with
202-
Nominatim only. The **null** output does not write anything and is only
203-
useful for testing or with **\--slim** for creating slim tables.
198+
**flex**, and **null**. **pgsql** is the default output still available for
199+
backwards compatibility. New setups should use the **flex** output which
200+
allows for a much more flexible configuration. The **null** output does not
201+
write anything and is only useful for testing or with **\--slim** for
202+
creating slim tables.
204203

205204
-S, \--style=FILE
206205
: The style file. This specifies how the data is imported into the database,
@@ -307,10 +306,6 @@ mandatory for short options too.
307306
\--number-processes=THREADS
308307
: Specifies the number of parallel threads used for certain operations.
309308

310-
\--with-forward-dependencies=BOOL
311-
: Propagate changes from nodes to ways and node/way members to relations
312-
(Default: `true`). This option is deprecated.
313-
314309
# SEE ALSO
315310

316311
* [osm2pgsql website](https://osm2pgsql.org)

‎src/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ target_sources(osm2pgsql_lib PRIVATE
1313
dependency-manager.cpp
1414
expire-tiles.cpp
1515
expire-output.cpp
16-
gazetteer-style.cpp
1716
geom.cpp
1817
geom-box.cpp
1918
geom-from-osm.cpp
@@ -29,7 +28,6 @@ target_sources(osm2pgsql_lib PRIVATE
2928
node-persistent-cache.cpp
3029
ordered-index.cpp
3130
osmdata.cpp
32-
output-gazetteer.cpp
3331
output-null.cpp
3432
output-pgsql.cpp
3533
output.cpp

‎src/command-line-parser.cpp‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,7 @@ options_t parse_command_line(int argc, char *argv[])
333333

334334
// --output
335335
app.add_option("-O,--output", options.output_backend)
336-
->description("Set output ('pgsql' (default), 'flex', 'gazetteer' "
337-
"(deprecated), 'null').")
336+
->description("Set output ('pgsql' (default), 'flex', 'null').")
338337
->type_name("OUTPUT")
339338
->group("Output options");
340339

@@ -635,29 +634,6 @@ options_t parse_command_line(int argc, char *argv[])
635634
->option_text("TYPE")
636635
->group("Deprecated options");
637636

638-
// --with-forward-dependencies
639-
app.add_option_function<std::string>(
640-
"--with-forward-dependencies",
641-
[&](std::string const &arg) {
642-
log_warn("The option --with-forward-dependencies is deprecated "
643-
"and will soon be removed.");
644-
if (arg == "false") {
645-
options.with_forward_dependencies = false;
646-
return;
647-
}
648-
if (arg == "true") {
649-
options.with_forward_dependencies = true;
650-
return;
651-
}
652-
throw fmt_error(
653-
"Unknown value for --with-forward-dependencies option: {}",
654-
arg);
655-
})
656-
->description("Propagate changes from nodes to ways and node/way "
657-
"members to relations (default: true).")
658-
->option_text("BOOL")
659-
->group("Deprecated options");
660-
661637
try {
662638
app.parse(argc, argv);
663639
} catch (...) {
@@ -718,9 +694,6 @@ options_t parse_command_line(int argc, char *argv[])
718694

719695
if (options.output_backend == "flex") {
720696
check_options_output_flex(app);
721-
} else if (options.output_backend == "gazetteer") {
722-
log_warn(
723-
"The 'gazetteer' output is deprecated and will soon be removed.");
724697
} else if (options.output_backend == "null") {
725698
check_options_output_null(app);
726699
} else if (options.output_backend == "pgsql" ||

0 commit comments

Comments
 (0)