.clang-tidy

 ---
-Checks: '*,-android-cloexec-*,-bugprone-use-after-move,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-runtime-references,-hicpp-invalid-access-moved,-hicpp-no-array-decay,-hicpp-vararg,-modernize-make-unique,-readability-implicit-bool-cast,-readability-implicit-bool-conversion'
+Checks: '*,-android-cloexec-*,-bugprone-branch-clone,-bugprone-use-after-move,-cppcoreguidelines-avoid-c-arrays,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-macro-usage,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-type-static-cast-downcast,-cppcoreguidelines-pro-type-vararg,-fuchsia-*,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-invalid-access-moved,-hicpp-no-array-decay,-hicpp-vararg,-misc-non-private-member-variables-in-classes,-modernize-avoid-c-arrays,-modernize-make-unique,-modernize-use-trailing-return-type,-readability-convert-member-functions-to-static,-readability-implicit-bool-cast,-readability-implicit-bool-conversion,-readability-magic-numbers'
 #
 #  For a list of check options, see:
 #  https://clang.llvm.org/extra/clang-tidy/checks/list.html
@@ -9,11 +9,28 @@ Checks: '*,-android-cloexec-*,-bugprone-use-after-move,-cppcoreguidelines-owning
 #  android-cloexec-*
 #    O_CLOEXEC isn't available on Windows making this non-portable.
 #
+#  bugprone-branch-clone
+#    There are several cases in this code where the code seems much more
+#    readable with branch clones than without.
+#
 #  bugprone-use-after-move
 #  hicpp-invalid-access-moved
 #    Generates too many false positives. A bug report has been sent:
 #    https://bugs.llvm.org/show_bug.cgi?id=36516
 #
+#  cppcoreguidelines-avoid-c-arrays
+#    Alias for modernize-avoid-c-arrays.
+#
+#  cppcoreguidelines-avoid-magic-numbers
+#    Generally good advice, but there are too many places where this is
+#    useful, for instance in tests.
+#
+#  cppcoreguidelines-macro-usage
+#    There are cases where we actually need macros.
+#
+#  cppcoreguidelines-non-private-member-variables-in-classes
+#    Alias for misc-non-private-member-variables-in-classes
+#
 #  cppcoreguidelines-owning-memory
 #    Don't want to add dependency on gsl library.
 #
@@ -36,20 +53,42 @@ Checks: '*,-android-cloexec-*,-bugprone-use-after-move,-cppcoreguidelines-owning
 #  google-runtime-references
 #    This is just a matter of preference.
 #
+#  hicpp-avoid-c-arrays
+#    Alias for modernize-avoid-c-arrays.
+#
 #  hicpp-no-array-decay
 #    Alias for cppcoreguidelines-pro-bounds-array-to-pointer-decay.
 #
 #  hicpp-vararg
 #    Too strict, sometimes calling vararg functions is necessary.
 #
+#  misc-non-private-member-variables-in-classes
+#    Reports this also for structs, which doesn't make any sense. There is
+#    an option "IgnoreClassesWithAllMemberVariablesBeingPublic" which should
+#    disable this, but it didn't work for me.
+#
+#  modernize-avoid-c-arrays
+#    Makes sense for some array, but especially for char arrays using
+#    std::array isn't a good solution.
+#
 #  modernize-make-unique
 #    This is a C++11 program and C++ doesn't have std::make_unique.
 #
+#  modernize-use-trailing-return-type
+#    I am not quite that modern.
+#
+#  readability-convert-member-functions-to-static
+#    Not a bad idea, but it is overzealous when there are member functions
+#    overwritten in child classes and some of them can't be static.
+#
 #  readability-implicit-bool-cast
 #    Old name for readability-implicit-bool-conversion.
 #
 #  readability-implicit-bool-conversion
 #    I don't think this makes the code more readable.
 #
+#  readability-magic-numbers
+#    Alias for cppcoreguidelines-avoid-magic-numbers.
+#
 #WarningsAsErrors: '*'
 ...

.travis.yml

@@ -30,6 +30,9 @@ addons_shortcuts:
     apt:
       sources: ['ubuntu-toolchain-r-test']
       packages: ['libboost-all-dev', 'libboost-program-options-dev', 'pandoc', 'clang-6.0']
