[osm2pgsql] branch master updated (daddf73 -> d8fba2f)
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Apr 30 07:27:52 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a change to branch master
in repository osm2pgsql.
from daddf73 Set distribution to unstable.
new 004d913 Imported Upstream version 0.87.3
new 17c893b Merge tag 'upstream/0.87.3'
new a3af7bd New upstream release.
new c3d607d Change Upstream-Contact to OpenStreetMap Developers.
new d8fba2f Set distribution to unstable.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 3 +
Makefile.am | 20 +-
README.md | 9 +-
configure.ac | 6 +-
debian/changelog | 7 +
debian/copyright | 2 +-
docs/multi.md | 5 +-
expire-tiles.cpp | 115 +++--
expire-tiles.hpp | 8 +-
geometry-builder.cpp | 141 +++---
geometry-builder.hpp | 15 +-
geometry-processor.cpp | 91 ++--
geometry-processor.hpp | 27 +-
id-tracker.hpp | 1 -
keyvals.cpp | 144 -------
keyvals.hpp | 64 ---
m4/ax_append_flag.m4 | 30 +-
m4/ax_boost_base.m4 | 19 +-
m4/ax_compare_version.m4 | 1 -
m4/ax_compile_check_sizeof.m4 | 2 +-
m4/ax_lib_postgresql.m4 | 38 +-
m4/ax_lua.m4 | 27 +-
m4/ax_pthread.m4 | 156 ++++---
middle-pgsql.cpp | 472 ++++++++++-----------
middle-pgsql.hpp | 24 +-
middle-ram.cpp | 212 +++------
middle-ram.hpp | 31 +-
middle.cpp | 12 -
middle.hpp | 31 +-
multi.lua | 217 ++++++++--
multi.style.json | 30 +-
node-persistent-cache-reader.cpp | 36 +-
node-persistent-cache.cpp | 85 ++--
node-persistent-cache.hpp | 3 +-
node-ram-cache.cpp | 68 +--
node-ram-cache.hpp | 12 +-
options.hpp | 3 +-
osm2pgsql.cpp | 2 +-
osmdata.cpp | 38 +-
osmdata.hpp | 21 +-
osmtypes.hpp | 105 ++++-
output-gazetteer.cpp | 204 ++++-----
output-gazetteer.hpp | 53 ++-
output-multi.cpp | 116 ++---
output-multi.hpp | 22 +-
output-null.cpp | 12 +-
output-null.hpp | 12 +-
output-pgsql.cpp | 229 +++++-----
output-pgsql.hpp | 23 +-
output.hpp | 23 +-
parse-o5m.cpp | 84 ++--
parse-pbf.cpp | 364 +++++++---------
parse-pbf.hpp | 15 +-
parse-xml2.cpp | 105 ++---
parse-xml2.hpp | 6 +-
parse.cpp | 69 +--
parse.hpp | 56 +--
processor-line.cpp | 4 +-
processor-line.hpp | 2 +-
processor-polygon.cpp | 8 +-
processor-polygon.hpp | 4 +-
table.cpp | 50 ++-
table.hpp | 14 +-
tagtransform.cpp | 441 +++++++++----------
tagtransform.hpp | 31 +-
tests/middle-tests.cpp | 63 ++-
tests/regression-test.py | 26 +-
tests/test-expire-tiles.cpp | 2 +-
...oint.cpp => test-output-multi-line-storage.cpp} | 50 +--
tests/test-output-multi-poly-trivial.cpp | 137 ++++++
tests/test-output-multi-tags.cpp | 130 ++++++
tests/test-parse-options.cpp | 6 +-
tests/test-parse-xml2.cpp | 37 +-
tests/test-pgsql-escape.cpp | 1 +
tests/test_output_multi_line_storage.osm | 35 ++
tests/test_output_multi_line_trivial.lua | 10 +
tests/test_output_multi_line_trivial.style.json | 14 +
tests/test_output_multi_poly_trivial.lua | 24 ++
tests/test_output_multi_poly_trivial.osm | 39 ++
tests/test_output_multi_poly_trivial.style.json | 15 +
tests/test_output_multi_tags.json | 99 +++++
tests/test_output_multi_tags.lua | 63 +++
tests/test_output_multi_tags.osm | 28 ++
83 files changed, 2676 insertions(+), 2383 deletions(-)
delete mode 100644 keyvals.cpp
delete mode 100644 keyvals.hpp
copy tests/{test-output-multi-point.cpp => test-output-multi-line-storage.cpp} (59%)
create mode 100644 tests/test-output-multi-poly-trivial.cpp
create mode 100644 tests/test-output-multi-tags.cpp
create mode 100644 tests/test_output_multi_line_storage.osm
create mode 100644 tests/test_output_multi_line_trivial.lua
create mode 100644 tests/test_output_multi_line_trivial.style.json
create mode 100644 tests/test_output_multi_poly_trivial.lua
create mode 100644 tests/test_output_multi_poly_trivial.osm
create mode 100644 tests/test_output_multi_poly_trivial.style.json
create mode 100644 tests/test_output_multi_tags.json
create mode 100644 tests/test_output_multi_tags.lua
create mode 100644 tests/test_output_multi_tags.osm
--
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