Add Potlatch 2 as an editor option

openstreetmap · Nov 29, 2010 · b90219f · b90219f
1 parent cd66a5d
commit b90219f
Show file tree

Hide file tree

Showing 287 changed files with 6,421 additions and 3 deletions.
diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
@@ -0,0 +1,36 @@
+<div id="map">
+  <%= t 'site.edit.flash_player_required' %>
+</div>
+
+<%= javascript_include_tag 'swfobject.js' %>
+<script type="text/javascript" defer="defer">
+  var brokenContentSize = $("content").offsetWidth == 0;
+  var fo = new SWFObject("/potlatch2/potlatch2.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "9", "#FFFFFF");
+  // 700,600 for fixed size, 100%,100% for resizable
+  var changesaved=true;
+
+  window.onbeforeunload=function() {
+    if (!changesaved) {
+      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
+    }
+  }
+
+  function markChanged(a) { changesaved=a; }
+
+  function doSWF(lat,lon,zoom) {
+    fo.addParam("base","/potlatch2");
+    if (lat) { fo.addVariable("lat",lat); }
+    if (lon) { fo.addVariable("lon",lon); }
+    fo.addVariable("zoom",zoom);
+    fo.addVariable("api","/api/<%= API_VERSION %>/");
+    fo.addVariable("policy","/api/crossdomain.xml");
+    fo.addVariable("connection","XML");
+    fo.write("map");
+  }
+
+  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
+
+  function setPosition(lat, lon, zoom) {
+    doSWF(lat, lon, zoom || 15);
+  }
+</script>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1659,8 +1659,9 @@ en:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
       editor:
-        potlatch: "Potlatch (in-browser editor)"
-        josm:     "JOSM (via remote-control plugin)"
+        potlatch: "Potlatch 1 (in-browser editor)"
+        potlatch2: "Potlatch 2 (in-browser editor)"
+        josm: "JOSM (via remote-control plugin)"
     confirm:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."

diff --git a/lib/editors.rb b/lib/editors.rb
@@ -1,3 +1,3 @@
 module Editors 
-  ALL_EDITORS = [ "potlatch", "josm" ]
+  ALL_EDITORS = [ "potlatch", "potlatch2", "josm" ]
 end
diff --git a/public/potlatch2/FontLibrary.swf b/public/potlatch2/FontLibrary.swf
diff --git a/public/potlatch2/features/barrier_generic.png b/public/potlatch2/features/barrier_generic.png
diff --git a/public/potlatch2/features/barrier_generic.svg b/public/potlatch2/features/barrier_generic.svg
diff --git a/public/potlatch2/features/cycle__lcn.png b/public/potlatch2/features/cycle__lcn.png
diff --git a/public/potlatch2/features/cycle__ncn.png b/public/potlatch2/features/cycle__ncn.png
diff --git a/public/potlatch2/features/cycle__rcn.png b/public/potlatch2/features/cycle__rcn.png
diff --git a/public/potlatch2/features/highway__motorway.png b/public/potlatch2/features/highway__motorway.png
diff --git a/public/potlatch2/features/highway__residential.png b/public/potlatch2/features/highway__residential.png
diff --git a/public/potlatch2/features/highway__service.png b/public/potlatch2/features/highway__service.png
diff --git a/public/potlatch2/features/highway__trunk.png b/public/potlatch2/features/highway__trunk.png
diff --git a/public/potlatch2/features/highway__unclassified.png b/public/potlatch2/features/highway__unclassified.png
diff --git a/public/potlatch2/features/oneway__-1.png b/public/potlatch2/features/oneway__-1.png
diff --git a/public/potlatch2/features/oneway__no.png b/public/potlatch2/features/oneway__no.png
diff --git a/public/potlatch2/features/oneway__yes.png b/public/potlatch2/features/oneway__yes.png
diff --git a/public/potlatch2/features/paths__bike.png b/public/potlatch2/features/paths__bike.png
diff --git a/public/potlatch2/features/paths__bike.svg b/public/potlatch2/features/paths__bike.svg
diff --git a/public/potlatch2/features/paths__bridleway.png b/public/potlatch2/features/paths__bridleway.png