drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 13:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[classifier] Added building=guardhouse, office=security.

Browse Source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2025-08-23 23:14:16 -03:00
committed by Konstantin Pastbin
parent a35ec0df90
commit a48a9a67a4
12 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/mapcss-mapping.csv
View File

@@ -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;
Can't render this file because it contains an unexpected character in line 7 and column 16.

7
data/styles/default/dark/symbols/security-m.svg Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
<circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
<circle cx="9" cy="9" r="8.25" fill="#717065"/>
<path d="m13.295 7.9993h-8.5898v1.2734c0 2.6488 1.8321 5.1251 4.2949 5.7266 2.4627-0.60136 4.2949-3.0776 4.2949-5.7266zm-4.2949 0.49805 0.73633 1.7363 1.8887 0.16211-1.4316 1.2363 0.42969 1.8516-1.623-0.97656-1.623 0.97656 0.42969-1.8457-1.4316-1.2363 1.8906-0.16211z" fill="#000"/>
<path d="m11.5 7v-1c0-1.3807-1.1193-2.5-2.5-2.5s-2.5 1.1193-2.5 2.5v1" fill="none" stroke="#000" stroke-width="1.5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 652 B

7
data/styles/default/include/Icons.mapcss
View File

@@ -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;}

1
data/styles/default/include/priorities_3_FG.prio.txt
View File

@@ -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

2
data/styles/default/include/priorities_4_overlays.prio.txt
View File

@@ -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-)

7
data/styles/default/light/symbols/security-m.svg Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
<circle cx="9" cy="9" r="9" fill="#fff" opacity=".6"/>
<circle cx="9" cy="9" r="8.25" fill="#717065"/>
<path d="m13.295 7.9993h-8.5898v1.2734c0 2.6488 1.8321 5.1251 4.2949 5.7266 2.4627-0.60136 4.2949-3.0776 4.2949-5.7266zm-4.2949 0.49805 0.73633 1.7363 1.8887 0.16211-1.4316 1.2363 0.42969 1.8516-1.623-0.97656-1.623 0.97656 0.42969-1.8457-1.4316-1.2363 1.8906-0.16211z" fill="#fff"/>
<path d="m11.5 7v-1c0-1.3807-1.1193-2.5-2.5-2.5s-2.5 1.1193-2.5 2.5v1" fill="none" stroke="#fff" stroke-width="1.5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 652 B

1
data/styles/outdoors/include/priorities_3_FG.prio.txt
View File

@@ -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

2
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View File

@@ -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-)

8
data/styles/vehicle/include/Basemap_label.mapcss
View File

@@ -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],

10
data/styles/vehicle/include/Icons.mapcss
View File

@@ -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;}

1
data/styles/vehicle/include/priorities_3_FG.prio.txt
View File

@@ -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

2
data/styles/vehicle/include/priorities_4_overlays.prio.txt
View File

@@ -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-)