Update Potlatch 2 to 2.2-18-g514f0d2 build

diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index 93b9ae007dc88d58080939eee3d63cf6c78ccac9..44a524bb4d69bb8584080bd5c8191bea3eae2997 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 dfe817104acac8dd95491f4583cefb7e5c82c191..612445897c9c975d8dfaffbd27da04d2c09d610c 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 dbe85038868f482963cec0f8a3d7d719836c82fd..4e327b792b46eb39bfe397cefa4128bc4408b9db 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 95f48391ac78f13873db7c1f721b053f9e195ea2..975e0af0676ba3dc5e841c306b390dda517f7bdc 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 14fa8ac32fa97d73965c435b306a964ed9d0f645..c8cfa0c56bbb6a8c385d711fc307272c7a17bab0 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 93d7209fc9db1eae5b4dbca2b42af5e5293d74cb..9cb8970cbf45eb040edae6355c931a1abd6eaa58 100644 (file)
--- a/public/potlatch2/map_features.xml
+++ b/public/potlatch2/map_features.xml
@@ -85,6 +85,13 @@ Quick documentation:
     <input type="freetext" presence="always" name="Reference number" key="ref" description="A reference number or code used to identify this thing." />
   </inputSet>
 
+   <inputSet id="simpleBrand"> 
+     <input type="freetext" category="Naming" presence="always" name="Brand" key="brand" description="Brand, i.e. Acme"/> 
+   </inputSet> 
+  
+   <inputSet id="simpleOperator"> 
+     <input type="freetext" category="Naming" presence="always" name="Operator" key="operator" description="Operator, i.e. Acme Springfield Ltd"/> 
+   </inputSet> 
 
   <inputSet id="source">
     <input type="freetext" category="Misc" presence="onTagMatch" name="Source" key="source" description="The primary source of information for this object (GPS, survey, Yahoo, ...)" priority="lowest"/>

diff --git a/public/potlatch2/map_features/amenities.xml b/public/potlatch2/map_features/amenities.xml
index 1151a5ea91061eb5cfb47a266a0081e79feffaed..cfa34c432f2405acf6b0e30be1a6fd9f31d1bb8f 100644 (file)
--- a/public/potlatch2/map_features/amenities.xml
+++ b/public/potlatch2/map_features/amenities.xml
@@ -312,7 +312,7 @@
     <inputSet ref="common"/>
     <inputSet ref="simpleName"/>
     <input type="freetext" presence="always" name="Product" key="vending" description="What is being sold: tickets, food, maps..."/>
-    <input type="operator" presence="always" name="Operator" key="operator" description="Which company provides the service" />
+    <inputSet ref="simpleOperator"/>
   </feature>
 
   <!-- ========= Entertainment ========= -->
@@ -395,4 +395,4 @@
     <inputSet ref="common"/>
   </feature>
 
-</featureGroup>
\ No newline at end of file
+</featureGroup>

diff --git a/public/potlatch2/map_features/paths.xml b/public/potlatch2/map_features/paths.xml
index fbac906b654be260185700e26948858d8d610e23..f27f57779a481f265aa04b7c3d92e67f4d723d2d 100644 (file)
--- a/public/potlatch2/map_features/paths.xml
+++ b/public/potlatch2/map_features/paths.xml
@@ -23,11 +23,9 @@
     <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="cycleway" presence="onTagMatch" priority="low">
-        <choice value="segregated" text="Segregated" description="Cyclists and pedestrians are separated by a painted line or kerb."/>
-        <choice value="shared" 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." /> 
     </input> 
   </feature>
 
@@ -171,4 +169,4 @@
     <inputSet ref="common"/>
   </feature>
   
-</featureGroup>
\ No newline at end of file
+</featureGroup>

diff --git a/public/potlatch2/map_features/transport.xml b/public/potlatch2/map_features/transport.xml
index 7c0bad00b0d6e2f7f8cd14ae1447a75813923839..35150445da0341f31375b013456f11394443435a 100644 (file)
--- a/public/potlatch2/map_features/transport.xml
+++ b/public/potlatch2/map_features/transport.xml
@@ -352,50 +352,78 @@
 
 
   <feature name="Fuel">
-    <category>transport</category>
-    <point/>
-    <inputSet ref="simpleName"/>
-    <icon image="features/pois/transport_fuel.n.24.png"/>
+    <category>transport</category> 
+    <point /> 
+    <inputSet ref="simpleName" /> 
+    <icon image="features/pois/transport_fuel.n.24.png" />
     <tag k="amenity" v="fuel"/>
-    <input type="freetext" category="Naming" name="Operator" key="operator" description="The provider of the service"/>
-    <input type="choice" category="Fuels" name="Diesel" key="diesel" description="Is diesel fuel sold here?">
+    <inputSet ref="simpleBrand"/>
+    <inputSet ref="simpleOperator"/>
+
+    <input type="choice" category="Fuels" name="Diesel" key="fuel:diesel" description="Is diesel fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+    <input type="choice" category="Fuels" name="GTL Diesel" key="fuel:GTL_diesel" description="Is GTL diesel fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="Octane 95" key="octane_95" description="Is octane 95 unleaded fuel sold here?">
+    <input type="choice" category="Fuels" name="HGV Diesel" key="fuel:HGV_diesel" description="Is HGV diesel fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="Octane 98" key="octane_98" description="Is octane 98 unleaded fuel sold here?">
+    <input type="choice" category="Fuels" name="Biodiesel" key="fuel:biodiesel" description="Is biodiesel unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="Octane 100" key="octane_100" description="Is octane 100 unleaded fuel sold here?">
+    <input type="choice" category="Fuels" name="Octane 91" key="fuel:octane_91" description="Is octane 91 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="Ethanol" key="ethanol" description="Is ethanol sold here?">
+    <input type="choice" category="Fuels" name="Octane 95" key="fuel:octane_95" description="Is octane 95 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="LPG" key="lpg" description="Is LPG (liquid petroleum gas) sold here?">
+    <input type="choice" category="Fuels" name="Octane 98" key="fuel:octane_98" description="Is octane 98 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="Octane 91" key="diesel" description="Is octane 91 unleaded fuel sold here?">
+    <input type="choice" category="Fuels" name="Octane 100" key="fuel:octane_100" description="Is octane 100 unleaded fuel sold here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-    <input type="choice" category="Fuels" name="Bio-diesel" key="biodiesel" description="Is biodiesel unleaded fuel sold here?">
+    <input type="choice" category="Fuels" name="Mixture 1:25" key="fuel:1_25" description="Is mixture 1:25 fuel sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Mixture 1:50" key="fuel:1_50" description="Is mixture 1:50 fuel sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="E10" key="fuel:e10" description="Is E10 sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="E85" key="fuel:e85" description="Is E85 sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Biogas" key="fuel:biogas" description="Is biogas sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="CNG" key="fuel:cng" description="Is CNG sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="LPG" key="fuel:lpg" description="Is LPG sold here?" priority="low">
+      <choice value="yes" text="Yes"/>
+      <choice value="no" text="No"/>
+    </input>
+    <input type="choice" category="Fuels" name="Electricity" key="fuel:electricity" description="Is it possible to charge an electric car here?" priority="low">
       <choice value="yes" text="Yes"/>
       <choice value="no" text="No"/>
     </input>
-
-
     <inputSet ref="common"/>
   </feature>
 
@@ -500,4 +528,4 @@
   </feature>
 
       
-</featureGroup>
\ No newline at end of file
+</featureGroup>

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