Changeset 15307 in josm

Timestamp:

2019-08-20T21:36:24+02:00 (5 years ago)

Author:

Klumbumbus

Message:

fix #17950 - add police=* preset (Non-public police facility) (icon derived from internal police icon, which was resized as well, CC0 and PD licensed) and warn about police=yes and police=* together with amenity=police

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/validator/combinations.mapcss (modified) (1 diff)
• data/validator/deprecated.mapcss (modified) (1 diff)
• images/presets/service/police.svg (modified) (3 diffs)
• images/presets/service/police_non_public.svg (added)
• styles/standard/elemstyles.mapcss (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -4704 +4704 @@
             </optional>
         </item> <!-- Entrance -->
+        <item name="Non-public police facility" icon="presets/service/police_non_public.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:police" />
+            <space />
+            <combo key="police" text="Type" values="barracks,car_pound,checkpoint,detention,naval_base,offices,range,storage,training_area,yes" values_context="police" match="keyvalue!" values_searchable="true" />
+            <optional>
+                <text key="name" text="Name" />
+                <text key="operator" text="Operator" />
+            </optional>
+        </item> <!-- Non-public police facility -->
         <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=tower" />

trunk/data/validator/combinations.mapcss

@@ -259 +259 @@
 }
 
-/* {0.tag} together with {1.tag}, see #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
+/* {0.tag} together with {1.tag}, see #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */
+*[amenity=police][police],
 node[highway=crossing][crossing=no],
 node[railway=crossing][crossing=no],

trunk/data/validator/deprecated.mapcss

@@ -458 +458 @@
 }
 
-/* see #10661, #10837, #11737, #12771 */
+/* see #17950, #10661, #10837, #11737, #12771 */
+*[police=yes],
 *[traffic_calming=yes],
 *[access=restricted],

trunk/images/presets/service/police.svg

@@ -11 +11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="14.536685"
-   height="15.999996"
+   width="15"
+   height="16"
    id="svg2226"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    version="1.0"
-   sodipodi:docname="police3.svg"
+   sodipodi:docname="police.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
@@ -100 +100 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="6.5611541"
-     inkscape:cy="4.1970596"
+     inkscape:zoom="31.678384"
+     inkscape:cx="5.5468131"
+     inkscape:cy="7.155903"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      width="32px"
      height="32px"
-     inkscape:window-width="906"
-     inkscape:window-height="820"
-     inkscape:window-x="486"
-     inkscape:window-y="151"
-     showgrid="false"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     showgrid="true"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid824" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2231">
@@ -146 +150 @@
      transform="translate(-255.89842,-523.38464)">
     <path
-       style="fill:#917400;fill-opacity:1;stroke:#000000;stroke-width:0.28710759"
-       d="m 263.17214,539.35075 c 0.38597,-1.58882 8.03198,-0.52961 6.85035,-3.17764 -3.61641,-8.10434 0,-9.53291 0,-9.53291 -1.14352,-0.39721 -1.36704,-1.58883 -1.37222,-1.58883 -3.42453,1.58883 -5.47813,-1.58881 -5.47813,-1.58881 l 0,0 c 0,0 -2.02498,3.17764 -5.48889,1.58881 -0.003,0 -0.2287,1.19162 -1.37222,1.58883 0,0 3.61641,1.42857 0,9.53291 -1.18163,2.64803 6.47517,1.58882 6.86111,3.17764 z"
+       style="fill:#917400;fill-opacity:1;stroke:#000000;stroke-width:0.28981712"
+       d="m 263.40397,539.34905 c 0.39791,-1.57039 8.28034,-0.52347 7.06217,-3.14078 -3.72823,-8.01034 0,-9.42235 0,-9.42235 -1.17889,-0.39259 -1.40932,-1.5704 -1.41466,-1.5704 -3.53042,1.5704 -5.64751,-1.57038 -5.64751,-1.57038 v 0 c 0,0 -2.08759,3.14078 -5.65861,1.57038 -0.003,0 -0.23577,1.17781 -1.41465,1.5704 0,0 3.72822,1.41201 0,9.42235 -1.21818,2.61731 6.6754,1.57039 7.07326,3.14078 z"
        id="path2968"
        inkscape:connector-curvature="0" />
     <path
        id="path3435"
-       d="m 263.55699,527.55291 2.45042,7.38057 -6.41529,-4.56144 7.92974,0 -6.4153,4.56144 2.45043,-7.38057 z"
-       style="fill:#0000ff;stroke:#000000;stroke-width:0.01031038"
+       d="m 263.80073,527.68804 2.52618,7.29497 -6.61366,-4.50853 h 8.17494 l -6.61366,4.50853 z"
+       style="fill:#0000ff;stroke:#000000;stroke-width:0.01040768"
        inkscape:connector-curvature="0" />
   </g>

trunk/styles/standard/elemstyles.mapcss

@@ -2480 +2480 @@
 
 /****************/
+/* police tags */
+/****************/
+
+area[police=barracks],
+area[police=car_pound],
+area[police=checkpoint],
+area[police=detention],
+area[police=naval_base],
+area[police=offices],
+area[police=range],
+area[police=storage],
+area[police=training_area],
+area[police=yes] {
+    fill-color: police#ecba52;
+}
+node[police=barracks],
+node[police=car_pound],
+node[police=checkpoint],
+node[police=detention],
+node[police=naval_base],
+node[police=offices],
+node[police=range],
+node[police=storage],
+node[police=training_node],
+node[police=yes] {
+    icon-image: "presets/service/police_non_public.svg";
+    set icon_z17;
+}
+
+/****************/
 /* amenity tags */
 /****************/