+  addons_clang7: &clang7
+    apt:
+      packages: ['libboost-all-dev', 'libboost-program-options-dev', 'pandoc', 'clang-7']
   addons_gcc48: &gcc48
     apt:
       sources: ['ubuntu-toolchain-r-test', 'boost-latest']
@@ -47,8 +50,16 @@ addons_shortcuts:
       packages: ['libboost-all-dev', 'libboost-program-options-dev', 'pandoc', 'g++-6', 'gcc-6']
   addons_gcc7: &gcc7
     apt:
-      sources: ['ubuntu-toolchain-r-test']
-      packages: ['libboost-all-dev', 'libboost-program-options-dev', 'pandoc', 'g++-7', 'gcc-7']
+      packages: ['libboost-all-dev', 'libboost-program-options-dev', 'pandoc']
+
+#-----------------------------------------------------------------------------
+
+addons:
+  homebrew:
+    packages:
+      - cmake
+      - boost
+    update: true
 
 #-----------------------------------------------------------------------------
 
@@ -92,10 +103,16 @@ matrix:
 #           LDFLAGS="-fsanitize=address,undefined,integer"
 
     - os: linux
-      compiler: linux-clang60-release
-      addons: *clang60
-      env: CC='clang-6.0' CXX='clang++-6.0' BUILD_TYPE='Release'
+      compiler: linux-clang7-dev
+      addons: *clang7
+      env: CC='clang-7' CXX='clang++-7' BUILD_TYPE='Dev'
+      dist: bionic
 
+    - os: linux
+      compiler: linux-clang7-release
+      addons: *clang7
+      env: CC='clang-7' CXX='clang++-7' BUILD_TYPE='Release'
+      dist: bionic
 
     # Linux GCC Builds
 
@@ -125,11 +142,13 @@ matrix:
       compiler: linux-gcc7-dev
       addons: *gcc7
       env: CC='gcc-7' CXX='g++-7' BUILD_TYPE='Dev'
+      dist: bionic
 
     - os: linux
       compiler: linux-gcc7-release
       addons: *gcc7
       env: CC='gcc-7' CXX='g++-7' BUILD_TYPE='Release'
+      dist: bionic
 
 
     # OSX Clang Builds
@@ -145,13 +164,18 @@ matrix:
       env: CXX='clang++' BUILD_TYPE='Dev'
 
     - os: osx
-      osx_image: xcode10.1
-      compiler: xcode10-clang-release
+      osx_image: xcode10.2
+      compiler: xcode10-clang-dev
+      env: CXX='clang++' BUILD_TYPE='Dev'
+
+    - os: osx
+      osx_image: xcode11
+      compiler: xcode11-clang-release
       env: CXX='clang++' BUILD_TYPE='Release'
 
     - os: osx
-      osx_image: xcode10.1
-      compiler: xcode10-clang-dev
+      osx_image: xcode11
+      compiler: xcode11-clang-dev
       env: CXX='clang++' BUILD_TYPE='Dev'
 
 #-----------------------------------------------------------------------------
@@ -159,10 +183,6 @@ matrix:
 install:
   - git clone --quiet --depth 1 https://github.com/osmcode/libosmium.git ../libosmium
   - git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero
-  - |
-    if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
-      brew install cmake boost || true
-    fi
   - cmake --version
 
 before_script:

CHANGELOG.md

