Ticket #20270: 20270.3.patch

File 20270.3.patch, 50.9 KB (added by taylor.smock, 5 years ago)

Add icons for specific utilities

  • resources/data/defaultpresets.xml 

    diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
index b5cff550a2..ac0e7e8c5f 100644
    a b  
    411411            <reference ref="voltage_frequency" />
    412412        </optional>
    413413    </chunk>
    414     <chunk id="power_pole">
     414    <chunk id="utilities">
     415        <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true"/>
     416    </chunk>
     417    <chunk id="pole">
    415418        <text key="height" text="Height (meters)" length="7" />
    416419        <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     420        <reference ref="ref_operator" />
     421    </chunk>
     422    <chunk id="power_pole">
    417423        <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    418424        <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
    419425        <check key="location:transition" text="Location transition" disable_off="true" />
    420         <reference ref="ref_operator" />
     426        <reference ref="pole" />
    421427    </chunk>
    422428    <chunk id="rating_phases">
    423429        <combo key="rating" text="Power rating (kVA/MVA)" values="2700 kVA,12500 kVA,15 MVA,50 MVA,100 MVA" />
    … …  
    57835789            <key key="man_made" value="embankment" />
    57845790        </item> <!-- Embankment -->
    57855791        <separator/>
     5792        <item name="Utility Pole" icon="presets/tower/pole.svg" type="node" preset_name_label="true">
     5793            <link wiki="Tag:man_made=utility_pole" />
     5794            <space />
     5795            <key key="man_made" value="utility_pole" />
     5796            <reference ref="pole" />
     5797            <reference ref="utilities" />
     5798            <preset_link preset_name="Pole" />
     5799        </item> <!-- Utility Pole -->
    57865800        <item name="Street Lamp" icon="presets/misc/streetlamp.svg" type="node" preset_name_label="true">
    57875801            <link wiki="Tag:highway=street_lamp" />
    57885802            <space />
    … …  
    60446058            <link wiki="Key:marker" />
    60456059            <space />
    60466060            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
    6047             <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true" />
     6061            <reference ref="utilities" />
    60486062            <optional>
    60496063                <reference ref="ref_operator" />
    60506064                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    … …  
    64996513            <space />
    65006514            <key key="power" value="pole" />
    65016515            <reference ref="power_pole" />
     6516            <preset_link preset_name="Utility Pole" />
    65026517        </item> <!-- Pole -->
    65036518        <item name="Pole with Switch" icon="presets/power/pole_switch.svg" type="node" preset_name_label="true">
    65046519            <link wiki="Tag:power=pole" />

  • resources/data/validator/ignoretags.cfg 

    diff --git a/resources/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg
index 6253bbcb9a..c5db631dc2 100644
    a b K:land_area=administrative  
    224224K:attraction=summer_toboggan
    225225K:water=pool
    226226K:golf=path
    227 K:man_made=utility_pole
    228227K:site=geodesic
    229228K:site=stop_area
    230229K:site=parking

  • new file resources/images/presets/tower/pole.svg 

    diff --git a/resources/images/presets/tower/pole.svg b/resources/images/presets/tower/pole.svg
