diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-20 17:12:58 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-22 08:04:39 -0700 |
| commit | 40e47556214e999c952c1e88e026d673cdd96c72 (patch) | |
| tree | e8d15795cbecc07c94908a8ebed31b73def64614 /platform/macos | |
| parent | 1520a56813f82bbe875774fdc2b3df26392278d6 (diff) | |
| download | qtlocation-mapboxgl-40e47556214e999c952c1e88e026d673cdd96c72.tar.gz | |
[core] Move setStyleJSON/URL to Style; add Map::setStyle
Diffstat (limited to 'platform/macos')
| -rw-r--r-- | platform/macos/src/MGLMapView.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index 756f237fba..0a567a8510 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -24,6 +24,7 @@ #import <mbgl/map/map.hpp> #import <mbgl/map/view.hpp> +#import <mbgl/style/style.hpp> #import <mbgl/annotation/annotation.hpp> #import <mbgl/map/camera.hpp> #import <mbgl/storage/reachability.h> @@ -239,7 +240,7 @@ public: // If the Style URL inspectable was not set, make sure to go through // -setStyleURL: to load the default style. - if (_mbglMap->getStyleURL().empty()) { + if (_mbglMap->getStyle().getURL().empty()) { self.styleURL = nil; } } @@ -607,7 +608,7 @@ public: } - (nonnull NSURL *)styleURL { - NSString *styleURLString = @(_mbglMap->getStyleURL().c_str()).mgl_stringOrNilIfEmpty; + NSString *styleURLString = @(_mbglMap->getStyle().getURL().c_str()).mgl_stringOrNilIfEmpty; return styleURLString ? [NSURL URLWithString:styleURLString] : [MGLStyle streetsStyleURLWithVersion:MGLStyleDefaultVersion]; } @@ -629,12 +630,12 @@ public: styleURL = styleURL.mgl_URLByStandardizingScheme; self.style = nil; - _mbglMap->setStyleURL(styleURL.absoluteString.UTF8String); + _mbglMap->getStyle().loadURL(styleURL.absoluteString.UTF8String); } - (IBAction)reloadStyle:(__unused id)sender { NSURL *styleURL = self.styleURL; - _mbglMap->setStyleURL(""); + _mbglMap->getStyle().loadURL(""); self.styleURL = styleURL; } |