Update Potlatch 2 to 2.2-41-gec89ae9 build

diff --git a/public/potlatch2/imagery.xml b/public/potlatch2/imagery.xml
index eaf416acb6b76664e7e12977a89fe1e1614e3a66..ebe2db731b2f16508f717964e001ba6a79c98901 100644 (file)
--- a/public/potlatch2/imagery.xml
+++ b/public/potlatch2/imagery.xml
@@ -108,9 +108,14 @@
                <url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url>
                <sourcetag>NAIP</sourcetag>
        </set>
                <url>http://cube.telascience.org/tilecache/tilecache.py/1.0.0/NAIP_ALL/$z/$x/$y.png</url>
                <sourcetag>NAIP</sourcetag>
        </set>

-    <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
-        <name>Denmark - Fugro Aerial Imagery</name>
-        <url>http://fugro.findvej.dk/fugro2005/$z/$x/$y.jpg</url>
-        <sourcetag>Fugro (2005)</sourcetag>
-    </set>
+       <set minlat="54.44" minlon="7.81" maxlat="57.86" maxlon="15.49">
+               <name>Denmark - Fugro Aerial Imagery</name>
+               <url>http://tile.openstreetmap.dk/fugro2005/$z/$x/$y.jpg</url>
+               <sourcetag>Fugro (2005)</sourcetag>
+       </set>
+       <set minlat="55.23403" minlon="12.09144" maxlat="55.43647" maxlon="12.47712">
+               <name>Denmark - Stevns Kommune</name>
+               <url>http://tile.openstreetmap.dk/stevns/2009/$z/$x/$y.jpg</url>
+               <sourcetag>Stevns Kommune (2009)</sourcetag>
+       </set>

 </imagery>
 </imagery>

diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index 44a524bb4d69bb8584080bd5c8191bea3eae2997..c406affaa9420db5dd3c11d7d06fdcea19af2b7c 100644 (file)
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 612445897c9c975d8dfaffbd27da04d2c09d610c..fd250e6606269daa2ccce9c9209e09e1e3d80db7 100644 (file)
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 4e327b792b46eb39bfe397cefa4128bc4408b9db..0e20d9a9f02de546fea57e3bc613626edca5cd90 100644 (file)
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 975e0af0676ba3dc5e841c306b390dda517f7bdc..6997c9a3ce85179e90a0ad46ebbe080d8f501d15 100644 (file)
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 c8cfa0c56bbb6a8c385d711fc307272c7a17bab0..704ac639859fda6127a59145b35244749989334e 100644 (file)
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 9cb8970cbf45eb040edae6355c931a1abd6eaa58..de8d4589d024c6e62e872f302891fb5d76288031 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -303,6 +303,8 @@ Quick documentation:
     <input type="choice" name="Electrified" category="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?"
            key="electrified">
       <choice value="yes" text="Yes"/>
     <input type="choice" name="Electrified" category="Electrification" description="Is the track electrified (whether by 3rd rail, overhead wires, etc)?"
            key="electrified">
       <choice value="yes" text="Yes"/>

+      <choice value="contact_line" text="Overhead line"/>
+      <choice value="rail" text="Third rail"/>

       <choice value="no" text="No"/>
     </input>
     <input type="choice" name="Voltage" category="Electrification" description="Nominal voltage of electric wires"
       <choice value="no" text="No"/>
     </input>
     <input type="choice" name="Voltage" category="Electrification" description="Nominal voltage of electric wires"


@@ -609,6 +611,44 @@ Quick documentation:
     </input>
   </inputSet>
 
     </input>
   </inputSet>
 

