Merge branch 'master' of github.com:mapbox/llmr-native
Conflicts: src/map/tile_data.cpp
This commit is contained in:
@@ -31,6 +31,8 @@
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationPortrait</string>
|
||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
</array>
|
||||
<key>UISupportedInterfaceOrientations~ipad</key>
|
||||
<array>
|
||||
|
||||
@@ -146,7 +146,7 @@ class MBXMapView
|
||||
paletteWidth,
|
||||
paletteHeight)];
|
||||
self.palette.backgroundColor = [UIColor colorWithWhite:0 alpha:alpha];
|
||||
self.palette.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin;
|
||||
self.palette.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
|
||||
self.palette.layer.cornerRadius = bufferSize;
|
||||
[self.view addSubview:self.palette];
|
||||
for (NSString *selectorName in selectorNames)
|
||||
@@ -162,12 +162,9 @@ class MBXMapView
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)shouldAutorotate {
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (NSUInteger)supportedInterfaceOrientations {
|
||||
return UIInterfaceOrientationMaskAll;
|
||||
- (NSUInteger)supportedInterfaceOrientations
|
||||
{
|
||||
return ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad ? UIInterfaceOrientationMaskAll : UIInterfaceOrientationMaskAllButUpsideDown);
|
||||
}
|
||||
|
||||
-(void)viewWillLayoutSubviews {
|
||||
|
||||
@@ -58,7 +58,7 @@ void TileData::request() {
|
||||
tile->data.swap(res.body);
|
||||
tile->parse();
|
||||
} else {
|
||||
fprintf(stderr, "tile loading failed: code %d\n", res.code);
|
||||
fprintf(stderr, "tile loading failed (%s): %d\n", url.c_str(), res.code);
|
||||
}
|
||||
}, []() {
|
||||
platform::restart();
|
||||
|
||||
Reference in New Issue
Block a user