- Timestamp:
- 2019-08-20T21:36:24+02:00 (5 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/defaultpresets.xml
r15305 r15307 4704 4704 </optional> 4705 4705 </item> <!-- Entrance --> 4706 <item name="Non-public police facility" icon="presets/service/police_non_public.svg" type="node,closedway,multipolygon" preset_name_label="true"> 4707 <link wiki="Key:police" /> 4708 <space /> 4709 <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" /> 4710 <optional> 4711 <text key="name" text="Name" /> 4712 <text key="operator" text="Operator" /> 4713 </optional> 4714 </item> <!-- Non-public police facility --> 4706 4715 <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway" preset_name_label="true"> 4707 4716 <link wiki="Tag:man_made=tower" /> -
trunk/data/validator/combinations.mapcss
r15286 r15307 259 259 } 260 260 261 /* {0.tag} together with {1.tag}, see #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */ 261 /* {0.tag} together with {1.tag}, see #17950, #17330, #17623, #17592, #17594, #17542, #16861, #16147, #10186 */ 262 *[amenity=police][police], 262 263 node[highway=crossing][crossing=no], 263 264 node[railway=crossing][crossing=no], -
trunk/data/validator/deprecated.mapcss
r15273 r15307 458 458 } 459 459 460 /* see #10661, #10837, #11737, #12771 */ 460 /* see #17950, #10661, #10837, #11737, #12771 */ 461 *[police=yes], 461 462 *[traffic_calming=yes], 462 463 *[access=restricted], -
trunk/images/presets/service/police.svg
r13363 r15307 11 11 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 12 12 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 13 width="1 4.536685"14 height="1 5.999996"13 width="15" 14 height="16" 15 15 id="svg2226" 16 16 sodipodi:version="0.32" 17 inkscape:version="0.9 1 r13725"17 inkscape:version="0.92.3 (2405546, 2018-03-11)" 18 18 version="1.0" 19 sodipodi:docname="police 3.svg"19 sodipodi:docname="police.svg" 20 20 inkscape:output_extension="org.inkscape.output.svg.inkscape"> 21 21 <defs … … 100 100 inkscape:pageopacity="0.0" 101 101 inkscape:pageshadow="2" 102 inkscape:zoom=" 11.2"103 inkscape:cx=" 6.5611541"104 inkscape:cy=" 4.1970596"102 inkscape:zoom="31.678384" 103 inkscape:cx="5.5468131" 104 inkscape:cy="7.155903" 105 105 inkscape:document-units="px" 106 106 inkscape:current-layer="layer1" 107 107 width="32px" 108 108 height="32px" 109 inkscape:window-width=" 906"110 inkscape:window-height=" 820"111 inkscape:window-x=" 486"112 inkscape:window-y=" 151"113 showgrid=" false"109 inkscape:window-width="1680" 110 inkscape:window-height="987" 111 inkscape:window-x="-8" 112 inkscape:window-y="-8" 113 showgrid="true" 114 114 fit-margin-top="0" 115 115 fit-margin-left="0" 116 116 fit-margin-right="0" 117 117 fit-margin-bottom="0" 118 inkscape:window-maximized="0" /> 118 inkscape:window-maximized="1"> 119 <inkscape:grid 120 type="xygrid" 121 id="grid824" /> 122 </sodipodi:namedview> 119 123 <metadata 120 124 id="metadata2231"> … … 146 150 transform="translate(-255.89842,-523.38464)"> 147 151 <path 148 style="fill:#917400;fill-opacity:1;stroke:#000000;stroke-width:0.28 710759"149 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.17764z"152 style="fill:#917400;fill-opacity:1;stroke:#000000;stroke-width:0.28981712" 153 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" 150 154 id="path2968" 151 155 inkscape:connector-curvature="0" /> 152 156 <path 153 157 id="path3435" 154 d="m 263. 55699,527.55291 2.45042,7.38057 -6.41529,-4.56144 7.92974,0 -6.4153,4.56144 2.45043,-7.38057z"155 style="fill:#0000ff;stroke:#000000;stroke-width:0.010 31038"158 d="m 263.80073,527.68804 2.52618,7.29497 -6.61366,-4.50853 h 8.17494 l -6.61366,4.50853 z" 159 style="fill:#0000ff;stroke:#000000;stroke-width:0.01040768" 156 160 inkscape:connector-curvature="0" /> 157 161 </g> -
trunk/styles/standard/elemstyles.mapcss
r15304 r15307 2480 2480 2481 2481 /****************/ 2482 /* police tags */ 2483 /****************/ 2484 2485 area[police=barracks], 2486 area[police=car_pound], 2487 area[police=checkpoint], 2488 area[police=detention], 2489 area[police=naval_base], 2490 area[police=offices], 2491 area[police=range], 2492 area[police=storage], 2493 area[police=training_area], 2494 area[police=yes] { 2495 fill-color: police#ecba52; 2496 } 2497 node[police=barracks], 2498 node[police=car_pound], 2499 node[police=checkpoint], 2500 node[police=detention], 2501 node[police=naval_base], 2502 node[police=offices], 2503 node[police=range], 2504 node[police=storage], 2505 node[police=training_node], 2506 node[police=yes] { 2507 icon-image: "presets/service/police_non_public.svg"; 2508 set icon_z17; 2509 } 2510 2511 /****************/ 2482 2512 /* amenity tags */ 2483 2513 /****************/
Note:
See TracChangeset
for help on using the changeset viewer.