Changeset 7915 in josm


Ignore:
Timestamp:
2014-12-30T19:00:37+01:00 (9 years ago)
Author:
Klumbumbus
Message:

see #10835 - icon unification and geometry consistency for aerialway

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7914 r7915  
    21802180    </group> <!-- Railway -->
    21812181    <group name="Aerialway" icon="presets/aerialway.png">
    2182         <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
    2183             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
    2184                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
    2185             <space />
    2186             <key key="aerialway" value="chair_lift" />
    2187             <reference ref="name_ref" />
    2188             <optional>
    2189                 <text key="aerialway:capacity" text="Number of people per hour" />
    2190                 <text key="aerialway:occupancy" text="Number of people per chair" />
    2191                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2192                 <check key="aerialway:bubble" text="Has bubble?" />
    2193                 <check key="aerialway:heating" text="Has heating?" />
    2194             </optional>
    2195         </item> <!-- Chair Lift -->
    2196         <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    2197             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
    2198             <space />
    2199             <key key="aerialway" value="drag_lift" />
    2200             <reference ref="name_ref" />
    2201             <optional>
    2202                 <text key="aerialway:capacity" text="Number of people per hour" />
    2203                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2204             </optional>
    2205         </item> <!-- Drag Lift -->
    22062182        <item name="Cable Car" icon="presets/cable_car.png" type="way" preset_name_label="true">
    22072183            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car"
    … …  
    22222198            </optional>
    22232199        </item> <!-- Cable Car -->
     2200                <item name="Chair Lift" icon="presets/chair_lift.png" type="way" preset_name_label="true">
     2201            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift"
     2202                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:aerialway=chair_lift" />
     2203            <space />
     2204            <key key="aerialway" value="chair_lift" />
     2205            <reference ref="name_ref" />
     2206            <optional>
     2207                <text key="aerialway:capacity" text="Number of people per hour" />
     2208                <text key="aerialway:occupancy" text="Number of people per chair" />
     2209                <text key="aerialway:duration" text="Typical journey time in minutes" />
     2210                <check key="aerialway:bubble" text="Has bubble?" />
     2211                <check key="aerialway:heating" text="Has heating?" />
     2212            </optional>
     2213        </item> <!-- Chair Lift -->
    22242214        <item name="Gondola" icon="presets/aerialway.png" type="way" preset_name_label="true">
    22252215            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=gondola" />
    … …  
    22342224            </optional>
    22352225        </item> <!-- Gondola -->
    2236         <item name="Mixed Lift" type="way" preset_name_label="true">
     2226        <item name="Mixed Lift" icon="styles/standard/transport/aerialway/mixed_lift.png" type="way" preset_name_label="true">
    22372227            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=mixed_lift" />
    22382228            <space />
    … …  
    22472237            </optional>
    22482238        </item> <!-- Mixed Lift -->
    2249         <item name="T-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    2250             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=t-bar" />
    2251             <space />
    2252             <key key="aerialway" value="t-bar" />
     2239        <item name="Drag Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
     2240            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
     2241            <space />
     2242            <combo key="aerialway" text="Type" values="drag_lift,t-bar,j-bar,platter,rope_tow" display_values="drag_lift (general type - use only if exact type (see values below) is unknown),t-bar,j-bar,platter,rope_tow" match="keyvalue" />
    22532243            <reference ref="name_ref" />
    22542244            <optional>
    … …  
    22562246                <text key="aerialway:duration" text="Typical journey time in minutes" />
    22572247            </optional>
    2258         </item> <!-- T-bar Lift -->
    2259         <item name="J-bar Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    2260             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=j-bar" />
    2261             <space />
    2262             <key key="aerialway" value="j-bar" />
    2263             <reference ref="name_ref" />
    2264             <optional>
    2265                 <text key="aerialway:capacity" text="Number of people per hour" />
    2266                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2267             </optional>
    2268         </item> <!-- J-bar Lift -->
    2269         <item name="Platter Lift" icon="presets/drag_lift.png" type="way" preset_name_label="true">
    2270             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=platter" />
    2271             <space />
    2272             <key key="aerialway" value="platter" />
    2273             <reference ref="name_ref" />
    2274             <optional>
    2275                 <text key="aerialway:capacity" text="Number of people per hour" />
    2276                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2277             </optional>
    2278         </item> <!-- Platter Lift -->
    2279         <item name="Rope Tow" type="way" preset_name_label="true">
    2280             <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=rope_tow" />
    2281             <space />
    2282             <key key="aerialway" value="rope_tow" />
    2283             <reference ref="name_ref" />
    2284             <optional>
    2285                 <text key="aerialway:capacity" text="Number of people per hour" />
    2286                 <text key="aerialway:duration" text="Typical journey time in minutes" />
    2287             </optional>
    2288         </item> <!-- Rope Tow -->
    2289         <item name="Magic Carpet" type="way" preset_name_label="true">
     2248        </item> <!-- Drag Lift -->
     2249        <item name="Magic Carpet" icon="styles/standard/transport/aerialway/magic_carpet.png" type="way" preset_name_label="true">
    22902250            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=magic_carpet" />
    22912251            <space />
    … …  
    23142274            <text key="name" text="Name" />
    23152275        </item> <!-- Station -->
    2316         <item name="Pylon" icon="presets/power_tower.png" type="node" preset_name_label="true">
     2276        <item name="Pylon" icon="styles/standard/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
    23172277            <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=pylon" />
    23182278            <space />

  • trunk/data/validator/deprecated.mapcss

    r7818 r7915  
    332332/* see #10661, #10837 */
    333333*[barrier=yes],
     334*[aerialway=yes],
    334335*[amenity=yes],
    335336*[place=yes] {

  • trunk/data/validator/geometry.mapcss

    r7814 r7915  
    44node[sidewalk],
    55node[footway],
     6node[aerialway=cable_car],
     7node[aerialway=gondola],
     8node[aerialway=chair_lift],
     9node[aerialway=mixed_lift],
     10node[aerialway=drag_lift],
     11node[aerialway=t-bar],
     12node[aerialway=j-bar],
     13node[aerialway=platter],
     14node[aerialway=magic_carpet],
     15node[aerialway=rope_tow],
     16node[aerialway=goods],
    617node[waterway=river],
    718node[waterway=riverbank],

  • trunk/styles/standard/elemstyles.mapcss

    r7904 r7915  
    33693369    dashes: 9,9;
    33703370}
    3371 node[aerialway=cable_car] {
    3372     icon-image: "transport/aerialway/cable_car.png";
    3373     set icon_z17;
    3374     text: auto;
    3375 }
    3376 node[aerialway=gondola] {
    3377     icon-image: "transport/aerialway/gondola.png";
    3378     set icon_z17;
    3379     text: auto;
    3380 }
    33813371way[aerialway=chair_lift] {
    33823372    width: 1;
    … …  
    33843374    dashes: 6,6;
    33853375}
    3386 node[aerialway=chair_lift] {
    3387     icon-image: "transport/aerialway/chair_lift.png";
    3388     set icon_z17;
    3389     text: auto;
    3390 }
     3376way[aerialway=mixed_lift] {
     3377    width: 1;
     3378    color: aerialway#663300;
     3379    dashes: 6,6,9,6;
     3380}
     3381way[aerialway=j-bar],
     3382way[aerialway=t-bar],
     3383way[aerialway=platter],
     3384way[aerialway=rope_tow],
    33913385way[aerialway=drag_lift] {
    33923386    width: 1;
    … …  
    33943388    dashes: 3,3;
    33953389}
    3396 node[aerialway=drag_lift] {
    3397     icon-image: "transport/aerialway/drag_lift.png";
    3398     set icon_z17;
    3399     text: auto;
    3400 }
    3401 area[aerialway=station],
    3402 area[aerialway=pylon] {
    3403     fill-color: aerialway#663300;
    3404 }
    3405 node[aerialway=station] {
    3406     icon-image: "transport/aerialway/station.png";
    3407     set icon_z17;
    3408     text: auto;
    3409 }
    3410 node[aerialway=pylon] {
    3411     icon-image: "misc/landmark/power/tower_small.png";
    3412     set icon_z17;
    3413     text: auto;
     3390way[aerialway=magic_carpet] {
     3391    width: 1;
     3392    color: aerialway#663300;
     3393    dashes: 3,3;
    34143394}
    34153395way[aerialway=goods] {
    … …  
    34183398    dashes: 2,2;
    34193399}
     3400area[aerialway=station] {
     3401    fill-color: aerialway#663300;
     3402}
     3403node[aerialway=station] {
     3404    icon-image: "transport/aerialway/station.png";
     3405    set icon_z17;
     3406    text: auto;
     3407}
     3408node[aerialway=pylon] {
     3409    icon-image: "transport/aerialway/pylon.svg";
     3410    set icon_z17;
     3411    text: auto;
     3412}
     3413node[aerialway=cable_car],
     3414node[aerialway=gondola],
     3415node[aerialway=chair_lift],
     3416node[aerialway=mixed_lift],
     3417node[aerialway=drag_lift],
     3418node[aerialway=t-bar],
     3419node[aerialway=j-bar],
     3420node[aerialway=platter],
     3421node[aerialway=magic_carpet],
     3422node[aerialway=rope_tow],
    34203423node[aerialway=goods] {
    3421     icon-image: "transport/aerialway/goods.png";
     3424    icon-image: "misc/deprecated.png";
    34223425    set icon_z17;
    34233426    text: auto;
Note: See TracChangeset for help on using the changeset viewer.