6 files changed, 78 insertions, 7 deletions
diff --git a/StoneIsland/plugins/cordova-plugin-geolocation/www/Coordinates.js b/StoneIsland/plugins/cordova-plugin-geolocation/www/Coordinates.js
index 84fdd5b8..84fdd5b8 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-geolocation/www/Coordinates.js
+++ b/StoneIsland/plugins/cordova-plugin-geolocation/www/Coordinates.js
diff --git a/StoneIsland/plugins/cordova-plugin-geolocation/www/Position.js b/StoneIsland/plugins/cordova-plugin-geolocation/www/Position.js
index f0470dea..d6b2c0cc 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-geolocation/www/Position.js
+++ b/StoneIsland/plugins/cordova-plugin-geolocation/www/Position.js
@@ -27,7 +27,7 @@ var Position = function(coords, timestamp) {
     } else {
         this.coords = new Coordinates();
     }
-    this.timestamp = (timestamp !== undefined) ? timestamp : new Date();
+    this.timestamp = (timestamp !== undefined) ? timestamp : new Date().getTime();
 };
 
 module.exports = Position;
diff --git a/StoneIsland/plugins/cordova-plugin-geolocation/www/PositionError.js b/StoneIsland/plugins/cordova-plugin-geolocation/www/PositionError.js
index 9403f11f..94562407 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-geolocation/www/PositionError.js
+++ b/StoneIsland/plugins/cordova-plugin-geolocation/www/PositionError.js
@@ -31,8 +31,8 @@ var PositionError = function(code, message) {
     this.message = message || '';
 };
 
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
+PositionError.prototype.PERMISSION_DENIED = PositionError.PERMISSION_DENIED = 1;
+PositionError.prototype.POSITION_UNAVAILABLE = PositionError.POSITION_UNAVAILABLE = 2;
+PositionError.prototype.TIMEOUT = PositionError.TIMEOUT = 3;
 
 module.exports = PositionError;
diff --git a/StoneIsland/plugins/cordova-plugin-geolocation/www/android/geolocation.js b/StoneIsland/plugins/cordova-plugin-geolocation/www/android/geolocation.js
new file mode 100644
index 00000000..7265bec0
--- /dev/null
+++ b/StoneIsland/plugins/cordova-plugin-geolocation/www/android/geolocation.js
@@ -0,0 +1,71 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+var exec = cordova.require('cordova/exec');
+var utils = require('cordova/utils');
+var PositionError = require('./PositionError');
+
+// Native watchPosition method is called async after permissions prompt.
+// So we use additional map and own ids to return watch id synchronously.
+var pluginToNativeWatchMap = {};
+
+module.exports = {
+    getCurrentPosition: function(success, error, args) {
+        var win = function() {
+          var geo = cordova.require('cordova/modulemapper').getOriginalSymbol(window, 'navigator.geolocation');
+          geo.getCurrentPosition(success, error, args);
+        };
+        var fail = function() {
+            if (error) {
+                error(new PositionError (PositionError.PERMISSION_DENIED, 'Illegal Access'));
+            }
+        };
+        exec(win, fail, "Geolocation", "getPermission", []);
+    },
+
+    watchPosition: function(success, error, args) {
+        var pluginWatchId = utils.createUUID();
+
+        var win = function() {
+            var geo = cordova.require('cordova/modulemapper').getOriginalSymbol(window, 'navigator.geolocation');
+            pluginToNativeWatchMap[pluginWatchId] = geo.watchPosition(success, error, args);
+        };
+
+        var fail = function() {
+            if (error) {
+                error(new PositionError(PositionError.PERMISSION_DENIED, 'Illegal Access'));
+            }
+        };
+        exec(win, fail, "Geolocation", "getPermission", []);
+
+        return pluginWatchId;
+    },
+
+    clearWatch: function(pluginWatchId) {
+        var win = function() {
+            var nativeWatchId = pluginToNativeWatchMap[pluginWatchId];
+            var geo = cordova.require('cordova/modulemapper').getOriginalSymbol(window, 'navigator.geolocation');
+            geo.clearWatch(nativeWatchId);
+        };
+
+        exec(win, null, "Geolocation", "getPermission", []);
+    }
+};
diff --git a/StoneIsland/plugins/cordova-plugin-geolocation/www/blackberry10/GeolocationProxy.js b/StoneIsland/plugins/cordova-plugin-geolocation/www/blackberry10/GeolocationProxy.js
index 0bba2263..0bba2263 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-geolocation/www/blackberry10/GeolocationProxy.js
+++ b/StoneIsland/plugins/cordova-plugin-geolocation/www/blackberry10/GeolocationProxy.js
diff --git a/StoneIsland/plugins/cordova-plugin-geolocation/www/geolocation.js b/StoneIsland/plugins/cordova-plugin-geolocation/www/geolocation.js
index 3814919a..f1f64456 100755..100644
--- a/StoneIsland/plugins/cordova-plugin-geolocation/www/geolocation.js
+++ b/StoneIsland/plugins/cordova-plugin-geolocation/www/geolocation.js
@@ -102,7 +102,7 @@ var geolocation = {
                     velocity:p.velocity,
                     altitudeAccuracy:p.altitudeAccuracy
                 },
-                (p.timestamp === undefined ? new Date() : ((p.timestamp instanceof Date) ? p.timestamp : new Date(p.timestamp)))
+                p.timestamp
             );
             geolocation.lastPosition = pos;
             successCallback(pos);
@@ -118,7 +118,7 @@ var geolocation = {
 
         // Check our cached position, if its timestamp difference with current time is less than the maximumAge, then just
         // fire the success callback with the cached position.
-        if (geolocation.lastPosition && options.maximumAge && (((new Date()).getTime() - geolocation.lastPosition.timestamp.getTime()) <= options.maximumAge)) {
+        if (geolocation.lastPosition && options.maximumAge && (((new Date()).getTime() - geolocation.lastPosition.timestamp) <= options.maximumAge)) {
             successCallback(geolocation.lastPosition);
         // If the cached position check failed and the timeout was set to 0, error out with a TIMEOUT error object.
         } else if (options.timeout === 0) {
@@ -184,7 +184,7 @@ var geolocation = {
                     velocity:p.velocity,
                     altitudeAccuracy:p.altitudeAccuracy
                 },
-                (p.timestamp === undefined ? new Date() : ((p.timestamp instanceof Date) ? p.timestamp : new Date(p.timestamp)))
+                p.timestamp
             );
             geolocation.lastPosition = pos;
             successCallback(pos);