Get mapbox-gl-styles via submodule (fixes #511)

.gitmodules

@@ -5,3 +5,7 @@
 [submodule "test/suite"]
 	path = test/suite
 	url = https://github.com/mapbox/mapbox-gl-test-suite.git
+
+[submodule "styles"]
+	path = styles
+	url = https://github.com/mapbox/mapbox-gl-styles.git

gyp/styles.gypi

@@ -19,7 +19,7 @@
       'hard_dependency': 1,
       'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
       'direct_dependent_settings': {
-        'mac_bundle_resources': [ '../styles' ],
+        'mac_bundle_resources': [ '../styles/styles' ],
       }
     },
     {

linux/main.cpp

@@ -65,7 +65,7 @@ int main(int argc, char *argv[]) {
     }
 
     // Load style
-    const std::string style = std::string("file://") + uv::cwd() + std::string("/styles/bright/style.json");
+    const std::string style = std::string("file://") + uv::cwd() + std::string("/styles/bright-v5.json");
     map.setStyleURL(style);
 
     int ret = view->run();

macosx/main.mm

@@ -100,7 +100,7 @@ int main() {
     if (accessToken) map.setAccessToken([accessToken cStringUsingEncoding:[NSString defaultCStringEncoding]]);
 
     // Load style
-    const std::string path([[[NSBundle mainBundle] pathForResource:@"style" ofType:@"json" inDirectory:@"styles/bright"] UTF8String]);
+    const std::string path([[[NSBundle mainBundle] pathForResource:@"bright-v5" ofType:@"json" inDirectory:@"styles/"] UTF8String]);
 
     map.setStyleURL(std::string("file://") + path);
 

scripts/travis_script.sh

@@ -3,6 +3,9 @@
 set -e
 set -o pipefail
 
+mapbox_time "checkout_styles" \
+git submodule update --init styles
+
 if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     #
     # build & test Linux