new file mode 100644
index 0000000000..0128d27514
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<svg
     3   xmlns:dc="http://purl.org/dc/elements/1.1/"
     4   xmlns:cc="http://creativecommons.org/ns#"
     5   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     6   xmlns:svg="http://www.w3.org/2000/svg"
     7   xmlns="http://www.w3.org/2000/svg"
     8   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     9   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     10   width="12"
     11   height="16"
     12   viewBox="0 0 12 16"
     13   id="svg4264"
     14   version="1.1"
     15   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
     16   sodipodi:docname="pole.svg">
     17  <defs
     18     id="defs4266">
     19    <marker
     20       inkscape:stockid="EmptyTriangleInL"
     21       orient="auto"
     22       refY="0"
     23       refX="0"
     24       id="EmptyTriangleInL"
     25       style="overflow:visible"
     26       inkscape:isstock="true">
     27      <path
     28         id="path4298"
     29         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
     30         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     31         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
     32         inkscape:connector-curvature="0" />
     33    </marker>
     34    <marker
     35       inkscape:stockid="Arrow1Lstart"
     36       orient="auto"
     37       refY="0"
     38       refX="0"
     39       id="marker4778"
     40       style="overflow:visible"
     41       inkscape:isstock="true">
     42      <path
     43         id="path4780"
     44         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     45         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     46         transform="matrix(0.8,0,0,0.8,10,0)"
     47         inkscape:connector-curvature="0" />
     48    </marker>
     49    <marker
     50       inkscape:stockid="Arrow1Lstart"
     51       orient="auto"
     52       refY="0"
     53       refX="0"
     54       id="marker4657"
     55       style="overflow:visible"
     56       inkscape:isstock="true">
     57      <path
     58         id="path4659"
     59         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     60         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     61         transform="matrix(0.8,0,0,0.8,10,0)"
     62         inkscape:connector-curvature="0" />
     63    </marker>
     64    <marker
     65       style="overflow:visible"
     66       inkscape:stockid="InfiniteLineStart"
     67       id="InfiniteLineStart"
     68       refX="0"
     69       refY="0"
     70       orient="auto"
     71       inkscape:isstock="true">
     72      <g
     73         id="g4391"
     74         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     75         transform="translate(-13,0)">
     76        <circle
     77           id="circle4393"
     78           r="0.80000001"
     79           cy="0"
     80           cx="3"
     81           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     82        <circle
     83           id="circle4395"
     84           r="0.80000001"
     85           cy="0"
     86           cx="6.5"
     87           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     88        <circle
     89           id="circle4397"
     90           r="0.80000001"
     91           cy="0"
     92           cx="10"
     93           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     94      </g>
     95    </marker>
     96    <marker
     97       inkscape:stockid="Arrow2Lstart"
     98       orient="auto"
     99       refY="0"
     100       refX="0"
     101       id="Arrow2Lstart"
     102       style="overflow:visible"
     103       inkscape:isstock="true">
     104      <path
     105         id="path4165"
     106         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
     107         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
     108         transform="matrix(1.1,0,0,1.1,1.1,0)"
     109         inkscape:connector-curvature="0" />
     110    </marker>
     111    <marker
     112       inkscape:stockid="Arrow1Mstart"
     113       orient="auto"
     114       refY="0"
     115       refX="0"
     116       id="Arrow1Mstart"
     117       style="overflow:visible"
     118       inkscape:isstock="true">
     119      <path
     120         id="path4153"
     121         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     122         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     123         transform="matrix(0.4,0,0,0.4,4,0)"
     124         inkscape:connector-curvature="0" />
     125    </marker>
     126    <marker
     127       inkscape:stockid="Arrow1Lstart"
     128       orient="auto"
     129       refY="0"
     130       refX="0"
     131       id="Arrow1Lstart"
     132       style="overflow:visible"
     133       inkscape:isstock="true">
     134      <path
     135         id="path4147"
     136         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     137         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     138         transform="matrix(0.8,0,0,0.8,10,0)"
     139         inkscape:connector-curvature="0" />
     140    </marker>
     141  </defs>
     142  <sodipodi:namedview
     143     id="base"
     144     pagecolor="#ffffff"
     145     bordercolor="#666666"
     146     borderopacity="1.0"
     147     inkscape:pageopacity="0.0"
     148     inkscape:pageshadow="2"
     149     inkscape:zoom="45.254834"
     150     inkscape:cx="2.4580159"
     151     inkscape:cy="9.6013118"
     152     inkscape:document-units="px"
     153     inkscape:current-layer="layer1"
     154     showgrid="true"
     155     units="px"
     156     inkscape:snap-bbox="true"
     157     inkscape:bbox-paths="true"
     158     inkscape:bbox-nodes="true"
     159     inkscape:snap-bbox-edge-midpoints="true"
     160     inkscape:snap-bbox-midpoints="true"
     161     inkscape:snap-global="true"
     162     inkscape:object-paths="true"
     163     inkscape:snap-intersection-paths="true"
     164     inkscape:object-nodes="true"
     165     inkscape:snap-smooth-nodes="true"
     166     inkscape:snap-midpoints="true"
     167     inkscape:snap-object-midpoints="true"
     168     inkscape:snap-center="true"
     169     inkscape:snap-nodes="true"
     170     inkscape:snap-others="true"
     171     inkscape:snap-page="true"
     172     inkscape:document-rotation="0"
     173     inkscape:window-width="1252"
     174     inkscape:window-height="943"
     175     inkscape:window-x="587"
     176     inkscape:window-y="44"
     177     inkscape:window-maximized="0">
     178    <inkscape:grid
     179       type="xygrid"
     180       id="grid4137" />
     181  </sodipodi:namedview>
     182  <metadata
     183     id="metadata4269">
     184    <rdf:RDF>
     185      <cc:Work
     186         rdf:about="">
     187        <dc:format>image/svg+xml</dc:format>
     188        <dc:type
     189           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     190        <dc:title></dc:title>
     191        <cc:license
     192           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     193      </cc:Work>
     194      <cc:License
     195         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     196        <cc:permits
     197           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     198        <cc:permits
     199           rdf:resource="http://creativecommons.org/ns#Distribution" />
     200        <cc:permits
     201           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     202      </cc:License>
     203    </rdf:RDF>
     204  </metadata>
     205  <g
     206     inkscape:label="Camada 1"
     207     inkscape:groupmode="layer"
     208     id="layer1"
     209     transform="translate(0,-1036.3621)">
     210    <path
     211       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.93599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     212       d="m 4,1036.3621 0,2 -4,0 0,6 3,0 0,-2 1,0 0,10 4,0 0,-10 1,0 0,2 3,0 0,-6 -4,0 0,-2 -4,0 z"
     213       id="path4218"
     214       inkscape:connector-curvature="0" />
     215    <g
     216       id="g3382-9"
     217       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
     218       style="fill:#000000;fill-opacity:1" />
     219    <path
     220       style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     221       d="m 6.0000008,1037.3621 0,15"
     222       id="path4282"
     223       inkscape:connector-curvature="0" />
     224    <path
     225       id="path4216"
     226       d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
     227       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     228       inkscape:connector-curvature="0" />
     229  </g>
     230</svg>

  • new file resources/images/presets/tower/pole_gas.svg 

    diff --git a/resources/images/presets/tower/pole_gas.svg b/resources/images/presets/tower/pole_gas.svg
