Update to iD v2.0.0

openstreetmap · Nov 15, 2016 · 6c3a31d · 6c3a31d
1 parent 2ed5e97
commit 6c3a31d
Show file tree

Hide file tree

Showing 90 changed files with 255,034 additions and 185,675 deletions.
diff --git a/Vendorfile b/Vendorfile
@@ -50,6 +50,7 @@ folder 'vendor/assets' do
       folder 'iD/img', 'dist/img'
       folder 'iD/locales', 'dist/locales'
       folder 'iD/traffico', 'dist/traffico'
+      folder 'iD/mapillary-js', 'dist/mapillary-js'
 
       file 'iD.css.erb', 'dist/iD.css' do |path|
         rewrite(path) do |content|
@@ -66,8 +67,6 @@ folder 'vendor/assets' do
       File.delete('vendor/assets/iD/iD/traffico/stylesheets/traffico.css')
 
       file 'iD.js', 'dist/iD.js'
-      file 'presets.js', 'dist/presets.js'
-      file 'imagery.js', 'dist/imagery.js'
     end
   end
 

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
@@ -1,3 +1 @@
 //= require iD
-//= require presets
-//= require imagery
diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
@@ -10,13 +10,13 @@
       params.id = mapParams.object.type[0] + mapParams.object.id;
       mapParams = OSM.parseHash(location.hash);
       if (mapParams.center) {
-        params.map = mapParams.zoom + '/' + mapParams.center.lng + '/' + mapParams.center.lat;
+        params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lon;
       }
     } else {
 <% if @lat && @lon -%>
-      params.map = '16/<%= @lon %>/<%= @lat %>';
+      params.map = '16/<%= @lat %>/<%= @lng %>';
 <% else -%>
-      params.map = (mapParams.zoom || 17) + '/' + mapParams.lon + '/' + mapParams.lat;
+      params.map = (mapParams.zoom || 17) + '/' + mapParams.lat + '/' + mapParams.lon;
 <% end -%>
     }
 

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
@@ -10,25 +10,22 @@
 <body>
 <div id='id-container'></div>
 <script>
-  if (typeof iD == 'undefined' || !iD.detect().support) {
+  if (typeof iD == 'undefined' || !iD.Detect().support) {
     document.getElementById('id-container').innerHTML = 'This editor is supported ' +
-      'in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. ' +
+      'in Firefox, Chrome, Safari, Opera, Edge, and Internet Explorer 11. ' +
       'Please upgrade your browser or use Potlatch 2 to edit the map.';
     document.getElementById('id-container').className = 'unsupported';
   } else {
     <% locale = ID::LOCALES.preferred(preferred_languages).to_s %>
 
-    var id = iD()
-      .presets(iD.data.presets)
-      .imagery(iD.data.imagery)
-      .taginfo(iD.services.taginfo())
+    var id = iD.Context()
       .embed(true)
       .assetPath("iD/")
       .assetMap(<%= assets("iD").to_json.html_safe %>)
       .locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>")
       .preauth({
         <% token = @user.access_token(ID_KEY) %>
-        url: "<%= request.protocol + request.host_with_port %>",
+        urlroot: "<%= request.protocol + request.host_with_port %>",
         oauth_consumer_key: "<%= token.client_application.key %>",
         oauth_secret: "<%= token.client_application.secret %>",
         oauth_token: "<%= token.token %>",
@@ -64,8 +61,7 @@
       }, 0);
     });
 
-    d3.select('#id-container')
-      .call(id.ui());
+    id.ui()(document.getElementById("id-container"));
   }
 </script>
 </body>