Add iD editor

iD sources live in vendor/assets/iD, and are managed with vendorer, using the "rewrite" functionality to replace relative paths in the CSS with <%= asset_path(…) %> directives. To avoid needing to namespace all of its CSS classes, iD is embedded via an iframe. To setup, edit application.yml to include an `id_key` key. (It can use the same consumer key as P2 if you like.)
2013-04-01 17:19:15 -04:00 · 2013-04-01 17:19:15 -04:00 · 7a98913d0c
commit 7a98913d0c
parent 2c8ed19553
59 changed files with 77628 additions and 2 deletions
--- a/10
+++ b/10
@ -37,4 +37,14 @@ folder 'vendor/assets' do
      file 'ohauth.js'
    end
  end
+
+  folder 'iD' do
+    from 'git://github.com/systemed/iD', :branch => 'embed' do
+      folder 'iD/img', 'dist/img'
+      file 'iD.css.erb', 'dist/iD.css' do |path|
+        rewrite(path) { |content| content.gsub(/url\('?(img\/[^')]+)'?\)/, 'url(<%= asset_path("iD/\1") %>)') }
+      end
+      file 'iD.js', 'dist/iD.js'
+    end
+  end
 end
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@ -1784,3 +1784,11 @@ a.button.submit {
    text-align: right;
  }
 }
+
+/*
+ * Rules for the iD editor
+ */
+.id-embed {
+  width: 100%;
+  height: 100%;
+}
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@ -65,4 +65,8 @@ class SiteController < ApplicationController
  def preview
    render :text => RichText.new(params[:format], params[:text]).to_html
  end
+
+  def id_iframe
+    render "id_iframe", :layout => false
+  end
 end
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@ -0,0 +1,34 @@
+<% if defined? ID_KEY %>
+<iframe frameBorder="0" id="id-embed" class="id-embed"></iframe>
+<% token = @user.access_token(ID_KEY) %>
+<script>
+var keys = {
+    '<%= 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 %>"
+    }
+};
+
+var coord = {};
+<% if @lat && @lon && @zoom -%>
+coord.lat = <%= @lat %>;
+coord.lon = <%= @lon %>;
+coord.zoom = <%= @zoom %>;
+<% else -%>
+var params = OSM.mapParams();
+coord.lat = params.lat;
+coord.lon = params.lon;
+coord.zoom = params.zoom;
+<% end -%>
+var url = 'id_iframe#map=' + coord.zoom + '/' + coord.lon + '/' + coord.lat +
+    '&preauth=' + JSON.stringify(keys);
+$('#id-embed').attr('src', url);
+</script>
+<% else%>
+<script type="text/javascript">alert("<%= t 'site.edit.id_not_configured' %>")</script>
+<% end %>
+
+<script type="text/javascript">
+</script>
--- a/app/views/site/id_iframe.html.erb
+++ b/app/views/site/id_iframe.html.erb
@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset='utf-8'>
+  <%= stylesheet_link_tag 'iD' %>
+  <!--[if !IE || gte IE 9]><!-->
+  <%= 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 {
+    var qs = iD.util.stringQs(location.hash);
+    if (qs.preauth) {
+      var preauth = JSON.parse(qs.preauth);
+
+      var id = iD()
+        .embed(true)
+        .imagePath("/assets/iD/img/"); <%# Can't use asset_path('id/img/') in production. %>
+
+      id.connection()
+        .url(Object.keys(preauth)[0])
+        .keys(preauth);
+
+      d3.select('#id-container')
+        .call(id.ui());
+    }
+  }
+</script>
+</body>
+</html>
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@ -62,6 +62,7 @@ OpenStreetMap::Application.configure do
  config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
  config.assets.precompile += %w( browse.css leaflet-all.css leaflet.ie.css )
  config.assets.precompile += %w( embed.js embed.css )
+  config.assets.precompile += %w( iD.js iD.css )

  # Disable delivery errors, bad email addresses will be ignored
  # config.action_mailer.raise_delivery_errors = false
--- a/config/example.application.yml
+++ b/config/example.application.yml
@ -78,6 +78,8 @@ defaults: &defaults
  #potlatch2_key: ""
  # OAuth consumer key for the web site
  #oauth_key: ""
