tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] upgrade to GeoJSON VT 3.0.0

Browse Source
This commit is contained in:
Konstantin Käfer
2015-12-08 18:17:21 -08:00
parent 655b777635
commit da7b6bb8b9
6 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/android/configure.sh
View File

@@ -8,7 +8,7 @@ LIBUV_VERSION=1.7.5
ZLIB_VERSION=system
NUNICODE_VERSION=1.6
LIBZIP_VERSION=0.11.2
GEOJSONVT_VERSION=2.1.6.3
GEOJSONVT_VERSION=3.0.0
VARIANT_VERSION=1.0
RAPIDJSON_VERSION=1.0.2

2
scripts/ios/configure.sh
View File

@@ -4,6 +4,6 @@ BOOST_VERSION=1.59.0
SQLITE_VERSION=system
LIBUV_VERSION=1.7.5
ZLIB_VERSION=system
GEOJSONVT_VERSION=2.1.6.3
GEOJSONVT_VERSION=3.0.0
VARIANT_VERSION=1.0
RAPIDJSON_VERSION=1.0.2

2
scripts/linux/configure.sh
View File

@@ -10,7 +10,7 @@ SQLITE_VERSION=3.9.1
LIBUV_VERSION=1.7.5
ZLIB_VERSION=system
NUNICODE_VERSION=1.6
GEOJSONVT_VERSION=2.1.6.3
GEOJSONVT_VERSION=3.0.0
VARIANT_VERSION=1.0
RAPIDJSON_VERSION=1.0.2
GTEST_VERSION=1.7.0

2
scripts/osx/configure.sh
View File

@@ -10,7 +10,7 @@ SQLITE_VERSION=3.9.1
LIBUV_VERSION=1.7.5
ZLIB_VERSION=system
NUNICODE_VERSION=1.6
GEOJSONVT_VERSION=2.1.6.3
GEOJSONVT_VERSION=3.0.0
VARIANT_VERSION=1.0
RAPIDJSON_VERSION=1.0.2
GTEST_VERSION=1.7.0

46
src/mbgl/annotation/shape_annotation_impl.cpp
View File

