Changeset 7724 in josm for trunk


Ignore:
Timestamp:
2014-11-13T22:34:55+01:00 (9 years ago)
Author:
Klumbumbus
Message:

icon unification of sport icons, i.e. same icon for preset and mappaint style. added white background to two icons for visibility in MapView

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7723 r7724  
    44174417    </group> <!-- Facilities -->
    44184418  </group>  <!-- Facilities -->
    4419   <group name="Sports" icon="presets/soccer.png">
     4419  <group name="Sports" icon="styles/standard/sport/soccer.png">
    44204420    <group name="Sport Facilities" icon="presets/stadium.png">
    4421         <item name="Stadium" icon="presets/stadium.png" type="node,closedway" preset_name_label="true">
     4421        <item name="Stadium" icon="styles/standard/sport/stadium.png" type="node,closedway" preset_name_label="true">
    44224422            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=stadium"
    44234423                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=stadium"
    … …  
    44324432            <reference ref="optional_sport" />
    44334433        </item> <!-- Stadium -->
    4434         <item name="Sports Centre" icon="presets/sports_centre.png" type="node,closedway" preset_name_label="true">
     4434        <item name="Sports Centre" icon="styles/standard/sport/centre.png" type="node,closedway" preset_name_label="true">
    44354435            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=sports_centre"
    44364436                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=sports_centre"
    … …  
    44444444            <reference ref="optional_sport" />
    44454445        </item> <!-- Sports Centre -->
    4446         <item name="Pitch" icon="presets/pitch.png" type="node,closedway" preset_name_label="true">
     4446        <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway" preset_name_label="true">
    44474447            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=pitch"
    44484448                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=pitch"
    … …  
    44594459            <reference ref="optional_sport" />
    44604460        </item> <!-- Pitch -->
    4461         <item name="Racetrack" icon="presets/stadium.png" type="node,way,closedway,relation" preset_name_label="true">
     4461        <item name="Racetrack" icon="styles/standard/sport/track.png" type="node,way,closedway,relation" preset_name_label="true">
    44624462            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=track"
    44634463                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=track"
    … …  
    44834483            <reference ref="name_oh" />
    44844484        </item> <!-- Golf Course -->
    4485         <item name="Miniature Golf" icon="presets/golf.png" type="node,closedway" preset_name_label="true">
     4485        <item name="Miniature Golf" icon="styles/standard/sport/miniature_golf.svg" type="node,closedway" preset_name_label="true">
    44864486            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=miniature_golf"
    44874487                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=miniature_golf"
    … …  
    45404540            <combo key="leisure" text="Type" values="sports_centre" />
    45414541        </item> <!-- Climbing -->
    4542         <item name="Canoeing/Kayaking" icon="presets/canoe.png" type="node,way,closedway" preset_name_label="true">
     4542        <item name="Canoeing/Kayaking" icon="styles/standard/sport/canoe.svg" type="node,way,closedway" preset_name_label="true">
    45434543            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=canoe" />
    45444544            <space />
    … …  
    45464546            <text key="name" text="Name" />
    45474547        </item> <!-- Canoeing/Kayaking -->
    4548         <item name="Cycling" icon="presets/cycling.png" type="node,closedway" preset_name_label="true">
     4548        <item name="Cycling" icon="styles/standard/sport/cycling.png" type="node,closedway" preset_name_label="true">
    45494549            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cycling" />
    45504550            <space />
    … …  
    45674567            <reference ref="riding_surface" />
    45684568        </item> <!-- Equestrian -->
    4569         <item name="Horse Racing" icon="presets/equestrian.png" type="node,closedway" preset_name_label="true">
     4569        <item name="Horse Racing" icon="styles/standard/sport/riding.png" type="node,closedway" preset_name_label="true">
    45704570            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=horse_racing" />
    45714571            <space />
    … …  
    45974597            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium,track" default="pitch" values_context="racing" />
    45984598        </item> <!-- Skateboard -->
    4599         <item name="Swimming" icon="presets/swimming.png" type="node,closedway" preset_name_label="true">
     4599        <item name="Swimming" icon="styles/standard/sport/pool.png" type="node,closedway" preset_name_label="true">
    46004600            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=swimming"
    46014601                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=swimming" />
    … …  
    46134613            <text key="name" text="Name" />
    46144614        </item> <!-- Scuba Diving -->
    4615         <item name="Skiing" icon="presets/skiing_downhill.png" type="node,way,closedway" preset_name_label="true">
     4615        <item name="Skiing" icon="styles/standard/sport/skiing.png" type="node,way,closedway" preset_name_label="true">
    46164616            <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"
    46174617                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Piste_Maps"
    … …  
    46374637        </item> <!-- Shooting -->
    46384638    </group> <!-- Sport -->
    4639     <group name="Sport (Ball)" icon="presets/soccer.png">
    4640         <item name="Soccer" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
     4639    <group name="Sport (Ball)" icon="styles/standard/sport/soccer.png">
     4640        <item name="Soccer" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
    46414641            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=soccer"
    46424642                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=soccer"
    … …  
    46474647            <reference ref="name_leisure_pitch" />
    46484648        </item> <!-- Soccer -->
    4649         <item name="Australian Football" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
     4649        <item name="Australian Football" icon="presets/football.png" type="node,closedway" preset_name_label="true">
    46504650            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=australian_football" />
    46514651            <space />
    … …  
    46654665            <reference ref="name_leisure_pitch" />
    46664666        </item> <!-- Canadian Football -->
    4667         <item name="Gaelic Games" icon="presets/soccer.png" type="node,closedway" preset_name_label="true">
     4667        <item name="Gaelic Games" icon="styles/standard/sport/soccer.png" type="node,closedway" preset_name_label="true">
    46684668            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=gaelic_games" />
    46694669            <space />
    … …  
    46914691            <reference ref="name_leisure_pitch" />
    46924692        </item> <!-- Rugby Union -->
    4693         <item name="Baseball" icon="presets/baseball.png" type="node,closedway" preset_name_label="true">
     4693        <item name="Baseball" icon="styles/standard/sport/baseball.png" type="node,closedway" preset_name_label="true">
    46944694            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=baseball" />
    46954695            <space />
    … …  
    47394739            <reference ref="name_leisure_pitch" />
    47404740        </item> <!-- Lawn Bowling -->
    4741         <item name="Cricket" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
     4741        <item name="Cricket" icon="styles/standard/sport/cricket.png" type="node,closedway" preset_name_label="true">
    47424742            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket" />
    47434743            <space />
    … …  
    47454745            <reference ref="name_leisure_pitch" />
    47464746        </item> <!-- Cricket -->
    4747         <item name="Cricket Nets" icon="presets/cricket.png" type="node,closedway" preset_name_label="true">
     4747        <item name="Cricket Nets" icon="styles/standard/sport/cricket.png" type="node,closedway" preset_name_label="true">
    47484748            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=cricket_nets" />
    47494749            <space />
    … …  
    47724772            <reference ref="name_leisure_pitch" />
    47734773        </item> <!-- Pelota -->
    4774         <item name="Racquetball" icon="presets/racquetball.png" type="node,closedway" preset_name_label="true">
     4774        <item name="Racquetball" icon="styles/standard/sport/racquetball.png" type="node,closedway" preset_name_label="true">
    47754775            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=racquet"
    47764776                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:sport=racquet" />
    … …  
    47874787            <combo key="leisure" text="Type" values="pitch,sports_centre,stadium" />
    47884788        </item> <!-- Table Tennis/Ping-Pong -->
    4789         <item name="Tennis" icon="presets/tennis.png" type="node,closedway" preset_name_label="true">
     4789        <item name="Tennis" icon="styles/standard/sport/tennis.png" type="node,closedway" preset_name_label="true">
    47904790            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=tennis" />
    47914791            <space />
    … …  
    48514851            <combo key="leisure" text="Type" values="pitch,sports_centre,track" values_context="aerialway" />
    48524852        </item> <!-- Model Aerodrome -->
    4853         <item name="RC Car" icon="presets/car.png" type="node,closedway" preset_name_label="true">
     4853        <item name="RC Car" icon="styles/standard/transport/car.png" type="node,closedway" preset_name_label="true">
    48544854            <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
    48554855                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"

  • trunk/styles/standard/elemstyles.mapcss

    r7717 r7724  
    14491449}
    14501450node[leisure=miniature_golf] {
    1451     icon-image: "sport/golf.png";
     1451    icon-image: "sport/miniature_golf.svg";
    14521452    set icon_z17;
    14531453    text: auto;
    … …  
    16191619node[shop=car],
    16201620node[shop=car_dealer] {
    1621     icon-image: "transport/car.png";
     1621    icon-image: "vehicle.png";
    16221622    set icon_z17;
    16231623    text: auto;
    … …  
    33283328area[sport=american_football],
    33293329area[sport=canadian_football],
    3330 area[sport=gaelic_football],
     3330area[sport=gaelic_games],
    33313331area[sport=rugby_league],
    33323332area[sport=rugby_union] {
    … …  
    33493349}
    33503350node[sport=soccer],
     3351node[sport=gaelic_games] {
     3352    icon-image: "sport/soccer.png";
     3353    set icon_z17;
     3354    text: auto;
     3355}
    33513356node[sport=australian_football],
    33523357node[sport=american_football],
    33533358node[sport=canadian_football],
    3354 node[sport=gaelic_football] {
    3355     icon-image: "sport/soccer.png";
    3356     set icon_z17;
    3357     text: auto;
    3358 }
    33593359node[sport=rugby_league],
    33603360node[sport=rugby_union] {
    … …  
    33963396}
    33973397node[sport=canoe] {
    3398     icon-image: "sport/canoe.png";
     3398    icon-image: "sport/canoe.svg";
    33993399    set icon_z17;
    34003400    text: auto;
    … …  
    34163416}
    34173417node[sport=cricket_nets] {
    3418     icon-image: "misc/no_icon.png";
     3418    icon-image: "sport/cricket.png";
    34193419    set icon_z17;
    34203420    text: auto;
    … …  
    34483448}
    34493449node[sport=equestrian] {
    3450     icon-image: "sport/riding.png";
     3450    icon-image: "presets/equestrian.png";
     3451    icon-width: 16;
    34513452    set icon_z17;
    34523453    text: auto;
    … …  
    34583459}
    34593460node[sport=gymnastics] {
    3460     icon-image: "sport/multi.png";
     3461    icon-image: "presets/gymnastics.png";
     3462    icon-width: 16;
    34613463    set icon_z17;
    34623464    text: auto;
    … …  
    35713573}
    35723574node[sport=shooting] {
    3573     icon-image: "misc/no_icon.png";
     3575    icon-image: "presets/range.png";
     3576    icon-width: 16;
    35743577    set icon_z17;
    35753578    text: auto;
Note: See TracChangeset for help on using the changeset viewer.