X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d8a504d8dbc7262dee96678e98d017d918dfa111..67e77fd20e2b75e353cc26d3f3b79e7e789be49c:/app/views/site/id.html.erb diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index fde4a07cd..075e70b74 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -2,9 +2,9 @@ - <%= stylesheet_link_tag 'iD' %> + <%= stylesheet_link_tag 'id' %> - <%= javascript_include_tag 'iD' %> + <%= javascript_include_tag 'id' %> @@ -19,8 +19,11 @@ <% locale = select_locale(ID::LOCALES).to_s %> var id = iD() + .presets(iD.data.presets) + .imagery(iD.data.imagery) + .taginfo(iD.taginfo()) .embed(true) - .assetPath("/iD/") <%# Can't use asset_path('iD/') in production. %> + .assetPath("/iD/") <%# Cant use asset_path('iD/') in production. %> .assetMap(<%= assets("iD").to_json.html_safe %>) .locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>") .preauth({ @@ -33,24 +36,15 @@ }); id.map().on('move.embed', parent.$.throttle(250, function() { - var extent = id.map().extent(), - zoom = ~~id.map().zoom(), - center = id.map().center(); + var zoom = ~~id.map().zoom(), + center = id.map().center(), + llz = { lon: center[0], lat: center[1], zoom: zoom }; - parent.updatelinks({ - lon: center[0], - lat: center[1] - }, - zoom, - null, - [[extent[0][1], - extent[0][0]], - [extent[1][1], - extent[1][0]]]); + parent.updateLinks(llz, zoom); // Manually resolve URL to avoid iframe JS context weirdness. // http://bl.ocks.org/jfirebaugh/5439412 - var hash = parent.OSM.formatHash({ lon: center[0], lat: center[1], zoom: zoom }); + var hash = parent.OSM.formatHash(llz); if (hash !== parent.location.hash) { parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash)); }