Merge branch 'master' into outdoors-style

.travis.yml

@@ -26,3 +26,6 @@ script:
 - make llmr
 - make linux
 - make run-tests
+
+notifications:
+- hipchat: WB52YkcbCGMbNcStsGeaoRO7cyBSK4wX2ZHo2Y4b@GL

Makefile

@@ -53,31 +53,41 @@ run-linux: linux
 
 ##### Xcode projects ###########################################################
 
+clear_xcode_cache:
+    @CUSTOM_DD=`defaults read com.apple.dt.Xcode IDECustomDerivedDataLocation 2>/dev/null`; \
+    if [[ $$CUSTOM_DD ]]; then \
+        echo clearing files in $$CUSTOM_DD older than one day; \
+        find $$CUSTOM_DD/llmr-app-* -mtime +1 | xargs rm -rf; \
+    fi; \
+    if [[ -d ~/Library/Developer/Xcode/DerivedData/ ]] && [[ ! $$CUSTOM_DD ]]; then \
+        echo 'clearing files in ~/Library/Developer/Xcode/DerivedData/llmr-app-* older than one day'; \
+        find ~/Library/Developer/Xcode/DerivedData/llmr-app-* -mtime +1 | xargs rm -rf; \
+    fi
+
 # build Mac OS X project for Xcode
-xproj: config.gypi macosx/llmr-app.gyp node
+xproj: config.gypi macosx/llmr-app.gyp clear_xcode_cache node
 	deps/run_gyp macosx/llmr-app.gyp --depth=. --generator-output=./build -f xcode
 	open ./build/macosx/llmr-app.xcodeproj
 
 # build iOS project for Xcode
-iproj: config.gypi ios/llmr-app.gyp node
+iproj: config.gypi ios/llmr-app.gyp clear_xcode_cache node
 	deps/run_gyp ios/llmr-app.gyp --depth=. --generator-output=./build -f xcode
 	open ./build/ios/llmr-app.xcodeproj
 
 # build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code)
-lproj: config.gypi linux/llmr-app.gyp node
+lproj: config.gypi linux/llmr-app.gyp clear_xcode_cache node
 	deps/run_gyp linux/llmr-app.gyp --depth=. --generator-output=./build -f xcode
 	open ./build/linux/llmr-app.xcodeproj
 
 
 ##### Maintenace operations ####################################################
 
-clean:
+clean: clear_xcode_cache
 	-rm -rf ./build/Release
 	-rm -rf ./build/Debug
 	-rm -f include/llmr/shader/shaders.hpp
 	-rm -f include/llmr/style/resources.hpp
 	-rm -f src/style/resources.cpp
-	-rm -rf ~/Library/Developer/Xcode/DerivedData/llmr*
 
 distclean: clean
 	-rm -rf ./build

ios/MBXAppDelegate.m

@@ -21,15 +21,4 @@
     return YES;
 }
 
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    [(MBXViewController *)self.window.rootViewController saveState];
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    [(MBXViewController *)self.window.rootViewController restoreState];
-}
-
-
-@end
+@end

ios/MBXViewController.h

@@ -2,7 +2,4 @@
 
 @interface MBXViewController : UIViewController
 
-- (void)saveState;
-- (void)restoreState;
-
 @end

ios/MBXViewController.mm

@@ -36,6 +36,19 @@ MBXViewController *viewController = nullptr;
 
 #pragma mark - Setup
 
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(saveState) name:UIApplicationDidEnterBackgroundNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(restoreState) name:UIApplicationWillEnterForegroundNotification object:nil];
+    }
+
+    return self;
+}
+
 - (void)loadView
 {
     [super loadView];
@@ -252,6 +265,8 @@ MBXViewController *viewController = nullptr;
 
 - (void)dealloc
 {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+
     if (settings)
     {
         // Save settings

src/map/map.cpp

@@ -528,7 +528,7 @@ void Map::renderLayer(const LayerDescription& layer_desc, RenderPass pass) {
                     break;
                 case BucketType::Raster:
                     if (pass == Translucent) return;
-                    if (is_invisible(style.computed.lines, layer_desc)) return;
+                    if (is_invisible(style.computed.rasters, layer_desc)) return;
                     break;
                 default:
                     break;