Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15306)
+++ /trunk/data/defaultpresets.xml	(revision 15307)
@@ -4704,4 +4704,13 @@
             </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" />
Index: /trunk/data/validator/combinations.mapcss
===================================================================
--- /trunk/data/validator/combinations.mapcss	(revision 15306)
+++ /trunk/data/validator/combinations.mapcss	(revision 15307)
@@ -259,5 +259,6 @@
 }
 
-/* {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],
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 15306)
+++ /trunk/data/validator/deprecated.mapcss	(revision 15307)
@@ -458,5 +458,6 @@
 }
 
-/* see #10661, #10837, #11737, #12771 */
+/* see #17950, #10661, #10837, #11737, #12771 */
+*[police=yes],
 *[traffic_calming=yes],
 *[access=restricted],
Index: /trunk/images/presets/service/police.svg
===================================================================
--- /trunk/images/presets/service/police.svg	(revision 15306)
+++ /trunk/images/presets/service/police.svg	(revision 15307)
@@ -11,11 +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,21 +100,25 @@
      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,12 +150,12 @@
      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>
Index: /trunk/images/presets/service/police_non_public.svg
===================================================================
--- /trunk/images/presets/service/police_non_public.svg	(revision 15307)
+++ /trunk/images/presets/service/police_non_public.svg	(revision 15307)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   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"
+   width="15"
+   height="16"
+   id="svg2226"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   version="1.0"
+   sodipodi:docname="police4.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs2228">
+    <radialGradient
+       cx="-41.2598"
+       cy="-47.871601"
+       fx="-41.2598"
+       fy="-47.871601"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_15_"
+       r="599.07233">
+      <stop
+         offset="0"
+         style="stop-color:#E8D776"
+         id="stop2960" />
+      <stop
+         offset="0.4141"
+         style="stop-color:#B39949"
+         id="stop2962" />
+      <stop
+         offset="0.8085"
+         style="stop-color:#856422"
+         id="stop2964" />
+      <stop
+         offset="1"
+         style="stop-color:#734F13"
+         id="stop2966" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="0.4551"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#734F13" />
+    </radialGradient>
+    <radialGradient
+       cx="-41.2598"
+       cy="-47.871601"
+       fx="-41.2598"
+       fy="-47.871601"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2241"
+       r="599.07233">
+      <stop
+         offset="0"
+         style="stop-color:#E8D776"
+         id="stop2243" />
+      <stop
+         offset="0.4141"
+         style="stop-color:#B39949"
+         id="stop2245" />
+      <stop
+         offset="0.8085"
+         style="stop-color:#856422"
+         id="stop2247" />
+      <stop
+         offset="1"
+         style="stop-color:#734F13"
+         id="stop2249" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="0.4551"
+         style="stop-color:#E8D776" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#734F13" />
+    </radialGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="0.25635431"
+     inkscape:cy="5.5160575"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     width="32px"
+     height="32px"
+     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="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid824" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2231">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:title></dc:title>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://web.resource.org/cc/PublicDomain">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-255.89842,-523.38464)">
+    <path
+       style="fill:#917400;fill-opacity:1;stroke:#000000;stroke-width:0.28981566"
+       d="m 263.40457,539.34897 c 0.3979,-1.57039 8.28022,-0.52347 7.06207,-3.14079 -3.72818,-8.01036 0,-9.42237 0,-9.42237 -1.17886,-0.3926 -1.40929,-1.57041 -1.41463,-1.57041 -3.53038,1.57041 -5.64744,-1.57038 -5.64744,-1.57038 v 0 c 0,0 -2.08756,3.14079 -5.65855,1.57038 -0.003,0 -0.23575,1.17781 -1.4146,1.57041 0,0 3.72816,1.41201 0,9.42237 -1.21816,2.61732 6.67527,1.5704 7.07315,3.14079 z"
+       id="path2968"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3435"
+       d="m 263.80132,527.68793 2.52615,7.295 -6.61357,-4.50855 h 8.17481 l -6.61356,4.50855 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.01040763"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 15306)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 15307)
@@ -2480,4 +2480,34 @@
 
 /****************/
+/* 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 */
 /****************/