[mapnik] 02/05: Merge tag 'upstream/3.0.8+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 68d8d257532ede021d91b69e2def5527b443b318
Merge: d226f9b ecefdf0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 24 12:45:40 2015 +0200

    Merge tag 'upstream/3.0.8+ds'
    
    Upstream version 3.0.8+ds

 .travis.yml                                        |    3 +-
 CHANGELOG.md                                       |   17 +
 SConstruct                                         |    6 +-
 demo/viewer/mainwindow.cpp                         |    8 +-
 demo/viewer/mapwidget.cpp                          |    2 +-
 include/mapnik/attribute_descriptor.hpp            |   24 +-
 include/mapnik/feature.hpp                         |    2 -
 include/mapnik/feature_layer_desc.hpp              |   20 +-
 include/mapnik/json/feature_collection_grammar.hpp |   23 +-
 .../json/feature_collection_grammar_impl.hpp       |   63 +-
 include/mapnik/text/harfbuzz_shaper.hpp            |    6 +
 include/mapnik/version.hpp                         |    2 +-
 localize.sh                                        |    3 +-
 plugins/input/csv/csv_datasource.cpp               |   41 +-
 plugins/input/csv/csv_featureset.cpp               |    6 +-
 plugins/input/csv/csv_featureset.hpp               |    4 +-
 plugins/input/csv/csv_index_featureset.cpp         |    6 +-
 plugins/input/csv/csv_index_featureset.hpp         |    4 +-
 plugins/input/csv/csv_utils.hpp                    |   35 +-
 plugins/input/geojson/build.py                     |    4 +-
 plugins/input/geojson/geojson_datasource.cpp       |  243 +++-
 plugins/input/geojson/geojson_datasource.hpp       |    2 +
 .../geojson_index_featureset.cpp}                  |   82 +-
 .../geojson_index_featureset.hpp}                  |   43 +-
 ...set.cpp => geojson_memory_index_featureset.cpp} |   13 +-
 ...set.hpp => geojson_memory_index_featureset.hpp} |   14 +-
 plugins/input/ogr/ogr_index_featureset.cpp         |    4 +-
 plugins/input/shape/dbfile.cpp                     |    8 +-
 plugins/input/shape/dbfile.hpp                     |    4 +-
 plugins/input/shape/shape_datasource.cpp           |   36 +-
 plugins/input/shape/shape_featureset.cpp           |   38 +-
 plugins/input/shape/shape_featureset.hpp           |    3 +-
 plugins/input/shape/shape_index_featureset.cpp     |   15 +-
 plugins/input/shape/shape_io.cpp                   |   13 +-
 plugins/input/shape/shape_io.hpp                   |    8 +-
 plugins/input/shape/shapefile.hpp                  |   17 +-
 .../mapnik_json_feature_collection_grammar.cpp     |    1 +
 src/mapped_memory_cache.cpp                        |    2 +-
 test/standalone/csv_test.cpp                       |  676 -----------
 test/unit/datasource/csv.cpp                       | 1173 ++++++++++++++++++++
 test/unit/datasource/geojson.cpp                   |  492 ++++++--
 utils/mapnik-index/build.py                        |    1 -
 utils/mapnik-index/mapnik-index.cpp                |   30 +-
 utils/mapnik-index/process_csv_file.cpp            |   49 +-
 utils/mapnik-index/process_geojson_file.cpp        |   26 +-
 utils/shapefile/shapefile_reader.py                |   23 +-
 utils/shapeindex/shapeindex.cpp                    |  167 ++-
 utils/svg2png/svg2png.cpp                          |    2 +-
 48 files changed, 2319 insertions(+), 1145 deletions(-)

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