+  <inputSet id="pitchSport">
+    <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
+      <choice value="9pin" text="9 pin bowling"/>
+      <choice value="10pin" text="10 pin bowling"/>
+      <choice value="american_football" text="American football"/>
+      <choice value="archery" text="Archery"/>
+      <choice value="athletics" text="Athletics"/>
+      <choice value="australian_football" text="Australian Rules Football"/>
+      <choice value="baseball" text="Baseball"/>
+      <choice value="basketball" text="Basketball"/>
+      <choice value="beachvolleyball" text="Beach volleyball"/>
+      <choice value="boules" text="Boules/petanque/bocci"/>
+      <choice value="bowls" text="Lawn bowls"/>
+      <choice value="canadian_football" text="Canadian football"/>
+      <choice value="chess" text="Chess"/>
+      <choice value="cricket" text="Cricket"/>
+      <choice value="cricket_nets" text="Cricket nets"/>
+      <choice value="croquet" text="Croquet"/>
+      <choice value="equestrian" text="Equestrian"/>
+      <choice value="gaelic_football" text="Gaelic football"/>
+      <choice value="gymnastics" text="Gymnastics"/>
+      <choice value="team_handball" text="(Team) handball"/>
+      <choice value="hockey" text="(Field) hockey"/>
+      <choice value="korfball" text="Korfball"/>
+      <choice value="pelota" text="Pelota"/>
+      <choice value="rugby_league" text="Rugby league"/>
+      <choice value="rugby_union" text="Rugby union"/>
+      <choice value="shooting" text="Shooting"/>
+      <choice value="skating" text="Ice skating"/>
+      <choice value="skateboard" text="Skateboarding"/>
+      <choice value="soccer" text="Soccer/football"/>
+      <choice value="swimming" text="Swimming"/>
+      <choice value="table_tennis" text="Table tennis"/>
+      <choice value="tennis" text="Tennis"/>
+      <choice value="volleyball" text="Volleyball"/>
+    </input>
+  </inputSet>
+

 
 <!-- Features -->
 
 
 <!-- Features -->
 

diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
index cfa34c432f2405acf6b0e30be1a6fd9f31d1bb8f..abf8c9f754192b074ae1f3e486cbb8e9a2d2c497 100644 (file)
--- a/public/potlatch2/map_features/amenities.xml
+++ b/public/potlatch2/map_features/amenities.xml
@@ -110,7 +110,97 @@
     <icon image="features/pois/amenity_recycling.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
     <point/>
     <icon image="features/pois/amenity_recycling.n.24.png"/>
     <help>http://wiki.openstreetmap.org/wiki/Tag:amenity%3Drecycling</help>
     <point/>

+    <area/>

     <tag k="amenity" v="recycling"/>
     <tag k="amenity" v="recycling"/>

+    <inputSet ref="simpleName"/>
+    <input type="choice" presence="always" category="Recycling" name="Type of facility" key="recycling_type" description="Is this containers in a rural area or at an manned facility?" priority="high">
+      <choice value="container" text="Container"/>
+      <choice value="centre" text="Recycling centre"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Batteries" key="recycling:batteries" description="Small batteries for household appliances" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Books" key="recycling:books" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Cans" key="recycling:cans" description="Metal cans and other small metal packaging" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Cardboard" key="recycling:cardboard" description="I.e. large pieces of packaging" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Cartons" key="recycling:cartons" description="Packaging for groceries, i.e. milk cartons" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Clothes" key="recycling:clothes" description="Clothes, including shoes" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Electrical appliances" key="recycling:electrical_appliances" description="Larger electrical items, i.e. refrigerators, freezers, dishwashers" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Glass" key="recycling:glass" description="I.e glass sheets" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Glass bottles" key="recycling:glass_bottles" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Green waste" key="recycling:green_waste" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Magazines" key="recycling:magazines" description="Magazines (glossy pages)" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Newspaper" key="recycling:newspaper" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Paper" key="recycling:paper" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Paper packaging" key="recycling:paper_packaging" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic" key="recycling:plastic" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic bottles" key="recycling:plastic_bottles" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Plastic packaging" key="recycling:plastic_packaging" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Scrap metal" key="recycling:scrap_metal" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Small appliances" key="recycling:small_appliances" description="Small electrical appliances, i.e. walkman, power adapter, remote control" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Waste" key="recycling:waste" description="General waste (black bags)" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" presence="onTagMatch" category="Recycling" name="Wood" key="recycling:wood" description="" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>

     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 


