Changeset 7960 in josm


Ignore:
Timestamp:
2015-01-12T22:11:22+01:00 (9 years ago)
Author:
Klumbumbus
Message:

see #10835 - icon unification and geometry consistency for some man_made, historic amd bridge tags.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r7953 r7960  
    49744974            </optional>
    49754975        </item> <!-- Entrance -->
    4976         <item name="Tower" icon="presets/tower.png" type="node,closedway" preset_name_label="true">
     4976        <item name="Tower" icon="styles/standard/misc/landmark/tower.png" type="node,closedway" preset_name_label="true">
    49774977            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=tower"
    49784978                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=tower"
    … …  
    49984998        </item> <!-- Flagpole -->
    49994999        <separator/>
    5000         <item name="Works" icon="presets/works.png" type="node,closedway" preset_name_label="true">
     5000        <item name="Works" icon="styles/standard/misc/landmark/works.png" type="node,closedway" preset_name_label="true">
    50015001            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=works"
    50025002                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=works"
    … …  
    50165016            <text key="height" text="Height (meters)" />
    50175017        </item> <!-- Chimney -->
    5018         <item name="Windmill" icon="presets/windmill.png" type="node,closedway" preset_name_label="true">
     5018        <item name="Windmill" icon="styles/standard/misc/landmark/windmill.png" type="node,closedway" preset_name_label="true">
    50195019            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill"
    50205020                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=windmill"
    … …  
    51035103        </item> <!-- Embankment -->
    51045104        <separator/>
    5105         <item name="Water Tower" icon="presets/water_tower.png" type="node,closedway" preset_name_label="true">
     5105        <item name="Water Tower" icon="styles/standard/misc/landmark/water_tower.png" type="node,closedway" preset_name_label="true">
    51065106            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_tower"
    51075107                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_tower"
    … …  
    51605160            <text key="name" text="Name" />
    51615161        </item> <!-- Fountain -->
    5162         <item name="Water Well" icon="presets/water_well.png" type="node" preset_name_label="true">
     5162        <item name="Water Well" icon="presets/water_well.png" type="node,closedway" preset_name_label="true">
    51635163            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=water_well"
    51645164                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=water_well"
    … …  
    51835183            <text key="name" text="Name" />
    51845184        </item> <!-- Lighthouse -->
    5185         <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node" preset_name_label="true">
     5185        <item name="Beacon" icon="styles/standard/misc/landmark/beacon.png" type="node,closedway" preset_name_label="true">
    51865186            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
    51875187                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
    … …  
    52365236            </checkgroup>
    52375237        </item> <!-- Monitoring Station -->
    5238         <item name="Survey Point" icon="presets/survey_point.png" type="node" preset_name_label="true">
     5238        <item name="Survey Point" icon="styles/standard/misc/landmark/survey_point.png" type="node" preset_name_label="true">
    52395239            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point"
    52405240                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=survey_point"
    … …  
    53025302            <reference ref="optional_bridge" />
    53035303        </item> <!-- Movable Bridge -->
    5304         <item name="Bridge Support" icon="presets/bridge.png" type="node,closedway" preset_name_label="true">
     5304        <item name="Bridge Support" icon="styles/standard/bridge/support.svg" type="node,closedway" preset_name_label="true">
    53055305            <link href="http://wiki.openstreetmap.org/wiki/Key:bridge:support" />
    53065306            <space />
    … …  
    57185718        </item> <!-- Power Cable -->
    57195719    </group> <!-- Power -->
    5720     <group name="Historic Places" icon="presets/State_Tourist.png">
    5721         <item name="Castle" icon="presets/State_Tourist.png" type="node,closedway" preset_name_label="true">
     5720    <group name="Historic Places" icon="styles/standard/sightseeing/castle.svg">
     5721        <item name="Castle" icon="styles/standard/sightseeing/castle.svg" type="node,closedway" preset_name_label="true">
    57225722            <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
    57235723                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:historic=castle"

  • trunk/data/validator/geometry.mapcss

    r7942 r7960  
    11/* {0} on a node, should be a way */
    22node[oneway],
    3 node[bridge?],
     3node[bridge],
    44node[sidewalk],
    55node[footway],
     6node[man_made=embankment],
    67node[aerialway=cable_car],
    78node[aerialway=gondola],
    … …  
    4748node[natural=bare_rock],
    4849node[waterway=riverbank],
     50node[man_made=bridge],
    4951node[source:outline] {
    5052  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
    … …  
    5860
    5961/* {0} on a way, should be a node */
     62way[entrance],
     63way[man_made=survey_point],
    6064way[natural=peak],
    6165way[natural=saddle],

  • trunk/styles/standard/elemstyles.mapcss

    r7953 r7960  
    12111211area[man_made=beacon],
    12121212area[man_made=bridge],
     1213area[bridge:support],
    12131214area[man_made=chimney],
    12141215area[man_made=crane],
    1215 area[man_made=flagpole],
    12161216area[man_made=gasometer],
    12171217area[man_made=bunker_silo],
    12181218area[man_made=lighthouse],
    12191219area[man_made=monitoring_station],
    1220 area[man_made=mineshaft],
    1221 area[man_made=adit] {
     1220area[man_made=mineshaft] {
    12221221    fill-color: manmade#d8d8d8;
    12231222}
    … …  
    12271226    text: auto;
    12281227}
     1228node[man_made=bridge] {
     1229    icon-image: "misc/deprecated.png";
     1230    set icon_z17;
     1231    text: auto;
     1232}
     1233node[bridge:support] {
     1234    icon-image: "bridge/support.svg";
     1235    set icon_z17;
     1236    text: auto;
     1237}
    12291238node[man_made=chimney] {
    12301239    icon-image: "misc/landmark/chimney.png";
    … …  
    12431252}
    12441253node[man_made=gasometer] {
    1245     icon-image: "misc/landmark/gasometer.png";
     1254    icon-image: "presets/gasometer.png";
     1255    icon-width: 16;
    12461256    set icon_z17;
    12471257    text: auto;
    … …  
    13221332    color: pipeline#660000;
    13231333}
     1334node[man_made=embankment],
    13241335node[man_made=pipeline] {
    13251336    icon-image: "misc/deprecated.png";
    … …  
    13341345area[man_made=reservoir_covered],
    13351346area[man_made=surveillance],
    1336 area[man_made=survey_point],
    13371347area[man_made=tower],
    13381348area[man_made=wastewater_plant],
    … …  
    13511361}
    13521362node[man_made=surveillance] {
    1353     icon-image: "misc/surveillance.png";
     1363    icon-image: "presets/surveillance.png";
     1364    icon-width: 16;
    13541365    set icon_z17;
    13551366    text: auto;
    … …  
    28792890area[historic=ruins],
    28802891area[historic=battlefield],
    2881 area[historic=palaeontological_site],
     2892area[geological=palaeontological_site],
    28822893area[historic=wayside_cross],
    28832894area[historic=wayside_shrine],
    … …  
    28862897}
    28872898node[historic=castle] {
    2888     icon-image: "sightseeing/castle.png";
     2899    icon-image: "sightseeing/castle.svg";
    28892900    set icon_z17;
    28902901    text: auto;
    … …  
    29152926    text: auto;
    29162927}
    2917 node[historic=palaeontological_site] {
     2928node[geological=palaeontological_site] {
    29182929    icon-image: "historic/palaeontological_site.png";
    29192930    set icon_z17;
Note: See TracChangeset for help on using the changeset viewer.