Pinching a bollard icon from JOSM. Made cattle gride icon as variant of gate, though...

diff --git a/README.txt b/README.txt
index cb43cd3..cdc0b01 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -63,6 +63,14 @@ Running:
   server) the binary must have been served from "teh internets". Run resources/server.rb to launch a local 
   server, then go to http://localhost:3333/potlatch2.html to get started (or if you're already running e.g. 
   Apache locally, feel free to use that instead.
+  
+* If you are doing offline development, you will need a rails_port install. You 
+  will need to add an OAuth application by going to 
+  http://rails-port.local/user/<username>/oauth_clients/new
+  Enter the following details (assuming the above point):
+  * Name (Required): Potlatch2 (local)
+  * Main Application URL (Required): http://localhost:3333/resources/potlatch2.html
+  And then update resources/potlatch2.html replacing the domains.
 
 === Some other stuff you might need to know ===
 

diff --git a/resources/icons/bollard.png b/resources/icons/bollard.png
new file mode 100644 (file)
index 0000000..7714a3f
Binary files /dev/null and b/resources/icons/bollard.png differ

diff --git a/resources/icons/cattle_grid.png b/resources/icons/cattle_grid.png
new file mode 100644 (file)
index 0000000..b5e4ddc
Binary files /dev/null and b/resources/icons/cattle_grid.png differ

diff --git a/resources/map_features.xml b/resources/map_features.xml
index c4fb967..a785c75 100644 (file)
--- a/resources/map_features.xml
+++ b/resources/map_features.xml
@@ -523,7 +523,7 @@
   
   <feature name="Bollard">
     <category>barrier</category>
-    <icon>
+    <icon image="icons/bollard.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>
     
@@ -531,9 +531,19 @@
     <tag k="barrier" v="bollard"/>
   </feature>
   
+  <feature name="Gate">
+    <category>barrier</category>
+    <icon image="icons/gate.png">
+    </icon>
+    <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dgate</help>
+    
+    <point />
+    <tag k="barrier" v="gate"/>
+  </feature>
+  
   <feature name="Cycle Barrier">
     <category>barrier</category>
-    <icon>
+    <icon image="icons/bollard.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcycle_barrier</help>
     
@@ -543,7 +553,7 @@
   
   <feature name="Big Concrete Blocks">
     <category>barrier</category>
-    <icon>
+    <icon image="icons/bollard.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dblock</help>
     
@@ -553,7 +563,7 @@
   
   <feature name="Cattle Grid">
     <category>barrier</category>
-    <icon>
+    <icon image="icons/cattle_grid.png">
     </icon>
     <help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dcattle_grid</help>
     

diff --git a/resources/potlatch.css b/resources/potlatch.css
index abd144b..80e1dd4 100644 (file)
--- a/resources/potlatch.css
+++ b/resources/potlatch.css
@@ -102,6 +102,8 @@ node[amenity=school] { icon-image: icons/school.png; }
 node[amenity=taxi] { icon-image: icons/taxi.png; }
 node[amenity=telephone] { icon-image: icons/telephone.png; }
 way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; }
+way node[barrier=bollard] { icon-image: icons/bollard.png; }
+node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }
        
 /* We can stack styles at different z-index (depth) */