@@ -182,7 +272,7 @@
     <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
     <inputSet ref="common"/>
     <input type="freetext" presence="always" category="Naming" name="Ref" key="ref" description="Reference number of the post office"/>
     <input type="freetext" presence="always" category="Naming" name="Operator" key="operator" description="The provider of the postal service" priority="low"/>
     <inputSet ref="common"/>

-    <inputset ref="simpleName"/>
+    <inputSet ref="simpleName"/>

   </feature>
 
   <feature name="Trash/rubbish bin">
   </feature>
 
   <feature name="Trash/rubbish bin">


@@ -226,7 +316,13 @@
     <point/>
     <area/>
     <tag k="amenity" v="shelter"/>
     <point/>
     <area/>
     <tag k="amenity" v="shelter"/>

-    <inputset ref="names"/>
+    <input type="choice" presence="always" name="Type of shelter" key="shelter_type" description="The intended use of the shelter.">
+      <choice value="picnic_shelter" text="Picnic shelter"/>
+      <choice value="public_transport" text="Public transport"/>
+      <choice value="weather_shelter" text="Weather shelter"/>
+      <choice value="wildlife_hide" text="Wildlife hide"/>
+    </input>
+    <inputSet ref="names"/>

     <inputSet ref="common"/>
   </feature>
 
     <inputSet ref="common"/>
   </feature>
 

diff --git a/public/potlatch2/map_features/barriers.xml b/public/potlatch2/map_features/barriers.xml
index 2b82a5ad0edf82b5d3b5197bbed812cc94d165fd..a605d8f9d91cdd35ab6f1068b2767c698d789143 100644 (file)
--- a/public/potlatch2/map_features/barriers.xml
+++ b/public/potlatch2/map_features/barriers.xml
@@ -162,7 +162,7 @@
 
     <point/>
     <tag k="barrier" v="toll_booth"/>
 
     <point/>
     <tag k="barrier" v="toll_booth"/>

-    <tagSet ref="fee"/>
+    <inputSet ref="fee"/>

     <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
     <inputSet ref="common"/>
   </feature>
     <input type="freetext" presence="onTagMatch" category="Naming" name="Operator" key="operator" description="The provider of the toll" priority="low"/>
     <inputSet ref="common"/>
   </feature>

diff --git a/public/potlatch2/map_features/landuse.xml b/public/potlatch2/map_features/landuse.xml
index 5c308c114f4d872a6c2a4ec125fc5e492f5e87b7..0e39ff274a85489bd9051f0e7f27524c03825a14 100644 (file)
--- a/public/potlatch2/map_features/landuse.xml
+++ b/public/potlatch2/map_features/landuse.xml
@@ -177,44 +177,6 @@
   </feature>
 
 
   </feature>
 
 

-  <inputSet id="pitchSport">
-    <input name="Sport" presence="always" category="Sport" key="sport" type="choice" description="The sport that is predominantly played here.">
-      <choice value="9pin" text="9 pin bowling"/>
-      <choice value="10pin" text="10 pin bowling"/>
-      <choice value="american_football" text="American football"/>
-      <choice value="archery" text="Archery"/>
-      <choice value="athletics" text="Athletics"/>
-      <choice value="australian_football" text="Australian Rules Football"/>
-      <choice value="baseball" text="Baseball"/>
-      <choice value="basketball" text="Basketball"/>
-      <choice value="beachvolleyball" text="Beach volleyball"/>
-      <choice value="boules" text="Boules/petanque/bocci"/>
-      <choice value="bowls" text="Lawn bowls"/>
-      <choice value="canadian_football" text="Canadian football"/>
-      <choice value="chess" text="Chess"/>
-      <choice value="cricket" text="Cricket"/>
-      <choice value="cricket_nets" text="Cricket nets"/>
-      <choice value="croquet" text="Croquet"/>
-      <choice value="equestrian" text="Equestrian"/>
-      <choice value="gaelic_football" text="Gaelic football"/>
-      <choice value="gymnastics" text="Gymnastics"/>
-      <choice value="team_handball" text="(Team) handball"/>
-      <choice value="hockey" text="(Field) hockey"/>
-      <choice value="korfball" text="Korball"/>
-      <choice value="pelota" text="Pelota"/>
-      <choice value="rugby_league" text="Rugby league"/>
-      <choice value="rugby_union" text="Rugby union"/>
-      <choice value="shooting" text="Shooting"/>
-      <choice value="skating" text="Ice skating"/>
-      <choice value="skateboard" text="Skateboarding"/>
-      <choice value="soccer" text="Soccer/football"/>
-      <choice value="swimming" text="Swimming"/>
-      <choice value="table_tennis" text="Table tennis"/>
-      <choice value="tennis" text="Tennis"/>
-      <choice value="volleyball" text="Volleyball"/>
-    </input>
-  </inputSet>
-

   <feature name="Sports track">
     <category>sport</category>
     <area/>
   <feature name="Sports track">
     <category>sport</category>
     <area/>

