diff options
| author | jmkiley <jordan.kiley@mapbox.com> | 2019-09-04 10:30:26 -0700 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2019-09-25 14:28:56 -0700 |
| commit | f788f87e5a948ff99f7b3352288f69ef4e602613 (patch) | |
| tree | caf75c06f95d0b62645005a4e60405257f9cde06 | |
| parent | aa8c47b492e532328c4288f606e13ee50162f7de (diff) | |
| download | qtlocation-mapboxgl-f788f87e5a948ff99f7b3352288f69ef4e602613.tar.gz | |
[ios] chipping away
| -rw-r--r-- | platform/darwin/src/MGLShapeSource.mm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLShapeSource.mm b/platform/darwin/src/MGLShapeSource.mm index afaca4056a..837a197700 100644 --- a/platform/darwin/src/MGLShapeSource.mm +++ b/platform/darwin/src/MGLShapeSource.mm @@ -108,12 +108,16 @@ mbgl::style::GeoJSONOptions MGLGeoJSONOptionsFromDictionary(NSDictionary<MGLShap NSExpression *exp2 = expArray[1]; // convert values into style expressions. IDK how to do this, but ¯\_(ツ)_/¯ + // Static_assert failed due to requirement 'is_constructible<mbgl::style::PropertyExpression<std::__1::basic_string<char> >, const mbgl::style::expression::Expression **>::value' "Can't construct object in make_shared" auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(exp1, true); - const auto& mbglExpression1 = &mbglValue.PropertyValue::asExpression().getExpression(); - auto& sharedExpressionPtr1 = std::make_shared<mbgl::style::expression::Expression>(mbglExpression1); + auto mbglExpression1 = &mbglValue.PropertyValue::asExpression().getExpression(); + const auto sharedExpressionPtr1 = std::make_shared<mbgl::style::PropertyExpression<std::string>>(&mbglExpression1); + auto mbglValue2 = MGLStyleValueTransformer<std::string, NSString *>().toPropertyValue<mbgl::style::PropertyValue<std::string>>(exp2, true); - const auto& mbglExpression2 = &mbglValue2.PropertyValue::asExpression().getExpression(); - auto& sharedExpressionPtr2 = std::make_shared<mbgl::style::expression::Expression>(mbglExpression2); + auto& mbglExpression2 = mbglValue2.PropertyValue::asExpression().getExpression(); + + const auto sharedExpressionPtr2 = std::make_shared<mbgl::style::PropertyExpression<std::string>>(mbglExpression2); + // // mbgl::style::GeoJSONOptions::ClusterExpression mbglPair = std::make_pair(sharedExpressionPtr1, sharedExpressionPtr2); |