Merge branch 'master' of github.com:silsha/ponytime

silsha · Feb 18, 2012 · 6f2154b · 6f2154b
2 parents 3d0d861 + 2b2b07b
commit 6f2154b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/index.php b/index.php
@@ -27,7 +27,7 @@
       function init() {
         var mapCenter = new google.maps.LatLng(0, 0);
         map = new google.maps.Map(document.getElementById('map'), {
-          zoom: 12,
+          zoom: 6,
           center: new google.maps.LatLng(51.1, 10.5),
           mapTypeId: google.maps.MapTypeId.ROADMAP
         });
@@ -83,6 +83,7 @@ function getUsersLocation() {
             var pos = new google.maps.LatLng(position.coords.latitude,
               position.coords.longitude);
               map.panTo(pos);
+			  map.setZoom(13);
           }, function() {
             map.panTo(new google.maps.LatLng(51.1, 10.5));
           });

diff --git a/json.php b/json.php
@@ -11,14 +11,5 @@
 	$json[$row->id]['lng']	= $row->log;
 	$json[$row->id]['url']	= $row->url;
 }
-
-
-$jsonen = json_encode($json);
-
-echo $jsonen;
-
-//var_dump ($jsonen);
-
-//var_dump(json_decode($jsonen, true));
-
-?>
+print json_encode($json);
+?>