[osmium-tool] branch upstream updated (0ed0bda -> fd88ce7)
Bas Couwenberg
sebastic at debian.org
Thu Sep 15 14:57:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch upstream
in repository osmium-tool.
from 0ed0bda Imported Upstream version 1.3.1
new fd88ce7 Imported Upstream version 1.4.0
The 1 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:
.gitignore | 2 +
.travis.yml | 98 +-
.ycm_extra_conf.py | 7 +
CHANGELOG.md | 39 +-
CMakeLists.txt | 71 +-
CONTRIBUTING.md | 8 +
README.md | 66 +-
appveyor.yml | 60 +-
build-appveyor.bat | 110 +
build-local.bat | 43 +
doc/manual.md | 495 +++
doc/osmium-show.png | Bin 0 -> 51357 bytes
include/rapidjson/allocators.h | 532 +--
include/rapidjson/document.h | 4614 +++++++++++---------
include/rapidjson/encodedstream.h | 560 +--
include/rapidjson/encodings.h | 1341 +++---
include/rapidjson/error/en.h | 21 +-
include/rapidjson/error/error.h | 17 +-
include/rapidjson/filereadstream.h | 187 +-
include/rapidjson/filewritestream.h | 195 +-
include/rapidjson/fwd.h | 151 +
include/rapidjson/internal/biginteger.h | 14 +-
include/rapidjson/internal/diyfp.h | 17 +-
include/rapidjson/internal/dtoa.h | 50 +-
include/rapidjson/internal/ieee754.h | 3 +-
include/rapidjson/internal/meta.h | 362 +-
include/rapidjson/internal/pow10.h | 110 +-
include/rapidjson/internal/regex.h | 701 +++
include/rapidjson/internal/stack.h | 409 +-
include/rapidjson/internal/strfunc.h | 94 +-
include/rapidjson/internal/strtod.h | 33 +-
include/rapidjson/internal/{strfunc.h => swap.h} | 85 +-
include/rapidjson/istreamwrapper.h | 115 +
include/rapidjson/memorybuffer.h | 2 +-
include/rapidjson/memorystream.h | 16 +-
include/rapidjson/msinttypes/stdint.h | 8 +-
include/rapidjson/ostreamwrapper.h | 81 +
include/rapidjson/pointer.h | 119 +-
include/rapidjson/prettywriter.h | 462 +-
include/rapidjson/rapidjson.h | 1269 +++---
include/rapidjson/reader.h | 3331 ++++++++------
include/rapidjson/schema.h | 2006 +++++++++
include/rapidjson/stream.h | 179 +
include/rapidjson/stringbuffer.h | 210 +-
include/rapidjson/writer.h | 1005 +++--
iwyu.imp | 19 +
man/manpage.template | 4 +-
man/osmium-add-locations-to-ways.md | 1 +
man/osmium-apply-changes.md | 31 +-
man/osmium-cat.md | 1 +
man/osmium-changeset-filter.md | 1 +
man/osmium-check-refs.md | 1 +
man/osmium-derive-changes.md | 90 +
man/osmium-diff.md | 112 +
man/osmium-file-formats.md | 12 +-
man/osmium-fileinfo.md | 1 +
man/osmium-getid.md | 16 +-
man/osmium-merge-changes.md | 2 +-
man/osmium-merge.md | 63 +
man/osmium-renumber.md | 25 +-
man/osmium.md | 12 +
man/progress-options.md | 13 +
osmium-wrapper.in | 2 +-
src/CMakeLists.txt | 2 +-
src/cmd.cpp | 81 +-
src/cmd.hpp | 40 +-
src/cmd_factory.cpp | 9 +-
src/command_add_locations_to_ways.cpp | 43 +-
src/command_add_locations_to_ways.hpp | 27 +-
src/command_apply_changes.cpp | 102 +-
src/command_apply_changes.hpp | 9 +-
src/command_cat.cpp | 50 +-
src/command_cat.hpp | 9 +-
src/command_changeset_filter.cpp | 50 +-
src/command_changeset_filter.hpp | 6 +-
src/command_check_refs.cpp | 46 +-
src/command_check_refs.hpp | 5 +-
src/command_derive_changes.cpp | 186 +
...pply_changes.hpp => command_derive_changes.hpp} | 31 +-
src/command_diff.cpp | 346 ++
src/{command_sort.hpp => command_diff.hpp} | 22 +-
src/command_fileinfo.cpp | 65 +-
src/command_fileinfo.hpp | 7 +-
src/command_getid.cpp | 79 +-
src/command_getid.hpp | 6 +-
src/command_help.cpp | 11 +-
src/command_help.hpp | 7 +-
src/command_merge.cpp | 220 +
src/{command_sort.hpp => command_merge.hpp} | 22 +-
src/command_merge_changes.cpp | 23 +-
src/command_merge_changes.hpp | 4 +-
src/command_renumber.cpp | 130 +-
src/command_renumber.hpp | 8 +-
src/command_show.cpp | 42 +-
src/command_show.hpp | 4 +-
src/command_sort.cpp | 23 +-
src/command_sort.hpp | 4 +-
src/command_time_filter.cpp | 50 +-
src/command_time_filter.hpp | 4 +-
src/exception.hpp | 6 +-
src/io.cpp | 35 +-
src/main.cpp | 27 +-
src/version.cpp.in | 15 +
test/CMakeLists.txt | 6 +-
test/apply-changes/CMakeLists.txt | 14 +-
.../input.osm => apply-changes/input-history.osh} | 1 +
.../input.osm => apply-changes/input-history.osm} | 1 +
.../{simplified.osm => output-data.osm} | 0
.../{output.osh => output-history.osh} | 1 +
test/cat/CMakeLists.txt | 4 +-
test/cat/test_setup.cpp | 2 +-
test/derive-changes/CMakeLists.txt | 18 +
.../{getid/input.osm => derive-changes/input1.osm} | 4 +-
.../simplified.osm => derive-changes/input2.osm} | 0
.../output-incr-version.osc} | 2 +-
.../output-keep-details.osc} | 4 +-
.../output.osc} | 2 +-
test/diff/CMakeLists.txt | 26 +
test/{getid/input.osm => diff/input1.osm} | 2 +
.../simplified.osm => diff/input2.osm} | 2 +
test/diff/output-c.opl | 10 +
test/diff/output-compact | 12 +
test/diff/output-compact-c | 8 +
test/diff/output.opl | 14 +
test/diff/test_setup.cpp | 43 +
test/include/catch.hpp | 622 ++-
test/merge/CMakeLists.txt | 30 +
.../input-sorted.osm => merge/input1.osm} | 16 +-
test/{getid/input.osm => merge/input2.osm} | 16 +-
test/merge/input3.osm | 16 +
test/{sort/output-simple.osm => merge/output1.osm} | 15 +-
test/{getid/source.osm => merge/output2.osm} | 33 +-
test/merge/output3.osm | 54 +
test/misc/CMakeLists.txt | 4 +-
test/renumber/CMakeLists.txt | 5 +
.../{output-sorted.osm => output-sorted-n.osm} | 8 +-
test/time-filter/test_setup.cpp | 2 +-
test/unit_tests.cpp | 2 +-
zsh_completion/_osmium | 160 +-
139 files changed, 15179 insertions(+), 7540 deletions(-)
create mode 100644 CONTRIBUTING.md
create mode 100644 build-appveyor.bat
create mode 100644 build-local.bat
create mode 100644 doc/manual.md
create mode 100644 doc/osmium-show.png
create mode 100644 include/rapidjson/fwd.h
mode change 100755 => 100644 include/rapidjson/internal/biginteger.h
create mode 100644 include/rapidjson/internal/regex.h
copy include/rapidjson/internal/{strfunc.h => swap.h} (54%)
create mode 100644 include/rapidjson/istreamwrapper.h
create mode 100644 include/rapidjson/ostreamwrapper.h
create mode 100644 include/rapidjson/schema.h
create mode 100644 include/rapidjson/stream.h
create mode 100644 iwyu.imp
create mode 100644 man/osmium-derive-changes.md
create mode 100644 man/osmium-diff.md
create mode 100644 man/osmium-merge.md
create mode 100644 man/progress-options.md
create mode 100644 src/command_derive_changes.cpp
copy src/{command_apply_changes.hpp => command_derive_changes.hpp} (57%)
create mode 100644 src/command_diff.cpp
copy src/{command_sort.hpp => command_diff.hpp} (72%)
create mode 100644 src/command_merge.cpp
copy src/{command_sort.hpp => command_merge.hpp} (70%)
create mode 100644 src/version.cpp.in
copy test/{getid/input.osm => apply-changes/input-history.osh} (90%)
copy test/{getid/input.osm => apply-changes/input-history.osm} (90%)
copy test/apply-changes/{simplified.osm => output-data.osm} (100%)
rename test/apply-changes/{output.osh => output-history.osh} (93%)
create mode 100644 test/derive-changes/CMakeLists.txt
copy test/{getid/input.osm => derive-changes/input1.osm} (92%)
copy test/{apply-changes/simplified.osm => derive-changes/input2.osm} (100%)
copy test/{sort/output-change.osc => derive-changes/output-incr-version.osc} (83%)
copy test/{sort/output-change.osc => derive-changes/output-keep-details.osc} (79%)
copy test/{sort/output-change.osc => derive-changes/output.osc} (83%)
create mode 100644 test/diff/CMakeLists.txt
copy test/{getid/input.osm => diff/input1.osm} (83%)
rename test/{apply-changes/simplified.osm => diff/input2.osm} (82%)
create mode 100644 test/diff/output-c.opl
create mode 100644 test/diff/output-compact
create mode 100644 test/diff/output-compact-c
create mode 100644 test/diff/output.opl
create mode 100644 test/diff/test_setup.cpp
create mode 100644 test/merge/CMakeLists.txt
copy test/{renumber/input-sorted.osm => merge/input1.osm} (64%)
copy test/{getid/input.osm => merge/input2.osm} (64%)
create mode 100644 test/merge/input3.osm
copy test/{sort/output-simple.osm => merge/output1.osm} (63%)
copy test/{getid/source.osm => merge/output2.osm} (52%)
create mode 100644 test/merge/output3.osm
copy test/renumber/{output-sorted.osm => output-sorted-n.osm} (70%)
--
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