Changeset 7976 in josm


Ignore:
Timestamp:
2015-01-21T00:25:39+01:00 (5 years ago)
Author:
Klumbumbus
Message:

see #10963 - add more colored place icons and improve paint order

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7975 r7976  
    68246824            <reference ref="population_postcode_website" />
    68256825        </item> <!-- City -->
    6826         <item name="Town" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
     6826        <item name="Town" icon="styles/standard/place/settlement/town.png" type="node,closedway" preset_name_label="true">
    68276827            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town"
    68286828                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=town"
     
    68376837            <reference ref="population_postcode_website" />
    68386838        </item> <!-- Town -->
    6839         <item name="Suburb" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
     6839        <item name="Suburb" icon="styles/standard/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
    68406840            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
    68416841                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
     
    68496849            <reference ref="population_postcode_website" />
    68506850        </item> <!-- Suburb -->
    6851         <item name="Village" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
     6851        <item name="Village" icon="styles/standard/place/settlement/village.png" type="node,closedway" preset_name_label="true">
    68526852            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=village"
    68536853                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=village"
     
    68646864            <reference ref="population_postcode_website" />
    68656865        </item> <!-- Village -->
    6866         <item name="Hamlet" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
     6866        <item name="Neighbourhood" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
     6867            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
     6868                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
     6869                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
     6870                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
     6871                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
     6872                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
     6873            <space />
     6874            <key key="place" value="neighbourhood" />
     6875            <reference ref="name_wikipedia" />
     6876            <text key="population" text="Population" />
     6877            <text key="website" text="Website" />
     6878        </item> <!-- Neighbourhood -->
     6879        <item name="Hamlet" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
    68676880            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=hamlet"
    68686881                  da.href="http://wiki.openstreetmap.org/wiki/Da:Tag:place=hamlet"
     
    68776890            <reference ref="population_postcode_website" />
    68786891        </item> <!-- Hamlet -->
    6879         <item name="Farm" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
     6892        <item name="Farm" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
    68806893            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=farm"
    68816894                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=farm"
     
    68886901            <reference ref="population_postcode_website" />
    68896902        </item> <!-- Farm -->
    6890         <item name="Isolated Dwelling" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
     6903        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
    68916904            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
    68926905                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
     
    69006913            <reference ref="population_postcode_website" />
    69016914        </item> <!-- Isolated Dwelling -->
    6902         <item name="Neighbourhood" icon="styles/standard/place/settlement/city.png" type="node,closedway" preset_name_label="true">
    6903             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
    6904                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
    6905                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
    6906                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
    6907                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
    6908                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
    6909             <space />
    6910             <key key="place" value="neighbourhood" />
    6911             <reference ref="name_wikipedia" />
    6912             <text key="population" text="Population" />
    6913             <text key="website" text="Website" />
    6914         </item> <!-- Neighbourhood -->
    69156915        <separator/>
    69166916        <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
  • trunk/styles/standard/elemstyles.mapcss

    r7975 r7976  
    43114311    text-halo-color: white;
    43124312    text-halo-radius: 1;
     4313    z-index: 2.6;
    43134314}
    43144315node[place=city] {
     
    43224323    text-halo-color: white;
    43234324    text-halo-radius: 1;
    4324 }
    4325 node[place=town],
    4326 node[place=village],
    4327 node[place=hamlet],
    4328 node[place=farm],
    4329 node[place=isolated_dwelling],
    4330 node[place=neighbourhood],
    4331 node[place=suburb] {
     4325    z-index: 2.5;
     4326}
     4327node[place=town] {
    43324328    icon-image: "place/settlement/town.png";
    43334329    set icon_z0;
     
    43394335    text-halo-color: white;
    43404336    text-halo-radius: 1;
     4337    z-index: 2.4;
     4338}
     4339node[place=suburb] {
     4340    icon-image: "place/settlement/suburb.png";
     4341    set icon_z0;
     4342    text: auto;
     4343    set text_z0;
     4344    font-size: 10;
     4345    font-weight: bold;
     4346    text-color:black;
     4347    text-halo-color: white;
     4348    text-halo-radius: 1;
     4349    z-index: 2.3;
     4350}
     4351node[place=village] {
     4352    icon-image: "place/settlement/village.png";
     4353    set icon_z0;
     4354    text: auto;
     4355    set text_z0;
     4356    font-size: 10;
     4357    font-weight: bold;
     4358    text-color:black;
     4359    text-halo-color: white;
     4360    text-halo-radius: 1;
     4361    z-index: 2.2;
     4362}
     4363node[place=hamlet],
     4364node[place=farm],
     4365node[place=isolated_dwelling],
     4366node[place=neighbourhood] {
     4367    icon-image: "place/settlement/hamlet.png";
     4368    set icon_z0;
     4369    text: auto;
     4370    set text_z0;
     4371    font-size: 10;
     4372    font-weight: bold;
     4373    text-color:black;
     4374    text-halo-color: white;
     4375    text-halo-radius: 1;
     4376    z-index: 2.1;
    43414377}
    43424378node[place=locality] {
Note: See TracChangeset for help on using the changeset viewer.