conflicts merging old re-factor branch for ios after accepting a few 3rd-party PRs

README.md

@@ -80,9 +80,10 @@ A full example could be:
         desiredAccuracy: 10,
         stationaryRadius: 20,
         distanceFilter: 30,
-        debug: true, // <-- enable this hear sounds for background-geolocation life-cycle.
         notificationTitle: 'Background tracking', // <-- android only, customize the title of the notification
-        notificationText: 'ENABLED' // <-- android only, customize the text of the notification
+        notificationText: 'ENABLED', // <-- android only, customize the text of the notification
+        activityType: 'AutomotiveNavigation',
+        debug: true // <-- enable this hear sounds for background-geolocation life-cycle.
     });
 
     // Turn ON the background-geolocation system.  The user will be tracked whenever they suspend the app.
@@ -193,6 +194,16 @@ Optional HTTP headers POSTed to your server when persisting locations
 
 On Android devices it is required to have a notification in the drawer because it's a "foreground service".  This gives it high priority, decreasing probability of OS killing it.  To customize the title and text of the notification, set these options.
 
+#####`@param {Integer} locationTimeout 
+
+The minimum time interval between location updates, in seconds.  See [Android docs](http://developer.android.com/reference/android/location/LocationManager.html#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent)) for more information.
+
+### iOS Config
+
+#####`@param {String} activityType [AutomotiveNavigation, OtherNavigation, Fitness, Other]`
+
+Presumably, this affects ios GPS algorithm.  See [Apple docs](https://developer.apple.com/library/ios/documentation/CoreLocation/Reference/CLLocationManager_Class/CLLocationManager/CLLocationManager.html#//apple_ref/occ/instp/CLLocationManager/activityType) for more information
+
 ## Licence ##
 
 The MIT License

example/www/js/index.js

@@ -95,12 +95,16 @@ var app = {
                 auth_token: 'user_secret_auth_token',
                 foo: 'bar'
             },
+            headers: {
+                'X-Foo': 'bar'
+            },
             desiredAccuracy: 10,
             stationaryRadius: 20,
             distanceFilter: 30,
-            debug: true, // <-- enable this hear sounds for background-geolocation life-cycle.
             notificationTitle: 'Background tracking',   // <-- android only, customize the title of the notification
-            notificationText: 'ENABLED' // <-- android only, customize the text of the notification
+            notificationText: 'ENABLED',                // <-- android only, customize the text of the notification
+            activityType: "AutomotiveNavigation",       // <-- iOS-only
+            debug: true     // <-- enable this hear sounds for background-geolocation life-cycle.
         });
 
         // Turn ON the background-geolocation system.  The user will be tracked whenever they suspend the app.

src/android/BackgroundGpsPlugin.java

@@ -68,7 +68,9 @@ public class BackgroundGpsPlugin extends CordovaPlugin {
         } else if (ACTION_CONFIGURE.equalsIgnoreCase(action)) {
             result = true;
             try {
-                // [params, headers url, stationaryRadius, distanceFilter, locationTimeout, desiredAccuracy, debug]);
+                // Params.
+                //    0       1       2           3               4                5               6            7           8                8               9
+                //[params, headers, url, stationaryRadius, distanceFilter, locationTimeout, desiredAccuracy, debug, notificationTitle, notificationText, activityType]
                 this.params = data.getString(0);
                 this.headers = data.getString(1);
                 this.url = data.getString(2);

www/BackgroundGeoLocation.js

@@ -11,12 +11,14 @@ module.exports = {
             debug               = config.debug || false,
             notificationTitle   = config.notificationTitle || "Background tracking",
             notificationText    = config.notificationText || "ENABLED";
+            activityType        = config.activityType || "OTHER";
 
         exec(success || function() {},
              failure || function() {},
              'BackgroundGeoLocation',
              'configure',
-             [params, headers, url, stationaryRadius, distanceFilter, locationTimeout, desiredAccuracy, debug, notificationTitle, notificationText]);
+             [params, headers, url, stationaryRadius, distanceFilter, locationTimeout, desiredAccuracy, debug, notificationTitle, notificationText, activityType]
+        );
     },
     start: function(success, failure, config) {
         exec(success || function() {},