X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3b9987bb863e25fc3175f6848d8a430b17f54c2..bc70cae711fb6947233d6a750cb33f115aa7a01b:/app/assets/javascripts/id.js?ds=inline diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js index b54532af2..706097bba 100644 --- a/app/assets/javascripts/id.js +++ b/app/assets/javascripts/id.js @@ -2,38 +2,42 @@ /* 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 and Edge. " + + "Please upgrade your browser or use JOSM to edit the map."; + container.className = "unsupported"; } else { - var id = iD.Context() + var idContext = iD.coreContext(); + idContext.connection().apiConnections([]); + var url = location.protocol + "//" + location.host; + idContext.preauth({ + url: url, + apiUrl: url === "https://www.openstreetmap.org" ? "https://api.openstreetmap.org" : url, + access_token: container.dataset.token + }); + + var id = idContext .embed(true) .assetPath("iD/") - .assetMap(container.dataset.assetMap) - .locale(container.dataset.locale, container.dataset.localePath) - .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 - }); - - id.map().on('move.embed', parent.$.throttle(250, function() { + .assetMap(JSON.parse(container.dataset.assetMap)) + .locale(container.dataset.locale) + .containerNode(container) + .init(); + + 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); // Manually resolve URL to avoid iframe JS context weirdness. - // http://bl.ocks.org/jfirebaugh/5439412 + // https://gist.github.com/jfirebaugh/5439412 var hash = parent.OSM.formatHash(llz); if (hash !== parent.location.hash) { parent.location.replace(parent.location.href.replace(/(#.*|$)/, hash)); @@ -45,14 +49,12 @@ document.addEventListener("DOMContentLoaded", function() { var data = parent.$(this).data(); // 0ms timeout to avoid iframe JS context weirdness. - // http://bl.ocks.org/jfirebaugh/5439412 - setTimeout(function() { + // https://gist.github.com/jfirebaugh/5439412 + setTimeout(function () { id.map().centerZoom( [data.lon, data.lat], Math.max(data.zoom || 15, 13)); }, 0); }); - - id.ui()(container); } });