Update iD initialization for v2.18.1

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
index ba16d9df2451a394d79bb5f726b0fc4d7d22b71b..889a39f864a80aba8061bfa8787b66e2c95dd138 100644 (file)
--- a/app/assets/javascripts/id.js
+++ b/app/assets/javascripts/id.js
@@ -5,24 +5,26 @@
 document.addEventListener("DOMContentLoaded", function () {
   var container = document.getElementById("id-container");
 
 document.addEventListener("DOMContentLoaded", function () {
   var container = document.getElementById("id-container");
 

-  if (typeof iD === "undefined" || !iD.Detect().support) {
+  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 Potlatch 2 to edit the map.";
     container.className = "unsupported";
   } else {
     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";
   } else {

-    var id = iD.Context()
+    var id = iD.coreContext()

       .embed(true)
       .assetPath("iD/")
       .assetMap(JSON.parse(container.dataset.assetMap))
       .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
       .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 () {
       if (id.inIntro()) return;
 
     id.map().on("move.embed", parent.$.throttle(250, function () {
       if (id.inIntro()) return;


@@ -52,7 +54,5 @@ document.addEventListener("DOMContentLoaded", function () {
           Math.max(data.zoom || 15, 13));
       }, 0);
     });
           Math.max(data.zoom || 15, 13));
       }, 0);
     });

-
-    id.ui()(container);

   }
 });
   }
 });

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 39f75c8cac722abed2a1257d647267a94bcb9e65..0178c8f22f817b2d5c58a85e14cd56ce61e53c81 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -17,7 +17,6 @@
 <% data[:consumer_secret] = token.client_application.secret -%>
 <% end %>
 <% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>
 <% data[:consumer_secret] = token.client_application.secret -%>
 <% end %>
 <% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>

-<% data[:locale_path] = asset_path("iD/locales/#{data[:locale]}.json") -%>

 <% data[:asset_map] = assets("iD").to_json -%>
 <%= tag.div "", :id => "id-container", :data => data %>
 </body>
 <% data[:asset_map] = assets("iD").to_json -%>
 <%= tag.div "", :id => "id-container", :data => data %>
 </body>