[osmium-tool] 02/07: Merge tag 'upstream/1.5.0'
Bas Couwenberg
sebastic at debian.org
Wed Jan 18 19:56:25 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 a72a62a39fa569cf85961b68831d49438f72c41d
Merge: 4a6d05b 2c7d8bb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jan 18 19:57:17 2017 +0100
Merge tag 'upstream/1.5.0'
Upstream version 1.5.0
CHANGELOG.md | 11 +-
CMakeLists.txt | 9 +-
README.md | 15 +-
doc/manual.md | 495 ---------------------
doc/osmium-show.png | Bin 51357 -> 0 bytes
extract-example-config/README.md | 17 +
extract-example-config/berlin.geojson | 122 +++++
extract-example-config/berlin.poly | 115 +++++
extract-example-config/brandenburg.poly | 275 ++++++++++++
extract-example-config/extracts.json | 135 ++++++
extract-example-config/hamburg.poly | 71 +++
extract-example-config/karlsruhe.osm.bz2 | Bin 0 -> 16630 bytes
man/manpage.template | 2 +-
man/osmium-add-locations-to-ways.md | 2 +-
man/osmium-apply-changes.md | 2 +-
man/osmium-cat.md | 2 +-
man/osmium-changeset-filter.md | 2 +-
man/osmium-check-refs.md | 2 +-
man/osmium-derive-changes.md | 2 +-
man/osmium-diff.md | 6 +-
man/osmium-extract.md | 361 +++++++++++++++
man/osmium-file-formats.md | 25 +-
man/osmium-fileinfo.md | 2 +-
man/osmium-getid.md | 2 +-
man/osmium-merge-changes.md | 2 +-
man/osmium-merge.md | 2 +-
man/osmium-renumber.md | 4 +-
man/osmium-show.md | 2 +-
man/osmium-sort.md | 2 +-
man/osmium-time-filter.md | 2 +-
man/osmium.md | 5 +-
.../osm-history-splitter2osmium-extract-config.sh | 32 ++
src/CMakeLists.txt | 2 +-
src/cmd.cpp | 12 +-
src/cmd.hpp | 15 +-
src/cmd_factory.cpp | 4 +-
src/command_add_locations_to_ways.cpp | 5 +-
src/command_add_locations_to_ways.hpp | 4 +-
src/command_apply_changes.cpp | 51 ++-
src/command_apply_changes.hpp | 4 +-
src/command_cat.cpp | 5 +-
src/command_cat.hpp | 4 +-
src/command_changeset_filter.cpp | 4 +-
src/command_changeset_filter.hpp | 4 +-
src/command_check_refs.cpp | 5 +-
src/command_check_refs.hpp | 4 +-
src/command_derive_changes.cpp | 5 +-
src/command_derive_changes.hpp | 4 +-
src/command_diff.cpp | 7 +-
src/command_diff.hpp | 4 +-
src/command_extract.cpp | 486 ++++++++++++++++++++
src/command_extract.hpp | 79 ++++
src/command_fileinfo.cpp | 5 +-
src/command_fileinfo.hpp | 4 +-
src/command_getid.cpp | 5 +-
src/command_getid.hpp | 4 +-
src/command_help.cpp | 8 +-
src/command_help.hpp | 4 +-
src/command_merge.cpp | 96 ++--
src/command_merge.hpp | 4 +-
src/command_merge_changes.cpp | 4 +-
src/command_merge_changes.hpp | 4 +-
src/command_renumber.cpp | 4 +-
src/command_renumber.hpp | 4 +-
src/command_show.cpp | 4 +-
src/command_show.hpp | 4 +-
src/command_sort.cpp | 4 +-
src/command_sort.hpp | 4 +-
src/command_time_filter.cpp | 5 +-
src/command_time_filter.hpp | 4 +-
src/exception.hpp | 4 +-
src/{exception.hpp => extract/error.hpp} | 31 +-
src/extract/extract.cpp | 58 +++
src/extract/extract.hpp | 101 +++++
src/{command_help.hpp => extract/extract_bbox.cpp} | 46 +-
src/{exception.hpp => extract/extract_bbox.hpp} | 31 +-
src/extract/extract_polygon.cpp | 161 +++++++
src/extract/extract_polygon.hpp | 65 +++
src/extract/geojson_file_parser.cpp | 191 ++++++++
src/extract/geojson_file_parser.hpp | 58 +++
src/extract/osm_file_parser.cpp | 85 ++++
src/{exception.hpp => extract/osm_file_parser.hpp} | 34 +-
src/extract/poly_file_parser.cpp | 133 ++++++
src/extract/poly_file_parser.hpp | 78 ++++
src/extract/strategy.hpp | 173 +++++++
src/extract/strategy_complete_ways.cpp | 176 ++++++++
src/extract/strategy_complete_ways.hpp | 65 +++
.../strategy_complete_ways_with_history.cpp | 186 ++++++++
.../strategy_complete_ways_with_history.hpp | 65 +++
src/extract/strategy_simple.cpp | 113 +++++
src/extract/strategy_simple.hpp | 60 +++
src/extract/strategy_smart.cpp | 255 +++++++++++
src/extract/strategy_smart.hpp | 75 ++++
src/io.cpp | 27 +-
src/main.cpp | 6 +-
src/util.cpp | 69 +++
src/{exception.hpp => util.hpp} | 34 +-
test/CMakeLists.txt | 9 +-
test/extract/empty-root.geojson | 1 +
test/extract/empty.geojson | 0
test/extract/empty.osm.opl | 0
test/extract/empty.poly | 0
test/extract/invalid-root.geojson | 1 +
test/extract/invalid.geojson | 1 +
test/extract/missing-end-polygon.poly | 8 +
test/extract/missing-end-ring.poly | 7 +
test/extract/multipolygon.osm.opl | 17 +
test/extract/no-polygon.osm.opl | 5 +
test/extract/one-line.poly | 1 +
test/extract/polygon-crlf.poly | 9 +
test/extract/polygon-one-outer.poly | 9 +
test/extract/polygon-outer-inner.poly | 16 +
test/extract/polygon-two-outer.poly | 16 +
test/extract/polygon-two-ways.osm.opl | 10 +
test/extract/polygon-way.osm.opl | 5 +
test/extract/test_unit.cpp | 277 ++++++++++++
test/extract/two-line.poly | 2 +
test/extract/two-polygons-empty-line.poly | 26 ++
test/extract/two-polygons.poly | 25 ++
test/extract/wrong-geometry-type.geojson | 6 +
test/include/catch.hpp | 14 +-
test/util/test_unit.cpp | 25 ++
zsh_completion/_osmium | 45 +-
123 files changed, 4709 insertions(+), 811 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