From: Tom Hughes <tom@compton.nu>
Date: Fri, 11 Nov 2011 19:58:05 +0000 (+0000)
Subject: Update Potlatch 2 to 2.3-89-ga94491f build
X-Git-Tag: live~7468
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4e9af2b5dce9f974f69e746fea44bb06a4f38ba4
Update Potlatch 2 to 2.3-89-ga94491f build
---
diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index d926302d6..92c742e51 100644
Binary files a/public/potlatch2/locales/de_DE.swf and b/public/potlatch2/locales/de_DE.swf differ
diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf
index 2ac9bf713..f5078f1fa 100644
Binary files a/public/potlatch2/locales/en_GB.swf and b/public/potlatch2/locales/en_GB.swf differ
diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf
index 8f8c894e9..1f310e33c 100644
Binary files a/public/potlatch2/locales/en_US.swf and b/public/potlatch2/locales/en_US.swf differ
diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
index 6453a6a84..645bb4411 100644
Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ
diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf
index 7136e5896..d749ac383 100644
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ
diff --git a/public/potlatch2/map_features.xml b/public/potlatch2/map_features.xml
index 370ae2bf2..2e296e964 100644
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -532,7 +532,32 @@
</inputSet>
<inputSet id="isBuilding">
- <input type="checkbox" presence="onTagMatch" category="Details" description="Does this thing also represent one, solid building?" name="Building" key="building"/>
+ <input type="choice" presence="withCategory" category="Details" name="Building type, if it is one" key="building">
+ <choice value="yes" text="Generic building"/>
+ <choice value="residential" text="Generic residential"/>
+ <choice value="apartments" text="Big apartments house"/>
+ <choice value="terrace" text="Terraced house"/>
+ <choice value="house" text="Family house"/>
+ <choice value="hut" text="Small hut"/>
+ <choice value="garage" text="A garage"/>
+ <choice value="garages" text="Block of garages"/>
+ <choice value="office" text="Office building"/>
+ <choice value="public" text="Public building"/>
+ <choice value="industrial" text="Generic industrial"/>
+ <choice value="manufacture" text="Manufacture"/>
+ <choice value="warehouse" text="Warehouse"/>
+ <choice value="hangar" text="Hangar"/>
+ <choice value="storage_tank" text="Fluids storage tank"/>
+ <choice value="retail" text="Retail"/>
+ <choice value="supermarket" text="Supermarket"/>
+ <choice value="train_station" text="Train station"/>
+ <choice value="church" text="Church"/>
+ <choice value="school" text="School"/>
+ <choice value="bunker" text="Military bunker"/>
+ <choice value="collapsed" text="Collapsed building"/>
+ <choice value="roof" text="Just a roof"/>
+ <help>http://wiki.openstreetmap.org/wiki/Key:building</help>
+ </input>
</inputSet>
<inputSet id="powerCables">
@@ -614,8 +639,8 @@
<include file="map_features/shopping.xml" /> <!-- no clear distinction between this, amenities and buildings -->
<include file="map_features/amenities.xml" /> <!-- includes cafe, bar... -->
<include file="map_features/landuse.xml" /> <!-- includes outdoor leisure/sporting stuff, agriculture, natural. -->
- <include file="map_features/buildings.xml" /> <!-- a bit of a dumping ground, includes sports centre, shopping centre, hospital... -->
<include file="map_features/man_made.xml" />
+ <include file="map_features/buildings.xml" /> <!-- a bit of a dumping ground, includes sports centre, shopping centre, hospital... -->
diff --git a/public/potlatch2/map_features/buildings.xml b/public/potlatch2/map_features/buildings.xml
index 28775a92e..aa1b7da4b 100644
--- a/public/potlatch2/map_features/buildings.xml
+++ b/public/potlatch2/map_features/buildings.xml
@@ -234,39 +234,39 @@
</feature>
- <feature name="Building">
+ <feature name="Sports centre">
<category>buildings</category>
- <icon image="features/pois/building_generic.png">
+ <icon image="features/pois/sport_leisure_centre.n.24.png">
<b>${name} ${addr:housename}</b><br/>
${addr:housenumber} ${addr:street} ${addr:postcode}
</icon>
<area/>
<point/>
- <!-- 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"/>
+ <tag k="leisure" v="sports_centre"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
+ <inputSet ref="pitchSport"/>
+ <inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
- <feature name="Sports centre">
+ <!-- Generic building. Should be last in the entire xml chain -->
+ <!-- When user changes feature to some amenity, building tag is cleared. This should not be. -->
+ <feature name="Building">
<category>buildings</category>
- <icon image="features/pois/sport_leisure_centre.n.24.png">
+ <icon image="features/pois/building_generic.png">
<b>${name} ${addr:housename}</b><br/>
${addr:housenumber} ${addr:street} ${addr:postcode}
</icon>
<area/>
<point/>
- <tag k="leisure" v="sports_centre"/>
+ <tag k="building" v="yes" vmatch="*"/>
+ <inputSet ref="isBuilding"/>
<inputSet ref="names"/>
<inputSet ref="buildingAddress"/>
- <inputSet ref="pitchSport"/>
- <inputSet ref="isBuilding"/>
<inputSet ref="common"/>
</feature>
</featureGroup>
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 4cf7bc802..b348000f0 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