diff --git a/data/drules_proto.bin b/data/drules_proto.bin index a6cda9f88e..e944e8488f 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 19b770d0ff..0df60d2ca8 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -6305,6 +6305,48 @@ cont { } cont { name: "boundary-administrative-4-state" + element { + scale: 4 + lines { + width: 0.75 + color: 13421772 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 1345 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 5 + lines { + width: 0.75 + color: 13421772 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 1345 + join: ROUNDJOIN + cap: ROUNDCAP + } + } + element { + scale: 6 + lines { + width: 0.75 + color: 12303291 + dashdot { + dd: 2.0 + dd: 2.0 + } + priority: 1345 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 10 lines { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index a75f2ecaa3..a122920a0d 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 3ca0d2da5a..47a3a45bff 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -5148,6 +5148,16 @@ cont { } cont { name: "highway-cycleway" + element { + scale: 13 + lines { + width: 0.1 + color: 872384682 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -5201,6 +5211,16 @@ cont { } cont { name: "highway-cycleway-bridge" + element { + scale: 13 + lines { + width: 0.1 + color: 872384682 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -5254,6 +5274,16 @@ cont { } cont { name: "highway-cycleway-permissive" + element { + scale: 13 + lines { + width: 0.1 + color: 872384682 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -5307,6 +5337,16 @@ cont { } cont { name: "highway-cycleway-tunnel" + element { + scale: 13 + lines { + width: 0.1 + color: 872384682 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -33578,6 +33618,24 @@ cont { } } } +cont { + name: "shop" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} cont { name: "shop-alcohol" element { @@ -33600,7 +33658,456 @@ cont { scale: 19 symbol { name: "alcohol-m" - apply_for_type: 1 + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-bakery" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-beauty" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-beverages" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-bicycle" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-books" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-butcher" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-car" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-car_repair" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-chemist" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-clothes" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-computer" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-confectionery" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-convenience" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-department_store" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-doityourself" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-electronics" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-florist" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-furniture" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-garden_centre" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-gift" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-greengrocer" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-hairdresser" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-hardware" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-jewelry" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-kiosk" + element { + scale: 19 + symbol { + name: "shop-m" priority: 16000 } caption { @@ -33667,7 +34174,78 @@ cont { scale: 19 symbol { name: "shop-m" - apply_for_type: 1 + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-mobile_phone" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-optician" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-shoes" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-sports" + element { + scale: 19 + symbol { + name: "shop-m" priority: 16000 } caption { @@ -33718,7 +34296,24 @@ cont { scale: 19 symbol { name: "grocery-m" - apply_for_type: 1 + priority: 16000 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-toys" + element { + scale: 19 + symbol { + name: "shop-m" priority: 16000 } caption { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index 37005e96af..853f6333c1 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 ff38bf09d2..ccf63bb751 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -5148,6 +5148,16 @@ cont { } cont { name: "highway-cycleway" + element { + scale: 13 + lines { + width: 0.1 + color: 862340147 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -5201,6 +5211,16 @@ cont { } cont { name: "highway-cycleway-bridge" + element { + scale: 13 + lines { + width: 0.1 + color: 862340147 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -5254,6 +5274,16 @@ cont { } cont { name: "highway-cycleway-permissive" + element { + scale: 13 + lines { + width: 0.1 + color: 862340147 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -5307,6 +5337,16 @@ cont { } cont { name: "highway-cycleway-tunnel" + element { + scale: 13 + lines { + width: 0.1 + color: 862340147 + priority: 1611 + join: ROUNDJOIN + cap: ROUNDCAP + } + } element { scale: 15 lines { @@ -33578,6 +33618,24 @@ cont { } } } +cont { + name: "shop" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} cont { name: "shop-alcohol" element { @@ -33600,7 +33658,456 @@ cont { scale: 19 symbol { name: "alcohol-m" - apply_for_type: 1 + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-bakery" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-beauty" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-beverages" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-bicycle" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-books" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-butcher" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-car" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-car_repair" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-chemist" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-clothes" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-computer" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-confectionery" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-convenience" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-department_store" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-doityourself" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-electronics" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-florist" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-furniture" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-garden_centre" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-gift" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-greengrocer" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-hairdresser" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-hardware" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-jewelry" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-kiosk" + element { + scale: 19 + symbol { + name: "shop-m" priority: 16000 } caption { @@ -33667,7 +34174,78 @@ cont { scale: 19 symbol { name: "shop-m" - apply_for_type: 1 + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-mobile_phone" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-optician" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-shoes" + element { + scale: 19 + symbol { + name: "shop-m" + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-sports" + element { + scale: 19 + symbol { + name: "shop-m" priority: 16000 } caption { @@ -33718,7 +34296,24 @@ cont { scale: 19 symbol { name: "grocery-m" - apply_for_type: 1 + priority: 16000 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 8 + } + priority: 15000 + } + } +} +cont { + name: "shop-toys" + element { + scale: 19 + symbol { + name: "shop-m" priority: 16000 } caption { diff --git a/data/visibility.txt b/data/visibility.txt index c30ab87c3a..e1c99f36ad 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -126,7 +126,7 @@ world 00000000000000000000 + 2 01111111111111111111 - 3 00001110000000000000 - 4 00001110001100000000 + - state 00000000001111111111 - + state 00001110001111111111 - {} 5 00000000000000111111 - 6 00000000000000111111 -