[osmium-tool] 02/05: Merge tag 'upstream/1.7.0'
Bas Couwenberg
sebastic at debian.org
Tue Aug 15 17:44:33 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osmium-tool.
commit 1b693068418798246721dc30cf8918273d0084ad
Merge: f691009 abdb486
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Aug 15 19:29:16 2017 +0200
Merge tag 'upstream/1.7.0'
Upstream version 1.7.0
CHANGELOG.md | 51 +-
CMakeLists.txt | 9 +-
CONTRIBUTING.md | 6 +
README.md | 4 +-
cmake/FindOsmium.cmake | 4 +
export-example-config/default-config.json | 16 +
export-example-config/example-config.json | 16 +
extract-example-config/karlsruhe.osm.bz2 | Bin 16630 -> 16666 bytes
man/common-options.md | 2 +-
man/osmium-add-locations-to-ways.md | 31 +-
man/osmium-changeset-filter.md | 3 +
man/osmium-check-refs.md | 12 +-
man/osmium-diff.md | 2 +-
man/osmium-export.md | 282 +++++
man/osmium-fileinfo.md | 5 +-
man/osmium-getid.md | 9 +-
man/osmium-index-types.md | 62 +
man/osmium-merge.md | 8 +-
man/osmium-renumber.md | 9 +-
man/osmium-sort.md | 13 +-
man/osmium.md | 6 +-
src/CMakeLists.txt | 2 +-
src/command_add_locations_to_ways.cpp | 11 +-
src/command_add_locations_to_ways.hpp | 6 +-
src/command_apply_changes.cpp | 3 +-
src/command_cat.hpp | 4 -
src/command_changeset_filter.cpp | 10 +-
src/command_changeset_filter.hpp | 1 +
src/command_check_refs.cpp | 52 +-
src/command_export.cpp | 427 +++++++
src/command_export.hpp | 87 ++
src/command_extract.cpp | 75 +-
src/command_extract.hpp | 4 +-
src/command_fileinfo.cpp | 5 +-
src/command_getid.cpp | 2 +
src/command_getid.hpp | 3 +-
src/command_help.cpp | 12 +-
src/command_renumber.cpp | 39 +-
src/command_renumber.hpp | 7 +-
src/command_show.cpp | 1 +
src/command_show.hpp | 2 -
src/command_tags_filter.cpp | 70 +-
src/command_time_filter.cpp | 1 +
src/commands.cpp | 5 +
src/{command_show.hpp => export/export_format.hpp} | 53 +-
src/export/export_format_json.cpp | 219 ++++
src/export/export_format_json.hpp | 87 ++
src/export/export_format_text.cpp | 200 ++++
src/export/export_format_text.hpp | 71 ++
src/export/export_handler.cpp | 127 ++
src/export/export_handler.hpp | 82 ++
.../extract_bbox.cpp => export/options.hpp} | 42 +-
src/extract/extract_bbox.cpp | 6 +-
src/extract/extract_polygon.cpp | 2 +-
src/extract/poly_file_parser.hpp | 2 +-
src/extract/strategy_complete_ways.cpp | 2 +-
.../strategy_complete_ways_with_history.cpp | 2 +-
src/extract/strategy_simple.cpp | 2 +-
src/extract/strategy_smart.cpp | 2 +-
src/io.cpp | 2 -
src/main.cpp | 5 +
src/util.cpp | 94 ++
src/util.hpp | 20 +-
test/CMakeLists.txt | 3 +-
test/export/CMakeLists.txt | 26 +
.../input-incomplete-relation.osm} | 22 +-
.../input-missing-node.osm} | 24 +-
.../input-sorted.osm => export/input.osm} | 23 +-
test/export/output-incomplete-relation.geojson | 5 +
test/export/output-missing-node.geojson | 5 +
test/export/output.geojson | 6 +
test/export/output.geojsonseq | 4 +
test/getid/CMakeLists.txt | 2 +-
test/getid/idfile | 6 +-
.../input-sorted.osm => getid/output-file.osm} | 17 +-
test/include/catch.hpp | 1222 +++++++++++++-------
test/renumber/input-sorted.osm | 4 +-
test/sort/CMakeLists.txt | 8 +-
.../input-sorted.osm => sort/input-neg.osm} | 32 +-
.../input-sorted.osm => sort/output-neg.osm} | 22 +-
test/tags-filter/test_unit.cpp | 57 -
test/util/test_unit.cpp | 85 ++
zsh_completion/_osmium | 53 +-
83 files changed, 3189 insertions(+), 836 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