[osm2pgsql] 03/09: Merge tag 'upstream/0.87.0'
Bas Couwenberg
sebastic at xs4all.nl
Wed Dec 10 19:28:41 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository osm2pgsql.
commit e0076ea59b25cc387114d71225242efa853e98ed
Merge: b90ebbc 1ba4091
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Dec 10 11:53:32 2014 +0100
Merge tag 'upstream/0.87.0'
Upstream version 0.87.0
.gitignore | 24 +
.travis.yml | 44 +
Makefile.am | 149 +-
README.md | 38 +-
UTF8sanitizer.c => UTF8sanitizer.cpp | 24 +-
binarysearcharray.c => binarysearcharray.cpp | 13 +-
binarysearcharray.h => binarysearcharray.hpp | 0
build_geometry.h | 48 -
configure.ac | 10 +-
docs/osm2pgsql.1 | 2 +-
docs/usage.md | 6 +-
expire-tiles.c => expire-tiles.cpp | 314 ++--
expire-tiles.h | 14 -
expire-tiles.hpp | 63 +
build_geometry.cpp => geometry-builder.cpp | 573 ++++--
geometry-builder.hpp | 67 +
geometry-processor.cpp | 156 ++
geometry-processor.hpp | 98 ++
id-tracker.cpp | 176 ++
id-tracker.hpp | 27 +
input.c => input.cpp | 144 +-
input.h | 11 -
input.hpp | 13 +
keyvals.c | 346 ----
keyvals.cpp | 266 +++
keyvals.h | 41 -
keyvals.hpp | 50 +
m4/ax_boost_base.m4 | 272 +++
m4/ax_boost_filesystem.m4 | 118 ++
m4/ax_boost_system.m4 | 120 ++
m4/ax_boost_thread.m4 | 149 ++
mapnik-osm-updater.sh | 784 ---------
middle-pgsql.c | 1830 --------------------
middle-pgsql.cpp | 1453 ++++++++++++++++
middle-pgsql.h | 14 -
middle-pgsql.hpp | 107 ++
middle-ram.c | 387 -----
middle-ram.cpp | 364 ++++
middle-ram.h | 14 -
middle-ram.hpp | 86 +
middle.cpp | 26 +
middle.h | 49 -
middle.hpp | 78 +
...he-reader.c => node-persistent-cache-reader.cpp | 70 +-
...persistent-cache.c => node-persistent-cache.cpp | 218 +--
node-persistent-cache.h | 29 -
node-persistent-cache.hpp | 64 +
node-ram-cache.c => node-ram-cache.cpp | 170 +-
node-ram-cache.h | 53 -
node-ram-cache.hpp | 84 +
options.cpp | 543 ++++++
options.hpp | 88 +
osm2pgsql-svn.sh | 17 -
osm2pgsql.c | 796 ---------
osm2pgsql.cpp | 128 ++
osmdata.cpp | 407 +++++
osmdata.hpp | 37 +
osmtypes.h | 82 -
osmtypes.hpp | 37 +
output-gazetteer.c => output-gazetteer.cpp | 609 ++++---
output-gazetteer.h | 8 -
output-gazetteer.hpp | 79 +
output-multi.cpp | 435 +++++
output-multi.hpp | 83 +
output-null.c | 75 -
output-null.cpp | 90 +
output-null.h | 11 -
output-null.hpp | 41 +
output-pgsql.c | 1488 ----------------
output-pgsql.cpp | 762 ++++++++
output-pgsql.h | 27 -
output-pgsql.hpp | 89 +
output.cpp | 161 ++
output.h | 82 -
output.hpp | 79 +
parse-o5m.c => parse-o5m.cpp | 205 ++-
parse-o5m.h => parse-o5m.hpp | 17 +-
parse-pbf.c => parse-pbf.cpp | 323 ++--
parse-pbf.h => parse-pbf.hpp | 28 +-
parse-primitive.c | 486 ------
parse-primitive.h | 30 -
parse-xml2.c | 410 -----
parse-xml2.cpp | 426 +++++
parse-xml2.h | 30 -
parse-xml2.hpp | 63 +
parse.cpp | 229 +++
parse.hpp | 91 +
pgsql-id-tracker.cpp | 151 ++
pgsql-id-tracker.hpp | 28 +
pgsql.c | 133 --
pgsql.cpp | 180 ++
pgsql.h | 14 -
pgsql.hpp | 26 +
processor-line.cpp | 19 +
processor-line.hpp | 16 +
processor-point.cpp | 23 +
processor-point.hpp | 16 +
processor-polygon.cpp | 26 +
processor-polygon.hpp | 18 +
rb.c => rb.cpp | 53 +-
rb.h => rb.hpp | 2 +-
reprojection.c => reprojection.cpp | 132 +-
reprojection.h | 27 -
reprojection.hpp | 53 +
sanitizer.h => sanitizer.hpp | 0
sprompt.c => sprompt.cpp | 21 +-
sprompt.h => sprompt.hpp | 0
table.cpp | 558 ++++++
table.hpp | 90 +
taginfo.cpp | 215 +++
taginfo.hpp | 10 +
taginfo_impl.hpp | 50 +
tagtransform.c => tagtransform.cpp | 899 +++++-----
tagtransform.h | 29 -
tagtransform.hpp | 45 +
tests/common-pg.cpp | 173 ++
tests/common-pg.hpp | 69 +
tests/middle-tests.cpp | 176 ++
tests/middle-tests.hpp | 13 +
tests/regression-test.py | 96 +-
tests/regression-test.sh | 5 +
tests/test-expire-tiles.cpp | 365 ++++
tests/test-middle-pgsql.cpp | 80 +
tests/test-middle-ram.cpp | 50 +
tests/test-output-multi-line.cpp | 126 ++
tests/test-output-multi-point-multi-table.cpp | 147 ++
tests/test-output-multi-point.cpp | 121 ++
tests/test-output-multi-polygon.cpp | 126 ++
tests/test-output-pgsql.cpp | 311 ++++
tests/test-parse-options.cpp | 297 ++++
tests/test-parse-xml2.cpp | 162 ++
tests/test-pgsql-escape.cpp | 7 +
tests/test_output_pgsql_route_rel.osm | 15 +
tests/test_output_pgsql_way_area.osm | 13 +
text-tree.c => text-tree.cpp | 66 +-
text-tree.h | 21 -
text-tree.hpp | 21 +
util.cpp | 10 +
util.hpp | 19 +
wildcmp.c => wildcmp.cpp | 12 +-
wildcmp.h => wildcmp.hpp | 2 +-
win_fsync.h | 71 +
142 files changed, 14028 insertions(+), 9228 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