Ticket #23311: Recognize_natural=hill.diff

File Recognize_natural=hill.diff, 9.1 KB (added by hhtznr, 2 years ago)

  • resources/data/defaultpresets.xml 

    diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index 9e85f3f96..8076a7091 100644
    a b  
    573573            <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
    574574            <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation" member_expression="highway|route=ferry" />
    575575            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity" />
    576             <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality" />
     576            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=hill OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality" />
    577577            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost" />
    578578        </roles>
    579579    </chunk>

  • new file resources/images/presets/landmark/hill.svg 

    diff --git a/resources/images/presets/landmark/hill.svg b/resources/images/presets/landmark/hill.svg
new file mode 100644
index 000000000..ff370616a
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!-- Created with Inkscape (http://www.inkscape.org/) -->
     3
     4<svg
     5   width="400"
     6   height="400"
     7   id="svg2"
     8   version="1.1"
     9   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
     10   sodipodi:docname="hill.svg"
     11   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     12   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     13   xmlns="http://www.w3.org/2000/svg"
     14   xmlns:svg="http://www.w3.org/2000/svg"
     15   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     16   xmlns:cc="http://creativecommons.org/ns#"
     17   xmlns:dc="http://purl.org/dc/elements/1.1/">
     18  <defs
     19     id="defs4" />
     20  <sodipodi:namedview
     21     id="base"
     22     pagecolor="#ffffff"
     23     bordercolor="#666666"
     24     borderopacity="1.0"
     25     inkscape:pageopacity="0.0"
     26     inkscape:pageshadow="2"
     27     inkscape:zoom="5.12"
     28     inkscape:cx="145.89844"
     29     inkscape:cy="369.62891"
     30     inkscape:document-units="px"
     31     inkscape:current-layer="layer1"
     32     showgrid="true"
     33     showguides="true"
     34     inkscape:snap-global="false"
     35     inkscape:guide-bbox="true"
     36     inkscape:window-width="3770"
     37     inkscape:window-height="2083"
     38     inkscape:window-x="0"
     39     inkscape:window-y="0"
     40     inkscape:window-maximized="1"
     41     fit-margin-top="0"
     42     fit-margin-left="0"
     43     fit-margin-right="0"
     44     fit-margin-bottom="0"
     45     inkscape:showpageshadow="2"
     46     inkscape:pagecheckerboard="0"
     47     inkscape:deskcolor="#d1d1d1" />
     48  <metadata
     49     id="metadata7">
     50    <rdf:RDF>
     51      <cc:Work
     52         rdf:about="">
     53        <dc:format>image/svg+xml</dc:format>
     54        <dc:type
     55           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     56        <dc:title />
     57      </cc:Work>
     58    </rdf:RDF>
     59  </metadata>
     60  <g
     61     inkscape:label="Ebene 1"
     62     inkscape:groupmode="layer"
     63     id="layer1"
     64     transform="translate(-0.125,2.75)">
     65    <path
     66       style="fill:#aa4400;fill-rule:evenodd;stroke:#000000;stroke-width:1.58364px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     67       d="M 200.0892,225.83181 2.2554623,396.45817 398.41357,396.45688 Z"
     68       id="rect2985"
     69       inkscape:connector-curvature="0"
     70       sodipodi:nodetypes="cccc" />
     71  </g>
     72</svg>

  • new file resources/images/presets/sightseeing/hill_viewpoint.svg 

    diff --git a/resources/images/presets/sightseeing/hill_viewpoint.svg b/resources/images/presets/sightseeing/hill_viewpoint.svg
new file mode 100644
index 000000000..d992e761a
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!-- Created with Inkscape (http://www.inkscape.org/) -->
     3
     4<svg
     5   width="400"
     6   height="400"
     7   id="svg2"
     8   version="1.1"
     9   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
     10   sodipodi:docname="hill_viewpoint.svg"
     11   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     12   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     13   xmlns="http://www.w3.org/2000/svg"
     14   xmlns:svg="http://www.w3.org/2000/svg"
     15   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     16   xmlns:cc="http://creativecommons.org/ns#"
     17   xmlns:dc="http://purl.org/dc/elements/1.1/">
     18  <defs
     19     id="defs4" />
     20  <sodipodi:namedview
     21     id="base"
     22     pagecolor="#ffffff"
     23     bordercolor="#666666"
     24     borderopacity="1.0"
     25     inkscape:pageopacity="0.0"
     26     inkscape:pageshadow="2"
     27     inkscape:zoom="3.6203867"
     28     inkscape:cx="170.14757"
     29     inkscape:cy="328.27985"
     30     inkscape:document-units="px"
     31     inkscape:current-layer="layer1"
     32     showgrid="true"
     33     showguides="true"
     34     inkscape:snap-global="false"
     35     inkscape:guide-bbox="true"
     36     inkscape:window-width="3770"
     37     inkscape:window-height="2083"
     38     inkscape:window-x="0"
     39     inkscape:window-y="0"
     40     inkscape:window-maximized="1"
     41     fit-margin-top="0"
     42     fit-margin-left="0"
     43     fit-margin-right="0"
     44     fit-margin-bottom="0"
     45     inkscape:showpageshadow="2"
     46     inkscape:pagecheckerboard="0"
     47     inkscape:deskcolor="#d1d1d1">
     48    <inkscape:grid
     49       type="xygrid"
     50       id="grid3149"
     51       empspacing="5"
     52       visible="true"
     53       enabled="true"
     54       snapvisiblegridlinesonly="true" />
     55  </sodipodi:namedview>
     56  <metadata
     57     id="metadata7">
     58    <rdf:RDF>
     59      <cc:Work
     60         rdf:about="">
     61        <dc:format>image/svg+xml</dc:format>
     62        <dc:type
     63           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     64      </cc:Work>
     65    </rdf:RDF>
     66  </metadata>
     67  <g
     68     inkscape:label="Ebene 1"
     69     inkscape:groupmode="layer"
     70     id="layer1"
     71     transform="translate(-0.125,2.75)">
     72    <path
     73       style="fill:#0000ff"
     74       d="m 36.421341,297.16889 c -8.649727,-2.16859 -16.366887,-9.2973 -18.630387,-17.20979 -0.632225,-2.21005 -1.139636,-8.0335 -1.127583,-12.94098 0.01767,-7.19383 0.446324,-9.93263 2.212279,-14.13484 5.178759,-12.32326 16.599976,-17.33237 34.38021,-15.07846 12.513234,1.58623 86.40476,24.07795 89.51514,27.24737 3.51431,3.581 -1.84633,6.59816 -26.20561,14.74954 -19.292149,6.45576 -52.851828,15.99305 -61.263721,17.41048 -7.117731,1.19935 -13.986556,1.1836 -18.880328,-0.0433 v 0 z"
     75       id="path3087"
     76       inkscape:connector-curvature="0" />
     77    <path
     78       style="fill:#0000ff"
     79       d="m 163.51002,232.51371 c -11.58634,-8.34657 -61.59585,-60.81244 -67.740069,-71.06731 -9.717925,-16.21949 -9.580461,-28.00223 0.45124,-38.67806 9.429839,-10.03532 21.825239,-14.13066 31.944149,-10.55409 8.47901,2.99694 16.76352,14.21626 21.67999,29.36023 2.08593,6.42516 14.22517,57.25715 18.50988,77.50845 3.25419,15.38069 2.14184,18.4641 -4.84519,13.43078 z"
     80       id="path3089"
     81       inkscape:connector-curvature="0" />
     82    <path
     83       style="fill:#0000ff"
     84       d="m 229.29026,233.83404 c -1.61917,-1.25992 -1.65539,-1.87962 -0.53726,-9.19318 3.27902,-21.4476 15.54902,-72.72153 20.85372,-87.14365 8.82669,-23.99746 23.29471,-32.19911 40.70748,-23.07629 19.78126,10.36371 23.63354,27.51097 10.8099,48.11698 -3.94533,6.33966 -27.39885,31.61346 -53.20312,57.33235 -15.21493,15.16458 -16.16877,15.87949 -18.63072,13.96379 z"
     85       id="path3091"
     86       inkscape:connector-curvature="0" />
     87    <path
     88       style="fill:#0000ff"
     89       d="m 334.49472,294.25492 c -16.10713,-3.65816 -77.37282,-23.11127 -79.49293,-25.24064 -3.82801,-3.84469 0.45142,-6.27045 26.48592,-15.01338 8.63099,-2.89845 24.60026,-7.74103 35.48727,-10.76127 16.67364,-4.62555 21.39093,-5.5624 29.91957,-5.94208 11.89525,-0.52955 17.10806,0.856 22.83032,6.06826 9.12349,8.31031 11.24108,28.37199 4.25491,40.31003 -6.60419,11.28531 -20.26268,14.94478 -39.48506,10.57908 z"
     90       id="path3093"
     91       inkscape:connector-curvature="0" />
     92    <path
     93       style="fill:#aa4400;fill-rule:evenodd;stroke:#000000;stroke-width:1.58364px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     94       d="M 200.44459,225.86217 2.6108511,396.48853 398.76896,396.48753 Z"
     95       id="rect2985"
     96       inkscape:connector-curvature="0"
     97       sodipodi:nodetypes="cccc" />
     98  </g>
     99</svg>

  • resources/styles/standard/elemstyles.mapcss 

    diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
index 082dd3767..ee1d753d6 100644
    a b node[natural=peak][tourism=viewpoint] {  
    49644964    set icon_z0;
    49654965    set text_z0;
    49664966}
     4967node[natural=hill] {
     4968    icon-image: "presets/landmark/hill.svg";
     4969    set icon_z0;
     4970    set text_z0;
     4971}
     4972node[natural=hill][tourism=viewpoint] {
     4973    icon-image: "presets/sightseeing/hill_viewpoint.svg";
     4974    set icon_z0;
     4975    set text_z0;
     4976}
    49674977area[natural=glacier] {
    49684978    fill-color: glacier#ffffff;
    49694979}