Changeset 7735 in josm for trunk


Ignore:
Timestamp:
2014-11-19T21:18:32+01:00 (10 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
Files:
3 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

  • trunk/styles/standard/elemstyles.mapcss

    r7729 r7735  
    37543754    text: auto;
    37553755}
     3756way[natural=ridge] {
     3757    width: 1;
     3758    color: natural#002f00;
     3759}
    37563760area[natural=scree] {
    37573761    fill-color: natural#002f00;
    37583762}
    3759 node[natural=scree] {
    3760     icon-image: "misc/no_icon.png";
    3761     set icon_z17;
    3762     text: auto;
    3763 }
    37643763area[natural=scrub] {
    37653764    fill-color: scrub#007000;
    37663765}
    3767 node[natural=scrub] {
    3768     icon-image: "presets/scrub.svg";
    3769     set icon_z17;
    3770     text: auto;
    3771 }
    37723766area[natural=fell] {
    37733767    fill-color: natural#002f00;
    37743768}
    3775 node[natural=fell] {
    3776     icon-image: "misc/no_icon.png";
    3777     set icon_z17;
    3778     text: auto;
    3779 }
    37803769area[natural=heath] {
    37813770    fill-color: heath#ffffc0;
    3782 }
    3783 node[natural=heath] {
    3784     icon-image: "misc/no_icon.png";
    3785     set icon_z17;
    3786     text: auto;
    37873771}
    37883772way[natural=tree_row] {
    … …  
    37903774    color: woodarea#008000;
    37913775}
    3792 node[natural=tree_row] {
    3793     icon-image: "misc/no_icon.png";
    3794     set icon_z17;
    3795     text: auto;
    3796 }
    37973776area[natural=wood] {
    37983777    fill-color: woodarea#008000;
    37993778}
    3800 node[natural=wood] {
    3801     icon-image: "misc/landmark/trees.png";
    3802     set icon_z17;
    3803     text: auto;
    3804 }
    38053779area[natural=grassland] {
    38063780    fill-color: green#b1e0c2;
    38073781}
    3808 node[natural=grassland] {
    3809     icon-image: "misc/deprecated.png";
    3810     set icon_z17;
    3811     text: auto;
    3812 }
    38133782area[natural=wetland] {
    38143783    fill-color: marsh#4f4ff3;
    38153784}
    3816 node[natural=wetland] {
    3817     icon-image: "misc/no_icon.png";
    3818     set icon_z17;
    3819     text: auto;
    3820 }
    38213785area[natural=water] {
    38223786    fill-color: water#0000ff;
    3823 }
    3824 node[natural=water] {
    3825     icon-image: "nautical/water.png";
    3826     set icon_z17;
    3827     text: auto;
    38283787}
    38293788way[natural=coastline] {
    … …  
    38313790    color: water#0000ff;
    38323791}
    3833 node[natural=coastline] {
    3834     icon-image: "misc/coastline.png";
    3835     set icon_z17;
    3836     text: auto;
    3837 }
    38383792area[natural=mud] {
    38393793    fill-color: mud#cba762;
    38403794}
    3841 node[natural=mud] {
    3842     icon-image: "misc/mud.png";
    3843     set icon_z17;
    3844     text: auto;
    3845 }
    38463795area[natural=beach] {
    38473796    fill-color: beach#f8dba2;
    38483797}
    3849 node[natural=beach] {
    3850     icon-image: "misc/beach.png";
    3851     set icon_z17;
    3852     text: auto;
    3853 }
    38543798area[natural=sand] {
    38553799    fill-color: sand#f8dba2;
    38563800}
    3857 node[natural=sand] {
     3801area[natural=bare_rock] {
     3802    fill-color: bare_rock#f8f8c7;
     3803}
     3804area[natural=stone] {
     3805    fill-color: stone#f8f8c7;
     3806}
     3807node[natural=stone] {
    38583808    icon-image: "misc/no_icon.png";
    38593809    set icon_z17;
    … …  
    38613811}
    38623812area[natural=bay],
    3863 area[natural=land],
    38643813area[natural=cave_entrance] {
    38653814    fill-color: natural#002f00;
    … …  
    38673816node[natural=bay] {
    38683817    icon-image: "misc/bay.png";
    3869     set icon_z17;
    3870     text: auto;
    3871 }
    3872 node[natural=land] {
    3873     icon-image: "misc/no_icon.png";
    38743818    set icon_z17;
    38753819    text: auto;
    … …  
    39023846    text: auto;
    39033847}
    3904 
     3848node[natural=scree],
     3849node[natural=scrub],
     3850node[natural=fell],
     3851node[natural=heath],
     3852node[natural=tree_row],
     3853node[natural=wood],
     3854node[natural=grassland],
     3855node[natural=wetland],
     3856node[natural=water],
     3857node[natural=coastline],
     3858node[natural=mud],
     3859node[natural=beach],
     3860node[natural=sand],
     3861node[natural=land],
     3862node[natural=bare_rock],
     3863node[natural=ridge] {
     3864    icon-image: "misc/deprecated.png";
     3865    set icon_z17;
     3866    text: auto;
     3867}
    39053868/*****************/
    39063869/* waterway tags */
Note: See TracChangeset for help on using the changeset viewer.