Changeset 7711 in josm


Ignore:
Timestamp:
2014-11-06T22:21:28+01:00 (5 years ago)
Author:
Klumbumbus
Message:

see #10679 - drop support of landuse=* on nodes in presets and mappaint style. rework some icons for presets (add a few, replace some generic by special ones)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7710 r7711  
    69876987            </optional>
    69886988        </item> <!-- Tree Row -->
    6989         <item name="Wood" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     6989        <item name="Wood" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
    69906990            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
    69916991                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
     
    70007000            <reference ref="leaf" />
    70017001        </item> <!-- Wood -->
    7002         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7002        <item name="Forest" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
    70037003            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
    70047004                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest"
     
    71277127    </group> <!-- Nature -->
    71287128    <group name="Land use" icon="presets/landuse.png">
    7129         <item name="Farmyard" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
     7129        <item name="Farmyard" icon="styles/standard/misc/landuse/farmyard.png" type="closedway,relation" preset_name_label="true">
    71307130            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
    71317131                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard"
     
    71507150            <text key="name" text="Name" />
    71517151        </item> <!-- Farmland -->
    7152         <item name="Meadow" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7152        <item name="Meadow" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
    71537153            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=meadow"
    71547154                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=meadow"
     
    71727172            <text key="name" text="Name" />
    71737173        </item> <!-- Orchard -->
    7174         <item name="Vineyard" icon="presets/fruits.png" type="node,closedway,relation" preset_name_label="true">
     7174        <item name="Vineyard" icon="presets/fruits.png" type="closedway,relation" preset_name_label="true">
    71757175            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=vineyard"
    71767176                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=vineyard"
     
    72067206            <text key="species" text="Species" />
    72077207        </item> <!-- Plant Nursery -->
    7208         <item name="Allotments" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7208        <item name="Allotments" icon="styles/standard/misc/landuse/allotments.svg" type="closedway,relation" preset_name_label="true">
    72097209            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=allotments"
    72107210                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=allotments"
     
    72217221        </item> <!-- Allotments -->
    72227222        <separator/>
    7223         <item name="Garden" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     7223        <item name="Garden" icon="styles/standard/leisure/garden.png" type="node,closedway,relation" preset_name_label="true">
    72247224            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=garden"
    72257225                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=garden"
     
    72317231            <text key="name" text="Name" />
    72327232        </item> <!-- Garden -->
    7233         <item name="Grass" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7233        <item name="Grass" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
    72347234            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=grass"
    72357235                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=grass"
     
    72447244            <text key="name" text="Name" />
    72457245        </item> <!-- Grass -->
    7246         <item name="Village Green" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7246        <item name="Village Green" icon="styles/standard/leisure/common.png" type="closedway,relation" preset_name_label="true">
    72477247            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green"
    72487248                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=village_green"
     
    72567256            <text key="name" text="Name" />
    72577257        </item> <!-- Village Green -->
    7258         <item name="Common" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     7258        <item name="Common" icon="styles/standard/leisure/common.png" type="closedway,relation" preset_name_label="true">
    72597259            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
    72607260                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:leisure=common"
     
    72647264            <text key="name" text="Name" />
    72657265        </item> <!-- Common -->
    7266         <item name="Park" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     7266        <item name="Park" icon="styles/standard/leisure/park.png" type="closedway,relation" preset_name_label="true">
    72677267            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=park"
    72687268                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=park"
     
    72777277            <text key="name" text="Name" />
    72787278        </item> <!-- Park -->
    7279         <item name="Recreation Ground" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7279        <item name="Recreation Ground" icon="styles/standard/leisure/common.png" type="closedway,relation" preset_name_label="true">
    72807280            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground"
    72817281                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=recreation_ground"
     
    73157315            <reference ref="religious" />
    73167316        </item> <!-- Graveyard -->
    7317         <item name="Cemetery" icon="presets/cemetery.png" type="node,closedway,relation" preset_name_label="true">
     7317        <item name="Cemetery" icon="presets/cemetery.png" type="closedway,relation" preset_name_label="true">
    73187318            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery"
    73197319                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=cemetery"
     
    73307330            <reference ref="religious" />
    73317331        </item> <!-- Cemetery -->
    7332         <item name="Religious" icon="styles/standard/religion.png" type="node,closedway,relation" preset_name_label="true">
     7332        <item name="Religious" icon="styles/standard/religion.png" type="closedway,relation" preset_name_label="true">
    73337333            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=religious"
    73347334                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=religious"
     
    73397339            <reference ref="religious" />
    73407340        </item> <!-- Religious -->
    7341         <item name="Retail" icon="styles/standard/shop/supermarket.png" type="node,closedway,relation" preset_name_label="true">
     7341        <item name="Retail" icon="styles/standard/shop/mall.png" type="closedway,relation" preset_name_label="true">
    73427342            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=retail"
    73437343                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=retail"
     
    73507350            <text key="name" text="Name" />
    73517351        </item> <!-- Retail -->
    7352         <item name="Commercial" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     7352        <item name="Commercial" icon="styles/standard/misc/landuse/commercial.png" type="closedway,relation" preset_name_label="true">
    73537353            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=commercial"
    73547354                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=commercial"
     
    73617361            <text key="name" text="Name" />
    73627362        </item> <!-- Commercial -->
    7363         <item name="Industrial" icon="presets/works.png" type="node,closedway,relation" preset_name_label="true">
     7363        <item name="Industrial" icon="styles/standard/misc/landmark/works.png" type="closedway,relation" preset_name_label="true">
    73647364            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=industrial"
    73657365                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=industrial"
     
    73737373            <text key="name" text="Name" />
    73747374        </item> <!-- Industrial -->
    7375         <item name="Garages" icon="presets/garages.png" type="closedway" preset_name_label="true">
     7375        <item name="Garages" icon="presets/garages.png" type="closedway,relation" preset_name_label="true">
    73767376            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=garages"
    73777377                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=garages"
     
    73967396            <text key="name" text="Name" />
    73977397        </item> <!-- Railway Land -->
    7398         <item name="Military" icon="presets/military.png" type="node,closedway,relation" preset_name_label="true">
     7398        <item name="Military" icon="presets/military.png" type="closedway,relation" preset_name_label="true">
    73997399            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=military"
    74007400                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=military"
     
    74077407        </item> <!-- Military -->
    74087408        <separator/>
    7409         <item name="Construction Area" icon="presets/construction.png" type="node,closedway,relation" preset_name_label="true">
     7409        <item name="Construction Area" icon="presets/construction.png" type="closedway,relation" preset_name_label="true">
    74107410            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=construction"
    74117411                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=construction"
     
    74197419            <text key="name" text="Name" />
    74207420        </item> <!-- Construction Area -->
    7421         <item name="Brownfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7421        <item name="Brownfield" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
    74227422            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=brownfield"
    74237423                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=brownfield"
     
    74307430            <text key="name" text="Name" />
    74317431        </item> <!-- Brownfield -->
    7432         <item name="Greenfield" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7432        <item name="Greenfield" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
    74337433            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=greenfield"
    74347434                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:landuse=greenfield"
     
    74407440            <text key="name" text="Name" />
    74417441        </item> <!-- Greenfield -->
    7442         <item name="Landfill" icon="presets/landuse.png" type="node,closedway,relation" preset_name_label="true">
     7442        <item name="Landfill" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
    74437443            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=landfill"
    74447444                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=landfill"
     
    74517451            <text key="name" text="Name" />
    74527452        </item> <!-- Landfill -->
    7453         <item name="Quarry" icon="presets/mine.png" type="node,closedway,relation" preset_name_label="true">
     7453        <item name="Quarry" icon="presets/mine.png" type="closedway,relation" preset_name_label="true">
    74547454            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=quarry"
    74557455                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=quarry"
  • trunk/styles/standard/elemstyles.mapcss

    r7710 r7711  
    13931393}
    13941394node[leisure=park] {
    1395     icon-image: "leisure/park.png";
     1395    icon-image: "misc/deprecated.png";
    13961396    set icon_z17;
    13971397    text: auto;
     
    28072807    fill-color: green#b1e0c2;
    28082808}
    2809 node[landuse=farm] {
    2810     icon-image: "misc/landmark/farm.png";
    2811     set icon_z17;
    2812     text: auto;
    2813 }
    2814 node[landuse=farmland] {
    2815     icon-image: "misc/landuse/farmland.png";
    2816     set icon_z17;
    2817     text: auto;
    2818 }
    2819 node[landuse=meadow] {
    2820     icon-image: "misc/no_icon.png";
    2821     set icon_z17;
    2822     text: auto;
    2823 }
    2824 node[landuse=vineyard] {
    2825     icon-image: "shop/groceries/fruits.png";
    2826     set icon_z17;
    2827     text: auto;
    2828 }
    28292809area[landuse=quarry] {
    28302810    fill-color: quarry#888888;
    28312811}
    2832 node[landuse=quarry] {
    2833     icon-image: "misc/landmark/mine.png";
    2834     set icon_z17;
    2835     text: auto;
    2836 }
    28372812area[landuse=landfill] {
    28382813    fill-color: landfill#663300;
    2839 }
    2840 node[landuse=landfill] {
    2841     icon-image: "misc/no_icon.png";
    2842     set icon_z17;
    2843     text: auto;
    28442814}
    28452815area[landuse=basin],
     
    28472817    fill-color: basin#0000bf;
    28482818}
    2849 node[landuse=basin],
    2850 node[landuse=reservoir] {
    2851     icon-image: "misc/no_icon.png";
    2852     set icon_z17;
    2853     text: auto;
    2854 }
    28552819area[landuse=forest] {
    28562820    fill-color: forest#b1efc8;
    2857 }
    2858 node[landuse=forest] {
    2859     icon-image: "misc/landmark/trees.png";
    2860     set icon_z17;
    2861     text: auto;
    28622821}
    28632822area[landuse=allotments],
     
    28672826    fill-color: green#b1e0c2;
    28682827}
    2869 node[landuse=allotments] {
    2870     icon-image: "misc/landmark/plant.png";
    2871     set icon_z17;
    2872     text: auto;
    2873 }
    2874 node[landuse=greenhouse_horticulture] {
    2875     icon-image: "misc/landuse/greenhouse_horticulture.png";
    2876     set icon_z17;
    2877     text: auto;
    2878 }
    2879 node[landuse=plant_nursery],
    2880 node[landuse=grass] {
    2881     icon-image: "misc/landmark/plant.png";
    2882     set icon_z17;
    2883     text: auto;
    2884 }
    28852828area[landuse=residential] {
    28862829    fill-color: residential#f0f0f0;
    28872830}
    2888 node[landuse=residential] {
    2889     icon-image: "misc/landuse/residential.png";
    2890     set icon_z17;
    2891     text: auto;
    2892 }
    28932831area[landuse=garages] {
    28942832    fill-color: garages#d6c8aa;
    28952833}
    2896 node[landuse=garages] {
    2897     icon-image: "misc/landuse/garages.png";
    2898     set icon_z17;
    2899     text: auto;
    2900 }
    29012834area[landuse=farmyard] {
    29022835    fill-color: farmyard#f0f0f0;
    2903 }
    2904 node[landuse=farmyard] {
    2905     icon-image: "misc/no_icon.png";
    2906     set icon_z17;
    2907     text: auto;
    29082836}
    29092837area[landuse=retail],
     
    29112839    fill-color: retail#ffc4ee;
    29122840}
    2913 node[landuse=retail] {
    2914     icon-image: "shop/mall.png";
    2915     set icon_z17;
    2916     text: auto;
    2917 }
    2918 node[landuse=commercial] {
    2919     icon-image: "misc/landuse/commercial.png";
    2920     set icon_z17;
    2921     text: auto;
    2922 }
    29232841area[landuse=industrial] {
    29242842    fill-color: industrial#ecd8ff;
    29252843}
    2926 node[landuse=industrial] {
    2927     icon-image: "misc/landmark/works.png";
    2928     set icon_z17;
    2929     text: auto;
    2930 }
    29312844area[landuse=brownfield] {
    29322845    fill-color: brownfield#ecba32;
    29332846}
    2934 node[landuse=brownfield] {
    2935     icon-image: "misc/no_icon.png";
    2936     set icon_z17;
    2937     text: auto;
    2938 }
    29392847area[landuse=greenfield] {
    29402848    fill-color: greenfield#b1ec5c;
    29412849}
    2942 node[landuse=greenfield] {
    2943     icon-image: "misc/no_icon.png";
    2944     set icon_z17;
    2945     text: auto;
    2946 }
    29472850area[landuse=railway] {
    29482851    fill-color: railland#888888;
    2949 }
    2950 node[landuse=railway] {
    2951     icon-image: "transport/railway_station.png";
    2952     set icon_z17;
    2953     text: auto;
    29542852}
    29552853area[landuse=construction] {
     
    29612859    dashes: 9,9;
    29622860}
    2963 node[landuse=construction] {
    2964     icon-image: "misc/construction.png";
    2965     set icon_z17;
    2966     text: auto;
    2967 }
    29682861area[landuse=military] {
    29692862    fill-color: military#b62c2c;
    29702863}
    2971 node[landuse=military] {
    2972     icon-image: "vehicle/tank.png";
    2973     set icon_z17;
    2974     text: auto;
    2975 }
    29762864area[landuse=religious] {
    29772865    fill-color: religious#ffd454;
     
    29802868    fill-color: cemetery#b1efc8;
    29812869}
    2982 node[landuse=cemetery] {
    2983     icon-image: "rendering/landuse/cemetery.png";
    2984     set icon_z17;
    2985     text: auto;
    2986 }
    29872870area[landuse=village_green] {
    29882871    fill-color: green#b1e0c2;
    29892872}
    2990 node[landuse=village_green] {
    2991     icon-image: "leisure/common.png";
    2992     set icon_z17;
    2993     text: auto;
    2994 }
    29952873area[landuse=recreation_ground] {
    29962874    fill-color: green#b1e0c2;
    29972875}
    2998 node[landuse=recreation_ground] {
    2999     icon-image: "leisure/common.png";
     2876node[landuse] {
     2877    icon-image: "misc/deprecated.png";
    30002878    set icon_z17;
    30012879    text: auto;
     
    38713749}
    38723750node[natural=grassland] {
    3873     icon-image: "misc/no_icon.png";
     3751    icon-image: "misc/deprecated.png";
    38743752    set icon_z17;
    38753753    text: auto;
Note: See TracChangeset for help on using the changeset viewer.