diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2014-05-31 11:32:42 -0700 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2014-05-31 11:32:42 -0700 |
| commit | a81a336638000f1986f1bde56e909a07b2a6ae36 (patch) | |
| tree | 19ca5424367a3c89e76009a77fe54413d8c3ea51 /ios | |
| parent | 6fd1525335bb753bb0efdfc3cfb58e1b6c4c1539 (diff) | |
| download | qtlocation-mapboxgl-a81a336638000f1986f1bde56e909a07b2a6ae36.tar.gz | |
programmatic styling API
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/MBXViewController.mm | 6 | ||||
| m--------- | ios/MVKMapKit | 0 | ||||
| -rw-r--r-- | ios/img/toggleStyle.png (renamed from ios/img/toggleRaster.png) | bin | 4966 -> 4966 bytes | |||
| -rw-r--r-- | ios/llmr-app.gyp | 9 |
4 files changed, 9 insertions, 6 deletions
diff --git a/ios/MBXViewController.mm b/ios/MBXViewController.mm index 25fca05996..213fdceeb1 100644 --- a/ios/MBXViewController.mm +++ b/ios/MBXViewController.mm @@ -85,7 +85,7 @@ llmr::Settings_NSUserDefaults *settings = nullptr; singleTap.numberOfTapsRequired = 1; [self.mapView addGestureRecognizer:singleTap]; - NSArray *selectorNames = @[ @"unrotate", @"resetPosition", @"toggleDebug", @"toggleRaster", @"locateUser" ]; + NSArray *selectorNames = @[ @"unrotate", @"resetPosition", @"toggleDebug", @"toggleStyle", @"locateUser" ]; CGFloat buttonSize = 40; CGFloat bufferSize = 20; CGFloat alpha = 0.75; @@ -166,9 +166,9 @@ llmr::Settings_NSUserDefaults *settings = nullptr; self.debug = ! self.debug; } -- (void)toggleRaster +- (void)toggleStyle { - [self.mapView toggleRaster]; + [self.mapView toggleStyle]; } - (void)locateUser diff --git a/ios/MVKMapKit b/ios/MVKMapKit -Subproject 7c7bb2310216a8d18108db40b09db08732df1f8 +Subproject fe12687eb95b925b37a260596f309931a745d82 diff --git a/ios/img/toggleRaster.png b/ios/img/toggleStyle.png Binary files differindex 59a6f330fb..59a6f330fb 100644 --- a/ios/img/toggleRaster.png +++ b/ios/img/toggleStyle.png diff --git a/ios/llmr-app.gyp b/ios/llmr-app.gyp index 5d7e1f8e3d..89acc2d749 100644 --- a/ios/llmr-app.gyp +++ b/ios/llmr-app.gyp @@ -14,8 +14,10 @@ "./MBXAppDelegate.m", "./MBXViewController.h", "./MBXViewController.mm", - "./MVKMapKit/MVKMapKit/MVKMapView.h", - "./MVKMapKit/MVKMapKit/MVKMapView.mm", + '<!@(find MVKMapKit/MVKMapKit -type f -name "MVKMapView.*")', + '<!@(find MVKMapKit/MVKMapKit -type f -name "MVKStyleFunctionValue.*")', + '<!@(find MVKMapKit/MVKMapKit -type f -name "MVKTypes.*")', + '<!@(find MVKMapKit/MVKMapKit -type f -name "*+MVKAdditions.*")', "../common/settings_nsuserdefaults.hpp", "../common/settings_nsuserdefaults.mm", "../common/foundation_request.h", @@ -25,7 +27,8 @@ 'mac_bundle': 1, 'mac_bundle_resources': [ '<!@(find img -type f)', - '<!@(find MVKMapKit/MVKMapKit/Resources -type f)' + '<!@(find MVKMapKit/MVKMapKit/Resources -type f)', + '<(SHARED_INTERMEDIATE_DIR)/bin/style.min.js' ], 'link_settings': { 'libraries': [ |
