diff --git a/data/classificator.txt b/data/classificator.txt index df5f3b42f8..30be00deec 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -218,6 +218,7 @@ world + wall - {} boundary + + aboriginal_lands - administrative + 10 - 11 - diff --git a/data/colors.txt b/data/colors.txt index 5e03018e89..df043cf472 100644 --- a/data/colors.txt +++ b/data/colors.txt @@ -150,6 +150,7 @@ 6702352 6710886 6834797 +6967599 7105644 7224647 7353344 @@ -608,6 +609,7 @@ 3427361097 3428218198 3428990335 +3430108454 3431500856 3432785840 3435428607 diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 33c6c4e8a8..d8af0ed7c0 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 3e1ce28018..0109bf0b3d 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -15900,6 +15900,174 @@ cont { } } } +cont { + name: "boundary-aboriginal_lands" + element { + scale: 10 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 11 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 12 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 13 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 14 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 15 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 16 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 17 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 18 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 19 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 20 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } +} cont { name: "boundary-administrative-2" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index e3ba91ffc4..66ab1b3bba 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 402b31d7ef..b6802b5309 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -15459,6 +15459,174 @@ cont { } } } +cont { + name: "boundary-aboriginal_lands" + element { + scale: 10 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 11 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 12 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 13 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 14 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 15 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 16 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 17 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 18 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 19 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 20 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } +} cont { name: "boundary-administrative-2" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index f27ac8d24f..a689b31893 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 9bf098b339..ca94cc8027 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -15459,6 +15459,174 @@ cont { } } } +cont { + name: "boundary-aboriginal_lands" + element { + scale: 10 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 11 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 12 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 13 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 14 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 15 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 16 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 17 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 18 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 19 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 20 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } +} cont { name: "boundary-administrative-2" element { diff --git a/data/drules_proto_outdoors_clear.bin b/data/drules_proto_outdoors_clear.bin index 9d30e578d9..fc38593411 100644 Binary files a/data/drules_proto_outdoors_clear.bin and b/data/drules_proto_outdoors_clear.bin differ diff --git a/data/drules_proto_outdoors_clear.txt b/data/drules_proto_outdoors_clear.txt index 0794b5af8d..d38fbceae0 100644 --- a/data/drules_proto_outdoors_clear.txt +++ b/data/drules_proto_outdoors_clear.txt @@ -15749,6 +15749,174 @@ cont { } } } +cont { + name: "boundary-aboriginal_lands" + element { + scale: 10 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 11 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 12 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 13 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 14 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 15 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 16 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 17 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 18 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 19 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } + element { + scale: 20 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 872415231 + } + priority: 6700 + } + } +} cont { name: "boundary-administrative-2" element { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index dae185d7df..8157d45c35 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 2268de286b..351f70a701 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -15749,6 +15749,174 @@ cont { } } } +cont { + name: "boundary-aboriginal_lands" + element { + scale: 10 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 11 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 12 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 13 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 14 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 15 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 16 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 17 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 18 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 19 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } + element { + scale: 20 + area { + color: 3430108454 + priority: 20 + } + caption { + primary { + height: 10 + color: 6967599 + stroke_color: 856756480 + } + priority: 6700 + } + } +} cont { name: "boundary-administrative-2" element { diff --git a/data/types.txt b/data/types.txt index 5c1f2a8d5c..f77905501f 100644 --- a/data/types.txt +++ b/data/types.txt @@ -330,7 +330,7 @@ sport|soccer *highway|steps|bridge *highway|track|tunnel *highway|pedestrian|tunnel -mapswithme +*boundary|aboriginal_lands *sport|cricket *sport|bowls *highway|path|tunnel diff --git a/data/visibility.txt b/data/visibility.txt index d265ca7662..1f3652c2ba 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -218,6 +218,7 @@ world 000000000000000000000 + wall 000000000000000001111 - {} boundary 000000000000000000000 + + aboriginal_lands 000000000000000000000 - administrative 000000000000000000000 + 10 000000000000000000000 - 11 000000000000000000000 -