Resolve conflict

[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 e2f783731b7ff50f6107e5af77ee7661963724b8..f88942669ecbb19595f5b6f62c4378ae68175e4e 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -3,23 +3,34 @@
     <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
   </div>
   <script>
     <iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
   </div>
   <script>

-    var coord = {};
-    <% if @lat && @lon && @zoom -%>
-    coord.lat = <%= @lat %>;
-    coord.lon = <%= @lon %>;
-    coord.zoom = <%= @zoom %>;
-    <% else -%>
-    coord = OSM.mapParams();
-    <% end -%>
+    var params = {};

 
 

-    var hash;
-    if (coord.object) {
-      hash = '#id=' + coord.object.type[0] + coord.object.id;
+    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.lng + '/' + mapParams.center.lat;
+      }

     } else {
     } else {

-      hash = '#map=' + (coord.zoom || 17) + '/' + coord.lon + '/' + coord.lat
+<% if @lat && @lon -%>
+      params.map = '16/<%= @lon %>/<%= @lat %>';
+<% else -%>
+      params.map = (mapParams.zoom || 17) + '/' + mapParams.lon + '/' + mapParams.lat;
+<% end -%>

     }
 
     }
 

-    $('#id-embed').attr('src', '<%= id_url :locale => params[:locale] %>' + hash);
+    var hashParams = OSM.params(location.hash.substring(1));
+
+    if (hashParams.background) {
+      params.background = hashParams.background;
+    }
+
+    if (hashParams.gpx) {
+      params.gpx = hashParams.gpx;
+    }
+
+    $('#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>
   </script>
 <% else %>
   <script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>