Changeset 17027 in josm for trunk/resources

Timestamp:

2020-09-14T18:04:05+02:00 (4 years 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:

• data/defaultpresets.xml (modified) (1 diff)
• images/presets/emergency/suction_point.svg (added)
• images/presets/service/firebrigade.svg (modified) (5 diffs)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/resources/data/defaultpresets.xml

@@ -4351 +4351 @@
             <text key="water_tank:volume" text="Volume (in liters)" />
         </item> <!-- Water Tank -->
+        <item name="Suction point" icon="presets/emergency/suction_point.svg" type="node" preset_name_label="true">
+            <link wiki="Tag:emergency=suction_point" />
+            <space />
+            <key key="emergency" value="suction_point" />
+            <reference ref="name_ref_operator" />
+        </item> <!-- Suction point -->
         <separator />
         <item name="Assembly Point" icon="presets/emergency/assembly_point.svg" type="node" preset_name_label="true">

trunk/resources/images/presets/service/firebrigade.svg

@@ -2 +2 @@
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
+   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"
@@ -8 +8 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docname="firebrigade.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="500"
    width="1000"
-   height="500"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   sodipodi:docname="firebrigade.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:docbase="C:\Dokumente und Einstellungen\ulfl\Eigene Dateien\svn.openstreetmap.org\applications\share\map-icons\svg\public">
+   version="1.1">
   <path
-     sodipodi:type="arc"
+     transform="matrix(2.1904762,0,0,1.7567568,-413.45641,54.77528)"
+     sodipodi:open="true"
+     sodipodi:end="6.2831853"
+     sodipodi:start="3.1415927"
+     d="M 563.20227,25.983145 A 14.747191,25.983147 0 0 1 592.69665,25.983146"
+     sodipodi:ry="25.983147"
+     sodipodi:rx="14.747191"
+     sodipodi:cy="25.983147"
+     sodipodi:cx="577.94946"
+     id="path3172"
      style="fill:#0000ff;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="path3172"
-     sodipodi:cx="577.94946"
-     sodipodi:cy="25.983147"
-     sodipodi:rx="14.747191"
-     sodipodi:ry="25.983147"
-     d="M 563.20227,25.983145 A 14.747191,25.983147 0 0 1 592.69665,25.983146"
-     sodipodi:start="3.1415927"
-     sodipodi:end="6.2831853"
-     sodipodi:open="true"
-     transform="matrix(2.1904762,0,0,1.7567568,-413.45641,54.77528)" />
+     sodipodi:type="arc" />
   <circle
-     r="77"
+     transform="matrix(-1,0,0,1,1000.5636,0)"
+     sodipodi:ry="77"
+     sodipodi:rx="77"
+     sodipodi:cy="412"
+     sodipodi:cx="748"
+     id="circle10"
+     style="fill:#333333;stroke:none"
+     cy="412"
      cx="748"
-     cy="412"
-     style="fill:#000000;stroke:none"
-     id="circle10"
-     sodipodi:cx="748"
-     sodipodi:cy="412"
-     sodipodi:rx="77"
-     sodipodi:ry="77"
-     transform="matrix(-1,0,0,1,1000.5636,0)" />
+     r="77" />
   <metadata
      id="metadata15">
@@ -51 +50 @@
         <cc:license
            rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
       </cc:Work>
       <cc:License
@@ -66 +66 @@
      id="defs13" />
   <sodipodi:namedview
-     inkscape:window-height="852"
+     inkscape:window-maximized="0"
+     showgrid="false"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="svg2"
+     inkscape:window-y="58"
+     inkscape:window-x="44"
+     inkscape:cy="138.73616"
+     inkscape:cx="500.63904"
+     inkscape:zoom="0.43578506"
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     objecttolerance="10.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
      inkscape:window-width="1178"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="0.712"
-     inkscape:cx="500.63904"
-     inkscape:cy="138.73616"
-     inkscape:window-x="44"
-     inkscape:window-y="58"
-     inkscape:current-layer="svg2" />
-<!-- Created by MarianSigler, mariansigler@gmail.com -->  <path
-     style="fill:#d40000;fill-rule:evenodd;stroke:none"
+     inkscape:window-height="852" />
+  <!-- Created by MarianSigler, mariansigler@gmail.com -->
+  <path
+     id="path4"
      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 "
-     id="path4" />
+     style="fill:#d40000;fill-rule:evenodd;stroke:none" />
   <path
-     style="fill:#d40000;stroke:none"
+     id="rect6"
      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 "
-     id="rect6" />
+     style="fill:#d40000;stroke:none" />
   <circle
-     r="77"
+     transform="matrix(-1,0,0,1,1000.5636,0)"
+     sodipodi:ry="77"
+     sodipodi:rx="77"
+     sodipodi:cy="412"
+     sodipodi:cx="164"
+     id="circle8"
+     style="fill:#333333;stroke:none"
+     cy="412"
      cx="164"
-     cy="412"
-     style="fill:#000000;stroke:none"
-     id="circle8"
-     sodipodi:cx="164"
-     sodipodi:cy="412"
-     sodipodi:rx="77"
-     sodipodi:ry="77"
-     transform="matrix(-1,0,0,1,1000.5636,0)" />
+     r="77" />
   <rect
-     style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     y="112.35955"
+     x="58.988766"
+     height="203.65169"
+     width="223.31461"
      id="rect3160"
+     style="fill:#333333;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect3162"
      width="223.31461"
      height="203.65169"
@@ -110 +121 @@
      y="112.35955" />
   <rect
-     y="112.35955"
-     x="58.988766"
+     y="110.95506"
+     x="296.34833"
      height="203.65169"
      width="223.31461"
-     id="rect3162"
+     id="rect3166"
      style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  <rect
-     style="fill:#808080;fill-opacity:1;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     id="rect3166"
-     width="223.31461"
-     height="203.65169"
-     x="296.34833"
-     y="110.95506" />
   <path
-     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"
+     id="path3174"
      d="M 853.93264,48.318081 L 853.93264,7.7252111"
-     id="path3174" />
-  <path
-     id="path5118"
-     d="M 871.91661,52.531564 L 894.93735,19.097648"
      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" />
   <path
      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"
+     d="M 871.91661,52.531564 L 894.93735,19.097648"
+     id="path5118" />
+  <path
+     id="path5120"
      d="M 835.94859,51.12707 L 812.92785,17.693154"
-     id="path5120" />
+     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" />
 </svg>

trunk/resources/styles/standard/elemstyles.mapcss

@@ -2646 +2646 @@
     set icon_z17;
 }
+node[emergency=suction_point] {
+    icon-image: "presets/emergency/suction_point.svg";
+    set icon_z17;
+}
 node[emergency=emergency_ward_entrance] {
     icon-image: "presets/emergency/emergency_ward_entrance.svg";