diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 85d49721a..065fdeb24 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1753,3 +1753,5 @@ post_office|post_partner;1626; amenity|ranger_station;1627; leisure|escape_game;1628; amenity|luggage_locker;1629; +building|guardhouse;1630; +office|security;1631; diff --git a/data/styles/default/dark/symbols/security-m.svg b/data/styles/default/dark/symbols/security-m.svg new file mode 100644 index 000000000..07af1bbb9 --- /dev/null +++ b/data/styles/default/dark/symbols/security-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss index f4e756bd1..a456e49de 100644 --- a/data/styles/default/include/Icons.mapcss +++ b/data/styles/default/include/Icons.mapcss @@ -803,6 +803,8 @@ node|z17-[amenity=cinema], node|z17-[amenity=ice_cream], node|z17-[leisure=bowling_alley], node|z17-[amenity=police], +node|z17-[building=guardhouse], +node|z17-[office=security], node|z17-[amenity=prison], node|z17-[office=diplomatic], node|z17-[office=lawyer], @@ -1284,8 +1286,13 @@ node|z17-[leisure=bowling_alley], node|z18-[leisure=bowling_alley], {font-size: 11;} +node|z17-[building=guardhouse], +node|z17-[office=security], +{icon-image: security-m.svg;} node|z17-[amenity=police], {icon-image: police-m.svg;} +node|z18-[building=guardhouse], +node|z18-[office=security], node|z18-[amenity=police], {font-size: 11;} diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index afc1c32b9..000ae6a27 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -398,6 +398,7 @@ railway-subway-bridge::bridgeblack # line::bridgeblack z16- (al building # area z14- (also has caption z16-) building-garage # area z14- (also has caption z16-) +building-guardhouse building-has_parts # area z14- (also has caption z16-) building-train_station # area z14- (also has caption z16-) === 130 diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 9955b07ca..8cc22c3ec 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -1186,6 +1186,7 @@ amenity-shower # icon z17- (also has captio amenity-toilets # icon z18- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) office # icon z18- (also has caption(optional) z18-) +office-security post_office-post_partner # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) === 470 @@ -1224,6 +1225,7 @@ emergency-emergency_ward_entrance # icon z16- (also has captio building # caption z16- (also has area z14-) building-garage # caption z16- (also has area z14-) +building-guardhouse building-has_parts # caption z16- (also has area z14-) power-plant # icon z17- (also has area z13-) power-plant-coal # icon z17- (also has area z13-) diff --git a/data/styles/default/light/symbols/security-m.svg b/data/styles/default/light/symbols/security-m.svg new file mode 100644 index 000000000..0659b6568 --- /dev/null +++ b/data/styles/default/light/symbols/security-m.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 153f71e3a..072b92dc8 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -400,6 +400,7 @@ railway-subway-bridge::bridgeblack # line::bridgeblack z16- (al building # area z14- (also has caption z16-) building-garage # area z14- (also has caption z16-) +building-guardhouse building-has_parts # area z14- (also has caption z16-) building-train_station # area z14- (also has caption z16-) === 130 diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 0e359e795..f91df4035 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -1187,6 +1187,7 @@ amenity-shower # icon z17- (also has captio amenity-toilets # icon z15- (also has caption(optional) z18-) man_made-embankment # pathtext z18- (also has line z16-) office # icon z18- (also has caption(optional) z18-) +office-security post_office-post_partner # icon z18- (also has caption(optional) z18-) shop # icon z18- (also has caption(optional) z18-) === 470 @@ -1225,6 +1226,7 @@ emergency-emergency_ward_entrance # icon z16- (also has captio building # caption z16- (also has area z14-) building-garage # caption z16- (also has area z14-) +building-guardhouse building-has_parts # caption z16- (also has area z14-) man_made-utility_pole # icon z15- power-plant # icon z17- (also has area z13-) diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss index 418aa675d..3536ee37a 100644 --- a/data/styles/vehicle/include/Basemap_label.mapcss +++ b/data/styles/vehicle/include/Basemap_label.mapcss @@ -524,6 +524,14 @@ node|z19-[building], node|z19-[building]::int_name, {font-size: 13;} +/* ToDo text: none; doesn't work here .. */ +node|z18-[building=guardhouse], +area|z18-[building=guardhouse], +node|z18-[building=guardhouse]::int_name, +area|z18-[building=guardhouse]::int_name, +{text-offset: 1;} + + node|z18[addr:housenumber][addr:street], {font-size: 13;} node|z19-[addr:housenumber][addr:street], diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss index 22ab46702..96f815c12 100644 --- a/data/styles/vehicle/include/Icons.mapcss +++ b/data/styles/vehicle/include/Icons.mapcss @@ -462,10 +462,16 @@ node|z17[amenity=bank], node|z18-[amenity=bank], {icon-image: bank-m.svg;font-size: 14.5; icon-min-distance: 10;} +node|z17-[building=guardhouse], +node|z17-[office=security], +{icon-image: security-m.svg;} +node|z17-[amenity=police], +{icon-image: police-m.svg;} + node|z17[amenity=police], -{icon-image: police-m.svg; font-size: 13.75; icon-min-distance: 15;} +{font-size: 13.75; icon-min-distance: 15;} node|z18-[amenity=police], -{icon-image: police-m.svg; font-size: 14.5; icon-min-distance: 10;} +{font-size: 14.5; icon-min-distance: 10;} node|z12[barrier=toll_booth], {icon-image: toll_booth-s.svg; icon-min-distance: 8;} diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 546d1f92c..202a30d5b 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -353,6 +353,7 @@ man_made-cutline # line z15- barrier-ditch # line z17- building # area z15- (also has caption z18-) building-garage # area z15- (also has caption z18-) +building-guardhouse building-has_parts # area z15- (also has caption z18-) building-train_station # area z15- (also has caption z18-) === 50 diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index e583f20fb..9c905de70 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -724,6 +724,7 @@ amenity-parcel_locker # icon z17- (also has captio amenity-police # icon z17- amenity-post_office # icon z17- (also has caption(optional) z17-) amenity-toilets # icon z17- (also has caption(optional) z17-) +office-security post_office-post_partner # icon z18- (also has caption(optional) z18-) shop-motorcycle # icon z17- === 200 @@ -746,6 +747,7 @@ building-has_parts # caption z18- (also has are === 50 building-garage # caption z18- (also has area z15-) +building-guardhouse === 30 entrance-main # icon z18- (also has caption(optional) z18-)