Changeset 11153 in josm


Ignore:
Timestamp:
2016-10-22T01:23:55+02:00 (3 years ago)
Author:
Klumbumbus
Message:
  • add display_values and values_sort=false for Route network values (iwn,nwn,...)
  • warn about missing sport key on pitches
  • see #13804 - group unnecessary tag warnings
  • add own colors for sport=multi|running|athletics to avoid false positive validator warning in stadiums (inner style equals MP style)
  • fix #13824 - adjust sport=equestrian|horse_racing presets
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r11150 r11153  
    3030    </chunk>
    3131    <chunk id="riding_surface">
    32         <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" values_context="riding" />
     32        <combo key="leisure" text="Type" values="horse_riding,pitch,sports_centre,stadium,track" values_context="riding" />
    3333        <combo key="surface" text="Surface" values="grass,sand,clay,dirt,fine_gravel,ground,mud,unpaved,compacted" />
    3434    </chunk>
     
    99749974                <key key="route" value="bicycle"/>
    99759975                <text key="name" text="Name" />
    9976                 <combo key="network" text="Network" values="icn,ncn,rcn,lcn" />
     9976                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" display_values="international,national,regional,local" values_sort="false" />
    99779977                <optional>
    99789978                    <reference ref="route_hikebike_optionals" />
     
    1002110021                <key key="route" value="hiking"/>
    1002210022                <text key="name" text="Name" />
    10023                 <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" />
     10023                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" display_values="international,national,regional,local" values_sort="false"/>
    1002410024                <optional>
    1002510025                    <reference ref="route_hikebike_optionals" />
     
    1003710037                <key key="route" value="foot"/>
    1003810038                <text key="name" text="Name" />
    10039                 <combo key="network" text="Network" values="rwn,lwn" />
     10039                <combo key="network" text="Network" values="rwn,lwn" display_values="regional,local" values_sort="false" />
    1004010040                <optional>
    1004110041                    <reference ref="route_hikebike_optionals" />
     
    1005310053                <key key="route" value="horse"/>
    1005410054                <text key="name" text="Name" />
    10055                 <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" />
     10055                <combo key="network" text="Network" values="ihn,nhn,rhn,lhn" display_values="international,national,regional,local" values_sort="false" />
    1005610056                <optional>
    1005710057                    <reference ref="route_hikebike_optionals" />
  • trunk/data/validator/combinations.mapcss

    r11146 r11153  
    129129relation[route=ski][!piste:type][type=route],
    130130*[tourism=information][!information],
     131*[leisure=pitch][!sport],
    131132*[aeroway=terminal][!building],
    132133*[power=generator][!generator:source],
  • trunk/data/validator/unnecessary.mapcss

    r11146 r11153  
    77  /* see #9365 - Useless tag layer=0 */
    88  throwWarning: tr("{0} is unnecessary", "{0.tag}");
     9  group: tr("unnecessary tag");
    910  fixRemove: "{0.key}";
    1011  assertMatch: "way layer=0";
     
    2021area:closed[shop    ][area?] {
    2122  throwWarning: tr("{0} is unnecessary for {1}", "{2.key}", "{1.key}");
     23  group: tr("unnecessary tag");
    2224  fixRemove: "{2.key}";
    2325}
  • trunk/styles/standard/elemstyles.mapcss

    r11010 r11153  
    37073707area[sport="9pin"],
    37083708area[sport="10pin"],
    3709 area[sport=athletics],
    3710 area[sport=running],
    37113709area[sport=soccer],
    37123710area[sport=australian_football],
     
    37243722node[sport="10pin"] {
    37253723    icon-image: "presets/sport/10pin.svg";
    3726     set icon_z17;
    3727 }
    3728 node[sport=athletics] {
    3729     icon-image: "presets/sport/athletics.svg";
    3730     set icon_z17;
    3731 }
    3732 node[sport=running] {
    3733     icon-image: "presets/sport/running.svg";
    37343724    set icon_z17;
    37353725}
     
    38543844    set icon_z17;
    38553845}
    3856 area[sport=multi],
     3846area[sport=athletics] {
     3847    fill-color: sport_athletics#cfebd7;
     3848}
     3849node[sport=athletics] {
     3850    icon-image: "presets/sport/athletics.svg";
     3851    set icon_z17;
     3852}
     3853area[sport=running] {
     3854    fill-color: sport_running#cfebd8;
     3855}
     3856node[sport=running] {
     3857    icon-image: "presets/sport/running.svg";
     3858    set icon_z17;
     3859}
     3860area[sport=multi] {
     3861    fill-color: sport_multi#cfebd9;
     3862}
     3863node[sport=multi] {
     3864    icon-image: "presets/sport/multi.svg";
     3865    set icon_z17;
     3866}
    38573867area[sport=pelota],
    38583868area[sport=racquet],
     
    38613871area[sport=skateboard] {
    38623872    fill-color: sport#bde3cb;
    3863 }
    3864 node[sport=multi] {
    3865     icon-image: "presets/sport/multi.svg";
    3866     set icon_z17;
    38673873}
    38683874node[sport=pelota] {
Note: See TracChangeset for help on using the changeset viewer.