@@ -13,6 +13,48 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ### Fixed
 
 
+## [1.11.0] - 2019-09-16
+
+### Added
+
+* New option `--remove-tags`/`-t` to `getid` command. When used the tags of
+  all objects are removed that are not explicitly requested but are only
+  included to complete references.
+* Add `create-locations-index` and `query-locations-index` commands. These
+  are used to create, update, query and dump node location indexes on disk.
+  These indexes store the location of nodes, typically to add them to ways
+  and relations later. It is the same format used by osm2pgsql (they call
+  it "flat node store") and by the `add-locations-to-ways` command.
+* Support for new [Spaten](https://thomas.skowron.eu/spaten/) export format.
+* Add special syntax for `--output-header` to copy header from input.
+  Sometimes it is useful to copy header fields from the input to the
+  output, for instance the `osmosis_replication_timestamp` field. This
+  can now be done for some commands (currently only `extract`) by
+  using the special syntax `--output-header=OPTION!`, i.e. using an
+  exclamation mark instead of setting a value.
+
+### Changed
+
+* Better checking of coordinates in extract boundary polygons/bboxes.
+* Compile with NDEBUG in RelWithDebInfo mode.
+* Various code cleanups based on problems found with clang-tidy.
+* Updated Catch to version 1.12.2.
+* Mark PBF output of extract, renumber, and sort commands as sorted. Uses the
+  new header option `sorting` of the libosmium library which is not in a
+  released version yet. This sets the `Sort.Type_then_ID` header property
+  in the PBF file.
+
+### Fixed
+
+* Only check if way is closed after check that it contains nodes.
+* `get_start_id()` is not `noexcept`.
+* Man pages correctly show options starting with double dash and other small
+  man page fixes.
+* Allow file-based location index types (`dense_file_array` and
+  `sparse_file_array`) that need a file name. Using them was not possible
+  because of an overzealous check that didn't recognize the file name.
+
+
 ## [1.10.0] - 2018-12-10
 
 ### Added
@@ -475,7 +517,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Minor updates to documentation and build system
 
 
-[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.10.0...HEAD
+[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.11.0...HEAD
+[1.11.0]: https://github.com/osmcode/osmium-tool/compare/v1.10.0...v1.11.0
 [1.10.0]: https://github.com/osmcode/osmium-tool/compare/v1.9.1...v1.10.0
 [1.9.1]: https://github.com/osmcode/osmium-tool/compare/v1.9.0...v1.9.1
 [1.9.0]: https://github.com/osmcode/osmium-tool/compare/v1.8.0...v1.9.0

CMakeLists.txt

@@ -25,7 +25,7 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRel;Dev"
 project(osmium)
 
 set(OSMIUM_VERSION_MAJOR 1)
-set(OSMIUM_VERSION_MINOR 10)
+set(OSMIUM_VERSION_MINOR 11)
 set(OSMIUM_VERSION_PATCH 0)
 
 set(OSMIUM_VERSION ${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERSION_PATCH})
@@ -44,7 +44,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 find_package(Boost 1.55.0 REQUIRED COMPONENTS program_options)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
-find_package(Osmium 2.15.0 REQUIRED COMPONENTS io)
+find_package(Osmium 2.15.1 REQUIRED COMPONENTS io)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
 
 
@@ -110,16 +110,18 @@ endif()
 #
 #-----------------------------------------------------------------------------
 if(MSVC)
-    set(USUAL_COMPILE_OPTIONS "/Ox")
+    set(DEV_COMPILE_OPTIONS "/Ox")
+    set(RWD_COMPILE_OPTIONS "/Ox /DNDEBUG")
 else()
-    set(USUAL_COMPILE_OPTIONS "-O3 -g")
+    set(DEV_COMPILE_OPTIONS "-O3 -g")
+    set(RWD_COMPILE_OPTIONS "-O3 -g -DNDEBUG")
 endif()
 
 if(WIN32)
     add_definitions(-DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32)
 endif()
 
-set(CMAKE_CXX_FLAGS_DEV "${USUAL_COMPILE_OPTIONS}"
+set(CMAKE_CXX_FLAGS_DEV "${DEV_COMPILE_OPTIONS}"
     CACHE STRING "Flags used by the compiler during developer builds."
     FORCE)
 
@@ -131,7 +133,7 @@ mark_as_advanced(
     CMAKE_EXE_LINKER_FLAGS_DEV
 )
 
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${USUAL_COMPILE_OPTIONS}"
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${RWD_COMPILE_OPTIONS}"
     CACHE STRING "Flags used by the compiler during RELWITHDEBINFO builds."
     FORCE)
 
@@ -207,6 +209,7 @@ SET(OSMIUM_COMMANDS
     cat
     changeset-filter
     check-refs
+    create-locations-index
     derive-changes
     diff
     export
@@ -216,6 +219,7 @@ SET(OSMIUM_COMMANDS
     getparents
     merge
     merge-changes
+    query-locations-index
     renumber
     show
     sort
@@ -232,6 +236,7 @@ set(OSMIUM_SOURCE_FILES
     command_help.cpp
     export/export_format_json.cpp
     export/export_format_pg.cpp
+    export/export_format_spaten.cpp
     export/export_format_text.cpp
     export/export_handler.cpp
     extract/extract_bbox.cpp
@@ -270,7 +275,7 @@ add_subdirectory(test)
 #
 #-----------------------------------------------------------------------------
 message(STATUS "Looking for clang-tidy")
-find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-6.0 clang-tidy-5.0)
+find_program(CLANG_TIDY NAMES clang-tidy clang-tidy-10 clang-tidy-9 clang-tidy-8 clang-tidy-7 clang-tidy-7.0 clang-tidy-6.0 clang-tidy-5.0)
 
 if(CLANG_TIDY)
     message(STATUS "Looking for clang-tidy - found ${CLANG_TIDY}")

README.md

@@ -6,8 +6,9 @@ the Osmium library.
 
 Official web site: https://osmcode.org/osmium-tool/
 
-[![Build Status](https://secure.travis-ci.org/osmcode/osmium-tool.svg)](https://travis-ci.org/osmcode/osmium-tool)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/osmcode/osmium-tool?svg=true)](https://ci.appveyor.com/project/Mapbox/osmium-tool)
+[![Travis Build Status](https://secure.travis-ci.org/osmcode/osmium-tool.svg)](https://travis-ci.org/osmcode/osmium-tool)
+[![Appveyor Build status](https://ci.appveyor.com/api/projects/status/k9v6et0o4baekrmi/branch/master?svg=true)](https://ci.appveyor.com/project/lonvia/osmium-tool/branch/master)
+
 
 ## Prerequisites
 
@@ -16,7 +17,7 @@ later are known to work. It also works on modern Visual Studio C++ compilers.
 
 You also need the following libraries:
 
-    Libosmium (>= 2.15.0)
+    Libosmium (>= 2.15.2)
         https://osmcode.org/libosmium
         Debian/Ubuntu: libosmium2-dev
         Fedora/CentOS: libosmium-devel
@@ -133,7 +134,7 @@ More extensive tests of the libosmium I/O system can also be run. See
 
 ## License
 
-Copyright (C) 2013-2018  Jochen Topf (jochen@topf.org)
+Copyright (C) 2013-2019  Jochen Topf (jochen@topf.org)
 
 This program is available under the GNU GENERAL PUBLIC LICENSE Version 3.
 See the file LICENSE.txt for the complete text of the license.

cmake/test_install.cmake

 
 set(OSMIUM_INSTALL_FILES
-    share/man/man1/osmium-show.1
-    share/man/man1/osmium-export.1
-    share/man/man1/osmium-tags-filter.1
+    share/man/man1/osmium-add-locations-to-ways.1
+    share/man/man1/osmium-apply-changes.1
     share/man/man1/osmium-cat.1
+    share/man/man1/osmium-changeset-filter.1
     share/man/man1/osmium-check-refs.1
-    share/man/man1/osmium-renumber.1
-    share/man/man1/osmium-sort.1
+    share/man/man1/osmium-create-locations-index.1
+    share/man/man1/osmium-derive-changes.1
+    share/man/man1/osmium-diff.1
+    share/man/man1/osmium-export.1
+    share/man/man1/osmium-extract.1
+    share/man/man1/osmium-fileinfo.1
     share/man/man1/osmium-getid.1
     share/man/man1/osmium-getparents.1
-    share/man/man1/osmium.1
-    share/man/man1/osmium-add-locations-to-ways.1
-    share/man/man1/osmium-apply-changes.1
+    share/man/man1/osmium-merge-changes.1
     share/man/man1/osmium-merge.1
-    share/man/man1/osmium-extract.1
+    share/man/man1/osmium-query-locations-index.1
+    share/man/man1/osmium-renumber.1
+    share/man/man1/osmium-show.1
+    share/man/man1/osmium-sort.1
+    share/man/man1/osmium-tags-filter.1
     share/man/man1/osmium-time-filter.1
-    share/man/man1/osmium-fileinfo.1
-    share/man/man1/osmium-derive-changes.1
-    share/man/man1/osmium-changeset-filter.1
-    share/man/man1/osmium-diff.1
-    share/man/man1/osmium-merge-changes.1
+    share/man/man1/osmium.1
     share/man/man5/osmium-file-formats.5
     share/man/man5/osmium-index-types.5
     bin/osmium

debian/changelog

-osmium-tool (1.10.0-2) UNRELEASED; urgency=medium
+osmium-tool (1.11.0-1) unstable; urgency=medium
 
+  * New upstream release.
   * Bump Standards-Version to 4.4.0, no changes.
   * Append -DNDEBUG to CXXFLAGS to remove buildpath from binaries.
   * Update gbp.conf to use --source-only-changes by default.
+  * Update copyright years for Jochen Topf.
+  * Bump minimum required libosmium2-dev to 2.15.2.
+  * Add patch to fix spelling errors.
 
- -- Bas Couwenberg <sebastic@debian.org>  Tue, 25 Dec 2018 22:50:08 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 17 Sep 2019 06:25:36 +0200
 
 osmium-tool (1.10.0-1) unstable; urgency=medium
 

debian/control

@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
                libboost-program-options-dev,
                libbz2-dev,
                libexpat1-dev,
-               libosmium2-dev (>= 2.15.0),
+               libosmium2-dev (>= 2.15.2),
                pandoc,
                zlib1g-dev
 Standards-Version: 4.4.0

debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact: Osmium Developers (https://osmcode.org/contact)
 Source: https://github.com/osmcode/osmium-tool
 
 Files: *
-Copyright: 2013-2018, Jochen Topf <jochen@topf.org>
+Copyright: 2013-2019, Jochen Topf <jochen@topf.org>
 License: GPL-3+
 
 Files: include/rapidjson/*

debian/patches/series

+spelling-errors.patch

debian/patches/spelling-errors.patch

+Description: Fix spelling errors.
+ * wih -> with
+Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://github.com/osmcode/osmium-tool/pull/175
+
+--- a/man/osmium-fileinfo.md
++++ b/man/osmium-fileinfo.md
+@@ -99,7 +99,7 @@ The following variables are available:
+     data.bbox - BOX
+         (in JSON as nested ARRAY with coordinates)
+     data.timestamp.first - STRING with TIMESTAMP
+-    data.timestamp.last - STRING wih TIMESTAMP
++    data.timestamp.last - STRING with TIMESTAMP
+     data.objects_ordered - BOOL (yes|no)
+     data.multiple_versions - STRING (yes|no|unknown)
+         (in JSON as BOOL and missing if "unknown")

man/CMakeLists.txt

@@ -52,6 +52,7 @@ if(PANDOC)
     add_man_page(1 osmium-cat)
     add_man_page(1 osmium-changeset-filter)
     add_man_page(1 osmium-check-refs)
+    add_man_page(1 osmium-create-locations-index)
     add_man_page(1 osmium-derive-changes)
     add_man_page(1 osmium-diff)
     add_man_page(1 osmium-export)
@@ -61,6 +62,7 @@ if(PANDOC)
     add_man_page(1 osmium-getparents)
     add_man_page(1 osmium-merge)
     add_man_page(1 osmium-merge-changes)
+    add_man_page(1 osmium-query-locations-index)
     add_man_page(1 osmium-renumber)
     add_man_page(1 osmium-show)
     add_man_page(1 osmium-sort)

man/common-options.md

 
 # COMMON OPTIONS
 
--h, --help
+-h, \--help
 :   Show usage help.
 
--v, --verbose
+-v, \--verbose
 :   Set verbose mode. The program will output information about what it is
     doing to STDERR.

man/input-options.md

 
 # INPUT OPTIONS
 
--F, --input-format=FORMAT
+-F, \--input-format=FORMAT
 :   The format of the input file(s). Can be used to set the input format if it
     can't be autodetected from the file name(s). This will set the format for
     all input files, there is no way to set the format for some input files

man/manpage.template

@@ -15,7 +15,7 @@ $endfor$
 $if(author)$
 .SH COPYRIGHT
 .PP
-Copyright (C) 2013\-2018 Jochen Topf <jochen@topf.org>.
+Copyright (C) 2013\-2019 Jochen Topf <jochen@topf.org>.
 
 License GPLv3+: GNU GPL version 3 or later
 <https://gnu.org/licenses/gpl.html>.

man/osmium-add-locations-to-ways.md

@@ -17,13 +17,14 @@ taking the locations from the nodes and adding them to the ways. This makes
 it easier for other programs to assemble the way geometries.
 
 The input file must contain all nodes needed for the ways, otherwise there will
-be an error. You can change this behaviour using the `--ignore-missing-nodes`
+be an error. You can change this behaviour using the **\--ignore-missing-nodes**
 option.
 
-Nodes without any tags will not be copied (unless the **--keep-untagged-nodes**,
-**-n** option is used). The size of the output file will be similar or a bit
-smaller than the input file (unless the **--keep-untagged-nodes**,
-**-n** option is used in which case it will be a lot bigger).
+Nodes without any tags will not be copied (unless the
+**\--keep-untagged-nodes/-n** option is used). The size of the output file will
+be similar or a bit smaller than the input file (unless the
+**\--keep-untagged-nodes/-n** option is used in which case it will be a lot
+bigger).
 
 Note that the OSM files generated by this command use a non-standard format
 extension.
@@ -34,9 +35,9 @@ are several different ways it can do that which have different advantages and
 disadvantages. The default is good enough for most cases, but see the
 **osmium-index-types**(5) man page for details.
 
-If the **--keep-untagged-nodes**, **-n** option is used, files created by this
+If the **\--keep-untagged-nodes/-n** option is used, files created by this
 command can be updated with the **apply-changes** command using the
-**--locations-on-ways** option.
+**\--locations-on-ways** option.
 
 This command will not work on full history files.
 
@@ -47,18 +48,18 @@ STDOUT.
 
 # OPTIONS
 
--i, --index-type=TYPE
+-i, \--index-type=TYPE
 :   Set the index type. For details see the **osmium-index-types**(5) man
     page.
 
--I, --show-index-types
+-I, \--show-index-types
 :   Shows a list of available index types. For details see the
     **osmium-index-types**(5) man page.
 
--n, --keep-untagged-nodes
+-n, \--keep-untagged-nodes
 :   Keep the untagged nodes in the output file.
 
---ignore-missing-nodes
+\--ignore-missing-nodes
 :   If this is not set a missing node needed for a way results in an error.
     If this is set, errors are ignored and the way will have an invalid
     location set for the missing node.

man/osmium-apply-changes.md

@@ -21,7 +21,7 @@ the change files are given or in what order they contain the data.
 
 Changes can be applied to normal OSM data files or OSM history files with this
 command. File formats will be autodetected from the file name suffixes, see
-the **--with-history** option if that doesn't work.
+the **\--with-history/-H** option if that doesn't work.
 
 This commands reads its input file(s) only once and writes its output file
 in one go so it can be streamed, ie. it can read from STDIN and write to
@@ -30,31 +30,31 @@ STDOUT.
 
 # OPTIONS
 
--H, --with-history
+-H, \--with-history
 :   Update an OSM history file (instead of a normal OSM data file). Both
     input and output must be history files. This option is usually not
     necessary, because history files will be detected from their file name
     suffixes, but if this detection doesn't work, you can force this mode
-    with this option. Can not be used together with the **--locations-on-ways**
+    with this option. Can not be used together with the **\--locations-on-ways**
     option.
 
---locations-on-ways
+\--locations-on-ways
 :   Input has and output should have node locations on ways. Can be used
     to update files created by the **osmium-add-locations-to-ways**. See
     there for details on the format. Can not be used together with the
-    **--with-history**,**-H** option.
+    **\--with-history/-H** option.
 
---redact
+\--redact
 :   Redact (patch) history files. Change files can contain any version of
     any object which will replace that version of that object from the input.
     This allows changing the history! This mode is for special use only, for
     instance to remove copyrighted or private data.
 
--r, --remove-deleted
+-r, \--remove-deleted
 :   Deprecated. Remove deleted objects from the output. This is now the
     default if your input file is a normal OSM data file ('.osm').
 
--s, --simplify
+-s, \--simplify
 :   Deprecated. Only write the last version of any object to the output.
     This is now the default if your input file is a normal OSM data file
     ('.osm').
@@ -64,12 +64,12 @@ STDOUT.
 @MAN_PROGRESS_OPTIONS@
 # INPUT OPTIONS
 
--F, --input-format=FORMAT
+-F, \--input-format=FORMAT
 :   The format of the OSM-DATA-FILE or OSM-HISTORY-FILE. Can be used to set
     the input format if it can't be autodetected from the file name.
     See **osmium-file-formats**(5) or the libosmium manual for details.
 
---change-file-format=FORMAT
+\--change-file-format=FORMAT
 :   The format of the OSM-CHANGE-FILE(s). Can be used to set the input format
     if it can't be autodetected from the file name(s). This will set the format
     for all change files, there is no way to set the format for some change

man/osmium-cat.md

@@ -24,7 +24,7 @@ STDOUT.
 
 # OPTIONS
 
--t, --object-type=TYPE
+-t, \--object-type=TYPE
 :   Read only objects of given type (*node*, *way*, *relation*, *changeset*).
     By default all types are read. This option can be given multiple times.
 

man/osmium-changeset-filter.md

@@ -20,42 +20,42 @@ STDOUT.
 
 # FILTER OPTIONS
 
--a, --after=TIMESTAMP
+-a, \--after=TIMESTAMP
 :   Only copy changesets closed after the given time.
     This will always include all open changesets.
 
--b, --before=TIMESTAMP
+-b, \--before=TIMESTAMP
 :   Only copy changesets created before the given time.
 
--B, --bbox=LONG1,LAT1,LONG2,LAT2
+-B, \--bbox=LONG1,LAT1,LONG2,LAT2
 :   Only copy changesets with a bounding box overlapping the specified box.
     The coordinates LONG1,LAT1 are from one arbitrary corner, the coordinates
     LONG2,LAT2 are from the opposite corner.
 
--c, --with-changes
+-c, \--with-changes
 :   Only copy changesets with changes.
 
--C, --without-changes
+-C, \--without-changes
 :   Only copy changesets without changes.
 
--d, --with-discussion
+-d, \--with-discussion
 :   Only copy changesets with discussions, ie changesets with at least one
     comment.
 
--D, --without-discussion
+-D, \--without-discussion
 :   Only copy changesets without discussions, ie changesets without any
     comments.
 
---open
+\--open
 :   Only copy open changesets.
 
---closed
+\--closed
 :   Only copy closed changesets.
 
--u, --user=USER
+-u, \--user=USER
 :   Only copy changesets by the given user name.
 
--U, --uid=UID
+-U, \--uid=UID
 :   Only copy changesets by the given user ID.
 
 @MAN_COMMON_OPTIONS@

man/osmium-check-refs.md

@@ -19,9 +19,9 @@ Referential integrity is often broken in extracts. This can lead to problems
 with some uses of the OSM data. Use this command to make sure your data is
 good.
 
-If the option -r is not given, this command will only check if all nodes
-referenced in ways are in the file, with the option, relations will also be
-checked.
+If the option **\--check-relations/-r** is not given, this command will only
+check if all nodes referenced in ways are in the file, with the option,
+relations will also be checked.
 
 This command expects the input file to be ordered in the usual way: First
 nodes in order of ID, then ways in order of ID, then relations in order of ID.
@@ -35,11 +35,11 @@ This commands reads its input file only once, ie. it can read from STDIN.
 
 # OPTIONS
 
--i, --show-ids
+-i, \--show-ids
 :   Print all missing IDs to STDOUT. If you don't specify this option, only a
     summary is shown.
 
--r, --check-relations
+-r, \--check-relations
 :   Also check referential integrity of relations. Without this option, only
     nodes in ways are checked.
 
@@ -52,8 +52,8 @@ This commands reads its input file only once, ie. it can read from STDIN.
 **osmium check-refs** will do the check in one pass through the input data. It
 needs enough main memory to store all temporary data.
 
-Largest memory need will be about 1 bit for each node ID, that's roughly 540 MB
-these days (Summer 2017). With the **-r**, **--check-relations** option memory
+Largest memory need will be about 1 bit for each node ID, that's roughly 760 MB
+these days (spring 2019). With the **\--check-relations/-r** option memory
 use will be a bit bigger.