+  # OAuth consumer key for iD
+  #id_key: ""
  # Whether to require users to view the CTs before continuing to edit...
  require_terms_seen: false
  # Whether to require users to agree to the CTs before editing
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -85,6 +85,9 @@ en:
    potlatch:
      name: "Potlatch 1"
      description: "Potlatch 1 (in-browser editor)"
+    id:
+      name: "iD"
+      description: "iD (in-browser editor)"
    potlatch2:
      name: "Potlatch 2"
      description: "Potlatch 2 (in-browser editor)"
@ -1312,6 +1315,7 @@ en:
      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
      potlatch2_not_configured: "Potlatch 2 has not been configured - please see http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
      potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"
+      id_not_configured: "iD has not been configured"
      no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
    sidebar:
      search_results: Search Results
--- a/config/routes.rb
+++ b/config/routes.rb
@ -131,6 +131,7 @@ OpenStreetMap::Application.routes.draw do
  match '/logout' => 'user#logout', :via => [:get, :post]
  match '/offline' => 'site#offline', :via => :get
  match '/key' => 'site#key', :via => :get
+  match '/id_iframe' => 'site#id_iframe', :via => :get
  match '/user/new' => 'user#new', :via => :get
  match '/user/terms' => 'user#terms', :via => [:get, :post]
  match '/user/save' => 'user#save', :via => :post
--- a/lib/editors.rb
+++ b/lib/editors.rb
@ -1,4 +1,4 @@
 module Editors 
