Changeset 15169 in josm for trunk


Ignore:
Timestamp:
2019-06-12T22:04:53+02:00 (5 years ago)
Author:
Klumbumbus
Message:

fix #17804 - Add cemetery=sector and warn about cemetery=sector together with landuse=cemetery, icon self created, CC0 and PD licensed, little reorder in preset menu

Location:
trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r15166 r15169  
    70787078        </item> <!-- Recreation Ground -->
    70797079        <separator/>
     7080        <item name="Religious" icon="presets/religion/religion.svg" type="closedway,multipolygon" preset_name_label="true">
     7081            <link wiki="Tag:landuse=religious" />
     7082            <space />
     7083            <key key="landuse" value="religious" />
     7084            <text key="name" text="Name" />
     7085            <reference ref="religious" />
     7086        </item> <!-- Religious -->
     7087        <item name="Cemetery" icon="presets/landuse/cemetery.svg" type="closedway,multipolygon" preset_name_label="true">
     7088            <link wiki="Tag:landuse=cemetery" />
     7089            <space />
     7090            <key key="landuse" value="cemetery" />
     7091            <text key="name" text="Name" />
     7092            <reference ref="religious" />
     7093        </item> <!-- Cemetery -->
     7094        <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
     7095            <link wiki="Tag:amenity=grave_yard" />
     7096            <space />
     7097            <key key="amenity" value="grave_yard" />
     7098            <text key="name" text="Name" />
     7099            <reference ref="religious" />
     7100        </item> <!-- Graveyard -->
     7101        <item name="Cemetery sector" icon="presets/misc/cemetery_sector.svg" type="node,closedway,multipolygon" preset_name_label="true">
     7102            <link wiki="Tag:cemetery=sector" />
     7103            <space />
     7104            <key key="cemetery" value="sector" />
     7105            <optional>
     7106                <text key="ref" text="Reference" />
     7107                <text key="name" text="Name" />
     7108            </optional>
     7109        </item> <!-- Cemetery sector-->
     7110        <separator/>
    70807111        <item name="Residential Area" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
    70817112            <link wiki="Tag:landuse=residential" />
    … …  
    70847115            <reference ref="optional_name" />
    70857116        </item> <!-- Residential Area -->
    7086         <item name="Graveyard" icon="presets/landuse/graveyard.svg" type="node,closedway,multipolygon" preset_name_label="true">
    7087             <link wiki="Tag:amenity=grave_yard" />
    7088             <space />
    7089             <key key="amenity" value="grave_yard" />
    7090             <text key="name" text="Name" />
    7091             <reference ref="religious" />
    7092         </item> <!-- Graveyard -->
    7093         <item name="Cemetery" icon="presets/landuse/cemetery.svg" type="closedway,multipolygon" preset_name_label="true">
    7094             <link wiki="Tag:landuse=cemetery" />
    7095             <space />
    7096             <key key="landuse" value="cemetery" />
    7097             <text key="name" text="Name" />
    7098             <reference ref="religious" />
    7099         </item> <!-- Cemetery -->
    7100         <item name="Religious" icon="presets/religion/religion.svg" type="closedway,multipolygon" preset_name_label="true">
    7101             <link wiki="Tag:landuse=religious" />
    7102             <space />
    7103             <key key="landuse" value="religious" />
    7104             <text key="name" text="Name" />
    7105             <reference ref="religious" />
    7106         </item> <!-- Religious -->
    71077117        <item name="Retail" icon="presets/shop/mall.svg" type="closedway,multipolygon" preset_name_label="true">
    71087118            <link wiki="Tag:landuse=retail" />

  • trunk/data/validator/combinations.mapcss

    r15139 r15169  
    592592  group: tr("suspicious tag combination");
    593593}
     594
     595/* #17804 */
     596area[cemetery=sector][landuse=cemetery] {
     597  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
     598  group: tr("suspicious tag combination");
     599}

  • trunk/styles/standard/elemstyles.mapcss

    r15093 r15169  
    33083308    set icon_z17;
    33093309}
     3310area[cemetery=sector] {
     3311    fill-color: cemetery_sector#dbf8e6;
     3312}
     3313node[cemetery=sector] {
     3314    icon-image: "presets/misc/cemetery_sector.svg";
     3315    set icon_z17;
     3316}
    33103317node[historic=tomb] {
    33113318    icon-image: "presets/misc/tomb.svg";
Note: See TracChangeset for help on using the changeset viewer.