Changeset 7984 in josm


Ignore:
Timestamp:
2015-01-23T23:58:57+01:00 (7 years ago)
Author:
Klumbumbus
Message:

see #10963 - improve color and order of place icons

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7979 r7984  
    67836783        </item> <!-- Protected Area -->
    67846784    </group> <!-- Boundaries -->
    6785     <group name="Places" icon="styles/standard/place/settlement/city.png">
     6785    <group name="Places" icon="styles/standard/place/settlement/isolated_dwelling.png">
    67866786        <item name="Continent" icon="styles/standard/place/settlement/capital.png" type="node,closedway" preset_name_label="true">
    67876787            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=continent"
     
    68496849            <reference ref="population_postcode_website" />
    68506850        </item> <!-- Town -->
    6851         <item name="Suburb" icon="styles/standard/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
    6852             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
    6853                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
    6854                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
    6855                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
    6856                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
    6857                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
    6858             <space />
    6859             <key key="place" value="suburb" />
    6860             <reference ref="name_wikipedia" />
    6861             <reference ref="population_postcode_website" />
    6862         </item> <!-- Suburb -->
    68636851        <item name="Village" icon="styles/standard/place/settlement/village.png" type="node,closedway" preset_name_label="true">
    68646852            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=village"
     
    68766864            <reference ref="population_postcode_website" />
    68776865        </item> <!-- Village -->
    6878         <item name="Neighbourhood" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
    6879             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
    6880                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
    6881                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
    6882                   ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
    6883                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
    6884                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
    6885             <space />
    6886             <key key="place" value="neighbourhood" />
    6887             <reference ref="name_wikipedia" />
    6888             <text key="population" text="Population" />
    6889             <text key="website" text="Website" />
    6890         </item> <!-- Neighbourhood -->
    68916866        <item name="Hamlet" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
    68926867            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=hamlet"
     
    69026877            <reference ref="population_postcode_website" />
    69036878        </item> <!-- Hamlet -->
    6904         <item name="Farm" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
     6879        <item name="Isolated Dwelling" icon="styles/standard/place/settlement/isolated_dwelling.png" type="node,closedway" preset_name_label="true">
     6880            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
     6881                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
     6882                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=isolated_dwelling"
     6883                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=isolated_dwelling"
     6884                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=isolated_dwelling"
     6885                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=isolated_dwelling" />
     6886            <space />
     6887            <key key="place" value="isolated_dwelling" />
     6888            <reference ref="name_wikipedia" />
     6889            <reference ref="population_postcode_website" />
     6890        </item> <!-- Isolated Dwelling -->
     6891        <separator/>
     6892        <item name="Suburb" icon="styles/standard/place/settlement/suburb.png" type="node,closedway" preset_name_label="true">
     6893            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb"
     6894                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=suburb"
     6895                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=suburb"
     6896                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=suburb"
     6897                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=suburb"
     6898                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=suburb" />
     6899            <space />
     6900            <key key="place" value="suburb" />
     6901            <reference ref="name_wikipedia" />
     6902            <reference ref="population_postcode_website" />
     6903        </item> <!-- Suburb -->
     6904        <item name="Neighbourhood" icon="styles/standard/place/settlement/neighbourhood.png" type="node,closedway" preset_name_label="true">
     6905            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=neighbourhood"
     6906                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=neighbourhood"
     6907                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=neighbourhood"
     6908                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:place=neighbourhood"
     6909                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=neighbourhood"
     6910                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=neighbourhood" />
     6911            <space />
     6912            <key key="place" value="neighbourhood" />
     6913            <reference ref="name_wikipedia" />
     6914            <text key="population" text="Population" />
     6915            <text key="website" text="Website" />
     6916        </item> <!-- Neighbourhood -->
     6917        <item name="Farm" icon="styles/standard/place/settlement/farm.png" type="node,closedway" preset_name_label="true">
    69056918            <link href="http://wiki.openstreetmap.org/wiki/Tag:place=farm"
    69066919                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=farm"
     
    69136926            <reference ref="population_postcode_website" />
    69146927        </item> <!-- Farm -->
    6915         <item name="Isolated Dwelling" icon="styles/standard/place/settlement/hamlet.png" type="node,closedway" preset_name_label="true">
    6916             <link href="http://wiki.openstreetmap.org/wiki/Tag:place=isolated_dwelling"
    6917                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:place=isolated_dwelling"
    6918                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:place=isolated_dwelling"
    6919                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:place=isolated_dwelling"
    6920                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:place=isolated_dwelling"
    6921                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:place=isolated_dwelling" />
    6922             <space />
    6923             <key key="place" value="isolated_dwelling" />
    6924             <reference ref="name_wikipedia" />
    6925             <reference ref="population_postcode_website" />
    6926         </item> <!-- Isolated Dwelling -->
    69276928        <separator/>
    69286929        <item name="Locality" icon="presets/locality.png" type="node,closedway" preset_name_label="true">
  • trunk/styles/standard/elemstyles.mapcss

    r7979 r7984  
    43104310    text-halo-color: white;
    43114311    text-halo-radius: 1;
    4312     z-index: 2.6;
     4312    z-index: 2.9;
    43134313}
    43144314node[place=city] {
    43154315    icon-image: "place/settlement/city.png";
     4316    set icon_z0;
     4317    text: auto;
     4318    set text_z0;
     4319    font-size: 10;
     4320    font-weight: bold;
     4321    text-color:black;
     4322    text-halo-color: white;
     4323    text-halo-radius: 1;
     4324    z-index: 2.8;
     4325}
     4326node[place=town] {
     4327    icon-image: "place/settlement/town.png";
     4328    set icon_z0;
     4329    text: auto;
     4330    set text_z0;
     4331    font-size: 10;
     4332    font-weight: bold;
     4333    text-color:black;
     4334    text-halo-color: white;
     4335    text-halo-radius: 1;
     4336    z-index: 2.7;
     4337}
     4338node[place=suburb] {
     4339    icon-image: "place/settlement/suburb.png";
     4340    set icon_z0;
     4341    text: auto;
     4342    set text_z0;
     4343    font-size: 10;
     4344    font-weight: bold;
     4345    text-color:black;
     4346    text-halo-color: white;
     4347    text-halo-radius: 1;
     4348    z-index: 2.6;
     4349}
     4350node[place=village] {
     4351    icon-image: "place/settlement/village.png";
    43164352    set icon_z0;
    43174353    text: auto;
     
    43244360    z-index: 2.5;
    43254361}
    4326 node[place=town] {
    4327     icon-image: "place/settlement/town.png";
     4362node[place=neighbourhood] {
     4363    icon-image: "place/settlement/neighbourhood.png";
    43284364    set icon_z0;
    43294365    text: auto;
     
    43364372    z-index: 2.4;
    43374373}
    4338 node[place=suburb] {
    4339     icon-image: "place/settlement/suburb.png";
     4374node[place=hamlet] {
     4375    icon-image: "place/settlement/hamlet.png";
    43404376    set icon_z0;
    43414377    text: auto;
     
    43484384    z-index: 2.3;
    43494385}
    4350 node[place=village] {
    4351     icon-image: "place/settlement/village.png";
     4386node[place=isolated_dwelling] {
     4387    icon-image: "place/settlement/isolated_dwelling.png";
    43524388    set icon_z0;
    43534389    text: auto;
     
    43604396    z-index: 2.2;
    43614397}
    4362 node[place=hamlet],
    4363 node[place=farm],
    4364 node[place=isolated_dwelling],
    4365 node[place=neighbourhood] {
    4366     icon-image: "place/settlement/hamlet.png";
     4398node[place=farm] {
     4399    icon-image: "place/settlement/farm.png";
    43674400    set icon_z0;
    43684401    text: auto;
Note: See TracChangeset for help on using the changeset viewer.