[mapnik-vector-tile] 03/07: Imported Upstream version 1.2.1+dfsg
Bas Couwenberg
sebastic at debian.org
Fri Aug 5 20:57:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository mapnik-vector-tile.
commit 665b996f8792b70e4fb1c292597e40b3b3290438
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Aug 5 22:19:01 2016 +0200
Imported Upstream version 1.2.1+dfsg
---
.travis.yml | 19 +++--
CHANGELOG.md | 6 ++
Makefile | 2 +-
README.md | 3 +-
bootstrap.sh | 40 +++++-----
package.json | 2 +-
src/vector_tile_datasource_pbf.ipp | 20 ++---
test/unit/tile_impl/tile.cpp | 145 +------------------------------------
8 files changed, 56 insertions(+), 181 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 656058f..37b3b70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,21 +17,21 @@ matrix:
- os: linux
sudo: false
compiler: ": clang"
- env: JOBS=10 CXX="ccache clang++-3.5 -Qunused-arguments"
+ env: JOBS=10 CXX="ccache clang++-3.8 -Qunused-arguments"
sudo: false
addons:
apt:
- sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5']
- packages: ['clang-3.5']
+ sources: ['ubuntu-toolchain-r-test']
+ packages: [ 'libstdc++6', 'libstdc++-5-dev']
- os: linux
sudo: false
compiler: ": clang-coverage"
- env: JOBS=10 CXX="ccache clang++-3.5 -Qunused-arguments" COVERAGE=true BUILDTYPE=Debug
+ env: JOBS=10 CXX="ccache clang++-3.8 -Qunused-arguments" COVERAGE=true BUILDTYPE=Debug
sudo: false
addons:
apt:
- sources: ['ubuntu-toolchain-r-test','llvm-toolchain-precise-3.5']
- packages: ['clang-3.5', 'llvm-3.5-dev']
+ sources: ['ubuntu-toolchain-r-test']
+ packages: [ 'libstdc++6', 'libstdc++-5-dev']
- os: osx
compiler: clang
env: JOBS=10
@@ -40,6 +40,13 @@ matrix:
before_install:
- source ./bootstrap.sh
+ - |
+ if [[ $(uname -s) == 'Linux' ]]; then
+ mason install clang 3.8.0
+ export PATH=$(mason prefix clang 3.8.0)/bin:${PATH}
+ which clang++
+ export LLVM_COV="$(mason prefix clang 3.8.0)/bin/llvm-cov"
+ fi
install:
- source ./scripts/build.sh
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8ed24a..0d2e606 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## 1.2.1
+
+- Updated clipper
+- Upgrade to clang-3.8
+- Works with latest variant (stricter type matching)
+
## 1.2.0
- Big overhaul to the interface around the vector tile decoder
diff --git a/Makefile b/Makefile
index 5d2d335..c600e56 100755
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
MAPNIK_PLUGINDIR := $(shell mapnik-config --input-plugins)
BUILDTYPE ?= Release
-CLIPPER_REVISION=381c817fd13e819e90006ed1f3c26ea6f1e6e343
+CLIPPER_REVISION=ac8d6bf2517f46c05647b5c19cac113fb180ffb4
PROTOZERO_REVISION=v1.3.0
GYP_REVISION=3464008
diff --git a/README.md b/README.md
index 94a6c47..f0eaeec 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ Provides C++ headers that support rendering geodata into vector tiles and render
## Depends
- - mapnik-vector-tile >=0.7.x depends on Mapnik v3.0.x (until 3.0.0 is released this means latest mapnik HEAD)
+ - mapnik-vector-tile >=1.0.x depends on Mapnik >=v3.0.11
+ - mapnik-vector-tile 1.0.0 to 0.7.x depends on Mapnik v3.0.x (until 3.0.0 is released this means latest mapnik HEAD)
- mapnik-vector-tile 0.6.x and previous work with Mapnik v2.2.x or v2.3.x
- You will need `libmapnik` and `mapnik-config` available
- Protobuf: `libprotobuf` and `protoc`
diff --git a/bootstrap.sh b/bootstrap.sh
index 7e612ae..1320983 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-MASON_VERSION="694d08c"
+MASON_VERSION="b709931"
function setup_mason() {
if [[ ! -d ./.mason ]]; then
@@ -10,7 +10,6 @@ function setup_mason() {
echo "Updating to latest mason"
(cd ./.mason && git fetch && git checkout ${MASON_VERSION})
fi
- export MASON_DIR=$(pwd)/.mason
export PATH=$(pwd)/.mason:$PATH
export CXX=${CXX:-clang++}
export CC=${CC:-clang}
@@ -27,22 +26,27 @@ function install() {
ICU_VERSION="55.1"
function install_mason_deps() {
- install ccache 3.2.4
- install mapnik latest
- install protobuf 2.6.1
- install freetype 2.6
- install harfbuzz 0.9.40
- install jpeg_turbo 1.4.0
- install libxml2 2.9.2
- install libpng 1.6.17
- install webp 0.4.2
- install icu ${ICU_VERSION}
- install proj 4.8.0
- install libtiff 4.0.4beta
- install boost 1.59.0
- install boost_liball 1.59.0
- install pixman 0.32.6
- install cairo 1.14.2
+ install ccache 3.2.4 &
+ install mapnik latest &
+ install protobuf 2.6.1 &
+ install freetype 2.6 &
+ install harfbuzz 0.9.41 &
+ wait
+ install jpeg_turbo 1.4.0 &
+ install libpng 1.6.20 &
+ install webp 0.4.2 &
+ install icu ${ICU_VERSION} &
+ install proj 4.8.0 &
+ install libtiff 4.0.4beta &
+ wait
+ install boost 1.61.0 &
+ install boost_libsystem 1.61.0 &
+ install boost_libfilesystem 1.61.0 &
+ install boost_libprogram_options 1.61.0 &
+ install boost_libregex 1.61.0 &
+ install pixman 0.32.6 &
+ install cairo 1.14.2 &
+ wait
}
function setup_runtime_settings() {
diff --git a/package.json b/package.json
index ad62879..9f44867 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "mapnik-vector-tile",
- "version": "1.2.0",
+ "version": "1.2.1",
"description": "Mapnik Vector Tile API",
"main": "./package.json",
"repository" : {
diff --git a/src/vector_tile_datasource_pbf.ipp b/src/vector_tile_datasource_pbf.ipp
index 124c3db..9d83629 100644
--- a/src/vector_tile_datasource_pbf.ipp
+++ b/src/vector_tile_datasource_pbf.ipp
@@ -26,10 +26,10 @@
#include <stdexcept>
#include <string>
-namespace mapnik
-{
+namespace mapnik
+{
-namespace vector_tile_impl
+namespace vector_tile_impl
{
// tile_datasource impl
@@ -162,7 +162,7 @@ tile_datasource_pbf::tile_datasource_pbf(protozero::pbf_reader const& layer,
}
if (use_tile_extent)
{
- params_["vector_layer_extent"] = tile_size_;
+ params_["vector_layer_extent"] = static_cast<mapnik::value_integer>(tile_size_);
}
}
@@ -178,10 +178,10 @@ featureset_ptr tile_datasource_pbf::features(query const& q) const
if (!valid_layer_)
{
// From spec:
- // When a Vector Tile consumer encounters a Vector Tile layer with an unknown version,
- // it MAY make a best-effort attempt to interpret the layer, or it MAY skip the layer.
+ // When a Vector Tile consumer encounters a Vector Tile layer with an unknown version,
+ // it MAY make a best-effort attempt to interpret the layer, or it MAY skip the layer.
// In either case it SHOULD continue to process subsequent layers in the Vector Tile.
-
+
// Therefore if version is invalid we will just return pointer
return featureset_ptr();
}
@@ -195,10 +195,10 @@ featureset_ptr tile_datasource_pbf::features_at_point(coord2d const& pt, double
if (!valid_layer_)
{
// From spec:
- // When a Vector Tile consumer encounters a Vector Tile layer with an unknown version,
- // it MAY make a best-effort attempt to interpret the layer, or it MAY skip the layer.
+ // When a Vector Tile consumer encounters a Vector Tile layer with an unknown version,
+ // it MAY make a best-effort attempt to interpret the layer, or it MAY skip the layer.
// In either case it SHOULD continue to process subsequent layers in the Vector Tile.
-
+
// Therefore if version is invalid we will just return pointer
return featureset_ptr();
}
diff --git a/test/unit/tile_impl/tile.cpp b/test/unit/tile_impl/tile.cpp
index 41e6b92..1d9f5c9 100644
--- a/test/unit/tile_impl/tile.cpp
+++ b/test/unit/tile_impl/tile.cpp
@@ -192,150 +192,7 @@ TEST_CASE("Vector tile base class")
CHECK(parsed_layer.version() == 2);
CHECK(parsed_layer.name() == "valid");
}
-/*
- SECTION("Add valid empty layer with tile_layer")
- {
- mapnik::vector_tile_impl::tile tile(global_extent);
-
- // Create layer
- mapnik::vector_tile_impl::tile_layer layer;
- mapnik::vector_tile_impl::layer_builder_pbf builder("empty", 4096, layer.get_data());
- layer.build(builder);
-
- CHECK(layer.is_empty() == true);
- CHECK(layer.name() == "empty");
-
- tile.add_layer(layer);
-
- const std::set<std::string> empty_set{"empty"};
-
- CHECK(tile.get_empty_layers().size() == 1);
- CHECK(tile.is_painted() == false);
- CHECK(tile.is_empty() == true);
- }
-
- SECTION("Add valid layer with tile_layer")
- {
- mapnik::vector_tile_impl::tile tile(global_extent);
-
- mapnik::vector_tile_impl::tile_layer layer;
- layer.name("valid");
- // Create layer builder and add feature
- mapnik::vector_tile_impl::layer_builder_pbf builder("valid", 4096, layer.get_data());
- protozero::pbf_writer feature_writer = builder.get_feature_writer();
-
- // Get geojson file string
- mapnik::util::file input("./test/data/linestrings_and_point.geojson");
- std::string geojson(input.data().get(), input.size());
- auto context = std::make_shared<mapnik::context_type>();
- auto mapnik_feature = std::make_shared<mapnik::feature_impl>(context, 0);
- mapnik::json::from_geojson(geojson, *mapnik_feature);
-
- builder.add_feature(feature_writer, *mapnik_feature);
-
- // Create layer
- layer.build(builder);
-
- // Check properties of layer
- CHECK(layer.is_empty() == false);
- CHECK(layer.name() == "valid");
-
- // Add layer to tile
- tile.add_layer(layer);
-
- const std::set<std::string> expected_set{"valid"};
- const std::set<std::string> empty_set;
- const std::vector<std::string> expected_vec{"valid"};
-
- CHECK(tile.get_painted_layers() == expected_set);
- CHECK(tile.get_empty_layers() == empty_set);
- CHECK(tile.get_layers() == expected_vec);
- CHECK(tile.get_layers_set() == expected_set);
- CHECK(tile.has_layer("valid") == true);
- CHECK(tile.is_painted() == true);
- CHECK(tile.is_empty() == false);
-
- protozero::pbf_reader layer_reader_by_name;
- bool status_by_name = tile.layer_reader("valid", layer_reader_by_name);
- CHECK(status_by_name == true);
- CHECK(layer_reader_by_name.next(1) == true);
- CHECK(layer_reader_by_name.get_string() == "valid");
-
- vector_tile::Tile parsed_tile;
- parsed_tile.ParseFromString(tile.get_buffer());
- CHECK(parsed_tile.layers_size() == 1);
- vector_tile::Tile_Layer parsed_layer = parsed_tile.layers(0);
- CHECK(parsed_layer.version() == 2);
- CHECK(parsed_layer.name() == "valid");
- }
-
- SECTION("cannot add the same layer with add_layer")
- {
- mapnik::vector_tile_impl::tile tile(global_extent);
-
- // Add empty layer to tile
- tile.add_empty_layer("valid");
- std::set<std::string> empty_set{"valid"};
- CHECK(tile.get_empty_layers() == empty_set);
-
- // Create layer builder and add feature
- mapnik::vector_tile_impl::tile_layer layer;
- layer.name("valid");
- mapnik::vector_tile_impl::layer_builder_pbf builder("valid", 4096, layer.get_data());
- protozero::pbf_writer feature_writer = builder.get_feature_writer();
-
- // Get geojson file string
- mapnik::util::file input("./test/data/linestrings_and_point.geojson");
- std::string geojson(input.data().get(), input.size());
- auto context = std::make_shared<mapnik::context_type>();
- auto mapnik_feature = std::make_shared<mapnik::feature_impl>(context, 0);
- mapnik::json::from_geojson(geojson, *mapnik_feature);
-
- builder.add_feature(feature_writer, *mapnik_feature);
-
- // Create layer
- layer.build(builder);
-
- // Add layer to tile
- tile.add_layer(layer);
- empty_set.clear();
- CHECK(tile.get_empty_layers() == empty_set);
- }
-
- SECTION("add_layer takes layer out of empty layers")
- {
- mapnik::vector_tile_impl::tile tile(global_extent);
-
- // Create layer builder and add feature
- mapnik::vector_tile_impl::tile_layer layer;
- layer.name("valid");
- mapnik::vector_tile_impl::layer_builder_pbf builder("valid", 4096, layer.get_data());
- protozero::pbf_writer feature_writer = builder.get_feature_writer();
-
- // Get geojson file string
- mapnik::util::file input("./test/data/linestrings_and_point.geojson");
- std::string geojson(input.data().get(), input.size());
- auto context = std::make_shared<mapnik::context_type>();
- auto mapnik_feature = std::make_shared<mapnik::feature_impl>(context, 0);
- mapnik::json::from_geojson(geojson, *mapnik_feature);
-
- builder.add_feature(feature_writer, *mapnik_feature);
-
- // Create layer
- layer.build(builder);
-
- // Check properties of layer
- CHECK(layer.is_empty() == false);
- CHECK(layer.name() == "valid");
-
- // Add layer to tile
- bool status1 = tile.add_layer(layer);
- CHECK(status1 == true);
-
- bool status2 = tile.add_layer(layer);
- CHECK(status2 == false);
- }
-*/
+
SECTION("layer_reader by name works by name in buffer")
{
// Note - if the names of the layer are different
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik-vector-tile.git
More information about the Pkg-grass-devel
mailing list