Changeset 7735 in josm for trunk/data


Ignore:
Timestamp:
2014-11-19T21:18:32+01:00 (5 years ago)
Author:
Klumbumbus
Message:

see #10679 - drop support of some natural=* on nodes in presets and mappaint style. Add validator messages, change two icons in presets, add mappaint style for some natural=*.

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7734 r7735  
    17651765        </item> <!-- Covered Reservoir -->
    17661766        <separator/>
    1767         <item name="Water" icon="presets/water.png" type="node,closedway,relation" preset_name_label="true">
     1767        <item name="Water" icon="presets/water.png" type="closedway,relation" preset_name_label="true">
    17681768            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water"
    17691769                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=water"
     
    18371837            <text key="name" text="Name" />
    18381838        </item> <!-- Mud -->
    1839         <item name="Beach" icon="presets/beach.png" type="node,closedway,relation" preset_name_label="true">
     1839        <item name="Beach" icon="presets/beach.png" type="closedway,relation" preset_name_label="true">
    18401840            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach"
    18411841                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=beach"
     
    70037003            </optional>
    70047004        </item> <!-- Tree Row -->
    7005         <item name="Wood" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
     7005        <item name="Wood" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
    70067006            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
    70077007                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
     
    70297029            <reference ref="leaf" />
    70307030        </item> <!-- Forest -->
    7031         <item name="Grassland" icon="presets/landuse.png" type="closedway,relation" preset_name_label="true">
     7031        <item name="Grassland" icon="styles/standard/misc/landuse/meadow.svg" type="closedway,relation" preset_name_label="true">
    70327032            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=grassland"
    70337033                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=grassland"
     
    70567056        </item> <!-- Nature Reserve -->
    70577057        <separator/>
    7058         <item name="Scree" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     7058        <item name="Scree" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
    70597059            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scree"
    70607060                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scree"
     
    70687068            <text key="name" text="Name" />
    70697069        </item> <!-- Scree -->
    7070         <item name="Fell" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     7070        <item name="Fell" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
    70717071            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell"
    70727072                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=fell"
     
    70797079            <text key="name" text="Name" />
    70807080        </item> <!-- Fell -->
    7081         <item name="Scrub" icon="presets/scrub.svg" type="node,closedway,relation" preset_name_label="true">
     7081        <item name="Scrub" icon="presets/scrub.svg" type="closedway,relation" preset_name_label="true">
    70827082            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=scrub"
    70837083                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=scrub"
     
    70957095            </optional>
    70967096        </item> <!-- Scrub -->
    7097         <item name="Heath" icon="presets/empty.png" type="node,closedway,relation" preset_name_label="true">
     7097        <item name="Heath" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
    70987098            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath"
    70997099                  bg.href="http://wiki.openstreetmap.org/wiki/Bg:Tag:natural=heath"
  • trunk/data/validator/geometry.mapcss

    r7707 r7735  
    1 /* {0} on a node */
     1/* {0} on a node, should be a way */
    22node[oneway],
    33node[bridge?],
    4 node[landuse],
    54node[sidewalk],
    6 node[source:outline] {
    7   throwWarning: tr("{0} on a node", "{0.key}");
     5node[natural=coastline],
     6node[natural=ridge],
     7node[natural=tree_row] {
     8  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}");
    89  assertMatch: "node oneway=-1";
    910  assertNoMatch: "way oneway=-1";
     
    1213}
    1314
    14 node[natural=wood] {
    15   throwOther: tr("{0} on a node. Should be drawn as an area", "{0.tag}");
     15/* {0} on a node, should be an area; see ticket #10679 */
     16node[landuse],
     17node[natural=scree],
     18node[natural=scrub],
     19node[natural=fell],
     20node[natural=heath],
     21node[natural=wood],
     22node[natural=grassland],
     23node[natural=wetland],
     24node[natural=water],
     25node[natural=mud],
     26node[natural=beach],
     27node[natural=sand],
     28node[natural=wood],
     29node[natural=bare_rock],
     30node[waterway=riverbank],
     31node[source:outline] {
     32  throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
    1633}
    1734
Note: See TracChangeset for help on using the changeset viewer.