Changeset 579 in josm for trunk/presets


Ignore:
Timestamp:
2008-03-07T03:23:41+01:00 (16 years ago)
Author:
(none)
Message:

various improvements to the presets file (including new icons for cycling and money topics)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/presets/presets.xml

    r472 r579  
    44http://www.kde.org
    55http://openclipart.org/media/view/media/clip_art
    6 
    7 TODO:
    8 * Check leisure places
    96-->
    107
     
    129
    1310        <item name="Road" icon="presets/ways.png">
    14     <label text="Roads" />
    15                 <combo key="highway" text="Type:" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,residential,unclassified,service,byway,unsurfaced,bridleway,track,cycleway,pedestrian,footway,steps" delete_if_empty="true" />
    16                 <text key="name" text="Name:" default="" delete_if_empty="true" />
    17   </item>
    18 
    19         <item name="Road Point" icon="presets/waypoints.png">
    20                 <label text="Road Points" />
    21                 <combo key="highway" text="Type:" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,bridge,viaduct,stop,gate,bus_station,bus_halt,bus_stop,stile,cattle_grid,ford" default="" />
    22                 <text key="name" text="Name:" default="" delete_if_empty="true" />
    23   </item>
    24        
    25        
    26        
    27         <!--
    28         exit_nr,exit_name
    29         -->
    30        
    31        
    32         <item name="Road Attributes" icon="presets/roadattributes.png">
    33                 <label text="Road Attributes" />
     11    <label text="Road" />
     12                <combo key="highway" text="Type:" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,unclassified,unsurfaced,track,residential,living_street,service,bridleway,cycleway,footway,pedestrian,steps,bus_guideway,construction" delete_if_empty="true" />
     13                <text key="name" text="Name:" default="" delete_if_empty="true" />
     14                <label text=" " />
     15                <label text="Attributes" />
     16                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
    3417                <check key="bridge" text="Bridge" default="off" delete_if_empty="true" />
    3518                <check key="tunnel" text="Tunnel" default="off" delete_if_empty="true" />
     
    3720                <check key="embankment" text="Embankment" default="off" delete_if_empty="true" />
    3821                <combo key="layer" text="Layer:" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     22                <combo key="lanes" text="Lanes:" values="1,2,3,4,5" default="" delete_if_empty="true" />
    3923                <combo key="surface" text="Surface:" values="paved,unpaved" default="" delete_if_empty="true" />
     24                <combo key="junction" text="Junction:" values="roundabout" default="" delete_if_empty="true" />
     25                <text key="maxspeed" text="Max. speed (km/h):" default="" delete_if_empty="true" />
    4026                <text key="width" text="Width (metres):" default="" delete_if_empty="true" />
    41                 <text key="lanes" text="Lanes:" default="" delete_if_empty="true" />
    42         </item>
    43 
     27  </item>
     28
     29        <item name="Road Point" icon="presets/waypoints.png">
     30                <label text="Road Points" />
     31                <combo key="highway" text="Type:" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,viaduct,stop,gate,bus_stop,stile,cattle_grid,ford,turning_circle" default="" />
     32                <text key="name" text="Name:" default="" delete_if_empty="true" />
     33                <check key="mountain_pass" text="Mountain Pass" default="off" delete_if_empty="true" />
     34  </item>
     35       
     36       
    4437        <item name="Restrictions" icon="presets/restrictions.png">
    4538                <label text="Restrictions" />
    4639                <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
     40                <check key="toll" text="Toll" default="off" delete_if_empty="true"  />
     41                <check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true"  />
    4742                <combo key="access" text="Access:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
     43                <combo key="bicycle" text="Bicycle:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true"  />
    4844                <combo key="foot" text="Foot:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    49                 <combo key="bicycle" text="Bicycle:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true"  />
     45                <combo key="goods" text="Goods:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
     46                <combo key="hgv" text="Heavy Goods Vehicles (hgv):" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    5047                <combo key="horse" text="Horse:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    5148                <combo key="motorcycle" text="Motorcycle:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    5249                <combo key="motorcar" text="Motorcar:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    53                 <combo key="toll" text="Toll:" values="yes,no" default="" delete_if_empty="true"  />
    54                 <combo key="goods" text="Goods:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    55                 <combo key="hgv" text="hgv:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    56                 <combo key="psv" text="psv:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
     50                <combo key="psv" text="Public Service Vehicles (psv):" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    5751                <combo key="motorboat" text="Motorboat:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
    5852                <combo key="boat" text="Boat:" values="yes,private,permissive,unknown,no" default="" delete_if_empty="true" />
     
    6559 </item>
    6660
    67 
     61       
     62        <!--
     63        exit_nr,exit_name
     64        -->
    6865 
    6966 <!--
     
    7774        -->
    7875
     76 <item name=" " icon="presets/empty.png"></item>
     77 
    7978        <item name="Railway" icon="presets/railway.png">
    8079                <label text="Railways" />
    81                 <combo key="railway" text="Type:" values="rail,tram,light_rail,subway,preserved,disused,abandoned,narrow_gauge" default="" delete_if_empty="true" />
     80                <combo key="railway" text="Type:" values="rail,tram,light_rail,subway,preserved,disused,abandoned,narrow_gauge,monorail" default="" delete_if_empty="true" />
    8281                <!-- <text key="name" text="Name:" default="" delete_if_empty="true"  />-->
    8382  </item>
     
    8584        <item name="Railway Point" icon="presets/railwaypoint.png">
    8685                <label text="Railway Points" />
    87                 <combo key="railway" text="Type:" values="station,halt,viaduct,crossing" default="" delete_if_empty="true" />
     86                <combo key="railway" text="Type:" values="station,halt,tram_stop,subway_entrance,crossing,level_crossing,turntable,viaduct" default="" delete_if_empty="true" />
    8887                <text key="name" text="Name:" default="" delete_if_empty="true"  />
    8988  </item>
    9089
     90 <item name=" " icon="presets/empty.png"></item>
     91 
    9192        <item name="Waterway" icon="presets/waterway.png">
    9293                <label text="Waterways" />
    93                 <combo key="waterway" text="Type:" values="river,canal,drain,dock" default="" delete_if_empty="true" />
     94                <combo key="waterway" text="Type:" values="river,canal,stream,drain,dock,weir,dam" default="" delete_if_empty="true" />
    9495                <text key="name" text="Name:" default="" delete_if_empty="true" />
    9596  </item>
     
    9798        <item name="Waterway Point" icon="presets/waterwaypoint.png">
    9899                <label text="Waterway Points" />
    99                 <combo key="waterway" text="Type:" values="lock_gate,water_point,turning_point,aqueduct,boatyard,waste_disposal,mooring,weir" default="" delete_if_empty="true" />
     100                <combo key="waterway" text="Type:" values="lock_gate,turning_point,aqueduct,boatyard,water_point,waste_disposal,mooring,weir" default="" delete_if_empty="true" />
    100101                <text key="name" text="Name:" default="" delete_if_empty="true" />
    101102  </item>
     
    106107
    107108 <item name=" " icon="presets/empty.png"></item>
     109 <item name=" " icon="presets/empty.png"></item>
     110 <item name=" " icon="presets/empty.png"></item>
    108111
    109112
     
    111114 <item name="Places" icon="presets/places.png">
    112115         <label text="Places" />
    113          <combo key="place" text="Type" values="continent,country,state,region,county,city,town,suburb,village,hamlet" default="" delete_if_empty="true" />
     116         <combo key="place" text="Type" values="continent,country,state,region,county,city,town,suburb,village,hamlet,locality,island" default="" delete_if_empty="true" />
    114117         <text key="name" text="Name:" default="" delete_if_empty="true" />
    115118        </item>
     
    123126        <item name="Landuse" icon="presets/landuse.png">
    124127                <label text="Landuse" />
    125                 <combo key="landuse" text="Type:" values="farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,cemetery,plaza" default="" delete_if_empty="true" />
     128                <combo key="landuse" text="Type:" values="farm,quarry,landfill,basin,reservoir,forest,allotments,residential,retail,commercial,industrial,brownfield,greenfield,railway,construction,military,cemetery,village_green,recreation_ground" default="" delete_if_empty="true" />
    126129                <text key="name" text="Name:" default="" delete_if_empty="true" />
    127130 </item>
     
    129132 <item name="Natural" icon="presets/natural.png">
    130133         <label text="Natural locations" />
    131          <combo key="natural" text="Type:" values="spring,peak,cliff,scree,scrub,fell,heath,wood,marsh,water,coastline,mud,beach,bay" default="" delete_if_empty="true" />
     134         <combo key="natural" text="Type:" values="spring,peak,glacier,volcano,cliff,scree,scrub,fell,heath,wood,marsh,water,coastline,mud,beach,bay,land,cave_entrance" default="" delete_if_empty="true" />
    132135         <text key="name" text="Name:" default="" delete_if_empty="true" />
    133136        </item>
     
    142145 <item name="Amenities" icon="presets/pubinstitutes.png">
    143146         <label text="Amenities" />
    144          <combo key="amenity" text="Type" values="telephone,toilets,public_building,police,post_office,post_box,recycling,fire_station,courthouse,prison,refuge" default="" delete_if_empty="true" />
     147         <combo key="amenity" text="Type" values="telephone,toilets,bus_station,public_building,townhall,police,post_office,post_box,recycling,fire_station,courthouse,prison,taxi" default="" delete_if_empty="true" />
    145148         <!-- <text key="name" text="Name:" default="" delete_if_empty="true" /> -->
    146149 </item>
    147150
    148151
    149  <item name="Car" icon="presets/car.png">
     152 <item name="Bicycle" icon="presets/cycling.png">
     153         <label text="Bicycle" />
     154         <combo key="amenity" text="Facility:" values="bicycle_parking,bicycle_rental" default="" delete_if_empty="true" />
     155         <combo key="shop" text="Shop:" values="bicycle" default="" delete_if_empty="true" />
     156         <text key="name" text="Name:" default="" delete_if_empty="true" />
     157 </item>
     158 
     159<item name="Car" icon="presets/car.png">
    150160         <label text="Car" />
    151          <combo key="amenity" text="Type" values="fuel,parking" default="" delete_if_empty="true" />
    152          <!-- <text key="name" text="Name:" default="" delete_if_empty="true" /> -->
     161         <combo key="amenity" text="Facility" values="fuel,parking,car_rental,car_sharing" default="" delete_if_empty="true" />
     162         <text key="name" text="Name:" default="" delete_if_empty="true" />
    153163 </item>
    154164
     
    168178 <item name="Shopping" icon="presets/shopping.png">
    169179         <label text="Insert a shop etc." />
    170          <combo key="shop" text="Type" values="supermarket,bakery,butcher,chandler" default="" delete_if_empty="true" />
     180         <combo key="shop" text="Type" values="supermarket,convenience,butcher,bicycle,doityourself,dry_cleaning,laundry,outdoor,kiosk" default="" delete_if_empty="true" />
    171181         <text key="name" text="Name:" default="" delete_if_empty="true" />
    172182 </item>
     
    175185 <item name="Food + Drinks" icon="presets/restaurant.png">
    176186         <label text="Food + Drinks" />
    177          <combo key="amenity" text="Type" values="fast_food,restaurant,biergarten,pub,cafe" default="" delete_if_empty="true" />
     187         <combo key="amenity" text="Type" values="pub,biergarten,nightclub,cafe,restaurant,fast_food" default="" delete_if_empty="true" />
    178188         <text key="name" text="Name:" default="" delete_if_empty="true" />
    179189 </item>
     
    182192 <item name="Culture" icon="presets/book.png">
    183193         <label text="Insert a cultural location" />
    184          <combo key="amenity" text="Type" values="library,place_of_worship,grave_yard" default="" delete_if_empty="true" />
     194         <combo key="amenity" text="Type" values="library,place_of_worship,grave_yard,theatre,cinema,arts_centre" default="" delete_if_empty="true" />
     195         <text key="name" text="Name:" default="" delete_if_empty="true" />
     196 </item>
     197
     198 <item name="Money" icon="presets/money.png">
     199         <label text="Money" />
     200         <combo key="amenity" text="Money:" values="bank,bureau_de_change,atm" default="" delete_if_empty="true" />
    185201         <text key="name" text="Name:" default="" delete_if_empty="true" />
    186202 </item>
     
    188204 <item name="Sports" icon="presets/sports.png">
    189205         <label text="Sports" />
    190          <combo key="sport" text="Type:" values="sports_centre,golf_course,multi,10pin,athletics,baseball,basketball,bowls,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,football,golf,gymnastics,hockey,horse_racing,motor,racquet,rugby,skating,skateboard,soccer,swimming,skiing,table_tennis,tennis" default="" delete_if_empty="true" />
     206         <combo key="leisure" text="Facility:" values="sports_centre,golf_course,stadium,track,pitch" default="" delete_if_empty="true" />
     207         <combo key="sport" text="Sport:" values="multi,10pin,athletics,australian_football,baseball,basketball,boules,bowls,climbing,cricket,cricket_nets,croquet,cycling,dog_racing,equestrian,football,golf,gymnastics,hockey,horse_racing,motor,pelota,racquet,rugby,skating,skateboard,soccer,swimming,skiing,table_tennis,tennis" default="" delete_if_empty="true" />
    191208         <text key="name" text="Name:" default="" delete_if_empty="true" />
    192209 </item>
     
    194211 <item name="Leisure" icon="presets/leisure.png">
    195212         <label text="Leisure" />
    196          <combo key="leisure" text="Type:" values="stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,garden,slipway,playground,common" default="" delete_if_empty="true" />
    197          <text key="name" text="Name:" default="" delete_if_empty="true" />
    198  </item>
    199 
    200  <item name="Historic places" icon="presets/historic.png">
     213         <combo key="leisure" text="Type:" values="water_park,marina,slipway,fishing,nature_reserve,park,playground,garden,common" default="" delete_if_empty="true" />
     214         <text key="name" text="Name:" default="" delete_if_empty="true" />
     215 </item>
     216
     217 <item name="Historic Places" icon="presets/historic.png">
    201218         <label text="Historic places" />
    202          <combo key="historic" text="Type" values="castle,monument,museum,archaeological_site,icon,ruins" default="" delete_if_empty="true" />
     219         <combo key="historic" text="Type" values="castle,monument,memorial,archaeological_site,ruins,battlefield" default="" delete_if_empty="true" />
    203220         <text key="name" text="Name:" default="" delete_if_empty="true" />
    204221 </item>
     
    206223 <item name="Man Made" icon="presets/manmade.png">
    207224         <label text="Man Made" />
    208          <combo key="man_made" text="Type:" values="works,beacon,survey_point,power_wind,power_hydro,power_fossil,power_nuclear,tower,water_tower,gasometer,reservoir_covered,lighthouse" default="" delete_if_empty="true" />
     225         <combo key="man_made" text="Type:" values="works,beacon,survey_point,power_wind,power_hydro,power_fossil,power_nuclear,tower,water_tower,gasometer,reservoir_covered,lighthouse,windmill,pier,pipeline,wastewater_plant,crane" default="" delete_if_empty="true" />
    209226         <text key="name" text="Name:" default="" delete_if_empty="true" />
    210227 </item>
     
    220237<item name="Tourism" icon="presets/suitcase.png">
    221238        <label text="Tourism" />
    222         <combo key="tourism" text="Type:" values="information,camp_site,caravan_site,picnic_site,viewpoint,theme_park,hotel,motel,guest_house,hostel,attraction" default="" delete_if_empty="true" />
     239        <combo key="tourism" text="Accomodation:" values="hotel,motel,guest_house,hostel,camp_site,caravan_site" default="" delete_if_empty="true" />
     240        <combo key="tourism" text="Activities:" values="artwork,attraction,information,museum,picnic_site,theme_park,viewpoint,zoo" default="" delete_if_empty="true" />
    223241        <text key="name" text="Name:" default="" delete_if_empty="true" />
    224242 </item>
     
    230248               
    231249 <item name=" " icon="presets/empty.png"></item>
     250 <item name=" " icon="presets/empty.png"></item>
     251 <item name=" " icon="presets/empty.png"></item>
    232252
    233253 <item name="Post box" icon="presets/letter.png">
     
    252272
    253273 <item name="Fuel" icon="presets/fuel.png">
    254          <label text="Create a filling station" />
     274         <label text="Create a fuel station" />
    255275         <key key="amenity" value="fuel" />
    256276         <text key="name" text="Name:" default="" delete_if_empty="true" />
     
    263283 </item>
    264284
    265  <item name="Place of worship" icon="presets/church.png">
     285 <item name="Place of Worship" icon="presets/church.png">
    266286         <label text="Create a place of worship" />
    267287         <key key="amenity" value="place_of_worship" />
     
    277297 </item>
    278298
     299 <item name="Residential Road" icon="presets/ways.png">
     300         <label text="Create a residential road" />
     301         <key key="highway" value="residential" />
     302         <text key="name" text="Name:" default="" delete_if_empty="true" />
     303         <check key="oneway" text="Oneway" default="off" delete_if_empty="true" />
     304 </item>
     305
    279306<!--
    280307 <item name=" " icon="presets/empty.png"></item>
Note: See TracChangeset for help on using the changeset viewer.