X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9f7f39140e942df4dc08d4167d3c07202628840..67e77fd20e2b75e353cc26d3f3b79e7e789be49c:/app/views/site/id.html.erb diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index aaa3927a9..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,12 @@ <% locale = select_locale(ID::LOCALES).to_s %> var id = iD() + .presets(iD.data.presets) + .imagery(iD.data.imagery) + .taginfo(iD.taginfo()) .embed(true) - .assetPath("/assets/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({ <% token = @user.access_token(ID_KEY) %> @@ -31,21 +35,20 @@ oauth_token_secret: "<%= token.secret %>" }); - id.map().on('move.embed', function() { - var extent = id.map().extent(), - zoom = ~~id.map().zoom(), - center = id.map().center(); + id.map().on('move.embed', parent.$.throttle(250, function() { + var zoom = ~~id.map().zoom(), + center = id.map().center(), + llz = { lon: center[0], lat: center[1], zoom: zoom }; - parent.updatelinks( - center[0], - center[1], - zoom, - null, - extent[0][0], - extent[0][1], - extent[1][0], - extent[1][1]); - }); + parent.updateLinks(llz, zoom); + + // Manually resolve URL to avoid iframe JS context weirdness. + // http://bl.ocks.org/jfirebaugh/5439412 + var hash = parent.OSM.formatHash(llz); + if (hash !== parent.location.hash) { + parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash)); + } + })); parent.$("body").on("click", "a.set_position", function (e) { e.preventDefault(); @@ -60,16 +63,6 @@ }, 0); }); - var maximized = false; - id.on('toggleFullscreen.embed', function() { - if (maximized) { - parent.minimiseMap(); - } else { - parent.maximiseMap(); - } - maximized = !maximized; - }); - d3.select('#id-container') .call(id.ui()); }