new file mode 100644
index 0000000000..6d12709c35
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<svg
     3   xmlns:dc="http://purl.org/dc/elements/1.1/"
     4   xmlns:cc="http://creativecommons.org/ns#"
     5   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     6   xmlns:svg="http://www.w3.org/2000/svg"
     7   xmlns="http://www.w3.org/2000/svg"
     8   width="12"
     9   height="16"
     10   viewBox="0 0 12 16"
     11   id="svg4264"
     12   version="1.1">
     13  <defs
     14     id="defs4266">
     15    <marker
     16       orient="auto"
     17       refY="0"
     18       refX="0"
     19       id="EmptyTriangleInL"
     20       style="overflow:visible">
     21      <path
     22         id="path4298"
     23         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
     24         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     25         transform="matrix(-0.8,0,0,-0.8,4.8,0)" />
     26    </marker>
     27    <marker
     28       orient="auto"
     29       refY="0"
     30       refX="0"
     31       id="marker4778"
     32       style="overflow:visible">
     33      <path
     34         id="path4780"
     35         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     36         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     37         transform="matrix(0.8,0,0,0.8,10,0)" />
     38    </marker>
     39    <marker
     40       orient="auto"
     41       refY="0"
     42       refX="0"
     43       id="marker4657"
     44       style="overflow:visible">
     45      <path
     46         id="path4659"
     47         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     48         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     49         transform="matrix(0.8,0,0,0.8,10,0)" />
     50    </marker>
     51    <marker
     52       style="overflow:visible"
     53       id="InfiniteLineStart"
     54       refX="0"
     55       refY="0"
     56       orient="auto">
     57      <g
     58         id="g4391"
     59         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     60         transform="translate(-13,0)">
     61        <circle
     62           id="circle4393"
     63           r="0.80000001"
     64           cy="0"
     65           cx="3"
     66           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     67        <circle
     68           id="circle4395"
     69           r="0.80000001"
     70           cy="0"
     71           cx="6.5"
     72           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     73        <circle
     74           id="circle4397"
     75           r="0.80000001"
     76           cy="0"
     77           cx="10"
     78           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     79      </g>
     80    </marker>
     81    <marker
     82       orient="auto"
     83       refY="0"
     84       refX="0"
     85       id="Arrow2Lstart"
     86       style="overflow:visible">
     87      <path
     88         id="path4165"
     89         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
     90         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
     91         transform="matrix(1.1,0,0,1.1,1.1,0)" />
     92    </marker>
     93    <marker
     94       orient="auto"
     95       refY="0"
     96       refX="0"
     97       id="Arrow1Mstart"
     98       style="overflow:visible">
     99      <path
     100         id="path4153"
     101         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     102         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     103         transform="matrix(0.4,0,0,0.4,4,0)" />
     104    </marker>
     105    <marker
     106       orient="auto"
     107       refY="0"
     108       refX="0"
     109       id="Arrow1Lstart"
     110       style="overflow:visible">
     111      <path
     112         id="path4147"
     113         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     114         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     115         transform="matrix(0.8,0,0,0.8,10,0)" />
     116    </marker>
     117  </defs>
     118  <metadata
     119     id="metadata4269">
     120    <rdf:RDF>
     121      <cc:Work
     122         rdf:about="">
     123        <dc:format>image/svg+xml</dc:format>
     124        <dc:type
     125           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     126        <dc:title></dc:title>
     127        <cc:license
     128           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     129      </cc:Work>
     130      <cc:License
     131         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     132        <cc:permits
     133           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     134        <cc:permits
     135           rdf:resource="http://creativecommons.org/ns#Distribution" />
     136        <cc:permits
     137           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     138      </cc:License>
     139    </rdf:RDF>
     140  </metadata>
     141  <g
     142     id="layer1"
     143     transform="translate(0,-1036.3621)">
     144    <path
     145       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffff4c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.93599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     146       d="m 4,1036.3621 0,2 -4,0 0,6 3,0 0,-2 1,0 0,10 4,0 0,-10 1,0 0,2 3,0 0,-6 -4,0 0,-2 -4,0 z"
     147       id="path4218" />
     148    <g
     149       id="g3382-9"
     150       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
     151       style="fill:#000000;fill-opacity:1" />
     152    <path
     153       style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     154       d="m 6.0000008,1037.3621 0,15"
     155       id="path4282" />
     156    <path
     157       id="path4216"
     158       d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
     159       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     160  </g>
     161</svg>

  • new file resources/images/presets/tower/pole_street_light.svg 

    diff --git a/resources/images/presets/tower/pole_street_light.svg b/resources/images/presets/tower/pole_street_light.svg
