diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-10-15 13:59:31 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-11-02 18:41:34 -0500 |
| commit | 79a5a960370a1bfcb8a90a628d85b8cd6d9b6a76 (patch) | |
| tree | 5c418cf49c67eefc251a94606cf8e0b4e6d7d9a7 /src | |
| parent | ba7cc755e74006b14b46b13b65a100a519e402f3 (diff) | |
| download | qtlocation-mapboxgl-79a5a960370a1bfcb8a90a628d85b8cd6d9b6a76.tar.gz | |
[core] mason geojsonvt-2.1.6.3
- [osx] set -fvisibility-inlines-hidden in gyp/common.gypi to silence
mismatched visibility linker warnings
- [linux] set cxx_host in GYP_FLAGS to set -fabi-version=0 on gcc builds
to use clang-built mason binaries
- [ios] update symbol visibility for iOS tests
- [ios] link libgeojsonvt.a in iOS tests xcodeproj
- add libgeojsonvt.a to General -> Linked Frameworks and Libraries
- add mason_packages (recursive) to Build Settings -> Library Search Path
- [ios] add libuv and geojsonvt first in iOS libtool smush to ensure symbols
are found by later compilation units where they are undefined
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/annotation/shape_annotation_impl.cpp | 5 | ||||
| -rw-r--r-- | src/mbgl/annotation/shape_annotation_impl.hpp | 3 | ||||
| m--------- | src/mbgl/util/geojsonvt | 0 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp index a8d18b8463..f84946fe11 100644 --- a/src/mbgl/annotation/shape_annotation_impl.cpp +++ b/src/mbgl/annotation/shape_annotation_impl.cpp @@ -1,7 +1,8 @@ +#include <mapbox/geojsonvt/geojsonvt_convert.hpp> + #include <mbgl/annotation/shape_annotation_impl.hpp> #include <mbgl/annotation/annotation_manager.hpp> #include <mbgl/annotation/annotation_tile.hpp> -#include <mbgl/util/geojsonvt/geojsonvt_convert.hpp> #include <mbgl/util/constants.hpp> #include <mbgl/util/string.hpp> #include <mbgl/style/style.hpp> @@ -142,7 +143,7 @@ void ShapeAnnotationImpl::updateTile(const TileID& tileID, AnnotationTile& tile) assert(featureType != FeatureType::Unknown); GeometryCollection renderGeometry; - for (auto& shapeGeometry : shapeFeature.geometry) { + for (auto& shapeGeometry : shapeFeature.tileGeometry) { std::vector<Coordinate> renderLine; auto& shapeRing = shapeGeometry.get<TileRing>(); diff --git a/src/mbgl/annotation/shape_annotation_impl.hpp b/src/mbgl/annotation/shape_annotation_impl.hpp index 1b1dacf370..8c703f664c 100644 --- a/src/mbgl/annotation/shape_annotation_impl.hpp +++ b/src/mbgl/annotation/shape_annotation_impl.hpp @@ -1,10 +1,11 @@ #ifndef MBGL_SHAPE_ANNOTATION_IMPL #define MBGL_SHAPE_ANNOTATION_IMPL +#include <mapbox/geojsonvt/geojsonvt.hpp> + #include <mbgl/annotation/annotation.hpp> #include <mbgl/annotation/shape_annotation.hpp> #include <mbgl/util/geo.hpp> -#include <mbgl/util/geojsonvt/geojsonvt.hpp> #include <memory> #include <string> diff --git a/src/mbgl/util/geojsonvt b/src/mbgl/util/geojsonvt deleted file mode 160000 -Subproject 83bffbcc6ad75ff59c7640036567820c8932161 |