organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

Remove residential garden icons #3179

Merged
root merged 2 commits from remove-residential-icons into master 2022-08-16 06:05:42 +00:00
Conversation 0 Commits 2 Files changed 15 +392 -9
15 changed files with 392 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/classificator.txt
View file

@ -562,7 +562,9 @@ world +
dog_park -
fitness_centre -
fitness_station -
garden -
garden +
residential -
{}
golf_course -
ice_rink -
landscape_reserve -

BIN
data/drules_proto.bin
View file

Binary file not shown.

87
data/drules_proto.txt
View file

@ -36077,6 +36077,93 @@ cont {
apply_if: "!name"
}
}
cont {
name: "leisure-garden-residential"
element {
scale: 12
area {
color: 12372094
priority: -15916
}
}
element {
scale: 13
area {
color: 11781233
priority: -15916
}
}
element {
scale: 14
area {
color: 11453035
priority: -15916
}
}
element {
scale: 15
area {
color: 11584112
priority: -15916
}
}
element {
scale: 16
area {
color: 11190117
priority: -15916
}
apply_if: "!name"
}
element {
scale: 17
area {
color: 11190117
priority: -15953
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
element {
scale: 18
area {
color: 11190117
priority: -15953
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
element {
scale: 19
area {
color: 11190117
priority: -15953
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
}
cont {
name: "leisure-golf_course"
element {

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

87
data/drules_proto_clear.txt
View file

@ -35718,6 +35718,93 @@ cont {
apply_if: "!name"
}
}
cont {
name: "leisure-garden-residential"
element {
scale: 12
area {
color: 12372094
priority: -15916
}
}
element {
scale: 13
area {
color: 11781233
priority: -15916
}
}
element {
scale: 14
area {
color: 11453035
priority: -15916
}
}
element {
scale: 15
area {
color: 11584112
priority: -15916
}
}
element {
scale: 16
area {
color: 11190117
priority: -15916
}
apply_if: "!name"
}
element {
scale: 17
area {
color: 11190117
priority: -15953
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
element {
scale: 18
area {
color: 11190117
priority: -15953
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
element {
scale: 19
area {
color: 11190117
priority: -15953
}
caption {
primary {
height: 10
color: 4473924
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
}
cont {
name: "leisure-golf_course"
element {

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

87
data/drules_proto_dark.txt
View file

@ -35861,6 +35861,93 @@ cont {
apply_if: "!name"
}
}
cont {
name: "leisure-garden-residential"
element {
scale: 12
area {
color: 1317888
priority: -15916
}
}
element {
scale: 13
area {
color: 1317888
priority: -15916
}
}
element {
scale: 14
area {
color: 1317888
priority: -15916
}
}
element {
scale: 15
area {
color: 1317888
priority: -15916
}
}
element {
scale: 16
area {
color: 1317888
priority: -15916
}
apply_if: "!name"
}
element {
scale: 17
area {
color: 1317888
priority: -15953
}
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
element {
scale: 18
area {
color: 1317888
priority: -15953
}
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
element {
scale: 19
area {
color: 1317888
priority: -15953
}
caption {
primary {
height: 10
color: 5592405
offset_y: 1
}
priority: 15047
}
apply_if: "!name"
}
}
cont {
name: "leisure-golf_course"
element {

BIN
data/drules_proto_vehicle_clear.bin
View file

Binary file not shown.

59
data/drules_proto_vehicle_clear.txt
View file

@ -22325,6 +22325,65 @@ cont {
}
}
}
cont {
name: "leisure-garden-residential"
element {
scale: 12
area {
color: 13031851
priority: -15896
}
}
element {
scale: 13
area {
color: 13031851
priority: -15896
}
}
element {
scale: 14
area {
color: 13031851
priority: -15896
}
}
element {
scale: 15
area {
color: 13031851
priority: -15896
}
}
element {
scale: 16
area {
color: 13163437
priority: -15896
}
}
element {
scale: 17
area {
color: 13163437
priority: -15896
}
}
element {
scale: 18
area {
color: 13163437
priority: -15896
}
}
element {
scale: 19
area {
color: 13163437
priority: -15896
}
}
}
cont {
name: "leisure-golf_course"
element {

BIN
data/drules_proto_vehicle_dark.bin
View file

Binary file not shown.

59
data/drules_proto_vehicle_dark.txt
View file

@ -22649,6 +22649,65 @@ cont {
}
}
}
cont {
name: "leisure-garden-residential"
element {
scale: 12
area {
color: 593674
priority: -15896
}
}
element {
scale: 13
area {
color: 593674
priority: -15896
}
}
element {
scale: 14
area {
color: 593674
priority: -15896
}
}
element {
scale: 15
area {
color: 593674
priority: -15896
}
}
element {
scale: 16
area {
color: 593674
priority: -15896
}
}
element {
scale: 17
area {
color: 593674
priority: -15896
}
}
element {
scale: 18
area {
color: 593674
priority: -15896
}
}
element {
scale: 19
area {
color: 593674
priority: -15896
}
}
}
cont {
name: "leisure-golf_course"
element {

2
data/mapcss-mapping.csv
View file

@ -134,7 +134,7 @@ sport|tennis;133;
landuse|vineyard;134;
aeroway|taxiway;135;
aeroway|aerodrome;136;
deprecated|deprecated;137;x
leisure|garden|residential;[leisure=garden][garden:type=residential];;name;int_name;137;
amenity|fire_station;138;
landuse|retail;139;
leisure|nature_reserve;140;

Can't render this file because it has a wrong number of fields in line 11.

10
data/styles/clear/include/Basemap_label.mapcss
View file

@ -453,11 +453,11 @@ node|z17-[landuse=residential]::int_name,
area|z14-[leisure=park][name],
area|z14-[landuse=forest][name],
area|z16-[leisure=garden][name]
area|z16-[leisure=garden][garden:type!=residential][name]
{text: name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;icon-min-distance: 10;}
area|z14-[leisure=park][name]::int_name,
area|z14-[landuse=forest][name]::int_name,
area|z16-[leisure=garden][name]::int_name
area|z16-[leisure=garden][garden:type!=residential][name]::int_name
{text: int_name;text-color: @park_label;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
/*
@ -489,21 +489,21 @@ area|z16[landuse=forest][name]
{icon-image: nparkf-m.svg;text-offset: 1;font-size: 11;}
area|z16[leisure=park][name]
{icon-image: park-m.svg;text-offset: 1;font-size: 11;}
area|z16[leisure=garden][name]
area|z16[leisure=garden][garden:type!=residential][name]
{icon-image: garden-m.svg;text-offset: 1;font-size: 11;}
area|z17[landuse=forest][name]
{icon-image: nparkf-m.svg;text-offset: 1;font-size: 12;}
area|z17[leisure=park][name]
{icon-image: park-m.svg;text-offset: 1;font-size: 12;}
area|z17[leisure=garden][name]
area|z17[leisure=garden][garden:type!=residential][name]
{icon-image: garden-m.svg;text-offset: 1;font-size: 12;}
area|z18-[landuse=forest]
{icon-image: nparkf-m.svg;text-offset: 1;font-size: 13;}
area|z18-[leisure=park]
{icon-image: park-m.svg;text-offset: 1;font-size: 13;}
area|z18-[leisure=garden]
area|z18-[leisure=garden][garden:type!=residential]
{icon-image: garden-m.svg;text-offset: 1;font-size: 13;}
area|z18-[leisure=park]::int_name,
area|z18-[leisure=garden]::int_name,

2
data/types.txt
View file

@ -134,7 +134,7 @@ landuse|forest|mixed
*landuse|vineyard
*aeroway|taxiway
*aeroway|aerodrome
mapswithme
*leisure|garden|residential
*amenity|fire_station
*landuse|retail
*leisure|nature_reserve

4
data/visibility.txt
View file

@ -562,7 +562,9 @@ world 00000000000000000000 +
dog_park 00000000000000000000 -
fitness_centre 00000000000000000000 -
fitness_station 00000000000000000000 -
garden 00000000000011111111 -
garden 00000000000011111111 +
residential 00000000000011111111 -
{}
golf_course 00000000000000111111 -
ice_rink 00000000000000000000 -
landscape_reserve 00000000000000000000 -