Changeset 17027 in josm


Ignore:
Timestamp:
2020-09-14T18:04:05+02:00 (6 days ago)
Author:
Klumbumbus
Message:

fix #19759 - Add emergency=suction_point, icon derived from internal icon presets/service/firebrigade, PD and CC0 licensed, improve firebrigade icon too (wheels brighter)

Location:
trunk/resources
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r17026 r17027  
    43514351            <text key="water_tank:volume" text="Volume (in liters)" />
    43524352        </item> <!-- Water Tank -->
     4353        <item name="Suction point" icon="presets/emergency/suction_point.svg" type="node" preset_name_label="true">
     4354            <link wiki="Tag:emergency=suction_point" />
     4355            <space />
     4356            <key key="emergency" value="suction_point" />
     4357            <reference ref="name_ref_operator" />
     4358        </item> <!-- Suction point -->
    43534359        <separator />
    43544360        <item name="Assembly Point" icon="presets/emergency/assembly_point.svg" type="node" preset_name_label="true">
  • trunk/resources/images/presets/service/firebrigade.svg

    r13363 r17027  
    22<svg
    33   xmlns:dc="http://purl.org/dc/elements/1.1/"
    4    xmlns:cc="http://web.resource.org/cc/"
     4   xmlns:cc="http://creativecommons.org/ns#"
    55   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    66   xmlns:svg="http://www.w3.org/2000/svg"
     
    88   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    99   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    10    version="1.1"
     10   inkscape:output_extension="org.inkscape.output.svg.inkscape"
     11   sodipodi:docname="firebrigade.svg"
     12   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
     13   sodipodi:version="0.32"
     14   id="svg2"
     15   height="500"
    1116   width="1000"
    12    height="500"
    13    id="svg2"
    14    sodipodi:version="0.32"
    15    inkscape:version="0.45.1"
    16    sodipodi:docname="firebrigade.svg"
    17    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    18    sodipodi:docbase="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\svn.openstreetmap.org\applications\share\map-icons\svg\public">
     17   version="1.1">
    1918  <path
    20      sodipodi:type="arc"
     19     transform="matrix(2.1904762,0,0,1.7567568,-413.45641,54.77528)"
     20     sodipodi:open="true"
     21     sodipodi:end="6.2831853"
     22     sodipodi:start="3.1415927"
     23     d="M 563.20227,25.983145 A 14.747191,25.983147 0 0 1 592.69665,25.983146"
     24     sodipodi:ry="25.983147"
     25     sodipodi:rx="14.747191"
     26     sodipodi:cy="25.983147"
     27     sodipodi:cx="577.94946"
     28     id="path3172"
    2129     style="fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    22      id="path3172"
    23      sodipodi:cx="577.94946"
    24      sodipodi:cy="25.983147"
    25      sodipodi:rx="14.747191"
    26      sodipodi:ry="25.983147"
    27      d="M 563.20227,25.983145 A 14.747191,25.983147 0 0 1 592.69665,25.983146"
    28      sodipodi:start="3.1415927"
    29      sodipodi:end="6.2831853"
    30      sodipodi:open="true"
    31      transform="matrix(2.1904762,0,0,1.7567568,-413.45641,54.77528)" />
     30     sodipodi:type="arc" />
    3231  <circle
    33      r="77"
     32     transform="matrix(-1,0,0,1,1000.5636,0)"
     33     sodipodi:ry="77"
     34     sodipodi:rx="77"
     35     sodipodi:cy="412"
     36     sodipodi:cx="748"
     37     id="circle10"
     38     style="fill:#333333;stroke:none"
     39     cy="412"
    3440     cx="748"
    35      cy="412"
    36      style="fill:#000000;stroke:none"
    37      id="circle10"
    38      sodipodi:cx="748"
    39      sodipodi:cy="412"
    40      sodipodi:rx="77"
    41      sodipodi:ry="77"
    42      transform="matrix(-1,0,0,1,1000.5636,0)" />
     41     r="77" />
    4342  <metadata
    4443     id="metadata15">
     
    5150        <cc:license
    5251           rdf:resource="http://web.resource.org/cc/PublicDomain" />
     52        <dc:title></dc:title>
    5353      </cc:Work>
    5454      <cc:License
     
    6666     id="defs13" />
    6767  <sodipodi:namedview
    68      inkscape:window-height="852"
     68     inkscape:window-maximized="0"
     69     showgrid="false"
     70     inkscape:document-rotation="0"
     71     inkscape:current-layer="svg2"
     72     inkscape:window-y="58"
     73     inkscape:window-x="44"
     74     inkscape:cy="138.73616"
     75     inkscape:cx="500.63904"
     76     inkscape:zoom="0.43578506"
     77     id="base"
     78     pagecolor="#ffffff"
     79     bordercolor="#666666"
     80     borderopacity="1.0"
     81     objecttolerance="10.0"
     82     gridtolerance="10.0"
     83     guidetolerance="10.0"
     84     inkscape:pageopacity="0.0"
     85     inkscape:pageshadow="2"
    6986     inkscape:window-width="1178"
    70      inkscape:pageshadow="2"
    71      inkscape:pageopacity="0.0"
    72      guidetolerance="10.0"
    73      gridtolerance="10.0"
    74      objecttolerance="10.0"
    75      borderopacity="1.0"
    76      bordercolor="#666666"
    77      pagecolor="#ffffff"
    78      id="base"
    79      inkscape:zoom="0.712"
    80      inkscape:cx="500.63904"
    81      inkscape:cy="138.73616"
    82      inkscape:window-x="44"
    83      inkscape:window-y="58"
    84      inkscape:current-layer="svg2" />
    85 <!-- Created by MarianSigler, mariansigler@gmail.com -->  <path
    86      style="fill:#d40000;fill-rule:evenodd;stroke:none"
     87     inkscape:window-height="852" />
     88  <!-- Created by MarianSigler, mariansigler@gmail.com -->
     89  <path
     90     id="path4"
    8791     d="M 704.78238,86.8125 L 884.50113,99.21875 C 914.98082,101.52687 905.67809,93.253968 939.37613,182.6875 C 972.12634,266.58484 966.60398,237.38284 966.25113,281.625 L 966.25113,380.625 C 965.98019,406.5123 962.10399,412.88408 934.00113,413.09375 C 929.93537,282.42164 742.82184,281.9606 739.09488,413.84375 L 350.03238,414.09375 C 350.22007,380.0998 335.84464,354.1971 312.84488,335.40625 L 704.78238,335.09375 L 704.78238,233.15625 L 746.34488,233.15625 L 746.34488,127.8125 L 704.78238,127.8125 L 704.78238,86.8125 z M 781.06363,127.71875 L 782.62613,233.1875 L 915.25113,248.71875 C 938.76806,251.77859 940.13062,245.59051 931.53238,224.65625 L 905.93863,156.40625 C 899.51145,135.25078 899.36579,135.15941 881.12613,133.9375 L 781.06363,127.71875 z M 192.12613,335.5625 C 168.29458,354.67068 154.83272,381.84496 155.06363,414.1875 L 98.344882,414.25 L 33.751132,391.375 L 33.938632,335.59375 L 192.12613,335.5625 z "
    88      id="path4" />
     92     style="fill:#d40000;fill-rule:evenodd;stroke:none" />
    8993  <path
    90      style="fill:#d40000;stroke:none"
     94     id="rect6"
    9195     d="M 705.46988,86.59375 L 705.46988,127.8125 L 590.43863,127.8125 L 590.43863,233.15625 L 705.46988,233.15625 L 705.46988,337.75 L 34.813632,337.75 L 34.813632,86.59375 L 546.90738,86.59375 L 546.90738,314.59375 L 565.15738,314.59375 L 565.15738,86.59375 L 705.46988,86.59375 z "
    92      id="rect6" />
     96     style="fill:#d40000;stroke:none" />
    9397  <circle
    94      r="77"
     98     transform="matrix(-1,0,0,1,1000.5636,0)"
     99     sodipodi:ry="77"
     100     sodipodi:rx="77"
     101     sodipodi:cy="412"
     102     sodipodi:cx="164"
     103     id="circle8"
     104     style="fill:#333333;stroke:none"
     105     cy="412"
    95106     cx="164"
    96      cy="412"
    97      style="fill:#000000;stroke:none"
    98      id="circle8"
    99      sodipodi:cx="164"
    100      sodipodi:cy="412"
    101      sodipodi:rx="77"
    102      sodipodi:ry="77"
    103      transform="matrix(-1,0,0,1,1000.5636,0)" />
     107     r="77" />
    104108  <rect
    105      style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     109     y="112.35955"
     110     x="58.988766"
     111     height="203.65169"
     112     width="223.31461"
    106113     id="rect3160"
     114     style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     115  <rect
     116     style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     117     id="rect3162"
    107118     width="223.31461"
    108119     height="203.65169"
     
    110121     y="112.35955" />
    111122  <rect
    112      y="112.35955"
    113      x="58.988766"
     123     y="110.95506"
     124     x="296.34833"
    114125     height="203.65169"
    115126     width="223.31461"
    116      id="rect3162"
     127     id="rect3166"
    117128     style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    118   <rect
    119      style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    120      id="rect3166"
    121      width="223.31461"
    122      height="203.65169"
    123      x="296.34833"
    124      y="110.95506" />
    125129  <path
    126      style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:10.76448822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     130     id="path3174"
    127131     d="M 853.93264,48.318081 L 853.93264,7.7252111"
    128      id="path3174" />
    129   <path
    130      id="path5118"
    131      d="M 871.91661,52.531564 L 894.93735,19.097648"
    132132     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:10.76448822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    133133  <path
    134134     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:10.76448822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     135     d="M 871.91661,52.531564 L 894.93735,19.097648"
     136     id="path5118" />
     137  <path
     138     id="path5120"
    135139     d="M 835.94859,51.12707 L 812.92785,17.693154"
    136      id="path5120" />
     140     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0000ff;stroke-width:10.76448822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
    137141</svg>
  • trunk/resources/styles/standard/elemstyles.mapcss

    r17019 r17027  
    26462646    set icon_z17;
    26472647}
     2648node[emergency=suction_point] {
     2649    icon-image: "presets/emergency/suction_point.svg";
     2650    set icon_z17;
     2651}
    26482652node[emergency=emergency_ward_entrance] {
    26492653    icon-image: "presets/emergency/emergency_ward_entrance.svg";
Note: See TracChangeset for help on using the changeset viewer.