Changeset 7711 in josm for trunk/data


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)

File:
1 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"
Note: See TracChangeset for help on using the changeset viewer.