[osm2pgsql] 02/05: Merge tag 'upstream/0.92.0_rc1+ds'

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit 86ca77222b33898b389f73dd1f2bdbc0ff33c2e2
Merge: 425f285 a816bda
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 8 00:11:40 2016 +0100

    Merge tag 'upstream/0.92.0_rc1+ds'
    
    Upstream version 0.92.0~rc1+ds

 900913.sql                            |   1 -
 CMakeLists.txt                        |  15 +-
 README.md                             |  12 +-
 cmake/config.h.in                     |   3 -
 default.style                         |   2 +-
 docs/export.md                        |   2 +-
 docs/migrations.md                    |  16 ++
 docs/osm2pgsql.1                      |  17 +-
 docs/usage.md                         |  10 +-
 expire-tiles.cpp                      | 338 ++++++++++---------------
 expire-tiles.hpp                      |  57 +++--
 geometry-builder.cpp                  |  48 ++--
 id-tracker.cpp                        |   2 +-
 id-tracker.hpp                        |   2 +-
 middle-pgsql.cpp                      | 451 +++++++++++++++-------------------
 middle-pgsql.hpp                      |   9 +-
 multi.style.json                      |  10 -
 options.cpp                           |  19 +-
 options.hpp                           |   1 +
 osm2pgsql.cpp                         |   2 +-
 osmdata.cpp                           |   4 +-
 output-gazetteer.cpp                  |   2 +-
 output-gazetteer.hpp                  |  10 +-
 output-multi.cpp                      |  93 +++----
 output-multi.hpp                      |  17 +-
 output-pgsql.cpp                      | 102 ++++----
 output-pgsql.hpp                      |  13 +-
 output.cpp                            |  31 +--
 output.hpp                            |   6 +-
 parse-osmium.cpp                      |   2 +-
 pgsql.cpp                             |  10 +-
 pgsql.hpp                             |  11 +-
 reprojection.cpp                      |   2 +-
 reprojection.hpp                      |   2 +-
 sprompt.cpp                           |  10 +-
 style.lua                             | 428 +++++++++++++++++++-------------
 table.cpp                             | 150 ++++++-----
 table.hpp                             |   4 +-
 taginfo.cpp                           |  74 +++---
 taginfo.hpp                           |  21 ++
 taginfo_impl.hpp                      |  30 ++-
 tagtransform.cpp                      |   6 +-
 tests/CMakeLists.txt                  |  12 +
 tests/common-pg.cpp                   |  17 ++
 tests/common-pg.hpp                   |   2 +
 tests/regression-test.py              |  32 +--
 tests/test-expire-tiles.cpp           |  83 +++----
 tests/test-options-projection.cpp     | 114 +++++++++
 tests/test-output-pgsql-validgeom.cpp |  97 ++++++++
 tests/test-output-pgsql.cpp           |   2 +-
 tests/test-parse-xml2.cpp             |   2 +-
 tests/test-wildcard-match.cpp         |  61 +++++
 tests/test_output_multi_tags.json     |  25 +-
 tests/test_output_pgsql_validgeom.osm | 250 +++++++++++++++++++
 wildcmp.cpp                           | 115 ++-------
 wildcmp.hpp                           |   6 +-
 56 files changed, 1676 insertions(+), 1187 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm2pgsql.git