Optimise the finding of nearby users a bit.

[rails.git] / app / views / site / edit.rhtml

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index 42f428a62a85a41c9ebe0ab23dd997738f3079d8..d7c47101a6c707369a1e2eff5e777be8c638e9b0 100644 (file)
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -1,26 +1,149 @@
-<div id="mapImage">
-
-  <div style="position: absolute; left: 0px; top: 0px; height: 500px; width: 700px; padding: 1em;">
-
-    <applet
-    code="org/openstreetmap/processing/OsmApplet.class"
-    archive="OSMApplet.jar, commons-codec-1.3.jar, core.jar, commons-logging.jar, commons-httpclient-3.0-rc3.jar, MinML2.jar, plugin.jar, thinlet.jar"
-    width="700"
-    height="500"
-    MAYSCRIPT="true" >
-    <param name="clat" value="<%= params['lat'] %>">
-    <param name="clon" value="<%= params['lon'] %>">
-    <param name="zoom" value="<%= params['zoom'] %>">
-    <param name="user" value="token">
-    <param name="pass" value="<%= @user.token %>">
-    <param name="wmsurl" value="http://www.openstreetmap.org/tile/0.2/gpx?;http://www.openstreetmap.org/api/wms/0.2/landsat/?request=GetMap&layers=modis,global_mosaic&styles=&srs=EPSG:4326&FORMAT=image/jpeg">
-    <param name="apiurl" value="http://www.openstreetmap.org/api/0.3/">
-    Your browser needs to support Java to edit maps.<br>
-    <a href="http://java.com/en/download/index.jsp">Download Java here</a>
-    </applet>
-    <br /><a href="http://www.openstreetmap.org/wiki/index.php/Editing" target="_blank">Need help editing?</a>
-
-  </div>
+<% if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline %>
+<p><%= t 'layouts.osm_offline' %>
+</p>
+<% elsif OSM_STATUS == :database_readonly or OSM_STATUS == :api_readonly %>
+<p><%= t 'layouts.osm_read_only' %>
+</p>
+<% elsif !@user.data_public? %>
+<p><%= t 'site.edit.not_public' %></p>
+<p><%= t 'site.edit.not_public_description', 
+:user_page => (link_to t('site.edit.user_page_link'), {:controller => 'user', :action => 'account', :display_name => @user.display_name, :anchor => 'public'}) %></p>
+<p><%= t 'site.edit.anon_edits', :link => link_to(t('site.edit.anon_edit_link_text'), t('site.edit.anon_edits_link')) %> (<a href=""></a>)</p>
+<% else %>
+<% content_for :greeting do %>
+<% if @user and !@user.home_lon.nil? and !@user.home_lat.nil? %>
+<%= link_to_function 'home', "setPosition(#{@user.home_lat}, #{@user.home_lon}, 10)" %> |
+<% end %>
+<% end %>

 
 

+<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'search' %>
+
+<%
+session[:token] = @user.tokens.create.token unless session[:token]
+
+# Decide on a lat lon to initialise potlatch with. Various ways of doing this
+if params['lon'] and params['lat']
+       lon =  h(params['lon']) 
+       lat =  h(params['lat']) 
+       zoom =  h(params['zoom'])
+
+elsif params['mlon'] and params['mlat'] 
+       lon =  h(params['mlon']) 
+       lat =  h(params['mlat']) 
+       zoom =  h(params['zoom'])
+       
+elsif params['gpx']
+       #use gpx id to locate (dealt with below)
+       
+elsif cookies.key?("_osm_location")
+       lon,lat,zoom,layers = cookies["_osm_location"].split("|")
+       
+elsif @user and !@user.home_lon.nil? and !@user.home_lat.nil? 
+       lon =  @user.home_lon
+       lat =  @user.home_lat
+
+else
+       #catch all.  Do nothing.  lat=nil, lon=nil
+       #Currently this results in potlatch starting up at 0,0 (Atlantic ocean).
+end
+
+zoom='14' if zoom.nil?
+%>
+
+<div id="map">
+       <%= t 'site.edit.flash_player_required' %>

 </div>
 
 </div>
 

+<%= javascript_include_tag 'swfobject.js' %>
+<script type="text/javascript" defer="defer">
+  var brokenContentSize = $("content").offsetWidth == 0;
+  var fo = new SWFObject("/potlatch/potlatch.swf?d="+Math.round(Math.random()*1000), "potlatch", "100%", "100%", "6", "#FFFFFF");
+  // 700,600 for fixed size, 100%,100% for resizable
+  var changesaved=true;
+  var winie=false; if (document.all && window.print) { winie=true; }
+  
+  window.onbeforeunload=function() {
+    if (!changesaved) {
+      return "<%= t 'site.edit.potlatch_unsaved_changes' %>";
+    }
+  }
+
+  function markChanged(a) { changesaved=a; }
+
+  function doSWF(lat,lon,sc) {
+    if (sc < 11) sc = 11;
+    fo.addVariable('winie',winie);
+    fo.addVariable('scale',sc);
+    fo.addVariable('token','<%= session[:token] %>');
+    if (lat) { fo.addVariable('lat',lat); }
+    if (lon) { fo.addVariable('long',lon); }
+    <% if params['gpx']  %>fo.addVariable('gpx' ,'<%= h(params['gpx'] ) %>');<% end %>
+    <% if params['way']  %>fo.addVariable('way' ,'<%= h(params['way'] ) %>');<% end %>
+    <% if params['node'] %>fo.addVariable('node','<%= h(params['node']) %>');<% end %>
+    fo.write("map");
+  }
+
+  doSWF(<%= lat || 'null' %>,<%= lon || 'null' %>,<%= zoom %>);
+
+  function setPosition(lat, lon, zoom) {
+    doSWF(lat, lon, zoom);
+  }
+
+  function resizeContent() {
+    var content = $("content");
+    var rightMargin = parseInt(getStyle(content, "right"));
+    var bottomMargin = parseInt(getStyle(content, "bottom"));
+
+    content.style.width = document.documentElement.clientWidth - content.offsetLeft - rightMargin;
+    content.style.height = document.documentElement.clientHeight - content.offsetTop - bottomMargin;
+  }
+  
+  function resizeMap() {
+    var sidebar_width = $("sidebar").offsetWidth;
+
+    if (sidebar_width > 0) {
+      sidebar_width = sidebar_width + 5
+    }
+
+    $("map").style.left = (sidebar_width) + "px";
+    $("map").style.width = ($("content").offsetWidth - sidebar_width) + "px";
+    $("map").style.height = ($("content").offsetHeight - 2) + "px";
+  }
+
+  function handleResize() {
+    if (brokenContentSize) {
+      resizeContent();
+    }
+
+    resizeMap();
+  }
+
+  function maximiseMap() {
+    $("left").style.display = "none";
+    $("greeting").style.display = "none";
+    $("tabnav").style.display = "none";
+
+    $("content").style.top = "10px";
+    $("content").style.left = "10px";
+
+    handleResize();
+  }
+  
+  function minimiseMap() {
+    $("left").style.display = "";
+    $("greeting").style.display = "";
+    $("tabnav").style.display = "";
+
+    $("content").style.top = "35px";
+    $("content").style.left = "192px";
+
+    handleResize();
+  }
+
+  handleResize();
+
+  window.onload = handleResize;
+  window.onresize = handleResize;
+</script>
+<% end %>