new file mode 100644
index 0000000000..7b2486f063
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
     3<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" preserveAspectRatio="xMidYMid meet" viewBox="0 0 13 16" width="13" height="16"><defs><path d="M1.89 2L0.42 2L0.42 6L1.89 6L1.89 16L6.02 16L6.02 6L11.11 6L11.11 2L6.02 2L6.02 0.09L1.89 0.09L1.89 2Z" id="cWZw0878w"></path><path d="M3.97 1L3.97 16" id="cVFEn1fy"></path><path d="M1.55 5.12L9.05 5.12L9.05 6L10.24 6L10.24 3.12L1.55 3.12L1.55 5.12Z" id="b9iEcwQmZ"></path><path d="M6.74 6L12.24 6C12.24 7.36 12.24 8.22 12.24 8.56C12.24 9.81 11.22 10.83 9.96 10.83C9.32 10.83 9.73 10.83 9.1 10.83C7.79 10.83 6.74 9.77 6.74 8.47C6.74 8.14 6.74 7.32 6.74 6Z" id="bHZML4tp"></path><path d="M7.86 6L11.11 6C11.11 7.14 11.11 7.86 11.11 8.14C11.11 8.92 10.47 9.54 9.69 9.51C9.33 9.49 9.44 9.5 9.02 9.48C8.37 9.46 7.86 8.93 7.86 8.28C7.86 7.98 7.86 7.22 7.86 6Z" id="h1n4BIycNf"></path></defs><g><g><g><use xlink:href="#cWZw0878w" opacity="1" fill="#ffcc00" fill-opacity="1"></use><g><use xlink:href="#cWZw0878w" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="1.94" stroke-opacity="0"></use></g></g><g><use xlink:href="#cVFEn1fy" opacity="1" fill="#000000" fill-opacity="0"></use><g><use xlink:href="#cVFEn1fy" opacity="1" fill-opacity="0" stroke="#8b4513" stroke-width="2" stroke-opacity="1"></use></g></g><g><use xlink:href="#b9iEcwQmZ" opacity="1" fill="#000000" fill-opacity="1"></use><g><use xlink:href="#b9iEcwQmZ" opacity="1" fill-opacity="0" stroke="#000000" stroke-width="2" stroke-opacity="0"></use></g></g><g><use xlink:href="#bHZML4tp" opacity="1" fill="#ffcc00" fill-opacity="1"></use></g><g><use xlink:href="#h1n4BIycNf" opacity="1" fill="#f38c0a" fill-opacity="1"></use></g></g></g></svg>
     4 No newline at end of file

  • new file resources/images/presets/tower/pole_telecom.svg 

    diff --git a/resources/images/presets/tower/pole_telecom.svg b/resources/images/presets/tower/pole_telecom.svg
