latlng

8 files changed, 28 insertions, 18 deletions

diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml
index 72ad698b..f579a950 100644
--- a/StoneIsland/config.xml
+++ b/StoneIsland/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.1.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Stone Island</name>
     <description>
         Stone Island
diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
index 79b4bb61..a3474c5d 100644
--- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
index 7492f42c..b627cb12 100644
--- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
+++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist
@@ -57,7 +57,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.1.0</string>
+    <string>0.2.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleURLTypes</key>
@@ -70,7 +70,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>0.1.0</string>
+    <string>0.2.0</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>NSAppTransportSecurity</key>
diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml
index 68e44a08..dcbf0050 100755
--- a/StoneIsland/platforms/ios/Stone Island/config.xml
+++ b/StoneIsland/platforms/ios/Stone Island/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="us.okfoc.stoneisland" version="0.1.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="us.okfoc.stoneisland" version="0.2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <preference name="AllowInlineMediaPlayback" value="false" />
     <preference name="BackupWebStorage" value="cloud" />
     <preference name="DisallowOverscroll" value="false" />
diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
index 785717a8..254df6d1 100644
--- a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js
@@ -113,10 +113,10 @@ var ArchiveView = ScrollableView.extend({
 
   touchstart: function(e){
     app.archive.row = e.currentTarget
-    app.archive.mousedown(e.touches[0])
+    app.archive.mousedown(e.originalEvent.touches[0])
   },
   touchmove: function(e){
-    app.archive.mousemove(e.touches[0])
+    app.archive.mousemove(e.originalEvent.touches[0])
   },
   touchend: function(e){
     app.archive.mouseup()
diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js
index ab1f8372..fac34c1e 100644
--- a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js
+++ b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js
@@ -6,8 +6,8 @@ var geo = (function(){
   }
   
   geo.success = function(position){
-    var lat_str = as_degrees( position.coords.latitude )
-    var lng_str = as_degrees( position.coords.longitude )
+    var lat_str = as_degrees( position.coords.latitude || 40.99167 )
+    var lng_str = as_degrees( position.coords.longitude || -74.07944 )
     $(".latlng").html( lat_str + " " + lng_str )
   }
   
@@ -20,14 +20,19 @@ var geo = (function(){
     if (n >= 0) s += "+"
     s += Math.floor(n) + "&deg; "
     
+    n = Math.abs(n)
     n %= 1
     n *= 60
-    s += Math.floor(n) + "'"
+    nn = Math.floor(n)
+    if (nn < 10) nn = "0" + nn
+    s += nn + "' "
     
     n %= 1
     n *= 60
-
-    s += Math.floor(n) + '"'
+    nn = Math.floor(n)
+    if (nn < 10) nn = "0" + nn
+    s += nn + '"'
+    return s
   }
 
   return geo
diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js
index 785717a8..254df6d1 100644
--- a/StoneIsland/www/js/lib/blogs/ArchiveView.js
+++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js
@@ -113,10 +113,10 @@ var ArchiveView = ScrollableView.extend({
 
   touchstart: function(e){
     app.archive.row = e.currentTarget
-    app.archive.mousedown(e.touches[0])
+    app.archive.mousedown(e.originalEvent.touches[0])
   },
   touchmove: function(e){
-    app.archive.mousemove(e.touches[0])
+    app.archive.mousemove(e.originalEvent.touches[0])
   },
   touchend: function(e){
     app.archive.mouseup()
diff --git a/StoneIsland/www/js/lib/etc/geo.js b/StoneIsland/www/js/lib/etc/geo.js
index ab1f8372..fac34c1e 100644
--- a/StoneIsland/www/js/lib/etc/geo.js
+++ b/StoneIsland/www/js/lib/etc/geo.js
@@ -6,8 +6,8 @@ var geo = (function(){
   }
   
   geo.success = function(position){
-    var lat_str = as_degrees( position.coords.latitude )
-    var lng_str = as_degrees( position.coords.longitude )
+    var lat_str = as_degrees( position.coords.latitude || 40.99167 )
+    var lng_str = as_degrees( position.coords.longitude || -74.07944 )
     $(".latlng").html( lat_str + " " + lng_str )
   }
   
@@ -20,14 +20,19 @@ var geo = (function(){
     if (n >= 0) s += "+"
     s += Math.floor(n) + "&deg; "
     
+    n = Math.abs(n)
     n %= 1
     n *= 60
-    s += Math.floor(n) + "'"
+    nn = Math.floor(n)
+    if (nn < 10) nn = "0" + nn
+    s += nn + "' "
     
     n %= 1
     n *= 60
-
-    s += Math.floor(n) + '"'
+    nn = Math.floor(n)
+    if (nn < 10) nn = "0" + nn
+    s += nn + '"'
+    return s
   }
 
   return geo