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

[ios, macos] Fixed roundtripping padding functions

Browse Source
This commit is contained in:
Minh Nguyễn
2016-08-26 00:32:00 -07:00
committed by Minh Nguyễn
parent 1e1ae8fd25
commit b1cc89fc9c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/darwin/src/MGLStyleAttributeFunction.mm
View File

@@ -94,7 +94,7 @@
{
__block std::vector<std::pair<float, std::array<float, 4>>> stops;
[self.stops enumerateKeysAndObjectsUsingBlock:^(NSNumber * _Nonnull zoomKey, NSValue * _Nonnull padding, BOOL * _Nonnull stop) {
NSAssert([padding isKindOfClass:[NSArray class]], @"Stops should be NSValue");
NSAssert([padding isKindOfClass:[NSValue class]], @"Stops should be NSValue");
stops.emplace_back(zoomKey.floatValue, padding.mgl_paddingArrayValue);
}];
return mbgl::style::Function<std::array<float, 4>>({{stops}}, _base.floatValue);
@@ -181,7 +181,7 @@
auto stops = property.getStops();
NSMutableDictionary *convertedStops = [NSMutableDictionary dictionaryWithCapacity:stops.size()];
for (auto stop : stops) {
convertedStops[@(stop.first)] = @[@(stop.second[0]), @(stop.second[1]), @(stop.second[2]), @(stop.second[3])];
convertedStops[@(stop.first)] = [NSValue mgl_valueWithPaddingArray:stop.second];
}
function.base = @(property.getBase());
function.stops = convertedStops;