Updated potlatch preset tags for bridleway and byway

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 76a7fff79e59e1dc7e8e76e322a8ecf25ceb6d3f..921f213c545f347231b544523b4ef8ecf2b799e5 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -89,8 +89,8 @@ unclassified road: highway=unclassified,name=(type road name)
 
 way/footway
 footpath: highway=footway,foot=yes
-bridleway: highway=bridleway,foot=yes
-byway: highway=unsurfaced,foot=yes
+bridleway: highway=bridleway,foot=yes,horse=yes,bicycle=yes
+byway: highway=byway,foot=yes,horse=yes,bicycle=yes,motorcar=yes
 permissive path: highway=footway,foot=permissive
 
 way/cycleway

diff --git a/config/database.yml b/config/database.yml
index a972b44b376dc1123daa720d669a0f9b35bc53b6..44bb1eacef2d80e2c508d4cc5ed82497353f76d7 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -13,9 +13,9 @@
 development:
   adapter: mysql
   database: openstreetmap
-  username: openstreetmap
-  password: openstreetmap
-  host: 128.40.58.203
+  username: freemap
+  password: BPaNCyU4
+  host: localhost
 
 # Warning: The database defined as 'test' will be erased and
 # re-generated from your development database when you run 'rake'.
@@ -30,6 +30,6 @@ test:
 production:
   adapter: mysql
   database: openstreetmap
-  username: openstreetmap
-  password: openstreetmap
-  host: 128.40.58.203
+  username: freemap
+  password: BPaNCyU4
+  host: localhost

diff --git a/config/potlatch/presets.txt b/config/potlatch/presets.txt
index 45716cfa1508b2885724f05ea47edd428e49a907..5d696da43522b0e4a7584fe040b41ecf9bd7876b 100755 (executable)
--- a/config/potlatch/presets.txt
+++ b/config/potlatch/presets.txt
@@ -8,8 +8,8 @@ unclassified road: highway=unclassified,name=(type road name)
 
 way/footway
 footpath: highway=footway,foot=yes
-bridleway: highway=bridleway,foot=yes
-byway: highway=unsurfaced,foot=yes
+bridleway: highway=bridleway,foot=yes,horse=yes,bicycle=yes
+byway: highway=byway,foot=yes,horse=yes,bicycle=yes,motorcar=yes
 permissive path: highway=footway,foot=permissive
 
 way/cycleway