new file mode 100644
index 0000000000..ad16c9fb6a
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<svg
     3   xmlns:dc="http://purl.org/dc/elements/1.1/"
     4   xmlns:cc="http://creativecommons.org/ns#"
     5   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     6   xmlns:svg="http://www.w3.org/2000/svg"
     7   xmlns="http://www.w3.org/2000/svg"
     8   version="1.1"
     9   id="svg4264"
     10   viewBox="0 0 12 16"
     11   height="16"
     12   width="12">
     13  <defs
     14     id="defs4266">
     15    <marker
     16       style="overflow:visible"
     17       id="EmptyTriangleInL"
     18       refX="0"
     19       refY="0"
     20       orient="auto">
     21      <path
     22         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
     23         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     24         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
     25         id="path4298" />
     26    </marker>
     27    <marker
     28       style="overflow:visible"
     29       id="marker4778"
     30       refX="0"
     31       refY="0"
     32       orient="auto">
     33      <path
     34         transform="matrix(0.8,0,0,0.8,10,0)"
     35         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     36         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     37         id="path4780" />
     38    </marker>
     39    <marker
     40       style="overflow:visible"
     41       id="marker4657"
     42       refX="0"
     43       refY="0"
     44       orient="auto">
     45      <path
     46         transform="matrix(0.8,0,0,0.8,10,0)"
     47         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     48         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     49         id="path4659" />
     50    </marker>
     51    <marker
     52       orient="auto"
     53       refY="0"
     54       refX="0"
     55       id="InfiniteLineStart"
     56       style="overflow:visible">
     57      <g
     58         transform="translate(-13,0)"
     59         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     60         id="g4391">
     61        <circle
     62           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     63           cx="3"
     64           cy="0"
     65           r="0.80000001"
     66           id="circle4393" />
     67        <circle
     68           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     69           cx="6.5"
     70           cy="0"
     71           r="0.80000001"
     72           id="circle4395" />
     73        <circle
     74           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     75           cx="10"
     76           cy="0"
     77           r="0.80000001"
     78           id="circle4397" />
     79      </g>
     80    </marker>
     81    <marker
     82       style="overflow:visible"
     83       id="Arrow2Lstart"
     84       refX="0"
     85       refY="0"
     86       orient="auto">
     87      <path
     88         transform="matrix(1.1,0,0,1.1,1.1,0)"
     89         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
     90         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
     91         id="path4165" />
     92    </marker>
     93    <marker
     94       style="overflow:visible"
     95       id="Arrow1Mstart"
     96       refX="0"
     97       refY="0"
     98       orient="auto">
     99      <path
     100         transform="matrix(0.4,0,0,0.4,4,0)"
     101         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     102         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     103         id="path4153" />
     104    </marker>
     105    <marker
     106       style="overflow:visible"
     107       id="Arrow1Lstart"
     108       refX="0"
     109       refY="0"
     110       orient="auto">
     111      <path
     112         transform="matrix(0.8,0,0,0.8,10,0)"
     113         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     114         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     115         id="path4147" />
     116    </marker>
     117  </defs>
     118  <metadata
     119     id="metadata4269">
     120    <rdf:RDF>
     121      <cc:Work
     122         rdf:about="">
     123        <dc:format>image/svg+xml</dc:format>
     124        <dc:type
     125           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     126        <dc:title></dc:title>
     127        <cc:license
     128           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     129      </cc:Work>
     130      <cc:License
     131         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     132        <cc:permits
     133           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     134        <cc:permits
     135           rdf:resource="http://creativecommons.org/ns#Distribution" />
     136        <cc:permits
     137           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     138      </cc:License>
     139    </rdf:RDF>
     140  </metadata>
     141  <g
     142     transform="translate(0,-1036.3621)"
     143     id="layer1">
     144    <path
     145       id="path4218"
     146       d="m 4,1036.3621 0,2 -4,0 0,6 3,0 0,-2 1,0 0,10 4,0 0,-10 1,0 0,2 3,0 0,-6 -4,0 0,-2 -4,0 z"
     147       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#33ff33;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.93599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     148    <g
     149       style="fill:#000000;fill-opacity:1"
     150       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
     151       id="g3382-9" />
     152    <path
     153       id="path4282"
     154       d="m 6.0000008,1037.3621 0,15"
     155       style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     156    <path
     157       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     158       d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
     159       id="path4216" />
     160  </g>
     161</svg>

  • new file resources/images/presets/tower/pole_waste.svg 

    diff --git a/resources/images/presets/tower/pole_waste.svg b/resources/images/presets/tower/pole_waste.svg
