diff options
| author | jmkiley <jordan.kiley@mapbox.com> | 2019-08-28 10:43:41 -0700 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2019-09-25 14:28:56 -0700 |
| commit | a55cf0a01e11878dad64fd1beab527bf5d788887 (patch) | |
| tree | 62ca017ff10cf896e5833808712db18423b58d66 | |
| parent | ae57ad9edb193dfaf20fe0d92cbf1f3cc04a7cbb (diff) | |
| download | qtlocation-mapboxgl-a55cf0a01e11878dad64fd1beab527bf5d788887.tar.gz | |
[ios] a little clean up
| -rw-r--r-- | platform/darwin/src/MGLShapeSource.mm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/platform/darwin/src/MGLShapeSource.mm b/platform/darwin/src/MGLShapeSource.mm index 547db432c9..523d0bc3b0 100644 --- a/platform/darwin/src/MGLShapeSource.mm +++ b/platform/darwin/src/MGLShapeSource.mm @@ -94,9 +94,8 @@ mbgl::style::GeoJSONOptions MGLGeoJSONOptionsFromDictionary(NSDictionary<MGLShap NSEnumerator *stringEnumerator = [value keyEnumerator]; NSString *key; - std::unordered_map<std::string, std::pair<std::shared_ptr<mbgl::style::expression::Expression>, std::shared_ptr<mbgl::style::expression::Expression>>> clusterMap; + mbgl::style::GeoJSONOptions::ClusterProperties * clusterMap = new mbgl::style::GeoJSONOptions::ClusterProperties; -// new std::pair<mbgl::style::expression a, mbgl::style::expression b>; while (key == [stringEnumerator nextObject]) { // check that array has only 2 values NSArray *expArray = value[key]; @@ -114,17 +113,11 @@ mbgl::style::GeoJSONOptions MGLGeoJSONOptionsFromDictionary(NSDictionary<MGLShap std::string keyString = std::string([key UTF8String]); -// clusterMap[keyString] = ; + // No viable overloaded operator[] for type ... + // clusterMap[keyString] = mbglPair; } - geoJSONOptions.clusterProperties = clusterMap; -// for (NSExpression *exp in ) -// NSExpression *exp = [NSExpression expressionForFunction:@"max" arguments:@[[NSExpression valueForKeyPath:@"key"], []]; - -// geoJSONOptions.clusterProperties = MGLStyleValueTransformer<std::string, NSString *>().toExpression(value); -// auto mbglValue = MGLStyleValueTransformer<std::string, NSString *>().toExpression(propertyValue); -// properties->insert(<[ket cStringUsingEncoding:NSUTF8StringEncoding], expression.to>) -// mbgl::style::GeoJSONOptions::ClusterProperties clusterProperties = value; +// geoJSONOptions.clusterProperties = clusterMap; } if (NSNumber *value = options[MGLShapeSourceOptionLineDistanceMetrics]) { |