X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb79ce2833c56ef838eb94560de8506857d21018..87ea9fcb021b9b67a79d35cb719a064a34a7784d:/app/assets/javascripts/id.js?ds=sidebyside diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js index dd7cd3325..ac18da06f 100644 --- a/app/assets/javascripts/id.js +++ b/app/assets/javascripts/id.js @@ -2,33 +2,35 @@ /* globals iD */ -document.addEventListener("DOMContentLoaded", function() { +document.addEventListener("DOMContentLoaded", function () { var container = document.getElementById("id-container"); - if (typeof iD === 'undefined' || !iD.Detect().support) { - container.innerHTML = 'This editor is supported ' + - 'in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. ' + - 'Please upgrade your browser or use Potlatch 2 to edit the map.'; - container.className = 'unsupported'; + if (typeof iD === "undefined" || !iD.utilDetect().support) { + container.innerHTML = "This editor is supported " + + "in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. " + + "Please upgrade your browser or use JOSM to edit the map."; + container.className = "unsupported"; } else { - var id = iD.Context() + var id = iD.coreContext() .embed(true) .assetPath("iD/") .assetMap(JSON.parse(container.dataset.assetMap)) - .locale(container.dataset.locale, container.dataset.localePath) + .locale(container.dataset.locale) .preauth({ urlroot: location.protocol + "//" + location.host, oauth_consumer_key: container.dataset.consumerKey, oauth_secret: container.dataset.consumerSecret, oauth_token: container.dataset.token, oauth_token_secret: container.dataset.tokenSecret - }); + }) + .containerNode(container) + .init(); - id.map().on('move.embed', parent.$.throttle(250, function() { + id.map().on("move.embed", parent.$.throttle(250, function () { if (id.inIntro()) return; var zoom = ~~id.map().zoom(), - center = id.map().center(), - llz = { lon: center[0], lat: center[1], zoom: zoom }; + center = id.map().center(), + llz = { lon: center[0], lat: center[1], zoom: zoom }; parent.updateLinks(llz, zoom); @@ -46,13 +48,11 @@ document.addEventListener("DOMContentLoaded", function() { // 0ms timeout to avoid iframe JS context weirdness. // http://bl.ocks.org/jfirebaugh/5439412 - setTimeout(function() { + setTimeout(function () { id.map().centerZoom( [data.lon, data.lat], Math.max(data.zoom || 15, 13)); }, 0); }); - - id.ui()(container); } });