diff options
author | Minh Nguyễn <mxn@1ec5.org> | 2017-01-05 03:22:04 -0800 |
---|---|---|
committer | Minh Nguyễn <mxn@1ec5.org> | 2017-01-07 15:46:53 -0800 |
commit | 17b3ec1edd217b8b14d64b74cbf58b0e4ae4f241 (patch) | |
tree | 8d7a22ac6f52d5f8463b7c17d609a7d70e784dd9 /platform/ios/app/MBXViewController.m | |
parent | d5d6bcee0f2f11cfccb3cc8ee7bc90c4f0ac74e7 (diff) | |
download | qtlocation-mapboxgl-17b3ec1edd217b8b14d64b74cbf58b0e4ae4f241.tar.gz |
[ios, macos] Renamed text-field, text-font, text-font-size, circle-pitch-scale
Reduced the likelihood that the developer might attempt to set textField to an NSTextField or UITextField, or textFont to an NSFont or UIFont, or textSize to a CGSize or NSSize, or circlePitchScale to a number (given iconScale).
Diffstat (limited to 'platform/ios/app/MBXViewController.m')
-rw-r--r-- | platform/ios/app/MBXViewController.m | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 05c2f91695..c28ecfbe8c 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -1184,13 +1184,13 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { MGLSymbolStyleLayer *layer = (MGLSymbolStyleLayer *)[self.mapView.style layerWithIdentifier:layerName]; if ([layer isKindOfClass:[MGLSymbolStyleLayer class]]) { - if ([layer.textField isKindOfClass:[MGLStyleConstantValue class]]) { - MGLStyleConstantValue *label = (MGLStyleConstantValue<NSString *> *)layer.textField; + if ([layer.text isKindOfClass:[MGLStyleConstantValue class]]) { + MGLStyleConstantValue *label = (MGLStyleConstantValue<NSString *> *)layer.text; if ([label.rawValue hasPrefix:@"{name"]) { - layer.textField = [MGLStyleValue valueWithRawValue:language]; + layer.text = [MGLStyleValue valueWithRawValue:language]; } - } else if ([layer.textField isKindOfClass:[MGLStyleFunction class]]) { - MGLStyleFunction *function = (MGLStyleFunction<NSString *> *)layer.textField; + } else if ([layer.text isKindOfClass:[MGLStyleFunction class]]) { + MGLStyleFunction *function = (MGLStyleFunction<NSString *> *)layer.text; [function.stops enumerateKeysAndObjectsUsingBlock:^(id zoomLevel, id stop, BOOL *done) { if ([stop isKindOfClass:[MGLStyleConstantValue class]]) { MGLStyleConstantValue *label = (MGLStyleConstantValue<NSString *> *)stop; @@ -1199,7 +1199,7 @@ typedef NS_ENUM(NSInteger, MBXSettingsMiscellaneousRows) { } } }]; - layer.textField = function; + layer.text = function; } } else { NSLog(@"%@ is not a symbol style layer", layerName); |