new file mode 100644
index 0000000000..bff17819e1
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<svg
     3   xmlns:dc="http://purl.org/dc/elements/1.1/"
     4   xmlns:cc="http://creativecommons.org/ns#"
     5   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     6   xmlns:svg="http://www.w3.org/2000/svg"
     7   xmlns="http://www.w3.org/2000/svg"
     8   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     9   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     10   width="12"
     11   height="16"
     12   viewBox="0 0 12 16"
     13   id="svg4264"
     14   version="1.1"
     15   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
     16   sodipodi:docname="pole_waste.svg">
     17  <defs
     18     id="defs4266">
     19    <marker
     20       inkscape:stockid="EmptyTriangleInL"
     21       orient="auto"
     22       refY="0"
     23       refX="0"
     24       id="EmptyTriangleInL"
     25       style="overflow:visible"
     26       inkscape:isstock="true">
     27      <path
     28         id="path4298"
     29         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
     30         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     31         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
     32         inkscape:connector-curvature="0" />
     33    </marker>
     34    <marker
     35       inkscape:stockid="Arrow1Lstart"
     36       orient="auto"
     37       refY="0"
     38       refX="0"
     39       id="marker4778"
     40       style="overflow:visible"
     41       inkscape:isstock="true">
     42      <path
     43         id="path4780"
     44         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     45         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     46         transform="matrix(0.8,0,0,0.8,10,0)"
     47         inkscape:connector-curvature="0" />
     48    </marker>
     49    <marker
     50       inkscape:stockid="Arrow1Lstart"
     51       orient="auto"
     52       refY="0"
     53       refX="0"
     54       id="marker4657"
     55       style="overflow:visible"
     56       inkscape:isstock="true">
     57      <path
     58         id="path4659"
     59         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     60         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     61         transform="matrix(0.8,0,0,0.8,10,0)"
     62         inkscape:connector-curvature="0" />
     63    </marker>
     64    <marker
     65       style="overflow:visible"
     66       inkscape:stockid="InfiniteLineStart"
     67       id="InfiniteLineStart"
     68       refX="0"
     69       refY="0"
     70       orient="auto"
     71       inkscape:isstock="true">
     72      <g
     73         id="g4391"
     74         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     75         transform="translate(-13,0)">
     76        <circle
     77           id="circle4393"
     78           r="0.80000001"
     79           cy="0"
     80           cx="3"
     81           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     82        <circle
     83           id="circle4395"
     84           r="0.80000001"
     85           cy="0"
     86           cx="6.5"
     87           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     88        <circle
     89           id="circle4397"
     90           r="0.80000001"
     91           cy="0"
     92           cx="10"
     93           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     94      </g>
     95    </marker>
     96    <marker
     97       inkscape:stockid="Arrow2Lstart"
     98       orient="auto"
     99       refY="0"
     100       refX="0"
     101       id="Arrow2Lstart"
     102       style="overflow:visible"
     103       inkscape:isstock="true">
     104      <path
     105         id="path4165"
     106         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
     107         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
     108         transform="matrix(1.1,0,0,1.1,1.1,0)"
     109         inkscape:connector-curvature="0" />
     110    </marker>
     111    <marker
     112       inkscape:stockid="Arrow1Mstart"
     113       orient="auto"
     114       refY="0"
     115       refX="0"
     116       id="Arrow1Mstart"
     117       style="overflow:visible"
     118       inkscape:isstock="true">
     119      <path
     120         id="path4153"
     121         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     122         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     123         transform="matrix(0.4,0,0,0.4,4,0)"
     124         inkscape:connector-curvature="0" />
     125    </marker>
     126    <marker
     127       inkscape:stockid="Arrow1Lstart"
     128       orient="auto"
     129       refY="0"
     130       refX="0"
     131       id="Arrow1Lstart"
     132       style="overflow:visible"
     133       inkscape:isstock="true">
     134      <path
     135         id="path4147"
     136         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     137         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     138         transform="matrix(0.8,0,0,0.8,10,0)"
     139         inkscape:connector-curvature="0" />
     140    </marker>
     141  </defs>
     142  <sodipodi:namedview
     143     id="base"
     144     pagecolor="#ffffff"
     145     bordercolor="#666666"
     146     borderopacity="1.0"
     147     inkscape:pageopacity="0.0"
     148     inkscape:pageshadow="2"
     149     inkscape:zoom="45.254834"
     150     inkscape:cx="-2.8342364"
     151     inkscape:cy="9.6013118"
     152     inkscape:document-units="px"
     153     inkscape:current-layer="layer1"
     154     showgrid="true"
     155     units="px"
     156     inkscape:snap-bbox="true"
     157     inkscape:bbox-paths="true"
     158     inkscape:bbox-nodes="true"
     159     inkscape:snap-bbox-edge-midpoints="true"
     160     inkscape:snap-bbox-midpoints="true"
     161     inkscape:snap-global="true"
     162     inkscape:object-paths="true"
     163     inkscape:snap-intersection-paths="true"
     164     inkscape:object-nodes="true"
     165     inkscape:snap-smooth-nodes="true"
     166     inkscape:snap-midpoints="true"
     167     inkscape:snap-object-midpoints="true"
     168     inkscape:snap-center="true"
     169     inkscape:snap-nodes="true"
     170     inkscape:snap-others="true"
     171     inkscape:snap-page="true"
     172     inkscape:document-rotation="0"
     173     inkscape:window-width="1252"
     174     inkscape:window-height="943"
     175     inkscape:window-x="2288"
     176     inkscape:window-y="160"
     177     inkscape:window-maximized="0">
     178    <inkscape:grid
     179       type="xygrid"
     180       id="grid4137" />
     181  </sodipodi:namedview>
     182  <metadata
     183     id="metadata4269">
     184    <rdf:RDF>
     185      <cc:Work
     186         rdf:about="">
     187        <dc:format>image/svg+xml</dc:format>
     188        <dc:type
     189           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     190        <dc:title />
     191        <cc:license
     192           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     193      </cc:Work>
     194      <cc:License
     195         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     196        <cc:permits
     197           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     198        <cc:permits
     199           rdf:resource="http://creativecommons.org/ns#Distribution" />
     200        <cc:permits
     201           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     202      </cc:License>
     203    </rdf:RDF>
     204  </metadata>
     205  <g
     206     inkscape:label="Camada 1"
     207     inkscape:groupmode="layer"
     208     id="layer1"
     209     transform="translate(0,-1036.3621)">
     210    <path
     211       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ee82ee;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.93599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     212       d="m 4,1036.3621 0,2 -4,0 0,6 3,0 0,-2 1,0 0,10 4,0 0,-10 1,0 0,2 3,0 0,-6 -4,0 0,-2 -4,0 z"
     213       id="path4218"
     214       inkscape:connector-curvature="0" />
     215    <g
     216       id="g3382-9"
     217       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
     218       style="fill:#000000;fill-opacity:1" />
     219    <path
     220       style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     221       d="m 6.0000008,1037.3621 0,15"
     222       id="path4282"
     223       inkscape:connector-curvature="0" />
     224    <path
     225       id="path4216"
     226       d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
     227       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     228       inkscape:connector-curvature="0" />
     229  </g>
     230</svg>

  • new file resources/images/presets/tower/pole_water.svg 

    diff --git a/resources/images/presets/tower/pole_water.svg b/resources/images/presets/tower/pole_water.svg
