From 886bf2528ff1615a50521e75fc6ea211cef3b8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguye=CC=82=CC=83n?= <mxn@1ec5.org>
Date: Mon, 8 May 2017 17:45:22 -0700
Subject: [core, android, ios, macos] Added Traffic Day/Night to default styles

The Styles API section of the Mapbox API Documentation site now lists Traffic Day v2 and Traffic Night v2, so this change adds those styles to all the places where styles are listed.

Also switched iosapp and macosapp to unversioned style factory methods since MGLStyleDefaultVersion is no longer applicable for all styles.

Cherry-picked from 4d6f54553d277c0af24a0b8ff03d2dd7e9284ca2.
---
 platform/default/mbgl/util/default_styles.cpp | 2 ++
 platform/default/mbgl/util/default_styles.hpp | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'platform/default')

diff --git a/platform/default/mbgl/util/default_styles.cpp b/platform/default/mbgl/util/default_styles.cpp
index e051817ada..5f4ca862fe 100644
--- a/platform/default/mbgl/util/default_styles.cpp
+++ b/platform/default/mbgl/util/default_styles.cpp
@@ -10,6 +10,8 @@ const DefaultStyle light            = { "mapbox://styles/mapbox/light-v9",
 const DefaultStyle dark             = { "mapbox://styles/mapbox/dark-v9",               "Dark",               9 };
 const DefaultStyle satellite        = { "mapbox://styles/mapbox/satellite-v9",          "Satellite",          9 };
 const DefaultStyle satelliteStreets = { "mapbox://styles/mapbox/satellite-streets-v10", "Satellite Streets", 10 };
+const DefaultStyle trafficDay       = { "mapbox://styles/mapbox/traffic-day-v2",        "Traffic Day",        2 };
+const DefaultStyle trafficNight     = { "mapbox://styles/mapbox/traffic-night-v2",      "Traffic Night",      2 };
 
 } // namespace default_styles
 } // end namespace util
diff --git a/platform/default/mbgl/util/default_styles.hpp b/platform/default/mbgl/util/default_styles.hpp
index 5e0d083d82..466102d623 100644
--- a/platform/default/mbgl/util/default_styles.hpp
+++ b/platform/default/mbgl/util/default_styles.hpp
@@ -19,9 +19,12 @@ extern const DefaultStyle light;
 extern const DefaultStyle dark;
 extern const DefaultStyle satellite;
 extern const DefaultStyle satelliteStreets;
+extern const DefaultStyle trafficDay;
+extern const DefaultStyle trafficNight;
 
 const DefaultStyle orderedStyles[] = {
     streets, outdoors, light, dark, satellite, satelliteStreets,
+    trafficDay, trafficNight,
 };
 const size_t numOrderedStyles = sizeof(orderedStyles) / sizeof(DefaultStyle);
 
-- 
cgit v1.2.1