From: Richard Fairhurst <richard@systemed.net>
Date: Tue, 22 Apr 2008 21:32:26 +0000 (+0000)
Subject: Potlatch 0.8b
X-Git-Tag: live~7828
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9df6d2ac067c4f452004a3745213be2ca34dbf09?hp=8c98f1a6c4c95698cc4b2aae2ced527cf3db62e5

Potlatch 0.8b
---

diff --git a/app/views/site/edit.rhtml b/app/views/site/edit.rhtml
index c72a3ab1d..ac54cb5e5 100644
--- a/app/views/site/edit.rhtml
+++ b/app/views/site/edit.rhtml
@@ -24,29 +24,27 @@
 <% session[:token] = @user.tokens.create.token unless session[:token] %>
 
 <% if params['mlon'] and params['mlat'] %>
-<% lon =  h(params['mlon']) %>
-<% lat =  h(params['mlat'])  %>
-<% zoom =  h(params['zoom'] || '14') %>
+	<% lon =  h(params['mlon']) %>
+	<% lat =  h(params['mlat'])  %>
+	<% zoom =  h(params['zoom'] || '14') %>
 <% elsif @user and params['lon'].nil? and params['lat'].nil? and params['gpx'].nil? %> 
-<% lon =  @user.home_lon %>
-<% lat =  @user.home_lat %>
-<% zoom = '14' %>
-<% elsif params['gpx'].nil? %>
-<% lon =  h(params['lon'] || '-0.1') %>
-<% lat =  h(params['lat'] || '51.5') %>
-<% zoom =  h(params['zoom'] || '14') %>
+	<% lon =  @user.home_lon %>
+	<% lat =  @user.home_lat %>
+	<% zoom = '14' %>
 <% else %>
-<% lon = nil %>
-<% lat = nil %>
-<% zoom = '14' %>
+	<% lon =  h(params['lon'] || 'null') %>
+	<% lat =  h(params['lat'] || 'null') %>
+	<% zoom =  h(params['zoom'] || '14') %>
 <% end %>
 
-<div id="map">You need a Flash player to use Potlatch, the
+<div id="map">
+	You need a Flash player to use Potlatch, the
     OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>.
 
     <a href="http://wiki.openstreetmap.org/index.php/Editing">Several other options</a> are also available
     for editing OpenStreetMap.
 </div>
+
 <%= javascript_include_tag 'swfobject.js' %>
 <script type="text/javascript" defer="defer">
   var brokenContentSize = $("content").offsetWidth == 0;
@@ -68,7 +66,7 @@
     if (lat) { fo.addVariable('lat',lat); }
     if (lon) { fo.addVariable('long',lon); }
     <% if params['gpx'] %>
-    fo.addVariable('gpx','<%= h(params['gpx']) + "/data.xml" %>');
+		fo.addVariable('gpx','<%= h(params['gpx']) %>');
     <% end %>
     fo.write("map");
   }
diff --git a/config/potlatch/autocomplete.txt b/config/potlatch/autocomplete.txt
index 3480355ee..6a301822b 100755
--- a/config/potlatch/autocomplete.txt
+++ b/config/potlatch/autocomplete.txt
@@ -1,7 +1,7 @@
 # Potlatch autocomplete values
 # each line should be: key / way|point|POI (tab) list_of_values
 # '-' indicates no autocomplete for values
-highway/way		motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,service,bridleway,cycleway,footway,pedestrian,steps
+highway/way		motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,residential,service,bridleway,cycleway,footway,pedestrian,steps,living_street
 highway/point	mini_roundabout,traffic_signals,crossing,gate,stile,cattle_grid,toll_booth,incline,viaduct,motorway_junction,services,ford,bus_stop
 junction/way	roundabout
 cycleway/way	lane,track,opposite_lane,opposite_track,opposite
diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt
index d7e1494f0..ecca87d72 100644
--- a/config/potlatch/presets.txt
+++ b/config/potlatch/presets.txt
@@ -3,9 +3,10 @@ motorway: highway=motorway,ref=(type road number)
 trunk road: highway=trunk,ref=(type road number),name=(type road name)
 primary road: highway=primary,ref=(type road number),name=(type road name)
 secondary road: highway=secondary,ref=(type road number),name=(type road name)
-tertiary road: highway=tertiary,ref=,name=(type road name)
-residential road: highway=residential,ref=,name=(type road name)
+tertiary road: highway=tertiary,ref=(type road number),name=(type road name)
 unclassified road: highway=unclassified,ref=,name=(type road name)
+residential road: highway=residential,ref=,name=(type road name)
+service road: highway=service,ref=,name=
 
 way/footway
 footpath: highway=footway,foot=yes
diff --git a/public/potlatch/potlatch.swf b/public/potlatch/potlatch.swf
index bbea6ea23..e14e70993 100755
Binary files a/public/potlatch/potlatch.swf and b/public/potlatch/potlatch.swf differ