Skip to content

Commit

Permalink
Pinching a bollard icon from JOSM. Made cattle gride icon as variant …
Browse files Browse the repository at this point in the history
…of gate, though it's a bit slow. Some other barrier stuff.
  • Loading branch information
smsm1 committed Apr 25, 2010
1 parent 53903bf commit bec5222
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
8 changes: 8 additions & 0 deletions README.txt
Expand Up @@ -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 ===

Expand Down
Binary file added resources/icons/bollard.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/cattle_grid.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 14 additions & 4 deletions resources/map_features.xml
Expand Up @@ -523,17 +523,27 @@

<feature name="Bollard">
<category>barrier</category>
<icon>
<icon image="icons/bollard.png">
</icon>
<help>http://wiki.openstreetmap.org/wiki/Tag:barrier%3Dbollard</help>

<point />
<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>

Expand All @@ -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>

Expand All @@ -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>

Expand Down
2 changes: 2 additions & 0 deletions resources/potlatch.css
Expand Up @@ -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) */

Expand Down

0 comments on commit bec5222

Please sign in to comment.