[osmium] 05/16: Merge tag 'upstream/0.0_20140410-d1d56bedb3'
Bas Couwenberg
sebastic at xs4all.nl
Mon Jun 9 01:03:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository osmium.
commit 3ae36fcea03994c2edef25c6d954383fe60e053a
Merge: ed80541 5526664
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jun 9 02:35:24 2014 +0200
Merge tag 'upstream/0.0_20140410-d1d56bedb3'
Upstream version 0.0~20140410-d1d56bedb3
Doxyfile | 2586 +++++++++++++-------
Makefile | 62 +-
NOTES_FOR_DEVELOPERS | 30 +-
README | 77 +-
examples/.gitignore | 4 +-
examples/Makefile | 103 +-
examples/README | 20 +-
examples/nodedensity.cpp | 39 +-
examples/osmium_convert.cpp | 97 +-
examples/osmium_debug.cpp | 34 +-
examples/osmium_find_bbox.cpp | 44 +-
examples/osmium_mpdump.cpp | 90 +
examples/osmium_progress.cpp | 34 +-
examples/osmium_range_from_history.cpp | 40 +-
examples/osmium_relation_members.cpp | 109 +
examples/osmium_sizeof.cpp | 45 +-
examples/osmium_store_and_debug.cpp | 42 +-
examples/osmium_time.cpp | 65 +-
examples/osmium_to_postgis.cpp | 183 ++
examples/osmium_toogr.cpp | 163 +-
examples/osmium_toogr2.cpp | 154 +-
examples/osmium_toshape.cpp | 67 +-
get_options.sh | 20 +
include/osmium.hpp | 111 +-
include/osmium/CGAlgorithms.h | 217 --
include/osmium/debug.hpp | 73 +
include/osmium/export.hpp | 7 +-
include/osmium/export/csv.hpp | 42 +-
include/osmium/export/shapefile.hpp | 317 ++-
include/osmium/geometry.hpp | 107 +-
include/osmium/geometry/from_way.hpp | 81 +-
include/osmium/geometry/geos.hpp | 119 +
include/osmium/geometry/haversine.hpp | 83 +
include/osmium/geometry/linestring.hpp | 146 +-
include/osmium/geometry/multipolygon.hpp | 254 +-
include/osmium/geometry/null.hpp | 15 +-
include/osmium/geometry/ogr.hpp | 93 +
include/osmium/geometry/ogr_multipolygon.hpp | 97 +
include/osmium/geometry/point.hpp | 96 +-
include/osmium/geometry/polygon.hpp | 123 +-
include/osmium/geometry/shplib.hpp | 222 ++
include/osmium/handler.hpp | 161 +-
include/osmium/handler/coordinates_for_ways.hpp | 20 +-
include/osmium/handler/debug.hpp | 59 +-
include/osmium/handler/endtime.hpp | 41 +-
include/osmium/handler/find_bbox.hpp | 8 +-
include/osmium/handler/multipolygon.hpp | 181 --
include/osmium/handler/progress.hpp | 138 +-
include/osmium/handler/range_from_history.hpp | 51 +-
include/osmium/handler/statistics.hpp | 240 --
include/osmium/input.hpp | 59 +-
include/osmium/input/pbf.hpp | 64 +-
include/osmium/input/xml.hpp | 250 +-
.../osmium/javascript.hpp | 30 +-
.../handler.hpp} | 171 +-
include/osmium/javascript/template.hpp | 48 +-
include/osmium/{utils => javascript}/unicode.hpp | 41 +-
include/osmium/javascript/wrapper/export_csv.hpp | 80 +
.../osmium/javascript/wrapper/export_shapefile.hpp | 196 ++
include/osmium/javascript/wrapper/geometry.hpp | 224 ++
include/osmium/javascript/wrapper/osm.hpp | 323 +++
include/osmium/javascript/wrapper/position.hpp | 55 +
include/osmium/multipolygon/assembler.hpp | 128 +
include/osmium/multipolygon/builder.hpp | 980 ++++++++
include/osmium/osm.hpp | 2 +-
include/osmium/osm/area.hpp | 1140 +--------
include/osmium/osm/bounds.hpp | 53 +-
include/osmium/osm/meta.hpp | 24 +-
include/osmium/osm/node.hpp | 79 +-
include/osmium/osm/object.hpp | 136 +-
include/osmium/osm/position.hpp | 160 +-
include/osmium/osm/relation.hpp | 79 +-
include/osmium/osm/relation_member.hpp | 57 +-
include/osmium/osm/relation_member_list.hpp | 49 +-
include/osmium/osm/segment.hpp | 75 +
include/osmium/osm/tag.hpp | 15 +-
include/osmium/osm/tag_list.hpp | 65 +-
.../osmium/{exceptions.hpp => osm/tag_ostream.hpp} | 29 +-
include/osmium/osm/types.hpp | 37 +-
include/osmium/osm/undirected_segment.hpp | 66 +
include/osmium/osm/way.hpp | 170 +-
include/osmium/osm/way_node.hpp | 38 +-
include/osmium/osm/way_node_list.hpp | 74 +-
include/osmium/osmfile.hpp | 172 +-
include/osmium/osmfile_impl.hpp | 55 -
include/osmium/output.hpp | 92 +-
include/osmium/output/pbf.hpp | 159 +-
include/osmium/output/xml.hpp | 173 +-
include/osmium/relations/assembler.hpp | 527 ++++
include/osmium/relations/relation_info.hpp | 140 ++
include/osmium/{export.hpp => smart_ptr.hpp} | 32 +-
include/osmium/storage/byid.hpp | 381 +--
include/osmium/storage/byid/fixed_array.hpp | 113 +
include/osmium/storage/byid/mmap_anon.hpp | 126 +
include/osmium/storage/byid/mmap_file.hpp | 172 ++
include/osmium/storage/byid/sparse_table.hpp | 104 +
include/osmium/storage/byid/stl_map.hpp | 82 +
include/osmium/storage/byid/vector.hpp | 119 +
include/osmium/storage/objectstore.hpp | 54 +-
include/osmium/tags/key_filter.hpp | 82 +
include/osmium/tags/key_value_filter.hpp | 84 +
include/osmium/tags/regex_filter.hpp | 90 +
include/osmium/tags/to_string.hpp | 116 +
include/osmium/utils/delta.hpp | 7 +-
include/osmium/utils/filter_and_accumulate.hpp | 48 +
include/osmium/utils/sqlite.hpp | 195 --
include/osmium/utils/stringtable.hpp | 52 +-
include/osmium/utils/timer.h | 129 -
include/osmium/utils/timestamp.hpp | 95 +-
osmjs/Makefile | 50 +-
osmjs/README | 20 +-
osmjs/js/callback_test.js | 42 +
osmjs/js/config.js | 2 +-
osmjs/js/osm2csv.js | 20 +
osmjs/js/shape_export.js | 2 +-
osmjs/js/testgeom.js | 2 +-
osmjs/osmjs.cpp | 301 +--
test/.gitignore | 9 +
test/Makefile | 82 +
test/run_tests.sh | 131 +-
test/t/geometry/test_haversine.cpp | 23 +
.../geometry/test_linestring_geometry.cpp | 3 +-
.../geometry/test_point_geometry.cpp | 3 +-
.../geometry/test_polygon_geometry.cpp | 5 +-
.../geometry_geos}/test_point_geometry.cpp | 7 +-
.../geometry => t/geometry_ogr}/test_geometry.cpp | 8 +-
test/t/handler/test_handler.cpp | 199 ++
test/t/handler/test_handler_debug.cpp | 268 ++
test/{testgroup_plain => t}/osm/test_bounds.cpp | 13 +-
test/t/osm/test_node.cpp | 104 +
test/t/osm/test_object.cpp | 253 ++
test/{testgroup_plain => t}/osm/test_position.cpp | 41 +-
test/t/osm/test_relation.cpp | 100 +
test/t/osm/test_relation_member.cpp | 82 +
test/t/osm/test_relation_member_list.cpp | 100 +
test/t/osm/test_tag_list.cpp | 121 +
test/t/osm/test_tag_ostream.cpp | 19 +
test/t/osm/test_way.cpp | 118 +
test/{testgroup_plain => t}/osm/test_way_node.cpp | 34 +-
test/t/osm/test_way_node_list.cpp | 199 ++
test/t/osmfile/test_filename.cpp | 203 ++
test/t/osmfile/test_read_and_write.cpp | 256 ++
test/t/osmfile/test_url.cpp | 17 +
test/t/tags/test_filter.cpp | 110 +
test/t/tags/test_regex_filter.cpp | 38 +
test/t/tags/test_tag.cpp | 25 +
test/t/tags/test_to_string.cpp | 73 +
.../utils/test_timestamp.cpp | 9 +-
test/temp_file_fixture.hpp | 72 +
test/test_main.cpp | 1 -
test/test_utils.cpp | 2 +-
test/testgroup_geos/setup.sh | 1 -
test/testgroup_ogr/setup.sh | 1 -
test/testgroup_plain/osm/test_node.cpp | 41 -
test/testgroup_plain/osm/test_way_node_list.cpp | 38 -
test/testgroup_plain/osmfile/test_filename.cpp | 88 -
test/testgroup_plain/setup.sh | 1 -
valgrind.supp | 38 +
158 files changed, 12143 insertions(+), 6838 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium.git
More information about the Pkg-grass-devel
mailing list