From 73094ba0fd885a9f4e0944650a251e1efd9fd284 Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Tue, 6 Aug 2024 18:36:49 +0200
Subject: [PATCH] Add man_made=flare

---
 beautified_icons.mapping               |   1 +
 icons/png/man_made_flare.png           | Bin 0 -> 784 bytes
 icons/svg-osm-icons/man_made/flare.svg | 141 +++++++++++++++++++++++++
 josm_icons.mapping                     |   1 +
 master_preset.xml                      |  15 ++-
 5 files changed, 157 insertions(+), 1 deletion(-)
 create mode 100644 icons/png/man_made_flare.png
 create mode 100644 icons/svg-osm-icons/man_made/flare.svg

diff --git a/beautified_icons.mapping b/beautified_icons.mapping
index b20afeb3..3f0b6d0d 100644
--- a/beautified_icons.mapping
+++ b/beautified_icons.mapping
@@ -759,6 +759,7 @@ man_made_goods_conveyor=${ICONPATH}man_made_empty.${ICONTYPE}
 man_made_gantry=${ICONPATH}man_made_gantry.${ICONTYPE}
 man_made_mineshaft=${ICONPATH}poi_mine.${ICONTYPE}
 man_made_petroleum_well=${ICONPATH}man_made_petroleum_well_22045.${ICONTYPE}
+man_made_flare=${ICONPATH}man_made_flare.${ICONTYPE}
 man_made_adit=${ICONPATH}man_made_adit_22001.${ICONTYPE}
 man_made_embankment=${ICONPATH}man_made_empty.${ICONTYPE}
 man_made_avalanche_protection=${ICONPATH}man_made_empty.${ICONTYPE}