-  ALL_EDITORS = [ "potlatch", "potlatch2", "remote" ]
-  RECOMMENDED_EDITORS = [ "potlatch2", "remote" ]
+  ALL_EDITORS = [ "potlatch", "potlatch2", "id", "remote" ]
+  RECOMMENDED_EDITORS = [ "id", "potlatch2", "remote" ]
 end
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
--- a/vendor/assets/iD/iD.js
+++ b/vendor/assets/iD/iD.js
--- a/vendor/assets/iD/iD/img/background-pattern-1.png
+++ b/vendor/assets/iD/iD/img/background-pattern-1.png
--- a/vendor/assets/iD/iD/img/background-pattern-opacity.png
+++ b/vendor/assets/iD/iD/img/background-pattern-opacity.png
--- a/vendor/assets/iD/iD/img/bing_maps.png
+++ b/vendor/assets/iD/iD/img/bing_maps.png
--- a/vendor/assets/iD/iD/img/cursor-draw-connect-line.png
+++ b/vendor/assets/iD/iD/img/cursor-draw-connect-line.png
--- a/vendor/assets/iD/iD/img/cursor-draw-connect-line2x.png
+++ b/vendor/assets/iD/iD/img/cursor-draw-connect-line2x.png
--- a/vendor/assets/iD/iD/img/cursor-draw-connect-vertex.png
+++ b/vendor/assets/iD/iD/img/cursor-draw-connect-vertex.png
--- a/vendor/assets/iD/iD/img/cursor-draw-connect-vertex2x.png
+++ b/vendor/assets/iD/iD/img/cursor-draw-connect-vertex2x.png
--- a/vendor/assets/iD/iD/img/cursor-draw.png
+++ b/vendor/assets/iD/iD/img/cursor-draw.png
--- a/vendor/assets/iD/iD/img/cursor-draw2x.png
+++ b/vendor/assets/iD/iD/img/cursor-draw2x.png
--- a/vendor/assets/iD/iD/img/cursor-grab.png
+++ b/vendor/assets/iD/iD/img/cursor-grab.png
--- a/vendor/assets/iD/iD/img/cursor-grab2x.png
+++ b/vendor/assets/iD/iD/img/cursor-grab2x.png
--- a/vendor/assets/iD/iD/img/cursor-grabbing.png
+++ b/vendor/assets/iD/iD/img/cursor-grabbing.png
--- a/vendor/assets/iD/iD/img/cursor-grabbing2x.png
+++ b/vendor/assets/iD/iD/img/cursor-grabbing2x.png
--- a/vendor/assets/iD/iD/img/cursor-pointer.png
+++ b/vendor/assets/iD/iD/img/cursor-pointer.png
--- a/vendor/assets/iD/iD/img/cursor-pointer2x.png
+++ b/vendor/assets/iD/iD/img/cursor-pointer2x.png
--- a/vendor/assets/iD/iD/img/cursor-pointing.png
+++ b/vendor/assets/iD/iD/img/cursor-pointing.png
--- a/vendor/assets/iD/iD/img/cursor-pointing2x.png
+++ b/vendor/assets/iD/iD/img/cursor-pointing2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-acting.png
+++ b/vendor/assets/iD/iD/img/cursor-select-acting.png
--- a/vendor/assets/iD/iD/img/cursor-select-acting2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-acting2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-add.png
+++ b/vendor/assets/iD/iD/img/cursor-select-add.png
--- a/vendor/assets/iD/iD/img/cursor-select-add2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-add2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-area.png
+++ b/vendor/assets/iD/iD/img/cursor-select-area.png
--- a/vendor/assets/iD/iD/img/cursor-select-area2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-area2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-line.png
+++ b/vendor/assets/iD/iD/img/cursor-select-line.png
--- a/vendor/assets/iD/iD/img/cursor-select-line2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-line2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-point.png
+++ b/vendor/assets/iD/iD/img/cursor-select-point.png
--- a/vendor/assets/iD/iD/img/cursor-select-point2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-point2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-remove.png
+++ b/vendor/assets/iD/iD/img/cursor-select-remove.png
--- a/vendor/assets/iD/iD/img/cursor-select-remove2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-remove2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-split.png
+++ b/vendor/assets/iD/iD/img/cursor-select-split.png
--- a/vendor/assets/iD/iD/img/cursor-select-split2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-split2x.png
--- a/vendor/assets/iD/iD/img/cursor-select-vertex.png
+++ b/vendor/assets/iD/iD/img/cursor-select-vertex.png
--- a/vendor/assets/iD/iD/img/cursor-select-vertex2x.png
+++ b/vendor/assets/iD/iD/img/cursor-select-vertex2x.png
--- a/vendor/assets/iD/iD/img/feature-icons.png
+++ b/vendor/assets/iD/iD/img/feature-icons.png
--- a/vendor/assets/iD/iD/img/loader-black.gif
+++ b/vendor/assets/iD/iD/img/loader-black.gif
--- a/vendor/assets/iD/iD/img/loader-white.gif
+++ b/vendor/assets/iD/iD/img/loader-white.gif
--- a/vendor/assets/iD/iD/img/loader_bg.gif
+++ b/vendor/assets/iD/iD/img/loader_bg.gif
--- a/vendor/assets/iD/iD/img/logo.png
+++ b/vendor/assets/iD/iD/img/logo.png
--- a/vendor/assets/iD/iD/img/mini-loader.gif
+++ b/vendor/assets/iD/iD/img/mini-loader.gif
--- a/vendor/assets/iD/iD/img/pattern/cemetery.png
+++ b/vendor/assets/iD/iD/img/pattern/cemetery.png
--- a/vendor/assets/iD/iD/img/pattern/construction.png
+++ b/vendor/assets/iD/iD/img/pattern/construction.png
--- a/vendor/assets/iD/iD/img/pattern/dots.png
+++ b/vendor/assets/iD/iD/img/pattern/dots.png
--- a/vendor/assets/iD/iD/img/pattern/farmland.png
+++ b/vendor/assets/iD/iD/img/pattern/farmland.png
--- a/vendor/assets/iD/iD/img/pattern/orchard.png
+++ b/vendor/assets/iD/iD/img/pattern/orchard.png
--- a/vendor/assets/iD/iD/img/pattern/vineyard.png
+++ b/vendor/assets/iD/iD/img/pattern/vineyard.png
--- a/vendor/assets/iD/iD/img/pattern/wetland.png
+++ b/vendor/assets/iD/iD/img/pattern/wetland.png
--- a/vendor/assets/iD/iD/img/sprite.svg
+++ b/vendor/assets/iD/iD/img/sprite.svg