diff --git a/public/potlatch2/map_features/paths.xml b/public/potlatch2/map_features/paths.xml
index f27f57779a481f265aa04b7c3d92e67f4d723d2d..4e064aa54ceef3b24a71afe8bda044c87178c247 100644 (file)
--- a/public/potlatch2/map_features/paths.xml
+++ b/public/potlatch2/map_features/paths.xml
@@ -9,7 +9,6 @@
     <tag k="highway" v="footway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
     <tag k="highway" v="footway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>

-    <inputset ref="naming"/>

   </feature>
 
   <feature name="Cycle path">
   </feature>
 
   <feature name="Cycle path">


@@ -22,7 +21,6 @@
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
     <tag k="highway" v="cycleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>

-    <inputset ref="naming"/>

     <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low"> 
        <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." /> 
        <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." /> 
     <input type="choice" name="Cycleway type" category="Cycle" description="What kind of bike path is this?" key="segregated" presence="onTagMatch" priority="low"> 
        <choice value="yes" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb." /> 
        <choice value="no" text="Shared" description="Cyclists and pedestrians share the full width of the path." /> 


@@ -49,7 +47,6 @@
     </area>
     <inputSet ref="minorRoad"/>
     <inputSet ref="common"/>
     </area>
     <inputSet ref="minorRoad"/>
     <inputSet ref="common"/>

-    <inputset ref="naming"/>

   </feature>
 
   <feature name="Bridleway">
   </feature>
 
   <feature name="Bridleway">


@@ -61,7 +58,6 @@
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
     <tag k="highway" v="bridleway"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>

-    <inputset ref="naming"/>

   </feature>
 
   <feature name="Steps">
   </feature>
 
   <feature name="Steps">


@@ -88,7 +84,6 @@
     <tag k="highway" v="path"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>
     <tag k="highway" v="path"/>
     <inputSet ref="path"/>
     <inputSet ref="common"/>

-    <inputset ref="naming"/>

   </feature>
 
   
   </feature>
 
   

diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
index 35150445da0341f31375b013456f11394443435a..4e9a6f6f59f9e50e232787975a6d208c5c5180a2 100644 (file)
--- a/public/potlatch2/map_features/transport.xml
+++ b/public/potlatch2/map_features/transport.xml
@@ -98,7 +98,7 @@
         <tag k="railway" v="light_rail"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
         <tag k="railway" v="light_rail"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>

-        <inputset ref="embankment-cutting"/>
+        <inputSet ref="embankment-cutting"/>

         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>


@@ -115,7 +115,7 @@
         <input ref="tram-route"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
         <input ref="tram-route"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>

-        <inputset ref="embankment-cutting"/>
+        <inputSet ref="embankment-cutting"/>

         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>


@@ -133,7 +133,7 @@
         <tag k="railway" v="subway"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>
         <tag k="railway" v="subway"/>
         <inputSet ref="bridge"/>
         <inputSet ref="tunnel"/>

-        <inputset ref="embankment-cutting"/>
+        <inputSet ref="embankment-cutting"/>

         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>
         <inputSet ref="rail-electrification"/>
         <inputSet ref="common"/>
       </feature>

diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index 697b21de088d1559d36d113f5f99df327f438666..9b78e217be3b5a43279fc936e3a477e06f5b7039 100644 (file)
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