Update Potlatch 2 to 2.3-89-ga94491f build
authorTom Hughes <tom@compton.nu>
Fri, 11 Nov 2011 19:58:05 +0000 (19:58 +0000)
committerTom Hughes <tom@compton.nu>
Fri, 11 Nov 2011 19:58:05 +0000 (19:58 +0000)
public/potlatch2/locales/de_DE.swf
public/potlatch2/locales/en_GB.swf
public/potlatch2/locales/en_US.swf
public/potlatch2/locales/fr_FR.swf
public/potlatch2/locales/pl_PL.swf
public/potlatch2/map_features.xml
public/potlatch2/map_features/buildings.xml
public/potlatch2/potlatch2.swf

index d926302d6c05b7e537344fe7191fab9f794ea0fc..92c742e5145953b80aca2901c42a82530ffe328f 100644 (file)
Binary files a/public/potlatch2/locales/de_DE.swf and b/public/potlatch2/locales/de_DE.swf differ
index 2ac9bf7132353df401b721ad26682afbfd7be498..f5078f1faa7d23df91d43c1fe80084fdf2d38a9e 100644 (file)
Binary files a/public/potlatch2/locales/en_GB.swf and b/public/potlatch2/locales/en_GB.swf differ
index 8f8c894e91c436bc7e03e10db2cc6b6c9fed096d..1f310e33c27956085e51f5e556b0f618cc49aa52 100644 (file)
Binary files a/public/potlatch2/locales/en_US.swf and b/public/potlatch2/locales/en_US.swf differ
index 6453a6a8494ca90fee3cf3f856f8f14b1d8ee1ff..645bb4411dbae034086608e190eb7fafa5b12349 100644 (file)
Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ
index 7136e58967bf7ea0cfaa87f9dbb941d34326d4b6..d749ac3836d457deb26196aa1c18b6be7a3ca9ab 100644 (file)
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ
index 370ae2bf21657a25e27bd2038bdf7bdb53fa2adc..2e296e964d95a5e66d6599169336ad37c7c3f50d 100644 (file)
   </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">
   <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... --> 
 
 
   
index 28775a92e5e850c7c77d5a084b30b5bf9cccf362..aa1b7da4bde8c218203f61c470236783d63e6139 100644 (file)
   </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>
index 4cf7bc802a14c0c3f99fad81d47003dd0003e7e7..b348000f02eca3ab61886fe253cbab1cc47091b0 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