Changeset 3493 in josm


Ignore:
Timestamp:
2010-08-29T23:06:21+02:00 (14 years ago)
Author:
ulfl
Message:

sync preset and mappaint icons a little
(Presets and mappaint shouldn't use different icons for the same things ... still a lot to do here)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r3489 r3493  
    639639            <text key="ref" text="Number" default="" delete_if_empty="true" />
    640640        </item>
    641         <item name="Services" icon="presets/car_service.png" type="node,closedway,relation">
     641        <item name="Services" icon="styles/standard/vehicle/services.png" type="node,closedway,relation">
    642642            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
    643643            <label text="Edit Service Station" />
    … …  
    684684            <combo key="direction" text="Direction" values="clockwise" default="" delete_if_empty="true" />
    685685        </item>
    686         <item name="Pedestrian Crossing" icon="presets/zebracrossing.png" type="node">
     686        <item name="Pedestrian Crossing" icon="styles/standard/vehicle/zebra_crossing.png" type="node">
    687687            <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
    688688                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
    … …  
    11421142        </item>
    11431143        <separator/>
    1144         <item name="Slipway" icon="presets/slipway.png" type="node">
     1144        <item name="Slipway" icon="styles/standard/nautical/slipway.png" type="node">
    11451145            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
    11461146                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
    … …  
    11571157            <text key="name" text="Name" default="" delete_if_empty="true" />
    11581158        </item>
    1159         <item name="Dock" icon="presets/empty.png" type="node,closedway">
     1159        <item name="Dock" icon="presets/boatyard.png" type="node,closedway">
    11601160            <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
    11611161            <label text="Edit Dock" />
    … …  
    14151415            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
    14161416        </item>
    1417         <item name="Tyres" icon="presets/empty.png" type="node,closedway">
     1417        <item name="Tyres" icon="styles/standard/vehicle/tyres.png" type="node,closedway">
    14181418            <label text="Edit Tyres" />
    14191419            <key key="shop" value="tyres" />
    … …  
    14491449    </group> <!-- Car -->
    14501450    <group name="Motorcycle" icon="presets/motorbike.png">
    1451         <item name="Parking" icon="presets/bike_parking.png" type="node,closedway">
     1451        <item name="Parking" icon="styles/standard/vehicle/parking/motorbike.png" type="node,closedway">
    14521452            <label text="Edit Motorcycle Parking" />
    14531453            <key key="amenity" value="motorcycle_parking" />
    … …  
    14791479    </group> <!-- Motorcycle -->
    14801480    <group name="Bicycle" icon="presets/bike.png">
    1481         <item name="Parking" icon="presets/bike_parking.png" type="node,closedway">
     1481        <item name="Parking" icon="styles/standard/vehicle/parking/bicycle.png" type="node,closedway">
    14821482            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
    14831483            <label text="Edit Bicycle Parking" />
    … …  
    21582158            <text key="name" text="Name" default="" delete_if_empty="true" />
    21592159        </item>
    2160         <item name="Playground" icon="presets/playground.png" type="node,closedway">
     2160        <item name="Playground" icon="styles/standard/leisure/playground.png" type="node,closedway">
    21612161            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
    21622162            <label text="Edit Playground" />
    … …  
    24472447    </group>
    24482448    <group name="Motorsport" icon="presets/motorbike.png">
    2449         <item name="Motorsport" icon="presets/empty.png" type="node,closedway">
     2449        <item name="Motorsport" icon="styles/standard/sport/motor.png" type="node,closedway">
    24502450            <label text="Edit Motorsport" />
    24512451            <key key="sport" value="motor" />
    … …  
    24592459            <combo key="leisure" text="type" values="pitch,sports_centre,track" default="" delete_if_empty="true" />
    24602460        </item>
    2461         <item name="Motocross" icon="presets/empty.png" type="node,closedway">
     2461        <item name="Motocross" icon="styles/standard/sport/motocross.png" type="node,closedway">
    24622462            <label text="Edit Motocross" />
    24632463            <key key="sport" value="motocross" />
    … …  
    25232523            <text key="name" text="Name" default="" delete_if_empty="true" />
    25242524        </item>
    2525         <item name="Police" icon="presets/police.png" type="node,closedway,relation">
     2525        <item name="Police" icon="styles/standard/service/police.png" type="node,closedway,relation">
    25262526            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
    25272527                  fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
    … …  
    25382538            <text key="name" text="Name" default="" delete_if_empty="true" />
    25392539        </item>
    2540         <item name="Post Office" icon="presets/letter.png" type="node,closedway,relation">
     2540        <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,relation">
    25412541            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
    25422542            <label text="Edit Post Office" />
    … …  
    27502750            <text key="note" text="Note" default="" delete_if_empty="true" />
    27512751        </item>
    2752         <item name="Post Box" icon="presets/letter.png" type="node">
     2752        <item name="Post Box" icon="styles/standard/service/post_box.png" type="node">
    27532753            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
    27542754            <key key="amenity" value="post_box" />
    … …  
    28222822        </item>
    28232823    </group> <!-- Amenities -->
    2824     <group name="Food" icon="presets/shopping.png">
    2825         <item name="Supermarket" icon="presets/shopping.png" type="node,closedway">
     2824    <group name="Food" icon="styles/standard/shop/supermarket.png">
     2825        <item name="Supermarket" icon="styles/standard/shop/supermarket.png" type="node,closedway">
    28262826            <label text="Edit Supermarket" />
    28272827            <key key="shop" value="supermarket" />
    … …  
    28292829            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
    28302830        </item>
    2831         <item name="Convenience Store" icon="presets/empty.png" type="node,closedway">
     2831        <item name="Convenience Store" icon="styles/standard/shop/supermarket.png" type="node,closedway">
    28322832            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
    28332833            <label text="Edit Convenience Store" />
    … …  
    28572857            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
    28582858        </item>
    2859         <item name="Organic" icon="presets/empty.png" type="node,closedway">
     2859        <item name="Organic" icon="presets/fruits.png" type="node,closedway">
    28602860            <label text="Edit Organic Shop" />
    28612861            <key key="shop" value="organic" />
    … …  
    30443044    </group> <!-- Shops -->
    30453045    <group name="Cash" icon="presets/dollar.png">
    3046         <item name="Bank" icon="presets/bank.png" type="node,closedway">
     3046        <item name="Bank" icon="styles/standard/money/bank.png" type="node,closedway">
    30473047            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
    30483048            <label text="Edit Bank" />
    … …  
    30533053            <check key="atm" text="Automated Teller Machine" default="on" delete_if_empty="true" />
    30543054        </item>
    3055         <item name="Money Exchange" icon="presets/coins.png" type="node,closedway">
     3055        <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway">
    30563056            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
    30573057            <label text="Edit Money Exchange" />
    … …  
    30603060            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
    30613061        </item>
    3062         <item name="Automated Teller Machine" icon="presets/cash.png" type="node">
     3062        <item name="Automated Teller Machine" icon="styles/standard/money/atm.png" type="node">
    30633063            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
    30643064            <label text="Edit Automated Teller Machine" />
    … …  
    30893089            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" default="" delete_if_empty="true" />
    30903090        </item>
    3091         <item name="Hospital" icon="presets/hospital.png" type="node,closedway">
     3091        <item name="Hospital" icon="styles/standard/health/hospital.png" type="node,closedway">
    30923092            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
    30933093            <label text="Edit Hospital" />
    … …  
    31023102            <text key="opening_hours" text="Opening Hours" default="" delete_if_empty="true" />
    31033103        </item>
    3104         <item name="Emergency Access Point" icon="presets/emergency_access_point.png" type="node,closedway">
     3104        <item name="Emergency Access Point" icon="styles/standard/service/emergency_access_point.png" type="node,closedway">
    31053105            <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
    31063106                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
    … …  
    32533253            <text key="ele" text="Elevation" default="" delete_if_empty="true" />
    32543254        </item>
    3255         <item name="Cave Entrance" icon="presets/empty.png" type="node,closedway">
     3255        <item name="Cave Entrance" icon="presets/tunnel.png" type="node,closedway">
    32563256            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
    32573257            <label text="Edit Cave Entrance" />

  • trunk/styles/standard/elemstyles.xml

    r3448 r3493  
    20442044
    20452045        <rule>
     2046                <condition k="amenity" v="motorcycle_parking"/>
     2047                <icon annotate="true" src="vehicle/parking/motorbike.png"/>
     2048                <area colour="amenity_traffic#f7efb7"/>
     2049                <scale_min>1</scale_min>
     2050                <scale_max>50000</scale_max>
     2051        </rule>
     2052
     2053        <rule>
    20462054                <condition k="amenity" v="bicycle_parking"/>
    20472055                <icon annotate="true" src="vehicle/parking/bicycle.png"/>
    … …  
    24612469        <rule>
    24622470                <condition k="amenity" v="ferry_terminal"/>
    2463                 <icon annotate="true" src="misc/no_icon.png"/>
     2471                <icon annotate="true" src="nautical/ferry.png"/>
    24642472                <area colour="amenity_light#f7efb7"/>
    24652473                <scale_min>1</scale_min>
    … …  
    27262734        <rule>
    27272735                <condition k="shop" v="car_repair"/>
    2728                 <icon annotate="true" src="transport/car.png"/>
     2736                <icon annotate="true" src="vehicle/repair_shop.png"/>
     2737                <area colour="shop#00005f"/>
     2738                <scale_min>1</scale_min>
     2739                <scale_max>50000</scale_max>
     2740        </rule>
     2741
     2742        <rule>
     2743                <condition k="shop" v="tyres"/>
     2744                <icon annotate="true" src="vehicle/tyres.png"/>
    27292745                <area colour="shop#00005f"/>
    27302746                <scale_min>1</scale_min>
    … …  
    35783594        <rule>
    35793595                <condition k="natural" v="cave_entrance"/>
    3580                 <icon src="misc/no_icon.png"/>
     3596                <icon src="vehicle/tunnel.png"/>
    35813597                <area colour="natural#002f00"/>
    35823598                <scale_min>1</scale_min>
Note: See TracChangeset for help on using the changeset viewer.