From aa2c6dddf54e8eca7edb2747e164a5a527135a5a Mon Sep 17 00:00:00 2001
From: simonpoole <simon@poole.ch>
Date: Sat, 17 Aug 2024 14:24:25 +0200
Subject: [PATCH] Sync with JOSM 19195

---
 beautified_icons.mapping                      |   1 +
 icons/png/office_financial_institute.png      | Bin 0 -> 1105 bytes
 .../office/financial_institute.svg            |  80 ++++++++++++++++++
 josm_icons.mapping                            |   1 +
 master_preset.xml                             |  15 ++++
 5 files changed, 97 insertions(+)
 create mode 100644 icons/png/office_financial_institute.png
 create mode 100644 icons/svg-osm-icons/office/financial_institute.svg

diff --git a/beautified_icons.mapping b/beautified_icons.mapping
index 6574100d..85892d33 100644
--- a/beautified_icons.mapping
+++ b/beautified_icons.mapping
@@ -1343,6 +1343,7 @@ office_quango=${ICONPATH}office_quango_25041.${ICONTYPE}
 office_research=${ICONPATH}office_research_25042.${ICONTYPE}
 office_tax_advisor=${ICONPATH}office_tax_advisor_25043.${ICONTYPE}
 office_financial_advisor=${ICONPATH}office_financial_advisor.${ICONTYPE}
+office_financial_institute=${ICONPATH}office_financial_institute.${ICONTYPE}
 office_consulting=${ICONPATH}office_consulting_25044.${ICONTYPE}
 office_cooperative=${ICONPATH}office_cooperative_25045.${ICONTYPE}
 office_financial=${ICONPATH}office_financial_25046.${ICONTYPE}
