Add man_made=clarifier

simonpoole · simonpoole · commit 2db17279eb87 · 2024-03-25T11:52:36.000+01:00
diff --git a/beautified_icons.mapping b/beautified_icons.mapping
@@ -760,6 +760,7 @@ man_made_pipeline_marker=${ICONPATH}man_made_pipeline_marker.${ICONTYPE}
 man_made_manhole=${ICONPATH}man_made_manhole.${ICONTYPE}
 man_made_water_tower=${ICONPATH}poi_tower_water.${ICONTYPE}
 man_made_wastewater_plant=${ICONPATH}man_made_wastewater_plant_22081.${ICONTYPE}
+man_made_clarifier=${ICONPATH}man_made_clarifier.${ICONTYPE}
 man_made_watermill=${ICONPATH}man_made_watermill_22085.${ICONTYPE}
 man_made_pumping_station=${ICONPATH}man_made_pumping_station_22106.${ICONTYPE}
 man_made_dyke=${ICONPATH}man_made_dyke_22021.${ICONTYPE}
diff --git a/icons/png/man_made_clarifier.png b/icons/png/man_made_clarifier.png
diff --git a/icons/svg-osm-icons/man_made/clarifier.svg b/icons/svg-osm-icons/man_made/clarifier.svg
@@ -0,0 +1,307 @@
+<?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="svg46"
+   sodipodi:docname="clarifier.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata52"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs50"><pattern
+   inkscape:isstock="true"
+   inkscape:stockid="Polka dots, large white"
+   id="Polkadots-largewhite"
+   patternTransform="translate(0,0) scale(10,10)"
+   height="10"
+   width="10"
+   patternUnits="userSpaceOnUse"
+   inkscape:collect="always"><circle
+     id="circle5834"
+     r="0.45"
+     cy="0.810"
+     cx="2.567"
+     style="fill:white;stroke:none" /><circle
+     id="circle5836"
+     r="0.45"
+     cy="2.33"
+     cx="3.048"
+     style="fill:white;stroke:none" /><circle
+     id="circle5838"
+     r="0.45"
+     cy="2.415"
+     cx="4.418"
+     style="fill:white;stroke:none" /><circle
+     id="circle5840"
+     r="0.45"
+     cy="3.029"
+     cx="1.844"
+     style="fill:white;stroke:none" /><circle
+     id="circle5842"
+     r="0.45"
+     cy="1.363"
+     cx="6.08"
+     style="fill:white;stroke:none" /><circle
+     id="circle5844"
+     r="0.45"
+     cy="4.413"
+     cx="5.819"
+     style="fill:white;stroke:none" /><circle
+     id="circle5846"
+     r="0.45"
+     cy="4.048"
+     cx="4.305"
+     style="fill:white;stroke:none" /><circle
+     id="circle5848"
+     r="0.45"
+     cy="3.045"
+     cx="5.541"
+     style="fill:white;stroke:none" /><circle
+     id="circle5850"
+     r="0.45"
+     cy="5.527"
+     cx="4.785"
+     style="fill:white;stroke:none" /><circle
+     id="circle5852"
+     r="0.45"
+     cy="5.184"
+     cx="2.667"
+     style="fill:white;stroke:none" /><circle
+     id="circle5854"
+     r="0.45"
+     cy="1.448"
+     cx="7.965"
+     style="fill:white;stroke:none" /><circle
+     id="circle5856"
+     r="0.45"
+     cy="5.049"
+     cx="7.047"
+     style="fill:white;stroke:none" /><circle
+     id="circle5858"
+     r="0.45"
+     cy="0.895"
+     cx="4.340"
+     style="fill:white;stroke:none" /><circle
+     id="circle5860"
+     r="0.45"
+     cy="0.340"
+     cx="7.125"
+     style="fill:white;stroke:none" /><circle
+     id="circle5862"
+     r="0.45"
+     cy="1.049"
+     cx="9.553"
+     style="fill:white;stroke:none" /><circle
+     id="circle5864"
+     r="0.45"
+     cy="2.689"
+     cx="7.006"
+     style="fill:white;stroke:none" /><circle
+     id="circle5866"
+     r="0.45"
+     cy="2.689"
+     cx="8.909"
+     style="fill:white;stroke:none" /><circle
+     id="circle5868"
+     r="0.45"
+     cy="4.407"
+     cx="9.315"
+     style="fill:white;stroke:none" /><circle
+     id="circle5870"
+     r="0.45"
+     cy="3.870"
+     cx="7.820"
+     style="fill:white;stroke:none" /><circle
+     id="circle5872"
+     r="0.45"
+     cy="5.948"
+     cx="8.270"
+     style="fill:white;stroke:none" /><circle
+     id="circle5874"
+     r="0.45"
+     cy="7.428"
+     cx="7.973"
+     style="fill:white;stroke:none" /><circle
+     id="circle5876"
+     r="0.45"
+     cy="8.072"
+     cx="9.342"
+     style="fill:white;stroke:none" /><circle
+     id="circle5878"
+     r="0.45"
+     cy="9.315"
+     cx="8.206"
+     style="fill:white;stroke:none" /><circle
+     id="circle5880"
+     r="0.45"
+     cy="9.475"
+     cx="9.682"
+     style="fill:white;stroke:none" /><circle
+     id="circle5882"
+     r="0.45"
+     cy="6.186"
+     cx="9.688"
+     style="fill:white;stroke:none" /><circle
+     id="circle5884"
+     r="0.45"
+     cy="6.296"
+     cx="3.379"
+     style="fill:white;stroke:none" /><circle
+     id="circle5886"
+     r="0.45"
+     cy="8.204"
+     cx="2.871"
+     style="fill:white;stroke:none" /><circle
+     id="circle5888"
+     r="0.45"
+     cy="8.719"
+     cx="4.59"
+     style="fill:white;stroke:none" /><circle
+     id="circle5890"
+     r="0.45"
+     cy="9.671"
+     cx="3.181"
+     style="fill:white;stroke:none" /><circle
+     id="circle5892"
+     r="0.45"
+     cy="7.315"
+     cx="5.734"
+     style="fill:white;stroke:none" /><circle
+     id="circle5894"
+     r="0.45"
+     cy="6.513"
+     cx="6.707"
+     style="fill:white;stroke:none" /><circle
+     id="circle5896"
+     r="0.45"
+     cy="9.670"
+     cx="5.730"
+     style="fill:white;stroke:none" /><circle
+     id="circle5898"
+     r="0.45"
+     cy="8.373"
+     cx="6.535"
+     style="fill:white;stroke:none" /><circle
+     id="circle5900"
+     r="0.45"
+     cy="7.154"
+     cx="4.37"
+     style="fill:white;stroke:none" /><circle
+     id="circle5902"
+     r="0.45"
+     cy="7.25"
+     cx="0.622"
+     style="fill:white;stroke:none" /><circle
+     id="circle5904"
+     r="0.45"
+     cy="5.679"
+     cx="0.831"
+     style="fill:white;stroke:none" /><circle
+     id="circle5906"
+     r="0.45"
+     cy="8.519"
+     cx="1.257"
+     style="fill:white;stroke:none" /><circle
+     id="circle5908"
+     r="0.45"
+     cy="6.877"
+     cx="1.989"
+     style="fill:white;stroke:none" /><circle
+     id="circle5910"
+     r="0.45"
+     cy="3.181"
+     cx="0.374"
+     style="fill:white;stroke:none" /><circle
+     id="circle5912"
+     r="0.45"
+     cy="1.664"
+     cx="1.166"
+     style="fill:white;stroke:none" /><circle
+     id="circle5914"
+     r="0.45"
+     cy="0.093"
+     cx="1.151"
+     style="fill:white;stroke:none" /><circle
+     id="circle5916"
+     r="0.45"
+     cy="10.093"
+     cx="1.151"
+     style="fill:white;stroke:none" /><circle
+     id="circle5918"
+     r="0.45"
+     cy="4.451"
+     cx="1.302"
+     style="fill:white;stroke:none" /><circle
+     id="circle5920"
+     r="0.45"
+     cy="3.763"
+     cx="3.047"
+     style="fill:white;stroke:none" /></pattern>
+	
+
+		
+		
+		
+		
+	</defs><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1727"
+   inkscape:window-height="897"
+   id="namedview48"
+   showgrid="false"
+   inkscape:zoom="1.28"
+   inkscape:cx="290"
+   inkscape:cy="290"
+   inkscape:window-x="124"
+   inkscape:window-y="97"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="svg46" />
+<g
+   id="Layer_2">
+	<g
+   id="g1327">
+		<path
+   id="path1329"
+   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.923,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
+   inkscape:connector-curvature="0"
+   style="fill:#111111;stroke:#eeeeee;stroke-width:3.40799999" />
+	</g>
+</g>
+
+<circle
+   style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#Polkadots-largewhite);fill-opacity:1.0;fill-rule:nonzero;stroke:#ffffff;stroke-width:25;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+   id="path69"
+   cx="289.92651"
+   cy="290.43024"
+   r="200.03461" /><path
+   style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:15.06;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+   d="m 148.0378,149.91436 c 285.12034,285.12035 286.68121,286.16093 286.68121,286.16093 v 0"
+   id="path6103"
+   inkscape:connector-curvature="0" /><circle
+   style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+   id="path6105"
+   cx="289.92651"
+   cy="290.43024"
+   r="8.984375" /></svg>
diff --git a/josm_icons.mapping b/josm_icons.mapping
@@ -771,6 +771,7 @@ man_made_pipeline_marker=
 man_made_manhole=
 man_made_water_tower=
 man_made_wastewater_plant=
+man_made_clarifier=
 man_made_watermill=
 man_made_pumping_station=presets/misc/pumping_station.svg
 man_made_dyke=
diff --git a/master_preset.xml b/master_preset.xml
@@ -10607,6 +10607,12 @@
             <key key="man_made" value="wastewater_plant"/>
             <text key="name" text="Name"/>
         </item> <!-- Wastewater Treatment Plant -->
+        <item name="Wastewater clarifier" icon="${man_made_clarifier}" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=clarifier"/>
+            <space/>
+            <key key="man_made" value="clarfier"/>
+            <reference ref="ref_operator" />
+        </item> <!-- Wastewater clarifier -->
         <item name="Watermill" icon="${man_made_watermill}" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=watermill"/>
             <space/>
