cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update Potlatch 2 to r25050 build

Browse source
This commit is contained in:
Tom Hughes 2011-01-14 15:09:20 +00:00
parent 9f4395a743
commit 13743ae8d5
5 changed files with 146 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
public/potlatch2/features/pois/flowers.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

2
public/potlatch2/imagery.xml
View file

@ -55,7 +55,7 @@
</set>
<set minlat="54.5" minlon="-7.8" maxlat="61.1" maxlon="-1.1">
<name>OS Scottish Popular historic</name>
<url>http://gibin.geog.ucl.ac.uk/~ollie/scotland/tiles/$z/$x/$y.jpg</url>
<url>http://ooc.openstreetmap.org/npescotland/tiles/$z/$x/$y.jpg</url>
<sourcetag>NPE</sourcetag>
</set>
<set minlat="51.071" minlon="-0.856" maxlat="51.473" maxlon="0.062">

162
public/potlatch2/map_features.xml
View file

@ -589,6 +589,10 @@ Quick documentation:
</input>
</inputSet>
<inputSet id="isBuilding">
<input type="checkbox" presence="onTagMatch" category="Misc" description="Does this thing also represent one, solid building?" name="Building" key="building"/>
</inputSet>
<!-- ************************************************************************
Roads
************************************************************************ -->
@ -1376,8 +1380,8 @@ Quick documentation:
<area/>
<tag k="amenity" v="bus_station"/>
<tag k="building" v="yes"/>
<inputSet ref="names"/>
<inputSet ref="isBuilding"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="common"/>
</feature>
@ -1479,7 +1483,7 @@ Quick documentation:
<area/>
<tag k="amenity" v="school"/>
<tag k="building" v="yes"/>
<inputSet ref="isBuilding"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="common"/>
@ -1497,6 +1501,7 @@ Quick documentation:
<tag k="amenity" v="college"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -1511,6 +1516,7 @@ Quick documentation:
<tag k="amenity" v="university"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -1524,9 +1530,9 @@ Quick documentation:
<area/>
<tag k="shop" v="supermarket"/>
<tag k="building" v="yes"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -1540,13 +1546,13 @@ Quick documentation:
<area/>
<tag k="amenity" v="place_of_worship"/>
<tag k="building" v="yes"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<input type="choice" category="Religion" name="Religion" key="religion" description="The religion to which this place of worship belongs.">
<choice value="christian" text="Christianity (church)"/>
<choice value="jewish" text="Judaism (synagogue)"/>
</input>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -1576,9 +1582,9 @@ Quick documentation:
<area/>
<tag k="amenity" v="hospital"/>
<tag k="building" v="yes"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -1595,9 +1601,21 @@ Quick documentation:
<tag k="tourism" v="museum"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
<feature name="Shopping centre">
<category>buildings</category>
<category>shopping</category>
<node/>
<area/>
<tag k="shop" v="mall"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
<feature name="Zoo">
<category>buildings</category>
@ -1610,6 +1628,7 @@ Quick documentation:
<tag k="tourism" v="zoo"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -1625,6 +1644,7 @@ Quick documentation:
<tag k="leisure" v="stadium"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -1637,6 +1657,8 @@ Quick documentation:
</icon>
<area/>
<!-- This should catch all the "building=*" tags in use: yes, hut, house, residential, entrance, apartments, garage, industrial, garages, service, manufacture, collapsed...
Is this possible? -->
<!-- <tag k="building" v="*"/> -->
<tag k="building" v="yes"/>
<inputSet ref="names"/>
@ -1658,6 +1680,7 @@ Quick documentation:
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="pitchSport"/>
<inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
@ -3172,6 +3195,19 @@ Quick documentation:
<!-- ========= Shops ========= -->
<feature name="Supermarket">
<category>shopping</category>
<icon image="features/pois/shopping_supermarket.n.24.png">
${name}
</icon>
<help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
<point/>
<tag k="shop" v="supermarket"/>
<inputSet ref="names"/>
<inputSet ref="web"/>
<inputSet ref="buildingAddress"/>
<inputSet ref="common"/>
</feature>
<feature name="Small Convenience Store">
<category>shopping</category>
@ -3187,22 +3223,20 @@ Quick documentation:
<inputSet ref="common"/>
</feature>
<feature name="Supermarket">
<feature name="Bakery">
<category>shopping</category>
<icon image="features/pois/shopping_supermarket.n.24.png">
${name}
</icon>
<help>http://wiki.openstreetmap.org/wiki/Tag:shop%3Dsupermarket</help>
<point/>
<tag k="shop" v="supermarket"/>
<inputSet ref="names"/>
<inputSet ref="simpleName"/>
<inputSet ref="web"/>
<inputSet ref="buildingAddress"/>
<icon image="features/pois/shopping_bakery.n.24.png"/>
<tag k="shop" v="bakery"/>
<inputSet ref="common"/>
</feature>
<feature name="Alcohol shop">
<category>shopping</category>
<point/>
@ -3215,17 +3249,6 @@ Quick documentation:
</feature>
<feature name="Bakery">
<category>shopping</category>
<point/>
<inputSet ref="simpleName"/>
<inputSet ref="web"/>
<inputSet ref="buildingAddress"/>
<icon image="features/pois/shopping_bakery.n.24.png"/>
<tag k="shop" v="bakery"/>
<inputSet ref="common"/>
</feature>
<feature name="Bike shop">
<category>shopping</category>
@ -3262,6 +3285,17 @@ Quick documentation:
<inputSet ref="common"/>
</feature>
<feature name="Car sales">
<category>shopping</category>
<point/>
<inputSet ref="simpleName"/>
<inputSet ref="web"/>
<inputSet ref="buildingAddress"/>
<icon image="features/pois/shopping_car.n.24.png"/>
<tag k="shop" v="car"/>
<inputSet ref="common"/>
</feature>
<feature name="Car repair">
<category>shopping</category>
@ -3322,6 +3356,17 @@ Quick documentation:
<inputSet ref="common"/>
</feature>
<feature name="Florist">
<category>shopping</category>
<point/>
<inputSet ref="simpleName"/>
<inputSet ref="web"/>
<inputSet ref="buildingAddress"/>
<icon image="features/pois/flowers.png"/>
<tag k="shop" v="florist"/>
<inputSet ref="common"/>
</feature>
<feature name="Garden centre">
<category>shopping</category>
@ -3394,6 +3439,17 @@ Quick documentation:
<inputSet ref="common"/>
</feature>
<feature name="Kiosk">
<category>shopping</category>
<point/>
<inputSet ref="simpleName"/>
<inputSet ref="web"/>
<inputSet ref="buildingAddress"/>
<icon image="features/pois/shopping_jewelry.n.24.png"/>
<tag k="shop" v="kiosk"/>
<inputSet ref="common"/>
</feature>
<feature name="Laundrette">
<category>shopping</category>
@ -3507,17 +3563,71 @@ Quick documentation:
<inputSet ref="common"/>
</feature>
<!-- boundaries -->
<!-- Top 10 boundaries in order of usage on taginfo.openstreetmap.de -->
<feature name="Administrative Boundary">
<feature name="Admin Boundary">
<category>places</category>
<line/>
<icon image="features/pois/poi_boundary_administrative.n.24.png"/>
<help>http://wiki.openstreetmap.org/wiki/Tag:boundary=administrative</help>
<tag k="boundary" v="administrative"/>
<input type="number" minimum="2" maximum="10" presence="always" name="Admin Level" key="admin_level" description="The Administrative level" />
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
<feature name="National Park">
<category>places</category>
<category>natural</category>
<line/>
<help>http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park</help>
<tag k="boundary" v="national_park"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
<feature name="Post Code">
<category>places</category>
<line/>
<help>http://wiki.openstreetmap.org/wiki/Tag:boundary=postal_code</help>
<tag k="boundary" v="postal_code"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
<feature name="Protected Area">
<category>places</category>
<category>natural</category>
<line/>
<help>http://wiki.openstreetmap.org/wiki/Tag:boundary=protected_area</help>
<tag k="boundary" v="protected_area"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
<feature name="Town boundary">
<category>places</category>
<line/>
<help>http://wiki.openstreetmap.org/wiki/Tag:boundary=town</help>
<tag k="boundary" v="town"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
<!-- boundary=landuse goes here. no idea what it is.-->
<feature name="Census boundary">
<category>places</category>
<line/>
<help>http://wiki.openstreetmap.org/wiki/Tag:boundary=census</help>
<tag k="boundary" v="census"/>
<inputSet ref="simpleName"/>
<inputSet ref="common"/>
</feature>
<!-- next three are marker, postcode_area, administrative. all seem dubious -->
<!-- ************************************************************************
Relations
************************************************************************ -->

