Changeset 15081 in josm


Ignore:
Timestamp:
2019-05-17T21:21:36+02:00 (5 months ago)
Author:
Klumbumbus
Message:

fix #17727

  • allow lines for natural=bay
  • add bay=fjord checkbox in natural=bay preset
  • don't warn about long way segments of bay=fjord ways
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15075 r15081  
    17031703            </optional>
    17041704        </item> <!-- Beach -->
    1705         <item name="Bay" icon="presets/nautical/bay.svg" type="node,closedway,multipolygon" preset_name_label="true">
     1705        <item name="Bay" icon="presets/nautical/bay.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    17061706            <link wiki="Tag:natural=bay" />
    17071707            <label text="An area of water mostly surrounded by land but with level connection to the ocean or a lake." />
     
    17091709            <key key="natural" value="bay" />
    17101710            <text key="name" text="Name" />
     1711            <optional>
     1712                <check key="bay" text="Fjord" value_on="fjord" disable_off="true" />
     1713            </optional>
    17111714        </item> <!-- Bay -->
    17121715        <item name="Cape" icon="presets/nautical/cape.svg" type="node,closedway,multipolygon" preset_name_label="true">
  • trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java

    r12846 r15081  
    8484
    8585    private boolean ignoreWay(Way w) {
    86         return visitedWays.contains(w) || w.hasTag("route", "ferry");
     86        return visitedWays.contains(w) || w.hasTag("route", "ferry") || w.hasTag("bay", "fjord");
    8787    }
    8888
  • trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java

    r14735 r15081  
    138138        // duplicate warnings
    139139        new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"),
    140             new HashSet<>(Arrays.asList("arete", "cave", "cliff", "coastline", "gorge", "gully", "peak",
     140            new HashSet<>(Arrays.asList("arete", "bay", "cave", "cliff", "coastline", "gorge", "gully", "peak",
    141141                            "ridge", "saddle", "tree", "tree_row", "valley", "volcano"))),
    142142
  • trunk/styles/standard/elemstyles.mapcss

    r15066 r15081  
    42934293    set icon_z17;
    42944294}
    4295 area[natural=bay],
     4295area[natural=bay]:closed {
     4296    fill-color: natural#002f00;
     4297}
     4298way[natural=bay] {
     4299    width: 2;
     4300    color: natural#002f00;
     4301}
     4302node[natural=bay] {
     4303    icon-image: "presets/nautical/bay.svg";
     4304    set icon_z17;
     4305}
    42964306area[natural=cape],
    42974307area[natural=cave_entrance] {
    42984308    fill-color: natural#002f00;
    42994309}
    4300 node[natural=bay] {
    4301     icon-image: "presets/nautical/bay.svg";
    4302     set icon_z17;
    4303 }
    43044310node[natural=cape] {
    43054311    icon-image: "presets/nautical/cape.svg";
    43064312    set icon_z17;
    43074313}
     4314node[natural=cave_entrance] {
     4315    icon-image: "presets/landmark/cave_entrance.svg";
     4316    set icon_z17;
     4317}
    43084318area[natural=reef] {
    43094319    fill-color: reef#80c9ff;
     
    43114321node[natural=reef] {
    43124322    icon-image: "presets/landmark/reef.svg";
    4313     set icon_z17;
    4314 }
    4315 node[natural=cave_entrance] {
    4316     icon-image: "presets/landmark/cave_entrance.svg";
    43174323    set icon_z17;
    43184324}
Note: See TracChangeset for help on using the changeset viewer.