pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #5943 from igortomko/fix-island-name

Browse source 
MAPSME-4339 Fix island name
This commit is contained in:
Ilya Zverev 2017-05-02 11:56:28 +03:00 • committed by GitHub
commit 532dd4269e
7 changed files with 107 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/drules_proto.bin
View file

Binary file not shown.

36
data/drules_proto.txt
View file

@ -46022,11 +46022,31 @@ cont {
}
cont {
name: "place-island"
element {
scale: 10
caption {
primary {
height: 18
color: 8355711
}
priority: 15000
}
}
element {
scale: 11
caption {
primary {
height: 18
color: 8355711
}
priority: 15000
}
}
element {
scale: 12
caption {
primary {
height: 9
height: 14
color: 8355711
}
priority: 15000
@ -46036,7 +46056,7 @@ cont {
scale: 13
caption {
primary {
height: 9
height: 14
color: 8355711
}
priority: 15000
@ -46046,7 +46066,7 @@ cont {
scale: 14
caption {
primary {
height: 9
height: 10
color: 8355711
}
priority: 15000
@ -46056,7 +46076,7 @@ cont {
scale: 15
caption {
primary {
height: 9
height: 10
color: 8355711
}
priority: 15000
@ -46066,7 +46086,7 @@ cont {
scale: 16
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000
@ -46076,7 +46096,7 @@ cont {
scale: 17
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000
@ -46086,7 +46106,7 @@ cont {
scale: 18
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000
@ -46096,7 +46116,7 @@ cont {
scale: 19
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000

BIN
data/drules_proto_clear.bin
View file

Binary file not shown.

36
data/drules_proto_clear.txt
View file

@ -45722,11 +45722,31 @@ cont {
}
cont {
name: "place-island"
element {
scale: 10
caption {
primary {
height: 18
color: 8355711
}
priority: 15000
}
}
element {
scale: 11
caption {
primary {
height: 18
color: 8355711
}
priority: 15000
}
}
element {
scale: 12
caption {
primary {
height: 9
height: 14
color: 8355711
}
priority: 15000
@ -45736,7 +45756,7 @@ cont {
scale: 13
caption {
primary {
height: 9
height: 14
color: 8355711
}
priority: 15000
@ -45746,7 +45766,7 @@ cont {
scale: 14
caption {
primary {
height: 9
height: 10
color: 8355711
}
priority: 15000
@ -45756,7 +45776,7 @@ cont {
scale: 15
caption {
primary {
height: 9
height: 10
color: 8355711
}
priority: 15000
@ -45766,7 +45786,7 @@ cont {
scale: 16
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000
@ -45776,7 +45796,7 @@ cont {
scale: 17
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000
@ -45786,7 +45806,7 @@ cont {
scale: 18
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000
@ -45796,7 +45816,7 @@ cont {
scale: 19
caption {
primary {
height: 9
height: 8
color: 8355711
}
priority: 15000

BIN
data/drules_proto_dark.bin
View file

Binary file not shown.

36
data/drules_proto_dark.txt
View file

@ -45722,11 +45722,31 @@ cont {
}
cont {
name: "place-island"
element {
scale: 10
caption {
primary {
height: 18
color: 5592405
}
priority: 15000
}
}
element {
scale: 11
caption {
primary {
height: 18
color: 5592405
}
priority: 15000
}
}
element {
scale: 12
caption {
primary {
height: 9
height: 14
color: 5592405
}
priority: 15000
@ -45736,7 +45756,7 @@ cont {
scale: 13
caption {
primary {
height: 9
height: 14
color: 5592405
}
priority: 15000
@ -45746,7 +45766,7 @@ cont {
scale: 14
caption {
primary {
height: 9
height: 10
color: 5592405
}
priority: 15000
@ -45756,7 +45776,7 @@ cont {
scale: 15
caption {
primary {
height: 9
height: 10
color: 5592405
}
priority: 15000
@ -45766,7 +45786,7 @@ cont {
scale: 16
caption {
primary {
height: 9
height: 8
color: 5592405
}
priority: 15000
@ -45776,7 +45796,7 @@ cont {
scale: 17
caption {
primary {
height: 9
height: 8
color: 5592405
}
priority: 15000
@ -45786,7 +45806,7 @@ cont {
scale: 18
caption {
primary {
height: 9
height: 8
color: 5592405
}
priority: 15000
@ -45796,7 +45816,7 @@ cont {
scale: 19
caption {
primary {
height: 9
height: 8
color: 5592405
}
priority: 15000

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

@ -110,10 +110,10 @@ line[waterway],
{text-position: center;fill-position: background;}
node|z1-2[place=continent]
node|z12-[place=archipelago],
node|z12-[place=island],
area|z12-[place=archipelago],
area|z12-[place=island]
node|z10-[place=archipelago],
node|z10-[place=island],
area|z10-[place=archipelago],
area|z10-[place=island]
node|z14-[natural=cape],
area|z14-[natural=cape]
{text: name;}
@ -121,11 +121,29 @@ area|z14-[natural=cape]
node|z1-2[place=continent]
{font-size: 12;text-color: @country_label;max-width: 5;-x-me-text-priority:16000;}
node|z10-[place=archipelago],
node|z10-[place=island],
area|z10-[place=archipelago],
area|z10-[place=island]
{font-size: 18;text-color: @district_label;}
node|z12-[place=archipelago],
node|z12-[place=island],
area|z12-[place=archipelago],
area|z12-[place=island]
{font-size: 9;text-color: @district_label;}
{font-size: 14;text-color: @district_label;}
node|z14-[place=archipelago],
node|z14-[place=island],
area|z14-[place=archipelago],
area|z14-[place=island]
{font-size: 10;text-color: @district_label;}
node|z16-[place=archipelago],
node|z16-[place=island],
area|z16-[place=archipelago],
area|z16-[place=island]
{font-size: 8;text-color: @district_label;}
node|z14-[natural=cape],
area|z14-[natural=cape]