[mapnik] branch master updated (d226f9b -> 6e773ef)

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Oct 24 12:55:34 UTC 2015


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

sebastic pushed a change to branch master
in repository mapnik.

      from  d226f9b   Include mapnik-render in mapnik-utils.
       new  ecefdf0   Imported Upstream version 3.0.8+ds
       new  68d8d25   Merge tag 'upstream/3.0.8+ds'
       new  555c8e3   New upstream release.
       new  825875d   Include mapnik-index utility in mapnik-utils.
       new  6e773ef   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:
 .travis.yml                                        |    3 +-
 CHANGELOG.md                                       |   17 +
 SConstruct                                         |    6 +-
 debian/changelog                                   |    6 +-
 debian/libmapnik-dev.install                       |    2 +-
 debian/manpages/mapnik-index.1                     |   50 +
 debian/mapnik-utils.install                        |    1 +
 debian/mapnik-utils.manpages                       |    1 +
 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 +-
 53 files changed, 2376 insertions(+), 1148 deletions(-)
 create mode 100644 debian/manpages/mapnik-index.1
 copy plugins/input/{csv/csv_index_featureset.cpp => geojson/geojson_index_featureset.cpp} (56%)
 copy plugins/input/{csv/csv_index_featureset.hpp => geojson/geojson_index_featureset.hpp} (63%)
 rename plugins/input/geojson/{large_geojson_featureset.cpp => geojson_memory_index_featureset.cpp} (89%)
 rename plugins/input/geojson/{large_geojson_featureset.hpp => geojson_memory_index_featureset.hpp} (81%)
 delete mode 100644 test/standalone/csv_test.cpp
 create mode 100644 test/unit/datasource/csv.cpp

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



More information about the Pkg-grass-devel mailing list