Merge remote-tracking branch 'openstreetmap/pull/1469'

[rails.git] / app / views / site / _id.html.erb

diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index d582028f83226ceaad63ea3ea1b11b608a68abb3..d93ee091e91d68e3d478776891b959067e8b8168 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -5,24 +5,20 @@
   <script>
     var params = {};
 
-    function getParams(params) {
-      var mapParams = OSM.mapParams();
-      if (mapParams.object) {
-        params.id = mapParams.object.type[0] + mapParams.object.id;
-        mapParams = OSM.parseHash(location.hash);
-        if (mapParams.center) {
-          params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng;
-        }
-      } else {
-        params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
+    var mapParams = OSM.mapParams();
+    if (mapParams.object) {
+      params.id = mapParams.object.type[0] + mapParams.object.id;
+      mapParams = OSM.parseHash(location.hash);
+      if (mapParams.center) {
+        params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng;
       }
-    }
-
-    getParams(params);
-
+    } else {
 <% if @lat && @lon -%>
-    params.map = '16/<%= @lat %>/<%= @lon %>';
+      params.map = '16/<%= @lat %>/<%= @lon %>';
+<% else -%>
+      params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
 <% end -%>
+    }
 
     var hashParams = OSM.params(location.hash.substring(1));
 
@@ -44,14 +40,7 @@
     }
 <% end -%>
 
-    var baseUrl = '<%= id_url :locale => params[:locale] %>#';
-
-    $('#id-embed').attr('src', baseUrl + querystring.stringify(params));
-
-    $(window).on('hashchange', function () {
-      getParams(params);
-      $('#id-embed').attr('src', baseUrl + querystring.stringify(params));
-    });
+    $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>#' + querystring.stringify(params));
   </script>
 <% else %>
   <script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>