[osmium-tool] 02/06: Merge tag 'upstream/1.2.0'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Aug 18 14:00:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit 88382246854e23b69fe3955d57943bad4e7af5d1
Merge: a6845d3 838f6b3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Aug 18 15:52:37 2015 +0200
Merge tag 'upstream/1.2.0'
Upstream version 1.2.0
.travis.yml | 7 +-
CHANGELOG.md | 25 +-
CMakeLists.txt | 4 +-
LICENSE-rapidjson.txt | 24 -
README.md | 20 +-
appveyor.yml | 10 -
cmake/FindOSMPBF.cmake | 50 -
cmake/FindOsmium.cmake | 8 +-
cmake/run_test_compare_output.cmake | 21 +-
man/manpage.template | 1 +
man/osmium-apply-changes.md | 36 +-
man/osmium-cat.md | 15 +-
man/osmium-check-refs.md | 13 +-
man/osmium-file-formats.md | 2 +-
man/osmium-fileinfo.md | 32 +-
man/osmium-getid.md | 19 +-
man/osmium-merge-changes.md | 24 +-
man/osmium-renumber.md | 21 +-
man/osmium-time-filter.md | 19 +-
man/osmium.md | 33 +-
scripts/travis_install.sh | 7 -
scripts/travis_script.sh | 2 -
src/{osmc.hpp => cmd.hpp} | 164 +-
src/cmd_factory.cpp | 74 +
src/command_apply_changes.hpp | 4 +-
src/command_cat.cpp | 57 +-
src/command_cat.hpp | 11 +-
src/command_check_refs.hpp | 4 +-
src/command_fileinfo.cpp | 43 +-
src/command_fileinfo.hpp | 4 +-
src/command_getid.cpp | 24 +-
src/command_getid.hpp | 8 +-
src/command_help.cpp | 27 +-
src/command_help.hpp | 2 +-
src/command_merge_changes.hpp | 4 +-
src/command_renumber.cpp | 111 +-
src/command_renumber.hpp | 5 +-
src/command_time_filter.cpp | 1 +
src/command_time_filter.hpp | 4 +-
src/{command_help.hpp => exception.hpp} | 27 +-
src/io.cpp | 121 +
src/main.cpp | 26 +-
test/CMakeLists.txt | 50 +-
test/apply-changes/CMakeLists.txt | 17 +
test/{renumber => apply-changes}/input-change.osc | 10 +-
.../input-data.osm} | 0
test/apply-changes/output.osh | 30 +
.../simplified.osm} | 12 +-
test/cat/CMakeLists.txt | 9 +-
test/cat/output1.osm.opl | 3 +
test/cat/test_setup.cpp | 80 +
test/fileinfo/CMakeLists.txt | 2 +-
test/fileinfo/fi1-result.txt | 2 +-
test/formats/CMakeLists.txt | 58 +
test/formats/empty-nocompression.osm.pbf | Bin 0 -> 54 bytes
test/formats/empty-nodensenodes-nometadata.osm.pbf | Bin 0 -> 52 bytes
test/formats/empty-nodensenodes.osm.pbf | Bin 0 -> 52 bytes
test/formats/empty-nometadata.osm.pbf | Bin 0 -> 64 bytes
test/formats/empty.osm | 3 +
test/formats/empty.osm.opl | 0
test/formats/empty.osm.pbf | Bin 0 -> 64 bytes
test/formats/f1-nocompression.osm.pbf | Bin 0 -> 388 bytes
test/formats/f1-nodensenodes-nometadata.osm.pbf | Bin 0 -> 289 bytes
test/formats/f1-nodensenodes.osm.pbf | Bin 0 -> 402 bytes
test/formats/f1-nometadata.osm.pbf | Bin 0 -> 299 bytes
test/{renumber/input-sorted.osm => formats/f1.osm} | 21 +-
test/formats/f1.osm.opl | 7 +
test/formats/f1.osm.pbf | Bin 0 -> 404 bytes
test/getid/CMakeLists.txt | 2 +-
test/help/CMakeLists.txt | 9 +-
test/include/catch.hpp | 9416 ++++++++++++++++++++
test/include/test.hpp | 4 +
test/io/Makefile.in | 280 +
test/{renumber/input-sorted.osm => io/input.osm} | 8 +-
test/merge-changes/CMakeLists.txt | 17 +
test/merge-changes/change1.osc | 24 +
.../input-change.osc => merge-changes/change2.osc} | 10 +-
test/merge-changes/merged.osc | 44 +
test/merge-changes/simplified.osc | 37 +
test/{getid => misc}/CMakeLists.txt | 10 +-
test/renumber/CMakeLists.txt | 4 +-
test/renumber/input-change.osc | 2 +-
test/renumber/input-sorted.osm | 5 +-
test/renumber/output-change.osc | 4 +-
test/renumber/output-sorted.osm | 1 +
test/time-filter/CMakeLists.txt | 2 +-
test/time-filter/test_setup.cpp | 15 +
test/unit_tests.cpp | 2 +
88 files changed, 10760 insertions(+), 554 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git
More information about the Pkg-grass-devel
mailing list