@@ -1,4 +1,4 @@
#include <mapbox/geojsonvt/geojsonvt_convert.hpp>
#include <mapbox/geojsonvt/convert.hpp>
#include <mbgl/annotation/shape_annotation_impl.hpp>
#include <mbgl/annotation/annotation_manager.hpp>
@@ -11,7 +11,7 @@
namespace mbgl {
using namespace mapbox::util::geojsonvt;
namespace geojsonvt = mapbox::geojsonvt;
ShapeAnnotationImpl::ShapeAnnotationImpl(const AnnotationID id_,
const ShapeAnnotation& shape_,
@@ -27,7 +27,7 @@ void ShapeAnnotationImpl::updateStyle(Style& style) {
return;
if (shape.properties.is<LineAnnotationProperties>()) {
type = ProjectedFeatureType::LineString;
type = geojsonvt::ProjectedFeatureType::LineString;
std::unique_ptr<LineLayer> layer = std::make_unique<LineLayer>();
layer->layout.join = JoinType::Round;
@@ -44,7 +44,7 @@ void ShapeAnnotationImpl::updateStyle(Style& style) {
style.addLayer(std::move(layer), AnnotationManager::PointLayerID);
} else if (shape.properties.is<FillAnnotationProperties>()) {
type = ProjectedFeatureType::Polygon;
type = geojsonvt::ProjectedFeatureType::Polygon;
std::unique_ptr<FillLayer> layer = std::make_unique<FillLayer>();
@@ -66,8 +66,8 @@ void ShapeAnnotationImpl::updateStyle(Style& style) {
std::unique_ptr<StyleLayer> layer = sourceLayer->clone();
type = layer->is<LineLayer>()
? ProjectedFeatureType::LineString
: ProjectedFeatureType::Polygon;
? geojsonvt::ProjectedFeatureType::LineString
: geojsonvt::ProjectedFeatureType::Polygon;
layer->id = layerID;
layer->ref = "";
@@ -87,26 +87,31 @@ void ShapeAnnotationImpl::updateTile(const TileID& tileID, AnnotationTile& tile)
const uint64_t maxAmountOfTiles = 1 << maxZoom;
const double tolerance = baseTolerance / (maxAmountOfTiles * extent);
ProjectedGeometryContainer rings;
std::vector<LonLat> points;
geojsonvt::ProjectedRings rings;
std::vector<geojsonvt::LonLat> points;
for (size_t i = 0; i < shape.segments[0].size(); ++i) { // first segment for now (no holes)
const double constraintedLatitude = ::fmin(::fmax(shape.segments[0][i].latitude, -util::LATITUDE_MAX), util::LATITUDE_MAX);
points.push_back(LonLat(shape.segments[0][i].longitude, constraintedLatitude));
points.push_back(geojsonvt::LonLat(shape.segments[0][i].longitude, constraintedLatitude));
}
if (type == ProjectedFeatureType::Polygon &&
if (type == geojsonvt::ProjectedFeatureType::Polygon &&
(points.front().lon != points.back().lon || points.front().lat != points.back().lat)) {
points.push_back(LonLat(points.front().lon, points.front().lat));
points.push_back(geojsonvt::LonLat(points.front().lon, points.front().lat));
}
ProjectedGeometryContainer ring = Convert::project(points, tolerance);
rings.members.push_back(ring);
auto ring = geojsonvt::Convert::projectRing(points, tolerance);
rings.push_back(ring);
std::vector<ProjectedFeature> features;
features.push_back(Convert::create(Tags(), type, rings));
std::vector<geojsonvt::ProjectedFeature> features;
features.push_back(geojsonvt::Convert::create(geojsonvt::Tags(), type, rings));
shapeTiler = std::make_unique<mapbox::util::geojsonvt::GeoJSONVT>(features, maxZoom, 4, 100, 10);
mapbox::geojsonvt::Options options;
options.maxZoom = maxZoom;
options.indexMaxZoom = 4;
options.indexMaxPoints = 100;
options.tolerance = 10;
shapeTiler = std::make_unique<mapbox::geojsonvt::GeoJSONVT>(features, options);
}
const auto& shapeTile = shapeTiler->getTile(tileID.z, tileID.x, tileID.y);
@@ -119,20 +124,19 @@ void ShapeAnnotationImpl::updateTile(const TileID& tileID, AnnotationTile& tile)
for (auto& shapeFeature : shapeTile.features) {
FeatureType featureType = FeatureType::Unknown;
if (shapeFeature.type == TileFeatureType::LineString) {
if (shapeFeature.type == geojsonvt::TileFeatureType::LineString) {
featureType = FeatureType::LineString;
} else if (shapeFeature.type == TileFeatureType::Polygon) {
} else if (shapeFeature.type == geojsonvt::TileFeatureType::Polygon) {
featureType = FeatureType::Polygon;
}
assert(featureType != FeatureType::Unknown);
GeometryCollection renderGeometry;
for (auto& shapeGeometry : shapeFeature.tileGeometry) {
for (auto& shapeRing : shapeFeature.tileGeometry.get<geojsonvt::TileRings>()) {
std::vector<Coordinate> renderLine;
auto& shapeRing = shapeGeometry.get<TileRing>();
for (auto& shapePoint : shapeRing.points) {
for (auto& shapePoint : shapeRing) {
renderLine.emplace_back(shapePoint.x, shapePoint.y);
}

6
src/mbgl/annotation/shape_annotation_impl.hpp
View File

@@ -1,7 +1,7 @@
#ifndef MBGL_SHAPE_ANNOTATION_IMPL
#define MBGL_SHAPE_ANNOTATION_IMPL
#include <mapbox/geojsonvt/geojsonvt.hpp>
#include <mapbox/geojsonvt.hpp>
#include <mbgl/annotation/annotation.hpp>
#include <mbgl/annotation/shape_annotation.hpp>
@@ -32,8 +32,8 @@ public:
private:
const uint8_t maxZoom;
mapbox::util::geojsonvt::ProjectedFeatureType type;
std::unique_ptr<mapbox::util::geojsonvt::GeoJSONVT> shapeTiler;
mapbox::geojsonvt::ProjectedFeatureType type;
std::unique_ptr<mapbox::geojsonvt::GeoJSONVT> shapeTiler;
};
} // namespace mbgl