prepare release 2.2.0

Author: lonvia

CMakeLists.txt

@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.10.0)
 
-project(osm2pgsql VERSION 2.1.1 LANGUAGES CXX C)
+project(osm2pgsql VERSION 2.2.0 LANGUAGES CXX C)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 

man/osm2pgsql-expire.1

@@ -1,77 +1,79 @@
-.TH "OSM2PGSQL" "1" "2.1.1" "" ""
+.TH "OSM2PGSQL" "1" "2.2.0" "" ""
 .SH NAME
-.PP
-osm2pgsql-expire - Visualize expire output
+osm2pgsql\-expire \- Visualize expire output
 .SH SYNOPSIS
-.PP
-\f[B]osm2pgsql-expire\f[R] [\f[I]OPTIONS\f[R]] \f[I]OSM-FILE\f[R] (1)
-\f[B]osm2pgsql-expire\f[R] \f[I]TILES-FILE\f[R] (2)
+\f[B]osm2pgsql\-expire\f[R] [\f[I]OPTIONS\f[R]] \f[I]OSM\-FILE\f[R] (1)
+\f[B]osm2pgsql\-expire\f[R] \f[I]TILES\-FILE\f[R] (2)
 .SH DESCRIPTION
-.PP
 \f[B]This command is currently experimental.\f[R]
 .PP
 The expire command can be used for two things:
 .IP "1." 3
 \f[B]To check what tiles some OSM data is in.\f[R] If an
-\f[I]OSM-FILE\f[R] is specified osm2pgsql-expire will calculate the
+\f[I]OSM\-FILE\f[R] is specified osm2pgsql\-expire will calculate the
 tiles covering the objects in that file.
 Note that the file must not be a change file but a regular OSM data
 file!
 Output is, by default, a tile file, but GeoJSON is also possible.
 .IP "2." 3
