X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c8fb5ad24c5751bd2d43b86e4359381d200af066..f0764d3:/app/views/site/id.html.erb?ds=inline diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index c0682258d..64cb4fd58 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -2,78 +2,19 @@ <html> <head> <meta charset='utf-8'> - <%= stylesheet_link_tag 'iD' %> + <%= stylesheet_link_tag "id" %> <!--[if !IE || gte IE 9]><!--> - <%= javascript_include_tag 'iD' %> + <%= javascript_include_tag "id" %> <!-- <![endif]--> </head> <body> -<div id='id-container'></div> -<script> - if (typeof iD == 'undefined') { - document.getElementById('id-container').innerHTML = 'This editor is supported ' + - 'in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. ' + - 'Please upgrade your browser or use Potlatch 2 to edit the map.'; - document.getElementById('id-container').className = 'unsupported'; - } else { - <% locale = select_locale(ID::LOCALES).to_s %> - - var id = iD() - .embed(true) - .assetPath("/assets/iD/") <%# Can't use asset_path('iD/') in production. %> - .locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>") - .preauth({ - <% token = @user.access_token(ID_KEY) %> - url: "<%= request.protocol + request.host_with_port %>", - oauth_consumer_key: "<%= token.client_application.key %>", - oauth_secret: "<%= token.client_application.secret %>", - oauth_token: "<%= token.token %>", - oauth_token_secret: "<%= token.secret %>" - }); - - id.map().on('move.embed', function() { - var extent = id.map().extent(), - zoom = ~~id.map().zoom(), - center = id.map().center(); - - parent.updatelinks({ - lon: center[0], - lat: center[1] - }, - zoom, - null, - [[extent[0][1], - extent[0][0]], - [extent[1][1], - extent[1][0]]]); - }); - - parent.$("body").on("click", "a.set_position", function (e) { - e.preventDefault(); - var data = parent.$(this).data(); - - // 0ms timeout to avoid iframe JS context weirdness. - // http://bl.ocks.org/jfirebaugh/5439412 - setTimeout(function() { - id.map().centerZoom( - [data.lon, data.lat], - Math.max(data.zoom || 15, 13)); - }, 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()); - } -</script> +<% data = {} + if Settings.key?(:id_application) + token = current_user.oauth_token(Settings.id_application) + data[:token] = token.token + end + data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s + data[:asset_map] = assets("iD").to_json %> +<%= tag.div "", :id => "id-container", :data => data %> </body> </html>