Add traffic layer

Author: newmanw

CHANGELOG.md

@@ -3,12 +3,19 @@ All notable changes to this project will be documented in this file.
 Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
-## 6.2.7 (TBD)
+## 6.287 (TBD)
 
 ##### Features
 
 ##### Bug Fixes
 
+## [6.2.7](https://github.com/ngageoint/mage-android/releases/tag/6.2.7)
+
+##### Features
+* Traffic map layer 
+
+##### Bug Fixes
+
 ## [6.2.6](https://github.com/ngageoint/mage-android/releases/tag/6.2.6)
 
 ##### Features

mage/build.gradle

@@ -11,9 +11,9 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'maven-publish'
 group 'mil.nga.giat.mage'
 archivesBaseName = 'mage-android'
-version '6.2.6'
+version '6.2.7'
 ext {
-    versionCode = 69
+    versionCode = 70
     sourceRefspec = Grgit.open().head().id
 }
 

mage/src/main/java/mil/nga/giat/mage/map/MapFragment.java

@@ -416,6 +416,9 @@ public void onMapReady(GoogleMap googleMap) {
 			googleMap.setMapStyle(MapStyleOptions.loadRawResourceStyle(getContext(), R.raw.map_theme_night));
 		}
 
+		boolean showTraffic = preferences.getBoolean(getResources().getString(R.string.showTrafficKey), getResources().getBoolean(R.bool.showTrafficDefaultValue));
+		map.setTrafficEnabled(showTraffic);
+
 		Event currentEvent = EventHelper.getInstance(getActivity()).getCurrentEvent();
 		long currentEventId = this.currentEventId;
 		if (currentEvent != null) {

mage/src/main/res/values/pairs.xml

@@ -9,6 +9,9 @@
     <string name="baseLayerKey">baseLayer</string>
     <integer name="baseLayerDefaultValue">1</integer>
 
+    <string name="showTrafficKey">showTraffic</string>
+    <bool name="showTrafficDefaultValue">false</bool>
+
     <string name="showMGRSKey">showMGRS</string>
     <bool name="showMGRSDefaultValue">false</bool>
 

mage/src/main/res/xml/mappreferences.xml

@@ -11,11 +11,18 @@
             android:title="Base Layer"
             android:summary="%s"/>
 
+        <android.support.v7.preference.SwitchPreferenceCompat
+            android:defaultValue="@bool/showTrafficDefaultValue"
+            android:key="@string/showTrafficKey"
+            android:summary="Google Maps Traffic"
+            android:title="Traffic">
+        </android.support.v7.preference.SwitchPreferenceCompat>
+
         <android.support.v7.preference.SwitchPreferenceCompat
             android:defaultValue="@bool/showMGRSDefaultValue"
             android:key="@string/showMGRSKey"
-            android:summary="Show Military Grid Reference System overlay"
-            android:title="Show MGRS">
+            android:summary="Military Grid Reference System overlay"
+            android:title="MGRS">
         </android.support.v7.preference.SwitchPreferenceCompat>
 
         <mil.nga.giat.mage.map.preference.OverlayPreference