[osmium-tool] branch master updated (46d0056 -> 0a2c64f)

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a change to branch master
in repository osmium-tool.

      from  46d0056   Move from experimental to unstable.
       new  646424f   Imported Upstream version 1.6.0
       new  982d08b   Merge tag 'upstream/1.6.0'
       new  554f30a   New upstream release.
       new  33cf67b   Bump minimum required libosmium2-dev to 2.12.0.
       new  0a2c64f   Set distribution to experimental.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.md                                       |   41 +-
 CMakeLists.txt                                     |   10 +-
 cmake/FindOsmium.cmake                             |   14 +
 debian/changelog                                   |    7 +
 debian/control                                     |    2 +-
 man/osmium-add-locations-to-ways.md                |    4 +
 man/osmium-apply-changes.md                        |   39 +-
 man/osmium-extract.md                              |   35 +-
 man/osmium-getid.md                                |   12 +-
 man/osmium-merge.md                                |    4 +
 man/osmium-tags-filter.md                          |  156 ++
 man/osmium.md                                      |    4 +
 src/CMakeLists.txt                                 |    2 +
 src/command_apply_changes.cpp                      |  160 +-
 src/command_apply_changes.hpp                      |    3 +
 src/command_cat.cpp                                |    2 +-
 src/command_check_refs.cpp                         |    2 +-
 src/command_extract.cpp                            |   52 +-
 src/command_extract.hpp                            |    1 +
 src/command_fileinfo.cpp                           |   34 +-
 src/command_getid.cpp                              |   42 +-
 src/command_getid.hpp                              |   10 +-
 src/command_merge.cpp                              |    1 +
 src/command_merge_changes.cpp                      |    1 +
 src/command_show.cpp                               |    4 +
 src/command_sort.cpp                               |    1 +
 src/command_tags_filter.cpp                        |  385 ++++
 src/{command_getid.hpp => command_tags_filter.hpp} |   47 +-
 src/command_time_filter.cpp                        |    2 +
 src/commands.cpp                                   |    5 +
 src/extract/extract.hpp                            |   11 +
 src/extract/geojson_file_parser.cpp                |   16 +-
 src/extract/strategy_complete_ways.cpp             |    9 +-
 .../strategy_complete_ways_with_history.cpp        |    2 +-
 src/extract/strategy_simple.cpp                    |    7 +-
 src/extract/strategy_smart.cpp                     |    9 +-
 src/io.cpp                                         |    2 +-
 src/util.cpp                                       |   43 +
 src/util.hpp                                       |    6 +
 test/CMakeLists.txt                                |    3 +
 test/apply-changes/CMakeLists.txt                  |    1 +
 .../input.osm => apply-changes/input-data-low.osm} |   10 +-
 .../{output-data.osm => output-data-low.osm}       |   10 +-
 test/extract/CMakeLists.txt                        |   24 +
 test/extract/input1.osm                            |   41 +
 .../output-complete-ways.osm}                      |   36 +-
 .../{getid/out31.osm => extract/output-simple.osm} |   23 +-
 .../source.osm => extract/output-smart-nonmp.osm}  |   36 +-
 .../output2.osm => extract/output-smart.osm}       |   50 +-
 test/extract/test_unit.cpp                         |   63 +-
 test/include/catch.hpp                             | 2261 +++++++++++++-------
 test/merge/CMakeLists.txt                          |    2 +-
 test/tags-filter/CMakeLists.txt                    |   30 +
 test/{getid => tags-filter}/input.osm              |   12 +-
 test/tags-filter/output-amenity.osm                |    6 +
 .../input.osm => tags-filter/output-highway-r.osm} |   11 +-
 test/tags-filter/output-highway.osm                |   15 +
 .../output-no-note.osm}                            |   17 +-
 test/tags-filter/output-note.osm                   |   14 +
 test/tags-filter/test_unit.cpp                     |   57 +
 test/util/test_unit.cpp                            |   11 +
 zsh_completion/_osmium                             |   33 +-
 62 files changed, 2901 insertions(+), 1052 deletions(-)
 create mode 100644 man/osmium-tags-filter.md
 create mode 100644 src/command_tags_filter.cpp
 copy src/{command_getid.hpp => command_tags_filter.hpp} (58%)
 copy test/{getid/input.osm => apply-changes/input-data-low.osm} (85%)
 copy test/apply-changes/{output-data.osm => output-data-low.osm} (85%)
 create mode 100644 test/extract/CMakeLists.txt
 create mode 100644 test/extract/input1.osm
 copy test/{getid/source.osm => extract/output-complete-ways.osm} (56%)
 copy test/{getid/out31.osm => extract/output-simple.osm} (69%)
 copy test/{getid/source.osm => extract/output-smart-nonmp.osm} (56%)
 copy test/{merge/output2.osm => extract/output-smart.osm} (51%)
 create mode 100644 test/tags-filter/CMakeLists.txt
 copy test/{getid => tags-filter}/input.osm (69%)
 create mode 100644 test/tags-filter/output-amenity.osm
 copy test/{add-locations-to-ways/input.osm => tags-filter/output-highway-r.osm} (79%)
 create mode 100644 test/tags-filter/output-highway.osm
 copy test/{sort/output-simple.osm => tags-filter/output-no-note.osm} (63%)
 create mode 100644 test/tags-filter/output-note.osm
 create mode 100644 test/tags-filter/test_unit.cpp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git