Simplify further by using OSM.home

[rails.git] / app / assets / javascripts / user.js

diff --git a/app/assets/javascripts/user.js b/app/assets/javascripts/user.js
index 7d8c2f33410532e395f55ad1ca1909f0e9228e2a..77cb86a8d210b670e9a9c2ba1a350f678001d936 100644 (file)
--- a/app/assets/javascripts/user.js
+++ b/app/assets/javascripts/user.js
@@ -1,19 +1,20 @@
 $(document).ready(function () {
-  var params = $("#map").data();
   var map = createMap("map");
 
-  setMapCenter(new OpenLayers.LonLat(params.lon, params.lat), params.zoom);
+  if (OSM.home) {
+    setMapCenter(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat), 12);
+  } else {
+    setMapCenter(new OpenLayers.LonLat(0, 0), 0);
+  }
 
   if ($("#map").hasClass("set_location")) {
     var marker;
 
-    if (params.marker) {
-      marker = addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat));
+    if (OSM.home) {
+      marker = addMarkerToMap(new OpenLayers.LonLat(OSM.home.lon, OSM.home.lat));
     }
 
     map.events.register("click", map, function (e) {
-      closeMapPopup();
-
       if ($('#updatehome').is(':checked')) {
         var lonlat = getEventPosition(e);
 
@@ -29,8 +30,6 @@ $(document).ready(function () {
       }
     });
   } else {
-    addMarkerToMap(new OpenLayers.LonLat(params.lon, params.lat), null, params.marker.description);
-
     $("[data-user]").each(function () {
       var user = $(this).data('user');
       if (user.lon && user.lat) {