[osm2pgsql] 03/18: Merge tag 'upstream/0.90.0_rc1'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Feb 27 15:33:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osm2pgsql.
commit 7c1d218109e227d6f8de77056935387c0844b8d9
Merge: 40b0072 e3642cc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Feb 27 14:41:50 2016 +0100
Merge tag 'upstream/0.90.0_rc1'
Upstream version 0.90.0~rc1
.gitignore | 70 +-
.travis.yml | 82 +-
CMakeLists.txt | 266 +++
CONTRIBUTING.md | 22 +-
Makefile.am | 188 --
NEWS | 10 -
README.md | 88 +-
UTF8sanitizer.cpp | 160 --
appveyor.yml | 69 +
autogen.sh | 2 -
cmake/FindLua.cmake | 171 ++
cmake/FindOsmium.cmake | 317 +++
cmake/config.h.in | 35 +
configure.ac | 171 --
contrib/libosmium/LICENSE.txt | 23 +
contrib/libosmium/README.contrib | 2 +
contrib/libosmium/README.md | 108 +
contrib/libosmium/osmium/area/assembler.hpp | 787 +++++++
.../osmium/area/detail/node_ref_segment.hpp | 262 +++
.../libosmium/osmium/area/detail/proto_ring.hpp | 277 +++
.../libosmium/osmium/area/detail/segment_list.hpp | 218 ++
.../osmium/area/multipolygon_collector.hpp | 223 ++
contrib/libosmium/osmium/area/problem_reporter.hpp | 149 ++
.../osmium/area/problem_reporter_exception.hpp | 96 +
.../libosmium/osmium/area/problem_reporter_ogr.hpp | 139 ++
.../osmium/area/problem_reporter_stream.hpp | 96 +
contrib/libosmium/osmium/builder/builder.hpp | 237 ++
.../libosmium/osmium/builder/builder_helper.hpp | 103 +
.../osmium/builder/osm_object_builder.hpp | 370 +++
contrib/libosmium/osmium/diff_handler.hpp | 67 +
contrib/libosmium/osmium/diff_iterator.hpp | 129 ++
contrib/libosmium/osmium/diff_visitor.hpp | 104 +
contrib/libosmium/osmium/dynamic_handler.hpp | 190 ++
.../libosmium/osmium/experimental/flex_reader.hpp | 137 ++
contrib/libosmium/osmium/fwd.hpp | 70 +
contrib/libosmium/osmium/geom/coordinates.hpp | 96 +
contrib/libosmium/osmium/geom/factory.hpp | 419 ++++
contrib/libosmium/osmium/geom/geojson.hpp | 160 ++
contrib/libosmium/osmium/geom/geos.hpp | 240 ++
contrib/libosmium/osmium/geom/haversine.hpp | 94 +
.../libosmium/osmium/geom/mercator_projection.hpp | 110 +
contrib/libosmium/osmium/geom/ogr.hpp | 178 ++
contrib/libosmium/osmium/geom/projection.hpp | 167 ++
contrib/libosmium/osmium/geom/rapid_geojson.hpp | 190 ++
contrib/libosmium/osmium/geom/relations.hpp | 57 +
contrib/libosmium/osmium/geom/tile.hpp | 101 +
contrib/libosmium/osmium/geom/util.hpp | 75 +
contrib/libosmium/osmium/geom/wkb.hpp | 273 +++
contrib/libosmium/osmium/geom/wkt.hpp | 156 ++
contrib/libosmium/osmium/handler.hpp | 94 +
contrib/libosmium/osmium/handler/chain.hpp | 128 ++
contrib/libosmium/osmium/handler/disk_store.hpp | 111 +
contrib/libosmium/osmium/handler/dump.hpp | 294 +++
.../osmium/handler/node_locations_for_ways.hpp | 180 ++
.../libosmium/osmium/handler/object_relations.hpp | 106 +
contrib/libosmium/osmium/index/bool_vector.hpp | 85 +
.../osmium/index/detail/create_map_with_fd.hpp | 71 +
.../osmium/index/detail/mmap_vector_anon.hpp | 67 +
.../osmium/index/detail/mmap_vector_base.hpp | 180 ++
.../osmium/index/detail/mmap_vector_file.hpp | 74 +
contrib/libosmium/osmium/index/detail/tmpfile.hpp | 62 +
.../libosmium/osmium/index/detail/vector_map.hpp | 246 ++
.../osmium/index/detail/vector_multimap.hpp | 186 ++
contrib/libosmium/osmium/index/index.hpp | 100 +
contrib/libosmium/osmium/index/map.hpp | 275 +++
contrib/libosmium/osmium/index/map/all.hpp | 46 +
.../osmium/index/map/dense_file_array.hpp | 67 +
.../libosmium/osmium/index/map/dense_mem_array.hpp | 57 +
.../osmium/index/map/dense_mmap_array.hpp | 60 +
contrib/libosmium/osmium/index/map/dummy.hpp | 88 +
.../osmium/index/map/sparse_file_array.hpp | 67 +
.../osmium/index/map/sparse_mem_array.hpp | 60 +
.../libosmium/osmium/index/map/sparse_mem_map.hpp | 116 +
.../osmium/index/map/sparse_mem_table.hpp | 147 ++
.../osmium/index/map/sparse_mmap_array.hpp | 60 +
contrib/libosmium/osmium/index/multimap.hpp | 127 ++
contrib/libosmium/osmium/index/multimap/all.hpp | 41 +
contrib/libosmium/osmium/index/multimap/hybrid.hpp | 204 ++
.../osmium/index/multimap/sparse_file_array.hpp | 54 +
.../osmium/index/multimap/sparse_mem_array.hpp | 58 +
.../osmium/index/multimap/sparse_mem_multimap.hpp | 151 ++
.../osmium/index/multimap/sparse_mmap_array.hpp | 58 +
.../libosmium/osmium/index/node_locations_map.hpp | 70 +
contrib/libosmium/osmium/io/any_compression.hpp | 48 +
contrib/libosmium/osmium/io/any_input.hpp | 52 +
contrib/libosmium/osmium/io/any_output.hpp | 53 +
contrib/libosmium/osmium/io/bzip2_compression.hpp | 321 +++
contrib/libosmium/osmium/io/compression.hpp | 321 +++
contrib/libosmium/osmium/io/debug_output.hpp | 39 +
.../osmium/io/detail/debug_output_format.hpp | 485 ++++
.../libosmium/osmium/io/detail/input_format.hpp | 211 ++
.../osmium/io/detail/o5m_input_format.hpp | 633 ++++++
.../osmium/io/detail/opl_output_format.hpp | 261 +++
.../libosmium/osmium/io/detail/output_format.hpp | 184 ++
contrib/libosmium/osmium/io/detail/pbf.hpp | 89 +
contrib/libosmium/osmium/io/detail/pbf_decoder.hpp | 777 +++++++
.../osmium/io/detail/pbf_input_format.hpp | 242 ++
.../osmium/io/detail/pbf_output_format.hpp | 643 ++++++
.../libosmium/osmium/io/detail/protobuf_tags.hpp | 170 ++
contrib/libosmium/osmium/io/detail/queue_util.hpp | 157 ++
contrib/libosmium/osmium/io/detail/read_thread.hpp | 133 ++
contrib/libosmium/osmium/io/detail/read_write.hpp | 180 ++
.../libosmium/osmium/io/detail/string_table.hpp | 265 +++
contrib/libosmium/osmium/io/detail/string_util.hpp | 206 ++
.../libosmium/osmium/io/detail/write_thread.hpp | 107 +
.../osmium/io/detail/xml_input_format.hpp | 679 ++++++
.../osmium/io/detail/xml_output_format.hpp | 473 ++++
contrib/libosmium/osmium/io/detail/zlib.hpp | 115 +
contrib/libosmium/osmium/io/error.hpp | 70 +
contrib/libosmium/osmium/io/file.hpp | 328 +++
contrib/libosmium/osmium/io/file_compression.hpp | 72 +
contrib/libosmium/osmium/io/file_format.hpp | 84 +
contrib/libosmium/osmium/io/gzip_compression.hpp | 277 +++
contrib/libosmium/osmium/io/header.hpp | 122 +
contrib/libosmium/osmium/io/input_iterator.hpp | 178 ++
contrib/libosmium/osmium/io/o5m_input.hpp | 45 +
contrib/libosmium/osmium/io/opl_output.hpp | 39 +
contrib/libosmium/osmium/io/output_iterator.hpp | 133 ++
contrib/libosmium/osmium/io/overwrite.hpp | 39 +
contrib/libosmium/osmium/io/pbf_input.hpp | 48 +
contrib/libosmium/osmium/io/pbf_output.hpp | 48 +
contrib/libosmium/osmium/io/reader.hpp | 380 ++++
contrib/libosmium/osmium/io/reader_iterator.hpp | 51 +
contrib/libosmium/osmium/io/writer.hpp | 344 +++
contrib/libosmium/osmium/io/writer_options.hpp | 60 +
contrib/libosmium/osmium/io/xml_input.hpp | 48 +
contrib/libosmium/osmium/io/xml_output.hpp | 47 +
contrib/libosmium/osmium/memory/buffer.hpp | 617 +++++
contrib/libosmium/osmium/memory/collection.hpp | 153 ++
contrib/libosmium/osmium/memory/item.hpp | 177 ++
contrib/libosmium/osmium/memory/item_iterator.hpp | 234 ++
.../libosmium/osmium/object_pointer_collection.hpp | 112 +
contrib/libosmium/osmium/osm.hpp | 48 +
contrib/libosmium/osmium/osm/area.hpp | 215 ++
contrib/libosmium/osmium/osm/box.hpp | 250 +++
contrib/libosmium/osmium/osm/changeset.hpp | 458 ++++
contrib/libosmium/osmium/osm/crc.hpp | 242 ++
contrib/libosmium/osmium/osm/diff_object.hpp | 180 ++
contrib/libosmium/osmium/osm/entity.hpp | 80 +
contrib/libosmium/osmium/osm/entity_bits.hpp | 105 +
contrib/libosmium/osmium/osm/item_type.hpp | 200 ++
contrib/libosmium/osmium/osm/location.hpp | 285 +++
contrib/libosmium/osmium/osm/node.hpp | 76 +
contrib/libosmium/osmium/osm/node_ref.hpp | 173 ++
contrib/libosmium/osmium/osm/node_ref_list.hpp | 184 ++
contrib/libosmium/osmium/osm/object.hpp | 438 ++++
.../libosmium/osmium/osm/object_comparisons.hpp | 110 +
contrib/libosmium/osmium/osm/relation.hpp | 194 ++
contrib/libosmium/osmium/osm/segment.hpp | 105 +
contrib/libosmium/osmium/osm/tag.hpp | 140 ++
contrib/libosmium/osmium/osm/timestamp.hpp | 193 ++
contrib/libosmium/osmium/osm/types.hpp | 66 +
contrib/libosmium/osmium/osm/types_from_string.hpp | 122 +
.../libosmium/osmium/osm/undirected_segment.hpp | 100 +
contrib/libosmium/osmium/osm/way.hpp | 117 +
contrib/libosmium/osmium/relations/collector.hpp | 544 +++++
.../osmium/relations/detail/member_meta.hpp | 158 ++
.../osmium/relations/detail/relation_meta.hpp | 136 ++
contrib/libosmium/osmium/tags/filter.hpp | 162 ++
contrib/libosmium/osmium/tags/regex_filter.hpp | 58 +
contrib/libosmium/osmium/tags/taglist.hpp | 67 +
.../libosmium/osmium/thread/function_wrapper.hpp | 123 +
contrib/libosmium/osmium/thread/pool.hpp | 190 ++
contrib/libosmium/osmium/thread/queue.hpp | 192 ++
contrib/libosmium/osmium/thread/sorted_queue.hpp | 159 ++
contrib/libosmium/osmium/thread/util.hpp | 116 +
contrib/libosmium/osmium/util/cast.hpp | 103 +
contrib/libosmium/osmium/util/compatibility.hpp | 56 +
contrib/libosmium/osmium/util/config.hpp | 72 +
contrib/libosmium/osmium/util/data_file.hpp | 194 ++
contrib/libosmium/osmium/util/delta.hpp | 174 ++
contrib/libosmium/osmium/util/double.hpp | 93 +
contrib/libosmium/osmium/util/endian.hpp | 45 +
contrib/libosmium/osmium/util/file.hpp | 121 +
contrib/libosmium/osmium/util/memory_mapping.hpp | 757 +++++++
contrib/libosmium/osmium/util/minmax.hpp | 120 +
contrib/libosmium/osmium/util/options.hpp | 165 ++
contrib/libosmium/osmium/util/string.hpp | 102 +
contrib/libosmium/osmium/util/verbose_output.hpp | 139 ++
contrib/libosmium/osmium/visitor.hpp | 258 +++
contrib/libosmium/protozero/byteswap.hpp | 69 +
contrib/libosmium/protozero/exception.hpp | 68 +
contrib/libosmium/protozero/pbf_builder.hpp | 137 ++
contrib/libosmium/protozero/pbf_message.hpp | 94 +
contrib/libosmium/protozero/pbf_reader.hpp | 1067 +++++++++
contrib/libosmium/protozero/pbf_types.hpp | 49 +
contrib/libosmium/protozero/pbf_writer.hpp | 666 ++++++
contrib/libosmium/protozero/varint.hpp | 132 ++
contrib/libosmium/protozero/version.hpp | 22 +
default.style | 19 +-
docs/Doxyfile | 2362 ++++++++++++++++++++
docs/lua.md | 4 +-
docs/multi.md | 54 +-
docs/osm2pgsql.1 | 20 +-
docs/pgsql.md | 2 +-
docs/usage.md | 18 +-
empty.style | 58 +-
expire-tiles.cpp | 57 +-
expire-tiles.hpp | 2 +-
geometry-builder.cpp | 691 +++---
geometry-builder.hpp | 92 +-
geometry-processor.cpp | 26 +-
geometry-processor.hpp | 16 +-
geos-fallback/geos/noding/SegmentNode.h | 123 -
geos-fallback/geos/noding/SegmentNodeList.h | 204 --
geos-fallback/geos/noding/SegmentString.h | 224 --
id-tracker.hpp | 21 +-
input.cpp | 226 --
input.hpp | 14 -
install-postgis-osm-db.sh | 12 +-
install-postgis-osm-user.sh | 2 +-
m4/ax_append_flag.m4 | 71 -
m4/ax_boost_base.m4 | 285 ---
m4/ax_boost_filesystem.m4 | 118 -
m4/ax_boost_system.m4 | 120 -
m4/ax_boost_thread.m4 | 149 --
m4/ax_cflags_warn_all.m4 | 122 -
m4/ax_compare_version.m4 | 177 --
m4/ax_compile_check_sizeof.m4 | 114 -
m4/ax_config_nice.m4 | 37 -
m4/ax_cxx_compile_stdcxx_11.m4 | 142 --
m4/ax_lib_bzip2.m4 | 221 --
m4/ax_lib_geos.m4 | 161 --
m4/ax_lib_postgresql.m4 | 164 --
m4/ax_lib_proj.m4 | 216 --
m4/ax_lib_protobuf_c.m4 | 257 ---
m4/ax_lib_xml2.m4 | 150 --
m4/ax_lib_zlib.m4 | 220 --
m4/ax_lua.m4 | 664 ------
m4/ax_pthread.m4 | 332 ---
middle-pgsql.cpp | 501 ++---
middle-pgsql.hpp | 55 +-
middle-ram.cpp | 114 +-
middle-ram.hpp | 93 +-
middle.cpp | 8 +-
middle.hpp | 62 +-
multi.lua | 2 +-
node-persistent-cache-reader.cpp | 56 +-
node-persistent-cache.cpp | 64 +-
node-persistent-cache.hpp | 20 +-
node-ram-cache.cpp | 71 +-
node-ram-cache.hpp | 26 +-
options.cpp | 267 ++-
options.hpp | 120 +-
osm2pgsql.cpp | 67 +-
osm2pgsql.spec.in | 96 -
osmdata.cpp | 156 +-
osmdata.hpp | 10 +-
osmtypes.hpp | 31 +-
output-gazetteer.cpp | 492 ++--
output-gazetteer.hpp | 50 +-
output-multi.cpp | 116 +-
output-multi.hpp | 30 +-
output-null.cpp | 4 +-
output-null.hpp | 2 +-
output-pgsql.cpp | 315 +--
output-pgsql.hpp | 27 +-
output.cpp | 44 +-
output.hpp | 26 +-
parse-o5m.cpp | 962 --------
parse-o5m.hpp | 44 -
parse-osmium.cpp | 229 ++
parse-osmium.hpp | 145 ++
parse-pbf.cpp | 554 -----
parse-pbf.hpp | 67 -
parse-xml2.cpp | 414 ----
parse-xml2.hpp | 62 -
parse.cpp | 178 --
parse.hpp | 96 -
pgsql.cpp | 19 +-
pgsql.hpp | 10 +-
processor-line.cpp | 7 +-
processor-line.hpp | 2 +-
processor-point.cpp | 14 +-
processor-point.hpp | 2 +-
processor-polygon.cpp | 13 +-
processor-polygon.hpp | 4 +-
protobuf/fileformat.proto | 30 -
protobuf/osmformat.proto | 206 --
reprojection.cpp | 235 +-
reprojection.hpp | 71 +-
sanitizer.hpp | 8 -
sprompt.cpp | 13 +-
style.lua | 12 +-
table.cpp | 109 +-
table.hpp | 51 +-
taginfo.cpp | 11 +-
taginfo_impl.hpp | 3 +-
tagtransform.cpp | 133 +-
tagtransform.hpp | 2 +-
tests/008-ch.osc.gz | Bin 0 -> 110786 bytes
tests/CMakeLists.txt | 69 +
tests/common-cleanup.cpp | 21 +
tests/common-cleanup.hpp | 21 +
tests/common-pg.cpp | 146 +-
tests/common-pg.hpp | 63 +-
tests/common.hpp | 22 +
tests/hstore-match-only.osm | 323 +++
tests/hstore-match-only.style | 31 +
tests/liechtenstein-2013-08-03.osm.bz2 | Bin 1061981 -> 0 bytes
tests/middle-tests.cpp | 25 +-
tests/mockups.hpp | 116 +
tests/regression-test.py | 41 +-
tests/regression-test.sh | 3 +-
tests/test-expire-tiles.cpp | 1 +
tests/test-hstore-match-only.cpp | 92 +
tests/test-middle-flat.cpp | 27 +-
tests/test-middle-pgsql.cpp | 17 +-
tests/test-options-database.cpp | 87 +
...st-parse-options.cpp => test-options-parse.cpp} | 73 +-
tests/test-output-multi-line-storage.cpp | 64 +-
tests/test-output-multi-line.cpp | 91 +-
tests/test-output-multi-point-multi-table.cpp | 70 +-
tests/test-output-multi-point.cpp | 62 +-
tests/test-output-multi-poly-trivial.cpp | 76 +-
tests/test-output-multi-polygon.cpp | 93 +-
tests/test-output-multi-tags.cpp | 90 +-
tests/test-output-pgsql-area.cpp | 107 +
tests/test-output-pgsql-schema.cpp | 110 +
tests/test-output-pgsql-tablespace.cpp | 81 +-
tests/test-output-pgsql-z_order.cpp | 127 +-
tests/test-output-pgsql.cpp | 325 +--
tests/test-parse-diff.cpp | 126 ++
tests/test-parse-xml2.cpp | 78 +-
tests/test_output_pgsql_area.osm | 55 +
325 files changed, 38842 insertions(+), 11272 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git
More information about the Pkg-grass-devel
mailing list