fix #20682 - Add natural=arete, reuse glacier icon, modify icon for glacier (PD and CC0 licensed), remove ele from ridge preset (not useful on linear feature)

Klumbumbus · Klumbumbus · commit 458c2ec04832 · 2022-08-13T15:21:12.000Z
git-svn-id: https://josm.openstreetmap.de/svn/trunk@18534 0c6e7542-c601-0410-84e7-c038aed88b3b
diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
@@ -8603,14 +8603,21 @@
                 <combo key="volcano:type" text="Type" values="stratovolcano,shield,scoria" />
             </optional>
         </item> <!-- Volcano -->
+        <item name="Arete" icon="presets/landmark/arete.svg" type="way" preset_name_label="true">
+            <link wiki="Tag:natural=arete" />
+            <space />
+            <key key="natural" value="arete" />
+            <reference ref="name_wikipedia_wikidata" />
+            <preset_link preset_name="Ridge" text="Similar but different tags:" />
+        </item> <!-- Arete -->
         <item name="Ridge" icon="presets/landmark/ridge.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=ridge" />
             <space />
             <label text="A mountain or hill ridge." />
             <space />
             <key key="natural" value="ridge" />
             <reference ref="name_wikipedia_wikidata" />
-            <text key="ele" text="Elevation (meters)" length="10" />
+            <preset_link preset_name="Arete" text="Similar but different tags:" />
         </item> <!-- Ridge -->
         <item name="Valley" icon="presets/landmark/valley.svg" type="way" preset_name_label="true">
             <link wiki="Tag:natural=valley" />
diff --git a/resources/images/presets/landmark/arete.svg b/resources/images/presets/landmark/arete.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="15.999999"
+   height="10.95183"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="glacier.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective8" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="-32.014053"
+     inkscape:cy="9.8537159"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-8.8303575,-18.153193)">
+    <path
+       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.31793761px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 8.8303575,29.105023 16.843533,18.153193 24.830357,29.05783 8.8303575,29.105023 Z"
+       id="path3382"
+       sodipodi:nodetypes="cccc"
+       inkscape:export-filename="volcano_small.png"
+       inkscape:export-xdpi="59"
+       inkscape:export-ydpi="59"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/resources/images/presets/landmark/glacier.svg b/resources/images/presets/landmark/glacier.svg
@@ -2,29 +2,29 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="15.999999"
-   height="10.95183"
+   width="16"
+   height="11"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
    version="1.0"
-   sodipodi:docname="glacier.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   sodipodi:docname="glacier5.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_x="0 : 16.04817 : 1"
        inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_z="32 : 16.04817 : 1"
+       inkscape:persp3d-origin="16 : 10.714837 : 1"
        id="perspective8" />
   </defs>
   <sodipodi:namedview
@@ -37,23 +37,28 @@
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="-32.014053"
-     inkscape:cy="9.8537159"
+     inkscape:zoom="32"
+     inkscape:cx="12.171875"
+     inkscape:cy="7.984375"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      width="32px"
      height="32px"
      inkscape:window-width="1680"
-     inkscape:window-height="988"
+     inkscape:window-height="987"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
-     showgrid="false"
+     showgrid="true"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid824" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -64,7 +69,6 @@
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:title />
       </cc:Work>
       <cc:License
          rdf:about="http://web.resource.org/cc/PublicDomain">
@@ -83,13 +87,18 @@
      id="layer1"
      transform="translate(-8.8303575,-18.153193)">
     <path
-       style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.31793761px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8.8303575,29.105023 16.843533,18.153193 24.830357,29.05783 8.8303575,29.105023 Z"
+       style="fill:#c6f2f2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.31794px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.8303575,29.153193 8.0131755,-11 7.986824,11 z"
        id="path3382"
        sodipodi:nodetypes="cccc"
        inkscape:export-filename="volcano_small.png"
        inkscape:export-xdpi="59"
        inkscape:export-ydpi="59"
        inkscape:connector-curvature="0" />
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 8.8303575,29.153193 5.0000005,-6.890625 -2,4.890625 4,-3 0.999999,3 1,-5 2,3 0,-2.917969 5,6.917969 H 8.8303575 v 0"
+       id="path1617"
+       sodipodi:nodetypes="ccccccccccc" />
   </g>
 </svg>
diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
@@ -4945,6 +4945,10 @@ node[natural=cliff] {
     icon-image: "presets/misc/cliff.svg";
     set icon_z17;
 }
+way[natural=arete] {
+    width: 1;
+    color: arete#e6e6e6;
+}
 way[natural=ridge] {
     width: 1;
     color: natural#002f00;
@@ -5120,6 +5124,7 @@ node[natural=beach],
 node[natural=sand],
 node[natural=land],
 node[natural=bare_rock],
+node[natural=arete],
 node[natural=ridge],
 node[natural=valley] {
     icon-image: "presets/misc/deprecated.svg";