diff --git a/icons/png/man_made_flare.png b/icons/png/man_made_flare.png
new file mode 100644
index 0000000000000000000000000000000000000000..38053899241abc90661f9275aa99c08acece3847
GIT binary patch
literal 784
zcmV+r1MmEaP)<h;3K|Lk000e1NJLTq001ul001xu1^@s6fu|$l00006VoOIv0RI60
z0RN!9r;`8x0>w#0K~!jg?U`L@jd2{uKfmWW=h-=DXUxpzWh`5mwHsTAjG~6foq4&D
z`;kIikP9It!krtr&@MzFNx3j(Q%o%(+RV#dye^w<$LyT*bHi!k!o}}+sONL_?|<?A
ze*XV{Jw5do00lX*Gr9wjRf3i(L=aN^JA_b11bHdw&8aUF$LcST5(PQFJK88pJs^Ht
z{vnqJ;)(Tc{?43jAiFRY7smxv%gC`*cwgK;N5x%D7H+(B)^h8}v4}YCN=MMLY@}B$
z+)CKX%|`SOW;zOS>(p>g9M|<&RJYGMdJGzO0LMDEc-lOAUfiX+wt<483L>!r>k32=
zQ}L3rTB5myguNK~g=M^Izs1bCD=8?N&D@&JmQ{f9t$UF?R&PGb;6M*m^SAJ<?IP*a
zD5}cRwMPhrW0rNc^7)13l+Ip3aY+q|QoH65olkC1IJuHod=iy4n=I>W<!5~VJT6{!
zfK+mXNNfVt%eGTdy%B)&s&$rigsg%bH_Y_%S^#qMiZlCF3%1}oVE_t>=2+DMhVpsi
zr~P)OUDwO3lcU2{b%5d6q>>{5B!)g__BtM2%dGp}J>_+KlT{sHC_gyR%bQpCcyRl4
zX0P@3$;@Fo9$lra`HWQ^U^q4aSI=!Eola7{w1LsD!}N4E^Z8R3{U4vx+H{J<&<D#p
zTlv9(UI3b|>|sjjLR8a)y(rfk8_dPQSpEl39yFqwV$QsJ9^XID+t;nxsL75zK;4Ej
zxUNV0!^_#Ku>UFhn*{QH5y<;RAnzA}yk7+Jei6v~MIi4NfxKS?@_rG>`$Zt{7yq?<
z2+;&;|M303yA8+n=<n+^&jvs>5fYVd1@pJq#?#BJBY#3gx*ec7t1VeVMOvJRBo6BT
zb^xIzGB|u#08VXVTrwwmP=zI;l%N{%+wT`dz97=2X}vQVO6=czl>Tq}h{^CU^b@`S
O0000<MNUMnLSTY85`a+v

literal 0
HcmV?d00001

diff --git a/icons/svg-osm-icons/man_made/flare.svg b/icons/svg-osm-icons/man_made/flare.svg
new file mode 100644
index 00000000..822b4513
--- /dev/null
+++ b/icons/svg-osm-icons/man_made/flare.svg
@@ -0,0 +1,141 @@
+<?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"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="flare.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata10">
+    <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:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="1002"
+     inkscape:window-width="1747"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="0.82"
+     inkscape:cx="269.55838"
+     inkscape:cy="264.41064"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:current-layer="svg2"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective12" />
+    <style
+       type="text/css"
+       id="style6">
+   
+    .fil0 {fill:#EF7900}
+   
+  </style>
+    <inkscape:perspective
+       id="perspective6807"
+       inkscape:persp3d-origin="29.116032 : 19.410688 : 1"
+       inkscape:vp_z="58.232063 : 29.116032 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 29.116032 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6954"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2541"
+       inkscape:persp3d-origin="240 : 160 : 1"
+       inkscape:vp_z="480 : 240 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 240 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2750"
+       inkscape:persp3d-origin="215 : 143.33333 : 1"
+       inkscape:vp_z="430 : 215 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 215 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3730"
+       inkscape:persp3d-origin="88.929146 : 101.19778 : 1"
+       inkscape:vp_z="177.85829 : 151.79668 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 151.79668 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g1327">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 v 450.123 c 0,40.844 20.894,62.229 62.192,62.229 H 515.92 c 41.307,0 62.229,-20.316 62.229,-62.229 V 66.804 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+       style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999"
+       id="path1329"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:32.71380615;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="m 288.14928,230.11428 v 282.8319"
+     id="path3882"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <g
+     transform="matrix(0.50863688,0,0,0.50863688,140.90987,-22.196796)"
+     id="g984">
+    <g
+       id="g978">
+      <path
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         id="path976"
+         d="m 347.147,197.816 c 9.229,73.617 -9.684,83.375 -18.775,113.023 -21.374,-63.058 -63.477,-67.355 -73.973,-136.68 -15.295,56.037 5.983,82.906 4.507,123.915 -21.418,-37.921 -42.656,-71.495 -63.083,-85.614 16.839,33.937 -5.132,74.693 -12.672,107.718 -10.749,47.076 3.808,78.573 27.692,92.045 v 0 c -0.361,-22.939 7.177,-43.212 11.642,-48.064 5.883,41.454 12.622,66.855 45.434,91.621 3.31,-52.209 19.72,-38.696 25.534,-103.637 23.948,39.554 19.3,79.104 7.509,118.657 21.096,-18.855 44.45,-34.398 73.598,-118.657 l -6.007,63.084 c 18.561,-45.4 71.531,-90.488 -21.406,-217.411 z" />
+    </g>
+    <g
+       id="g982">
+      <path
+         style="fill:#ffffff"
+         inkscape:connector-curvature="0"
+         id="path980"
+         d="m 269.433,109.199 c -24.306,98.693 20.07,97.825 44.684,155.831 17.264,-89.442 -34.386,-69.318 -44.684,-155.831 z" />
+    </g>
+  </g>
+</svg>
diff --git a/josm_icons.mapping b/josm_icons.mapping
index 761f416f..d37dd38a 100644
--- a/josm_icons.mapping
+++ b/josm_icons.mapping
@@ -770,6 +770,7 @@ man_made_goods_conveyor=presets/landmark/goods_conveyor.svg
 man_made_gantry=
 man_made_mineshaft=presets/landmark/mine.svg
 man_made_petroleum_well=presets/landmark/petroleum_well.svg
+man_made_flare=
 man_made_adit=presets/landmark/adit.svg
 man_made_embankment=presets/misc/embankment.svg
 man_made_avalanche_protection=presets/misc/avalanche_protection.svg
diff --git a/master_preset.xml b/master_preset.xml
index 483fafa7..01ff3c68 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -2690,6 +2690,9 @@
     <chunk id="trailblazed">
         <combo key="trailblazed" text="Trail markings" values="yes,poles,cairns,symbols,no" display_values="Yes,Poles,Cairns,Symbols,No" match="key" />
     </chunk>
+    <chunk id="facility_visibility">
+        <combo key="visibility" text="Visibility" values="house,street,area" display_values="House (up to 5m),Street (up to 20m),Area (more than 20m)"/>
+    </chunk>
     <!-- Groups -->
     <group name="Highways" icon="${highway_group}">
     <group name="Streets" icon="${highway_group}" items_sort="false" >
@@ -9312,7 +9315,7 @@
                 <combo key="display" text="Display" values="analog,digital,sundial,unorthodox" display_values="Analog,Digital,Sundial,Unorthodox" text_context="clock" />
                 <reference ref="support"/>
                 <combo key="faces" text="Faces" text_context="clock" values="1,2,3,4" value_type="integer"/>
-                <combo key="visibility" text="Visibility/readability" values="house,street,area" display_values="house (up to 5m),street (up to 20m),area (more than 20m)"/>
+                <reference ref="facility_visibility"/>
                 <check key="date" text="Shows current date" disable_off="true"/>
                 <check key="thermometer" text="Shows temperature" disable_off="true"/>
                 <check key="barometer" text="Shows barometric pressure" disable_off="true"/>
@@ -10918,6 +10921,16 @@
             <preset_link preset_name="Windpump" text="Similar but different tags:" alternative="true" />
             <preset_link preset_name="Pump" text="Similar but different tags:" alternative="true" />
         </item> <!-- Petroleum well -->
+        <item name="Gas flare" icon="${man_made_flare}" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:man_made=flare" />
+            <space />
+            <key key="man_made" value="flare" />
+            <optional>
+                <reference ref="name_ref_operator" />
+                <text key="height" text="Height (meters)" value_type="dimension_vertical"/>
+                <reference ref="facility_visibility"/>
+            </optional>
+        </item> <!-- Gas flare -->
         <item name="Adit" icon="${man_made_adit}" type="node" preset_name_label="true">
             <link wiki="Tag:man_made=adit"/>
             <space/>