-\f[B]Visualize tile list.\f[R] If a \f[I]TILE-FILE\f[R] (presumably
+\f[B]Visualize tile list.\f[R] If a \f[I]TILE\-FILE\f[R] (presumably
 generated by osm2pgsql) is specified, a GeoJSON file is generated
 showing all mentioned tiles.
 In this mode all command line options are ignored.
 .PP
 Read the \f[I]Expire\f[R] chapter of the osm2pgsql manual
 (https://osm2pgsql.org/doc/manual.html#expire) for details on how to
-interpret the \f[V]-m, \[rs]--mode\f[R] and
-\f[V]\[rs]--full-area-limit\f[R] options.
+interpret the \f[CR]\-m, \[rs]\-\-mode\f[R] and
+\f[CR]\[rs]\-\-full\-area\-limit\f[R] options.
 .SH OPTIONS
-.PP
 This program follows the usual GNU command line syntax, with long
-options starting with two dashes (\f[V]--\f[R]).
+options starting with two dashes (\f[CR]\-\-\f[R]).
 Mandatory arguments to long options are mandatory for short options too.
 .SH MAIN OPTIONS
 .TP
--b, --buffer=VALUE
+\-b, \-\-buffer=VALUE
 Set buffer size around geometry relative to tile size.
 Example: Set to 0.1 for a buffer that\[cq]s 10% of the tile size.
 .TP
--f, --format=FORMAT
+\-f, \-\-format=FORMAT
 Output format.
 Options are `tiles' (default) or `geojson'.
 The GeoJSON output uses the Web Mercator projection (EPSG:3857) which is
 supported by many programs although, strictly speaking, it is not
 allowed by the GeoJSON spec.
 .TP
---full-area-limit=VALUE
+\-\-full\-area\-limit=VALUE
 Set full area limit.
 .TP
--m, --mode=MODE
+\-m, \-\-mode=MODE
 Set expire mode.
-One of \f[V]boundary_only\f[R], \f[V]full_area\f[R] (default), and
-\f[V]hybrid\f[R].
+One of \f[CR]boundary_only\f[R], \f[CR]full_area\f[R] (default), and
+\f[CR]hybrid\f[R].
 .TP
--z, --zoom=ZOOM
+\-z, \-\-zoom=ZOOM
 Zoom level on which to calculate tiles.
 .SH HELP/VERSION OPTIONS
 .TP
--h, --help
+\-h, \-\-help
 Print help.
 .TP
--V, --version
+\-V, \-\-version
 Print osm2pgsql version.
 .SH LOGGING OPTIONS
 .TP
---log-level=LEVEL
+\-\-log\-level=LEVEL
 Set log level (`debug', `info' (default), `warn', or `error').
 .SH SEE ALSO
 .IP \[bu] 2
-osm2pgsql website (https://osm2pgsql.org)
+\c
+.UR https://osm2pgsql.org
+osm2pgsql website
+.UE \c
 .IP \[bu] 2
-osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
+\c
+.UR https://osm2pgsql.org/doc/manual.html
+osm2pgsql manual
+.UE \c
 .IP \[bu] 2
 \f[B]osm2pgsql\f[R](1)
 .IP \[bu] 2

man/osm2pgsql-gen.1

@@ -1,99 +1,103 @@
-.TH "OSM2PGSQL" "1" "2.1.1" "" ""
+.TH "OSM2PGSQL" "1" "2.2.0" "" ""
 .SH NAME
-.PP
-osm2pgsql-gen - Generalize OpenStreetMap data - EXPERIMENTAL!
+osm2pgsql\-gen \- Generalize OpenStreetMap data \- EXPERIMENTAL!
 .SH SYNOPSIS
-.PP
-\f[B]osm2pgsql-gen\f[R] [\f[I]OPTIONS\f[R]]\&...
+\f[B]osm2pgsql\-gen\f[R] [\f[I]OPTIONS\f[R]]\&...
 .SH DESCRIPTION
-.PP
 THIS PROGRAM IS EXPERIMENTAL AND MIGHT CHANGE WITHOUT NOTICE!
 .PP
-\f[B]osm2pgsql-gen\f[R] reads data imported by \f[B]osm2pgsql\f[R] from
+\f[B]osm2pgsql\-gen\f[R] reads data imported by \f[B]osm2pgsql\f[R] from
 the database, performs various generalization steps specified by a Lua
 config file and writes the data back to the database.
 It is used in conjunction with and after \f[B]osm2pgsql\f[R] and reads
 the same config file.
 .PP
 This man page can only cover some of the basics and describe the command
 line options.
-See the Generalization chapter in the osm2pgsql
-Manual (https://osm2pgsql.org/doc/manual.html#generalization) for more
-information.
+See the \c
+.UR https://osm2pgsql.org/doc/manual.html#generalization
+Generalization chapter in the osm2pgsql Manual
+.UE \c
+\ for more information.
 .SH OPTIONS
-.PP
 This program follows the usual GNU command line syntax, with long
-options starting with two dashes (\f[V]--\f[R]).
+options starting with two dashes (\f[CR]\-\-\f[R]).
 Mandatory arguments to long options are mandatory for short options too.
 .SH MAIN OPTIONS
 .TP
--a, --append
+\-a, \-\-append
 Run in append mode.
 The default is to run in create mode.
 .TP
--S, --style=FILE
+\-S, \-\-style=FILE
 The Lua config file.
 Same as for \f[B]osm2pgsql\f[R].
 Usually not required because it is read from the
-\f[V]osm2pgsql_properties\f[R] table.
+\f[CR]osm2pgsql_properties\f[R] table.
 .TP
--j, -jobs=NUM
+\-j, \-jobs=NUM
 Specifies the number of parallel threads used for certain operations.
 Setting this to the number of available CPU cores is a reasonable
 starting point.
 Minimum value and default is 1, maximum value is 256.
 .SH HELP/VERSION OPTIONS
 .TP
--h, --help
+\-h, \-\-help
 Print help.
 .TP
--V, --version
+\-V, \-\-version
 Print osm2pgsql version.
 .SH LOGGING OPTIONS
 .TP
---log-level=LEVEL
+\-\-log\-level=LEVEL
 Set log level (`debug', `info' (default), `warn', or `error').
 .TP
---log-sql
+\-\-log\-sql
 Enable logging of SQL commands for debugging.
 .SH DATABASE OPTIONS
 .TP
--d, --database=NAME
+\-d, \-\-database=NAME
 The name of the PostgreSQL database to connect to.
-If this parameter contains an \f[V]=\f[R] sign or starts with a valid
-URI prefix (\f[V]postgresql://\f[R] or \f[V]postgres://\f[R]), it is
+If this parameter contains an \f[CR]=\f[R] sign or starts with a valid
+URI prefix (\f[CR]postgresql://\f[R] or \f[CR]postgres://\f[R]), it is
 treated as a conninfo string.
 See the PostgreSQL manual for details.
 .TP
--U, --username=NAME
+\-U, \-\-username=NAME
 Postgresql user name.
 .TP
--W, --password
+\-W, \-\-password
 Force password prompt.
 .TP
--H, --host=HOSTNAME
+\-H, \-\-host=HOSTNAME
 Database server hostname or unix domain socket location.
 .TP
--P, --port=PORT
+\-P, \-\-port=PORT
 Database server port.
 .TP
---schema=SCHEMA
-Default for various schema settings throughout osm2pgsql-gen (default:
-\f[V]public\f[R]).
+\-\-schema=SCHEMA
+Default for various schema settings throughout osm2pgsql\-gen (default:
+\f[CR]public\f[R]).
 The schema must exist in the database and be writable by the database
 user.
-It must be the same as used with \f[V]osm2pgsql\f[R].
+It must be the same as used with \f[CR]osm2pgsql\f[R].
 .TP
---middle-schema=SCHEMA
-Database schema where the \f[V]osm2pgsql_properties\f[R] table is to be
+\-\-middle\-schema=SCHEMA
+Database schema where the \f[CR]osm2pgsql_properties\f[R] table is to be
 found.
-Default set with \f[V]--schema\f[R].
-Set to the same value as on the \f[V]osm2pgsql\f[R] command line.
+Default set with \f[CR]\-\-schema\f[R].
+Set to the same value as on the \f[CR]osm2pgsql\f[R] command line.
 .SH SEE ALSO
 .IP \[bu] 2
-osm2pgsql website (https://osm2pgsql.org)
+\c
+.UR https://osm2pgsql.org
+osm2pgsql website
+.UE \c
 .IP \[bu] 2
-osm2pgsql manual (https://osm2pgsql.org/doc/manual.html)
+\c
+.UR https://osm2pgsql.org/doc/manual.html
+osm2pgsql manual
+.UE \c
 .IP \[bu] 2
 \f[B]postgres\f[R](1)
 .IP \[bu] 2