Normalize language name to our styling/tile data

Change-Id: I42daa6a61d792d9a4bf428832d6c35c30bff4046

diff --git a/src/mapzen/tangram_view.cpp b/src/mapzen/tangram_view.cpp
index 1516c2d..fb365ea 100644 (file)
--- a/src/mapzen/tangram_view.cpp
+++ b/src/mapzen/tangram_view.cpp
@@ -863,7 +863,7 @@ void TangramView::setMapType(maps_view_h view)
        if (newViewType != m_viewType) {
                m_buildingsEnabled = true;
                m_publicTransitEnabled = false;
-               m_language = "eng";
+               m_language = "en";
                m_isProviderKeySet = false;
        }
 
@@ -893,7 +893,7 @@ void TangramView::setMapType(maps_view_h view)
        maps_view_get_language(view, &language);
        if (m_language != language) {
                m_language = language;
-               sceneUpdates.push_back( {"global.ux_language", m_language.c_str()} );
+               sceneUpdates.push_back( {"global.ux_language", m_language.substr(0, 2).c_str()} );
        }
        free(language);
 

diff --git a/src/mapzen/tangram_view.hpp b/src/mapzen/tangram_view.hpp
index 395ad6e..ed2da19 100644 (file)
--- a/src/mapzen/tangram_view.hpp
+++ b/src/mapzen/tangram_view.hpp
@@ -99,7 +99,7 @@ private:
        bool m_publicTransitEnabled = false;
        bool m_buildingsEnabled = true;
        bool m_sceneLoaded = false;
-       std::string m_language = "eng";
+       std::string m_language = "en";
        std::string m_providerKey = "";
        bool m_isProviderKeySet = false;