This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osmium-tool.
commit 982d08b95e7888c357288a351223d88d49299bbf Merge: 46d0056 646424f Author: Bas Couwenberg <[email protected]> Date: Tue Mar 7 18:53:07 2017 +0100 Merge tag 'upstream/1.6.0' Upstream version 1.6.0 CHANGELOG.md | 41 +- CMakeLists.txt | 10 +- cmake/FindOsmium.cmake | 14 + 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 + test/apply-changes/input-data-low.osm | 22 + test/apply-changes/output-data-low.osm | 22 + test/extract/CMakeLists.txt | 24 + test/extract/input1.osm | 41 + test/extract/output-complete-ways.osm | 30 + test/extract/output-simple.osm | 23 + test/extract/output-smart-nonmp.osm | 30 + test/extract/output-smart.osm | 37 + test/extract/test_unit.cpp | 63 +- test/include/catch.hpp | 2261 +++++++++++++------- test/merge/CMakeLists.txt | 2 +- test/tags-filter/CMakeLists.txt | 30 + test/tags-filter/input.osm | 30 + test/tags-filter/output-amenity.osm | 6 + test/tags-filter/output-highway-r.osm | 19 + test/tags-filter/output-highway.osm | 15 + test/tags-filter/output-no-note.osm | 19 + test/tags-filter/output-note.osm | 14 + test/tags-filter/test_unit.cpp | 57 + test/util/test_unit.cpp | 11 + zsh_completion/_osmium | 33 +- 60 files changed, 3022 insertions(+), 949 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
