[mapnik] 02/04: Merge tag 'upstream/3.0.9_rc1+ds'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapnik.

commit 5397d5d089248004130618cdcb0210efe3839553
Merge: 6e773ef 9872e31
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 3 23:24:39 2015 +0100

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

 .travis.yml                                        |   8 +-
 demo/python/rundemo.py                             |   9 +-
 demo/simple-renderer/render.py                     |   4 +-
 include/mapnik/json/error_handler.hpp              |  36 ++-
 .../json/extract_bounding_box_grammar_impl.hpp     |  32 +--
 include/mapnik/json/feature_collection_grammar.hpp |  16 +-
 .../json/feature_collection_grammar_impl.hpp       |  53 +----
 include/mapnik/json/geometry_grammar.hpp           |   2 +-
 include/mapnik/json/geometry_grammar_impl.hpp      |  23 +-
 include/mapnik/util/variant.hpp                    |  65 +++++-
 include/mapnik/value.hpp                           | 121 +++++++---
 plugins/input/csv/csv_datasource.cpp               |   1 -
 plugins/input/geojson/geojson_datasource.cpp       |  10 +-
 plugins/input/geojson/geojson_index_featureset.cpp |   6 +-
 .../geojson/geojson_memory_index_featureset.cpp    |   7 +-
 src/image.cpp                                      |   5 +-
 test/unit/core/box2d_test.cpp                      |   1 -
 test/unit/core/comparison_test.cpp                 |  69 +++++-
 test/unit/core/conversions_test.cpp                |   2 -
 test/unit/core/copy_move_test.cpp                  |   3 -
 test/unit/core/params_test.cpp                     |   2 -
 test/unit/datasource/csv.cpp                       | 245 ++++++---------------
 test/unit/datasource/ds_test_util.hpp              | 172 +++++++++++++++
 test/unit/datasource/geojson.cpp                   |  21 +-
 test/unit/datasource/ogr.cpp                       |   1 -
 test/unit/datasource/postgis.cpp                   |  94 ++++++++
 test/unit/datasource/spatial_index.cpp             |   3 -
 test/unit/font/fontset_runtime_test.cpp            |  10 -
 test/unit/geometry/geometry.cpp                    |   1 -
 test/unit/geometry/geometry_converters_test.cpp    | 192 ----------------
 test/unit/geometry/geometry_envelope_test.cpp      |   2 -
 test/unit/geometry/geometry_is_simple.cpp          |   1 -
 test/unit/geometry/geometry_is_valid.cpp           |   1 -
 test/unit/geometry/geometry_reprojection.cpp       |   4 -
 test/unit/geometry/label_algo_test.cpp             |  64 ++----
 test/unit/imaging/image.cpp                        |  26 +--
 test/unit/imaging/image_io_test.cpp                |   2 -
 test/unit/imaging/image_set_pixel.cpp              |   4 +-
 test/unit/imaging/image_view.cpp                   |   2 +-
 test/unit/imaging/tiff_io.cpp                      |   2 -
 test/unit/imaging/webp_io.cpp                      |   3 +-
 test/unit/pixel/agg_blend_src_over_test.cpp        |   3 -
 test/unit/serialization/wkb_formats_test.cpp       |   3 -
 test/unit/serialization/xml_parser_trim.cpp        |   4 +-
 test/unit/svg/svg_parser_test.cpp                  |   4 +-
 test/unit/symbolizer/symbolizer_test.cpp           |   2 -
 test/unit/vertex_adapter/clipping_test.cpp         |   2 -
 test/unit/vertex_adapter/line_offset_test.cpp      |   6 +-
 test/unit/vertex_adapter/offset_converter.cpp      |   5 -
 .../vertex_adapter/simplify_converters_test.cpp    |  14 +-
 utils/mapnik-index/process_geojson_file.cpp        |  11 +-
 51 files changed, 713 insertions(+), 666 deletions(-)

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