Changeset 7942 in josm for trunk/data


Ignore:
Timestamp:
2015-01-08T21:39:04+01:00 (5 years ago)
Author:
Klumbumbus
Message:

see #10835 - icon unification and geometry consistency for some naturaltags. add validator warnings for some node features on ways

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r7940 r7942  
    70257025        </item> <!-- Ridge -->
    70267026    </group> <!-- Geography -->
    7027     <group name="Nature" icon="presets/tree.png">
    7028         <item name="Tree" icon="presets/tree.png" type="node" preset_name_label="true">
     7027    <group name="Nature" icon="styles/standard/misc/landmark/trees.png">
     7028        <item name="Tree" icon="styles/standard/misc/landmark/trees.png" type="node" preset_name_label="true">
    70297029            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
    70307030                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=tree"
     
    70507050            </optional>
    70517051        </item> <!-- Tree -->
    7052         <item name="Tree Row" icon="presets/tree.png" type="way" preset_name_label="true">
     7052        <item name="Tree Row" icon="styles/standard/misc/landmark/tree_row.svg" type="way" preset_name_label="true">
    70537053            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree_row"
    70547054                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:natural=tree_row"
     
    70687068            </optional>
    70697069        </item> <!-- Tree Row -->
    7070         <item name="Wood" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
     7070        <item name="Wood" icon="styles/standard/misc/landmark/forest.svg" type="closedway,relation" preset_name_label="true">
    70717071            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
    70727072                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood"
     
    70817081            <reference ref="leaf" />
    70827082        </item> <!-- Wood -->
    7083         <item name="Forest" icon="styles/standard/misc/landmark/trees.png" type="closedway,relation" preset_name_label="true">
     7083        <item name="Forest" icon="styles/standard/misc/landmark/forest.svg" type="closedway,relation" preset_name_label="true">
    70847084            <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
    70857085                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest"
     
    71747174            <text key="name" text="Name" />
    71757175        </item> <!-- Heath -->
    7176         <item name="Sand" icon="presets/empty.png" type="closedway,relation" preset_name_label="true">
     7176        <item name="Sand" icon="styles/standard/misc/sand.svg" type="closedway,relation" preset_name_label="true">
    71777177            <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=sand"
    71787178                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:natural=sand"
  • trunk/data/validator/geometry.mapcss

    r7937 r7942  
    2424node[natural=ridge],
    2525node[natural=tree_row] {
    26   throwWarning: tr("{0} on a node. Should be used on a way.", "{0.key}");
     26  throwWarning: tr("{0} on a node. Should be used on a way.", "{0.tag}");
    2727  assertMatch: "node oneway=-1";
    2828  assertNoMatch: "way oneway=-1";
     
    5555node[restriction] {
    5656  throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}");
     57}
     58
     59/* {0} on a way, should be a node */
     60way[natural=peak],
     61way[natural=saddle],
     62way[natural=volcano],
     63way[natural=tree] {
     64  throwWarning: tr("{0} on a way. Should be used on a node.", "{0.tag}");
    5765}
    5866
Note: See TracChangeset for help on using the changeset viewer.