diff options
| author | Young Hahn <young@mapbox.com> | 2016-07-06 17:29:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 17:29:34 -0400 |
| commit | 71a3b1d0db170cfc1786be88c3e7b286c50dece9 (patch) | |
| tree | 1d51cc28946dc990f8f613795417cb76ea8c00df /platform/darwin | |
| parent | 903d609b40b6d0f4873f7bb46d96f4a06d7b17d6 (diff) | |
| download | qtlocation-mapboxgl-71a3b1d0db170cfc1786be88c3e7b286c50dece9.tar.gz | |
[core] geometry@0.8.0 / geojsonvt@6.0.0 (#5514)
* [core] geometry.hpp 0.8.0
* geojsonvt @ 6.0.0
* Update platform deps, build scripts
* Perf optimizations/cleanup
* Rebase in geometry@080
* D.R.Y. etc
* Ensure fill annotation geometries have closed rings.
* Optimizations
* Update to geojsonvt @ 6.1.0 for clean handoff between geojson parsing and geojsonvt
* Apply close multi/poly geoms for line annotations as well
Diffstat (limited to 'platform/darwin')
| -rw-r--r-- | platform/darwin/src/MGLFeature.mm | 4 | ||||
| -rw-r--r-- | platform/darwin/test/MGLFeatureTests.mm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/darwin/src/MGLFeature.mm b/platform/darwin/src/MGLFeature.mm index 777b296303..3bf1e61153 100644 --- a/platform/darwin/src/MGLFeature.mm +++ b/platform/darwin/src/MGLFeature.mm @@ -118,7 +118,7 @@ */ class PropertyValueEvaluator { public: - id operator()(const std::nullptr_t &) const { + id operator()(const mbgl::NullValue &) const { return [NSNull null]; } @@ -260,7 +260,7 @@ NS_ARRAY_OF(MGLShape <MGLFeature> *) *MGLFeaturesFromMBGLFeatures(const std::vec GeometryEvaluator<double> evaluator; MGLShape <MGLFeaturePrivate> *shape = mapbox::geometry::geometry<double>::visit(feature.geometry, evaluator); if (feature.id) { - shape.identifier = @(*feature.id); + shape.identifier = mbgl::FeatureIdentifier::visit(*feature.id, PropertyValueEvaluator()); } shape.attributes = attributes; [shapes addObject:shape]; diff --git a/platform/darwin/test/MGLFeatureTests.mm b/platform/darwin/test/MGLFeatureTests.mm index 6cf038d4fb..13ad8759b0 100644 --- a/platform/darwin/test/MGLFeatureTests.mm +++ b/platform/darwin/test/MGLFeatureTests.mm @@ -89,7 +89,7 @@ mapbox::geometry::point<double> point = { -90.066667, 29.95 }; mbgl::Feature pointFeature(point); - pointFeature.id = UINT64_MAX; + pointFeature.id = { UINT64_MAX }; pointFeature.properties["null"] = nullptr; pointFeature.properties["bool"] = true; pointFeature.properties["unsigned int"] = UINT64_MAX; |