new file mode 100644
index 0000000000..2b50654031
    - +  
     1<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     2<svg
     3   xmlns:dc="http://purl.org/dc/elements/1.1/"
     4   xmlns:cc="http://creativecommons.org/ns#"
     5   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     6   xmlns:svg="http://www.w3.org/2000/svg"
     7   xmlns="http://www.w3.org/2000/svg"
     8   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
     9   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
     10   width="12"
     11   height="16"
     12   viewBox="0 0 12 16"
     13   id="svg4264"
     14   version="1.1"
     15   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
     16   sodipodi:docname="pole_water.svg">
     17  <defs
     18     id="defs4266">
     19    <marker
     20       inkscape:stockid="EmptyTriangleInL"
     21       orient="auto"
     22       refY="0"
     23       refX="0"
     24       id="EmptyTriangleInL"
     25       style="overflow:visible"
     26       inkscape:isstock="true">
     27      <path
     28         id="path4298"
     29         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
     30         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     31         transform="matrix(-0.8,0,0,-0.8,4.8,0)"
     32         inkscape:connector-curvature="0" />
     33    </marker>
     34    <marker
     35       inkscape:stockid="Arrow1Lstart"
     36       orient="auto"
     37       refY="0"
     38       refX="0"
     39       id="marker4778"
     40       style="overflow:visible"
     41       inkscape:isstock="true">
     42      <path
     43         id="path4780"
     44         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     45         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     46         transform="matrix(0.8,0,0,0.8,10,0)"
     47         inkscape:connector-curvature="0" />
     48    </marker>
     49    <marker
     50       inkscape:stockid="Arrow1Lstart"
     51       orient="auto"
     52       refY="0"
     53       refX="0"
     54       id="marker4657"
     55       style="overflow:visible"
     56       inkscape:isstock="true">
     57      <path
     58         id="path4659"
     59         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     60         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     61         transform="matrix(0.8,0,0,0.8,10,0)"
     62         inkscape:connector-curvature="0" />
     63    </marker>
     64    <marker
     65       style="overflow:visible"
     66       inkscape:stockid="InfiniteLineStart"
     67       id="InfiniteLineStart"
     68       refX="0"
     69       refY="0"
     70       orient="auto"
     71       inkscape:isstock="true">
     72      <g
     73         id="g4391"
     74         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
     75         transform="translate(-13,0)">
     76        <circle
     77           id="circle4393"
     78           r="0.80000001"
     79           cy="0"
     80           cx="3"
     81           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     82        <circle
     83           id="circle4395"
     84           r="0.80000001"
     85           cy="0"
     86           cx="6.5"
     87           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     88        <circle
     89           id="circle4397"
     90           r="0.80000001"
     91           cy="0"
     92           cx="10"
     93           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1" />
     94      </g>
     95    </marker>
     96    <marker
     97       inkscape:stockid="Arrow2Lstart"
     98       orient="auto"
     99       refY="0"
     100       refX="0"
     101       id="Arrow2Lstart"
     102       style="overflow:visible"
     103       inkscape:isstock="true">
     104      <path
     105         id="path4165"
     106         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
     107         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
     108         transform="matrix(1.1,0,0,1.1,1.1,0)"
     109         inkscape:connector-curvature="0" />
     110    </marker>
     111    <marker
     112       inkscape:stockid="Arrow1Mstart"
     113       orient="auto"
     114       refY="0"
     115       refX="0"
     116       id="Arrow1Mstart"
     117       style="overflow:visible"
     118       inkscape:isstock="true">
     119      <path
     120         id="path4153"
     121         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     122         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     123         transform="matrix(0.4,0,0,0.4,4,0)"
     124         inkscape:connector-curvature="0" />
     125    </marker>
     126    <marker
     127       inkscape:stockid="Arrow1Lstart"
     128       orient="auto"
     129       refY="0"
     130       refX="0"
     131       id="Arrow1Lstart"
     132       style="overflow:visible"
     133       inkscape:isstock="true">
     134      <path
     135         id="path4147"
     136         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
     137         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
     138         transform="matrix(0.8,0,0,0.8,10,0)"
     139         inkscape:connector-curvature="0" />
     140    </marker>
     141  </defs>
     142  <sodipodi:namedview
     143     id="base"
     144     pagecolor="#ffffff"
     145     bordercolor="#666666"
     146     borderopacity="1.0"
     147     inkscape:pageopacity="0.0"
     148     inkscape:pageshadow="2"
     149     inkscape:zoom="45.254834"
     150     inkscape:cx="6.1371809"
     151     inkscape:cy="7.9440303"
     152     inkscape:document-units="px"
     153     inkscape:current-layer="layer1"
     154     showgrid="true"
     155     units="px"
     156     inkscape:snap-bbox="true"
     157     inkscape:bbox-paths="true"
     158     inkscape:bbox-nodes="true"
     159     inkscape:snap-bbox-edge-midpoints="true"
     160     inkscape:snap-bbox-midpoints="true"
     161     inkscape:snap-global="true"
     162     inkscape:object-paths="true"
     163     inkscape:snap-intersection-paths="true"
     164     inkscape:object-nodes="true"
     165     inkscape:snap-smooth-nodes="true"
     166     inkscape:snap-midpoints="true"
     167     inkscape:snap-object-midpoints="true"
     168     inkscape:snap-center="true"
     169     inkscape:snap-nodes="true"
     170     inkscape:snap-others="true"
     171     inkscape:snap-page="true"
     172     inkscape:document-rotation="0"
     173     inkscape:window-width="1252"
     174     inkscape:window-height="943"
     175     inkscape:window-x="1990"
     176     inkscape:window-y="200"
     177     inkscape:window-maximized="0">
     178    <inkscape:grid
     179       type="xygrid"
     180       id="grid4137" />
     181  </sodipodi:namedview>
     182  <metadata
     183     id="metadata4269">
     184    <rdf:RDF>
     185      <cc:Work
     186         rdf:about="">
     187        <dc:format>image/svg+xml</dc:format>
     188        <dc:type
     189           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
     190        <dc:title />
     191        <cc:license
     192           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
     193      </cc:Work>
     194      <cc:License
     195         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
     196        <cc:permits
     197           rdf:resource="http://creativecommons.org/ns#Reproduction" />
     198        <cc:permits
     199           rdf:resource="http://creativecommons.org/ns#Distribution" />
     200        <cc:permits
     201           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
     202      </cc:License>
     203    </rdf:RDF>
     204  </metadata>
     205  <g
     206     inkscape:label="Camada 1"
     207     inkscape:groupmode="layer"
     208     id="layer1"
     209     transform="translate(0,-1036.3621)">
     210    <path
     211       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#2090cf;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.93599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     212       d="m 4,1036.3621 0,2 -4,0 0,6 3,0 0,-2 1,0 0,10 4,0 0,-10 1,0 0,2 3,0 0,-6 -4,0 0,-2 -4,0 z"
     213       id="path4218"
     214       inkscape:connector-curvature="0" />
     215    <g
     216       id="g3382-9"
     217       transform="matrix(0,0.15384648,-0.35461025,0,155.24126,1020.1082)"
     218       style="fill:#000000;fill-opacity:1" />
     219    <path
     220       style="fill:none;fill-rule:evenodd;stroke:#8b4513;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     221       d="m 6.0000008,1037.3621 0,15"
     222       id="path4282"
     223       inkscape:connector-curvature="0" />
     224    <path
     225       id="path4216"
     226       d="m 1,1039.3621 0,2 0,2 1,0 0,-2 8,0 0,2 1,0 0,-2 0,-2 -10,0 z"
     227       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
     228       inkscape:connector-curvature="0" />
     229  </g>
     230</svg>

  • resources/styles/standard/elemstyles.mapcss 

    diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
