[osm2pgsql] 02/10: Merge tag 'upstream/0.94.0_rc1+ds'
Bas Couwenberg
sebastic at debian.org
Mon Sep 18 23:12:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osm2pgsql.
commit 8d6f06c941add8dfad0f0ba2da9634d6e7eaa5be
Merge: e461ade 273f46f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Sep 19 00:40:36 2017 +0200
Merge tag 'upstream/0.94.0_rc1+ds'
Upstream version 0.94.0~rc1+ds
.clang-format | 9 +
.travis.yml | 7 +-
CMakeLists.txt | 32 +-
CONTRIBUTING.md | 36 +-
README.md | 28 +-
appveyor.yml | 45 +-
docs/lua.md | 2 +-
docs/migrations.md | 5 +
docs/osm2pgsql.1 | 5 +-
docs/pgsql.md | 4 +-
docs/usage.md | 7 +-
expire-tiles.cpp | 391 ++++++-------
expire-tiles.hpp | 207 +++++--
geometry-builder.cpp | 739 -----------------------
geometry-builder.hpp | 114 ----
geometry-processor.cpp | 101 ++--
geometry-processor.hpp | 48 +-
middle-pgsql.cpp | 627 +++++++++-----------
middle-pgsql.hpp | 55 +-
middle-ram.cpp | 99 ++--
middle-ram.hpp | 52 +-
middle.hpp | 54 +-
multi.lua | 16 +-
node-persistent-cache.cpp | 658 ++-------------------
node-persistent-cache.hpp | 100 +---
node-ram-cache.cpp | 406 +++++++------
node-ram-cache.hpp | 90 +--
options.cpp | 111 ++--
options.hpp | 12 +-
osm2pgsql.cpp | 6 +-
osmdata.cpp | 93 +--
osmdata.hpp | 22 +-
osmium-builder.cpp | 410 +++++++++++++
osmium-builder.hpp | 51 ++
osmtypes.hpp | 111 +++-
output-gazetteer.cpp | 804 ++++++++++++--------------
output-gazetteer.hpp | 139 ++---
output-multi.cpp | 300 +++++-----
output-multi.hpp | 62 +-
output-null.cpp | 30 +-
output-null.hpp | 34 +-
output-pgsql.cpp | 463 +++++++--------
output-pgsql.hpp | 67 +--
output.cpp | 4 +-
output.hpp | 12 +-
parse-osmium.cpp | 81 +--
parse-osmium.hpp | 27 +-
pgsql.cpp | 45 +-
pgsql.hpp | 19 +-
processor-line.cpp | 21 +-
processor-line.hpp | 17 +-
processor-point.cpp | 14 +-
processor-point.hpp | 10 +-
processor-polygon.cpp | 21 +-
processor-polygon.hpp | 18 +-
style.lua | 16 +-
table.cpp | 59 +-
table.hpp | 21 +-
taginfo.cpp | 54 +-
taginfo_impl.hpp | 14 +-
tagtransform-c.cpp | 421 ++++++++++++++
tagtransform-c.hpp | 31 +
tagtransform-lua.cpp | 202 +++++++
tagtransform-lua.hpp | 38 ++
tagtransform.cpp | 675 +--------------------
tagtransform.hpp | 70 +--
tests/000466354.osc.gz | Bin 161335 -> 125326 bytes
tests/CMakeLists.txt | 1 +
tests/common-pg.cpp | 8 +-
tests/common.hpp | 3 +-
tests/liechtenstein-2013-08-03.osm.pbf | Bin 666646 -> 592570 bytes
tests/middle-tests.cpp | 425 ++++++++------
tests/mockups.hpp | 137 ++---
tests/regression-test.py | 90 +--
tests/test-expire-tiles.cpp | 430 +++++++++-----
tests/test-hstore-match-only.cpp | 2 +-
tests/test-middle-flat.cpp | 1 -
tests/test-middle-pgsql.cpp | 1 -
tests/test-middle-ram.cpp | 1 -
tests/test-options-database.cpp | 14 +-
tests/test-options-parse.cpp | 41 +-
tests/test-options-projection.cpp | 2 +-
tests/test-output-multi-line-storage.cpp | 2 +-
tests/test-output-multi-line.cpp | 8 +-
tests/test-output-multi-point-multi-table.cpp | 4 +-
tests/test-output-multi-point.cpp | 4 +-
tests/test-output-multi-poly-trivial.cpp | 2 +-
tests/test-output-multi-polygon.cpp | 4 +-
tests/test-output-multi-tags.cpp | 2 +-
tests/test-output-pgsql-area.cpp | 3 +-
tests/test-output-pgsql-schema.cpp | 2 +-
tests/test-output-pgsql-tablespace.cpp | 6 +-
tests/test-output-pgsql-validgeom.cpp | 4 +-
tests/test-output-pgsql-z_order.cpp | 2 +-
tests/test-output-pgsql.cpp | 43 +-
tests/test-parse-diff.cpp | 32 +-
tests/test-parse-xml2.cpp | 63 +-
tests/test-persistent-node-cache.cpp | 119 ++++
tests/test_output_multi_poly_trivial.lua | 6 +-
win_fsync.h | 71 ---
wkb.hpp | 363 ++++++++++++
101 files changed, 4968 insertions(+), 5470 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