[osm2pgsql] branch master updated (1f11718 -> 6697eb4)

Bas Couwenberg sebastic at xs4all.nl
Wed Dec 10 19:28:40 UTC 2014


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

sebastic-guest pushed a change to branch master
in repository osm2pgsql.

      from  1f11718   Add upstream metadata.
       new  b90ebbc   Update watch file to rename downloaded tarball.
       new  1ba4091   Imported Upstream version 0.87.0
       new  e0076ea   Merge tag 'upstream/0.87.0'
       new  45f419a   New upstream release.
       new  20032e2   Add Boost build dependencies for C++ build.
       new  5ae9f3e   Enable verbose test output.
       new  c7c2cc4   Ignore test failures, some tests require a configured postgres database.
       new  23d5e06   Update copyright file.
       new  6697eb4   Set distribution to experimental.

The 9 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                                         |   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 +-
 debian/changelog                                   |   18 +-
 debian/control                                     |    5 +
 debian/copyright                                   |   54 +-
 debian/rules                                       |    6 +
 debian/watch                                       |    6 +-
 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 +
 147 files changed, 14090 insertions(+), 9255 deletions(-)
 create mode 100644 .travis.yml
 rename UTF8sanitizer.c => UTF8sanitizer.cpp (91%)
 rename binarysearcharray.c => binarysearcharray.cpp (89%)
 rename binarysearcharray.h => binarysearcharray.hpp (100%)
 delete mode 100644 build_geometry.h
 rename expire-tiles.c => expire-tiles.cpp (51%)
 delete mode 100644 expire-tiles.h
 create mode 100644 expire-tiles.hpp
 rename build_geometry.cpp => geometry-builder.cpp (56%)
 create mode 100644 geometry-builder.hpp
 create mode 100644 geometry-processor.cpp
 create mode 100644 geometry-processor.hpp
 create mode 100644 id-tracker.cpp
 create mode 100644 id-tracker.hpp
 rename input.c => input.cpp (62%)
 delete mode 100644 input.h
 create mode 100644 input.hpp
 delete mode 100644 keyvals.c
 create mode 100644 keyvals.cpp
 delete mode 100644 keyvals.h
 create mode 100644 keyvals.hpp
 create mode 100644 m4/ax_boost_base.m4
 create mode 100644 m4/ax_boost_filesystem.m4
 create mode 100644 m4/ax_boost_system.m4
 create mode 100644 m4/ax_boost_thread.m4
 delete mode 100755 mapnik-osm-updater.sh
 delete mode 100644 middle-pgsql.c
 create mode 100644 middle-pgsql.cpp
 delete mode 100644 middle-pgsql.h
 create mode 100644 middle-pgsql.hpp
 delete mode 100644 middle-ram.c
 create mode 100644 middle-ram.cpp
 delete mode 100644 middle-ram.h
 create mode 100644 middle-ram.hpp
 create mode 100644 middle.cpp
 delete mode 100644 middle.h
 create mode 100644 middle.hpp
 rename node-persistent-cache-reader.c => node-persistent-cache-reader.cpp (66%)
 rename node-persistent-cache.c => node-persistent-cache.cpp (82%)
 delete mode 100644 node-persistent-cache.h
 create mode 100644 node-persistent-cache.hpp
 rename node-ram-cache.c => node-ram-cache.cpp (80%)
 delete mode 100644 node-ram-cache.h
 create mode 100644 node-ram-cache.hpp
 create mode 100644 options.cpp
 create mode 100644 options.hpp
 delete mode 100755 osm2pgsql-svn.sh
 delete mode 100644 osm2pgsql.c
 create mode 100644 osm2pgsql.cpp
 create mode 100644 osmdata.cpp
 create mode 100644 osmdata.hpp
 delete mode 100644 osmtypes.h
 create mode 100644 osmtypes.hpp
 rename output-gazetteer.c => output-gazetteer.cpp (68%)
 delete mode 100644 output-gazetteer.h
 create mode 100644 output-gazetteer.hpp
 create mode 100644 output-multi.cpp
 create mode 100644 output-multi.hpp
 delete mode 100644 output-null.c
 create mode 100644 output-null.cpp
 delete mode 100644 output-null.h
 create mode 100644 output-null.hpp
 delete mode 100644 output-pgsql.c
 create mode 100644 output-pgsql.cpp
 delete mode 100644 output-pgsql.h
 create mode 100644 output-pgsql.hpp
 create mode 100644 output.cpp
 delete mode 100644 output.h
 create mode 100644 output.hpp
 rename parse-o5m.c => parse-o5m.cpp (86%)
 rename parse-o5m.h => parse-o5m.hpp (74%)
 rename parse-pbf.c => parse-pbf.cpp (65%)
 rename parse-pbf.h => parse-pbf.hpp (50%)
 delete mode 100644 parse-primitive.c
 delete mode 100644 parse-primitive.h
 delete mode 100644 parse-xml2.c
 create mode 100644 parse-xml2.cpp
 delete mode 100644 parse-xml2.h
 create mode 100644 parse-xml2.hpp
 create mode 100644 parse.cpp
 create mode 100644 parse.hpp
 create mode 100644 pgsql-id-tracker.cpp
 create mode 100644 pgsql-id-tracker.hpp
 delete mode 100644 pgsql.c
 create mode 100644 pgsql.cpp
 delete mode 100644 pgsql.h
 create mode 100644 pgsql.hpp
 create mode 100644 processor-line.cpp
 create mode 100644 processor-line.hpp
 create mode 100644 processor-point.cpp
 create mode 100644 processor-point.hpp
 create mode 100644 processor-polygon.cpp
 create mode 100644 processor-polygon.hpp
 rename rb.c => rb.cpp (94%)
 rename rb.h => rb.hpp (98%)
 rename reprojection.c => reprojection.cpp (62%)
 delete mode 100644 reprojection.h
 create mode 100644 reprojection.hpp
 rename sanitizer.h => sanitizer.hpp (100%)
 rename sprompt.c => sprompt.cpp (95%)
 rename sprompt.h => sprompt.hpp (100%)
 create mode 100644 table.cpp
 create mode 100644 table.hpp
 create mode 100644 taginfo.cpp
 create mode 100644 taginfo.hpp
 create mode 100644 taginfo_impl.hpp
 rename tagtransform.c => tagtransform.cpp (53%)
 delete mode 100644 tagtransform.h
 create mode 100644 tagtransform.hpp
 create mode 100644 tests/common-pg.cpp
 create mode 100644 tests/common-pg.hpp
 create mode 100644 tests/middle-tests.cpp
 create mode 100644 tests/middle-tests.hpp
 create mode 100755 tests/regression-test.sh
 create mode 100644 tests/test-expire-tiles.cpp
 create mode 100644 tests/test-middle-pgsql.cpp
 create mode 100644 tests/test-middle-ram.cpp
 create mode 100644 tests/test-output-multi-line.cpp
 create mode 100644 tests/test-output-multi-point-multi-table.cpp
 create mode 100644 tests/test-output-multi-point.cpp
 create mode 100644 tests/test-output-multi-polygon.cpp
 create mode 100644 tests/test-output-pgsql.cpp
 create mode 100644 tests/test-parse-options.cpp
 create mode 100644 tests/test-parse-xml2.cpp
 create mode 100644 tests/test-pgsql-escape.cpp
 create mode 100644 tests/test_output_pgsql_route_rel.osm
 create mode 100644 tests/test_output_pgsql_way_area.osm
 rename text-tree.c => text-tree.cpp (50%)
 delete mode 100644 text-tree.h
 create mode 100644 text-tree.hpp
 create mode 100644 util.cpp
 create mode 100644 util.hpp
 rename wildcmp.c => wildcmp.cpp (93%)
 rename wildcmp.h => wildcmp.hpp (64%)
 create mode 100644 win_fsync.h

-- 
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