diff --git a/icons/png/office_financial_institute.png b/icons/png/office_financial_institute.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d3903f148e0a32ddfdc2d1b047510ef8a637434
GIT binary patch
literal 1105
zcmV-X1g`suP)<h;3K|Lk000e1NJLTq001ul001xu1^@s6fu|$l00006VoOIv0RI60
z0RN!9r;`8x1O`b&K~!jg?U_wzQ&|+pfA<+{py^Z)KPrWx@dLB)vsF<_S9T^vP!Ohw
zNKsKiWyFPu2-8g$x+us{5yVYVu~?xC-DnB8YFzk<6v4WXv`LltQAgCaYI0p1!)wfY
z&3iHFYhiv6?#a11C;xZ3ALk|tK!c*L?igB!f!_f?kYf7aL+f!2BZk%yg28rm{d!9M
z5Z;B>&4BV+r6ZK;;r{)<l&-D)8~B%*B3#hGF$1lem|4O>^!{m}RM2ZB02l_GIRm?Q
zJB_IE0f7=qa*koZmMzjcBVYiIKV1@L&4Qgf;oLcSzi}h9wnAN9zDT8XZS62nRbq+O
zR8+v(v#@53b^nD6aPgvDbllrfKYrX4-rp~6JPsc|h<)GyEL&z9?w$BKbD*(N>|_!S
z9~OIH06IFvHVoLj**1l*#1iePsDQFEv12j#^2O}y?}tP}?DBHk6yAv+8G%$v7HlX4
z3m2Mw&!5Bg?RispH*HcW=<5?Z5P+*!U8nGN!FF_*i!(Dl>g#2ztf|Qx?ydM2FJR9e
zh(=9cSs85G23=jSckiU(-iikp9E77sp`|6;@AJWtBhb`j8|uCI3<CqwK70tbZkhg{
zA8G>Li4TR~@@0AL+GYCRzn3{bJS^{*EP>gxEmL?Weq=-*AQXa?E3^C3Y54R>Y^7v7
zwZJ>^$t1jaBX&artX*sNH8z@M!PBQOHfEWku)=KJI;r}SNw|F*Mn?-!4>UK!i4$UL
zEu;MHn=Dok`_LhH^vEhY?*4>5cu-y$T3Teg%k0-~=<Wu;U-J3=;>!qs{TkZZ?1Teu
zM}E;FxN#%*!qC}i*5ic`2*9RIaQZYndj{vv!@Yai^-eA>M?M&|zUeGq?kY_VA3wsK
zJ7OmiX4#MjcjAYJ%(*#{Sj<%#OVVjLc~aJqL)`5)LqpKhlkI!=4lZ4CmBx~E8X^&R
z^2Bk7``tz<2!~<)dKsneZh3&IC+<%C;>A#1o$LSnS&sL~7g(`zv0zV~f*m{T`(M74
zLTYfZ2)dl%Y|gJ(F}ZMnsw&vGuLzQy<4pX51<ta~pZ^O|+~Z9A+_}>B_L|k+L^?aO
zKQ~1<6Q4P<-@dh8l&@Y%Yg4+Gis^G1DFA2UzkYR=ZECkli}GOWR#?3{+m~6e8#cha
zdAV7_VQDKXWlQ~;_V$uISneU!+A6pAV$#qc2U&6P_=nbC#QKEYzaJhyF3vYxxl)`w
z7R>08|6jaU%y{ty{%+wpqXv-3az!H6#aE$RyXO3ac1OYhqFJtJ)YT<8FE?+NO8i}=
zSFI|?=j%l&`+u&c8(QCGeEbgupqDQFjmpY4pdPKOQOfVJyj-*%L#a5>2mGTRJoxWB
XHo7IJw#?o600000NkvXXu0mjfa%&)c

literal 0
HcmV?d00001

diff --git a/icons/svg-osm-icons/office/financial_institute.svg b/icons/svg-osm-icons/office/financial_institute.svg
new file mode 100644
index 00000000..ebd86c88
--- /dev/null
+++ b/icons/svg-osm-icons/office/financial_institute.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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.1"
+   x="0px"
+   y="0px"
+   width="580px"
+   height="580px"
+   viewBox="0 0 580 580"
+   enable-background="new 0 0 580 580"
+   xml:space="preserve"
+   id="svg863"
+   sodipodi:docname="financial_institute.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata869"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs867">
+	
+	
+	
+</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1614"
+   inkscape:window-height="925"
+   id="namedview865"
+   showgrid="false"
+   inkscape:zoom="1.2258621"
+   inkscape:cx="290"
+   inkscape:cy="350.61174"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="svg863" />
+<g
+   id="Layer_2">
+	<g
+   id="g1327">
+		<path
+   id="path1329"
+   fill="#111111"
+   stroke="#EEEEEE"
+   stroke-width="3.408"
+   d="M66.275,1.768    c-41.335,0-64.571,21.371-64.571,65.036v450.123c0,40.844,20.894,62.229,62.192,62.229H515.92    c41.307,0,62.229-20.316,62.229-62.229V66.804c0-42.601-20.923-65.036-63.522-65.036C514.624,1.768,66.133,1.625,66.275,1.768z" />
+	</g>
+</g>
+<g
+   id="g850">
+		<path
+   style="fill:#ffffff"
+   inkscape:connector-curvature="0"
+   id="path846"
+   d="m 309.094,427.584 h -66.456 c 1.362,-3.477 2.116,-7.256 2.116,-11.215 v -32.546 l -2.429,-29.659 c -4.677,-11.028 -15.604,-18.766 -28.338,-18.766 h -64.775 c -12.734,0 -23.661,7.737 -28.338,18.767 l -2.429,29.657 v 32.547 c 0,3.959 0.754,7.738 2.116,11.215 H 54.106 v 22.498 9 77.996 h 10.5 v -77.996 h 233.988 v 77.996 h 10.498 v -77.996 h 0.002 z m -88.63,-50.891 v 50.891 h -7.287 v -50.891 z m -77.729,0 h 7.288 v 50.891 h -7.288 z" />
+		<circle
+   style="fill:#ffffff"
+   id="circle848"
+   r="37.650002"
+   cy="284.664"
+   cx="181.60001" />
+	</g>
+<path
+   inkscape:connector-curvature="0"
+   id="path898"
+   style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:261.33334351px;line-height:125%;font-family:Helsinki;-inkscape-font-specification:'Helsinki Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+   d="m 431.67934,102.94588 q -7.27344,1.91406 -11.48438,8.03906 -4.21093,5.99739 -4.21093,14.54687 0,8.42188 3.70052,13.78125 3.70052,5.23178 11.99479,8.67709 z m 20.92708,140.23698 q 8.03907,-1.27604 13.65365,-8.16667 5.74219,-6.89062 5.74219,-15.82291 0,-8.9323 -4.21094,-14.03646 -4.08333,-5.23177 -15.1849,-9.82552 z m -20.92708,50.91406 v -22.96875 q -26.54167,-4.08333 -39.30209,-19.26823 -12.76041,-15.18489 -13.65364,-44.02344 h 34.96354 q 0,15.56771 3.95573,23.22396 3.95573,7.65625 14.03646,11.35677 V 186.1438 l -16.71615,-7.27344 q -17.35417,-7.65625 -25.64844,-20.67188 -8.29427,-13.01562 -8.29427,-32.66667 0,-19.65104 14.54688,-34.325518 14.54687,-14.80208 36.11198,-17.22656 V 52.54223 h 20.92708 v 21.437502 q 49.12761,8.16667 49.12761,57.039058 h -34.96354 q 0,-12.12239 -3.19011,-18.63021 -3.1901,-6.63541 -10.97396,-9.95312 v 54.74219 l 20.92709,9.1875 q 16.33333,7.27344 24.88281,20.54427 8.54948,13.14323 8.54948,31.13542 0,20.67187 -15.95052,36.11198 -15.95052,15.4401 -38.40886,16.97135 v 22.96875 z" /></svg>
\ No newline at end of file
diff --git a/josm_icons.mapping b/josm_icons.mapping
index 88320bf7..866deec4 100644
--- a/josm_icons.mapping
+++ b/josm_icons.mapping
@@ -1358,6 +1358,7 @@ office_quango=
 office_research=presets/office/research.svg
 office_tax_advisor=presets/office/tax_advisor.svg
 office_financial_advisor=
+office_financial_institute=
 office_consulting=
 office_cooperative=
 office_financial=
diff --git a/master_preset.xml b/master_preset.xml
index 8a2148c5..0a9ebf6f 100644
--- a/master_preset.xml
+++ b/master_preset.xml
@@ -8834,6 +8834,7 @@
             <key key="lifeguard" value="base"/>
             <text key="ref" text="Reference"/>
             <text key="operator" text="Operator"/>
+            <check key="seasonal" text="Seasonal" disable_off="true" />
         </item> <!-- Lifeguard base -->
         <item name="Lifeguard tower" icon="${emergency_lifeguard_tower}" type="node" preset_name_label="true" deprecated="true">
             <link wiki="Tag:emergency=lifeguard_tower"/>
@@ -8847,12 +8848,16 @@
             <key key="lifeguard" value="tower"/>
             <text key="ref" text="Reference"/>
             <text key="operator" text="Operator"/>
+            <check key="seasonal" text="Seasonal" disable_off="true" />
         </item> <!-- Lifeguard tower -->
         <item name="Life ring" icon="${emergency_life_ring}" type="node" preset_name_label="true">
             <link wiki="Tag:emergency=life_ring"/>
             <key key="emergency" value="life_ring"/>
             <text key="ref" text="Reference"/>
             <text key="operator" text="Operator"/>
+            <combo key="support" text="Support" values="pole,pillar,wall_mounted,fence" 
+                display_values="Pole,Pillar,Wall mounted,Fence" values_context="mounting/support" />
+            <reference ref="colours" />
         </item> <!-- Life ring -->
         <item name="Emergency Access Point (highway variant)" icon="${emergency_emergency_access_point}" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:highway=emergency_access_point"/>
@@ -11070,6 +11075,7 @@
             <link wiki="Tag:man_made=cairn"/>
             <space/>
             <key key="man_made" value="cairn"/>
+            <text key="height" text="Height (meters)" value_type="dimension_vertical"/>
         </item> <!-- Cairn -->
         <separator/>
         <item name="Pipeline" icon="${man_made_pipeline}" type="way" preset_name_label="true">
@@ -13794,6 +13800,7 @@
         <text key="ref" text="Reference"/>
         <reference ref="link_contact_address"/>
         <reference ref="kids_area" />
+        <preset_link preset_name="Financial institute" text="Similar but different tags:" alternative="true" />
     </item> <!-- Bank -->
     <item name="Money Exchange" icon="${money_currency_exchange}" type="node,closedway,multipolygon" preset_name_label="true">
         <link wiki="Tag:amenity=bureau_de_change"/>
@@ -16237,6 +16244,14 @@
             <reference ref="name_oh_wheelchair_level"/>
             <reference ref="link_contact_address"/>
         </item> <!-- Financial advisor -->
+        <item name="Financial institute" icon="${office_financial_institute}" type="node,closedway,multipolygon">
+            <link wiki="Tag:office=financial"/>
+            <space/>
+            <key key="office" value="financial"/>
+            <reference ref="name_oh_wheelchair_level"/>
+            <reference ref="link_contact_address"/>
+            <preset_link preset_name="Bank" text="Similar but different tags:" alternative="true" />
+        </item> <!-- Financial institute-->
         <item name="Consulting" icon="${office_consulting}" type="node,closedway,multipolygon">
             <link wiki="Tag:office=consulting"/>
             <space/>