index e09c569b59..ebc49ca600 100644
    a b node[man_made=communications_tower] {  
    17831783    icon-image: "presets/tower/communications_tower.svg";
    17841784    set icon_z17;
    17851785}
     1786node[man_made=utility_pole] {
     1787    icon-image: "presets/tower/pole.svg";
     1788    set icon_z17;
     1789}
     1790node[man_made=utility_pole][utility=power] {
     1791    icon-image: "presets/power/pole.svg";
     1792    set icon_z17;
     1793}
     1794node[man_made=utility_pole][utility=street_lighting] {
     1795    icon-image: "presets/tower/pole_street_light.svg";
     1796    set icon_z17;
     1797}
     1798node[man_made=utility_pole][utility=telecom],
     1799node[man_made=utility_pole][utility=television] {
     1800    icon-image: "presets/tower/pole_telecom.svg";
     1801    set icon_z17;
     1802}
     1803node[man_made=utility_pole][utility=water] {
     1804    icon-image: "presets/tower/pole_water.svg";
     1805    set icon_z17;
     1806}
     1807node[man_made=utility_pole][utility=gas] {
     1808    icon-image: "presets/tower/pole_gas.svg";
     1809    set icon_z17;
     1810}
     1811node[man_made=utility_pole][utility=waste] {
     1812    icon-image: "presets/tower/pole_waste.svg";
     1813    set icon_z17;
     1814}
    17861815
    17871816/****************/
    17881817/* telecom tags */