11
public/potlatch2/potlatch.css
View file

@ -44,6 +44,8 @@ area=yes tag should be filled. The below doesn't yet work as intended. */
way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 6; casing-dashes: 2,4;}
way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; }
way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 4; }
way[highway=steps] { color: #FF6644; width: 6; dashes: 2, 2; }
way[highway=footway] { color: #FF6644; width: 2; dashes: 6, 3; set .path;}
way[highway=footway][bicycle=yes] { z-index: 4; color: Blue; width: 1; }
@ -92,7 +94,8 @@ way[landuse=retail] :area { color: #cc2222; width: 2; fill-col
way[landuse=commercial] :area { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; }
way[landuse=military] :area { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; }
way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; }
way[leisure],way[sport] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */
way[leisure] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; }
way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;}
way[historic],way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;}
way[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;}
@ -117,6 +120,10 @@ way[leisure=marina] :area { color: pink; fill-color: pink; fill-opacity: 0.4
way[leisure=slipway] { color: grey; width: 3; casing-color: blue; casing-width: 7; }
way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;}
way[boundary] { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
/* Perhaps should be filled, on lower zooms. */
way[boundary=national_park] { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;}
way[boundary=protected_area] { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;}
way[boundary=administrative] { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;}
way[boundary=administrative][waterway] { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; }
way[landuse=cemetery] { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;}
@ -234,7 +241,7 @@ way[tunnel=yes][!waterway]
{ z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; }
way[embankment=yes], way[cutting=yes]
{ z-index: 8; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
{ z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; }
/* Oneway */
way[oneway=yes], way[junction=roundabout] { z-index: 15; color: #444444; width: 2; dashes: 15,35; line-style: arrows; }

BIN
public/potlatch2/potlatch2.swf
View file

Binary file not shown.