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

Update Potlatch 2 to 2.2-18-g514f0d2 build

Browse source
This commit is contained in:
Tom Hughes 2011-07-10 14:56:30 +01:00
parent 1f2545ea90
commit ea207f51cc
10 changed files with 84 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/potlatch2/map_features/amenities.xml
View file

@ -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>
</featureGroup>

10
public/potlatch2/map_features/paths.xml
View file

@ -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>
</featureGroup>

114
public/potlatch2/map_features/transport.xml
View file

@ -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?">
<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?">
<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?">
<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?">
<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?">
<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?">
<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?">
<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?">
<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?">
<choice value="yes" text="Yes"/>
<choice value="no" text="No"/>
</input>
<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="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="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="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 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="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="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 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="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>
</featureGroup>