diff --git a/data/drules_proto.bin b/data/drules_proto.bin index f6bea7791e..456f90474a 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index eace47f5df..972c0e838f 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -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 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index 06503333fd..8fdb969390 100644 Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 29237782aa..d31d849efe 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -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 diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 80a4eed7b7..5ccd499730 100644 Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index be76434ade..f1a343d6ee 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -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 diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss index a7448d4c66..d6551be10d 100755 --- a/data/styles/clear/include/Basemap_label.mapcss +++ b/data/styles/clear/include/Basemap_label.mapcss @@ -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]