diff --git a/data/classificator.txt b/data/classificator.txt index 5c9af09104..07c50c0191 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -552,7 +552,9 @@ world + yoga - {} stadium - - swimming_pool - + swimming_pool + + private - + {} track - water_park - {} @@ -788,21 +790,8 @@ world + {} {} subway + - blue - bridge - - brown - - darkgreen - - gray - - green - - grey - - lightblue - - lightgreen - - orange - - purple - - red - tunnel - - violet - - yellow - {} subway_entrance + barcelona - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 5105450b8b..83e9de459a 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 8aa13867e6..ec6d509388 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -36800,6 +36800,97 @@ cont { } } } +cont { + name: "leisure-swimming_pool-private" + element { + scale: 13 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 14 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 15 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 16 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 17 + area { + color: 9163744 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15500 + } + } + element { + scale: 18 + area { + color: 9163744 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15500 + } + } + element { + scale: 19 + area { + color: 9163744 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15500 + } + } +} cont { name: "leisure-track" element { @@ -49193,38 +49284,6 @@ cont { } cont { name: "power-substation" - element { - scale: 17 - symbol { - name: "power-m" - priority: 16462 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15462 - } - } - element { - scale: 18 - symbol { - name: "power-m" - priority: 16462 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15462 - } - } element { scale: 19 symbol { @@ -53951,6 +54010,324 @@ cont { } } } +cont { + name: "railway-subway" + element { + scale: 13 + lines { + width: 0.8 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 11710882 + priority: 1261 + } + lines { + width: 5.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 15658734 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1268 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 7.2 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1268 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 8.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 8.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } +} +cont { + name: "railway-subway-bridge" + element { + scale: 13 + lines { + width: 0.8 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + lines { + width: 4.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + lines { + width: 4.4 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 11710882 + priority: 1261 + } + lines { + width: 5.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 5.4 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 15658734 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1268 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 6.8 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 7.2 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1268 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 8.4 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 8.4 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } +} cont { name: "railway-subway_entrance" element { diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin index aa38212af8..7003d1be56 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 31c75ad88e..fcb38afdb0 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -36584,6 +36584,97 @@ cont { } } } +cont { + name: "leisure-swimming_pool-private" + element { + scale: 13 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 14 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 15 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 16 + area { + color: 9163744 + priority: -15500 + } + } + element { + scale: 17 + area { + color: 9163744 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15500 + } + } + element { + scale: 18 + area { + color: 9163744 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15500 + } + } + element { + scale: 19 + area { + color: 9163744 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 4473924 + offset_y: 1 + } + priority: 15500 + } + } +} cont { name: "leisure-track" element { @@ -48977,38 +49068,6 @@ cont { } cont { name: "power-substation" - element { - scale: 17 - symbol { - name: "power-m" - priority: 16462 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15462 - } - } - element { - scale: 18 - symbol { - name: "power-m" - priority: 16462 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 4473924 - offset_y: 1 - } - priority: 15462 - } - } element { scale: 19 symbol { @@ -53583,6 +53642,324 @@ cont { } } } +cont { + name: "railway-subway" + element { + scale: 13 + lines { + width: 0.8 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 11710882 + priority: 1261 + } + lines { + width: 5.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 15658734 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1268 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 7.2 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1268 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 8.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 8.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } +} +cont { + name: "railway-subway-bridge" + element { + scale: 13 + lines { + width: 0.8 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + lines { + width: 4.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 11710882 + priority: 1261 + cap: BUTTCAP + } + lines { + width: 4.4 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 11710882 + priority: 1261 + } + lines { + width: 5.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 5.4 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 15658734 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1268 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 6.8 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 7.2 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1268 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 8.4 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 11710882 + priority: 1261 + } + lines { + width: 8.0 + color: 15592411 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 8.4 + color: 8421504 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } +} cont { name: "railway-subway_entrance" element { diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin index c3b282292b..c2ec1ce31b 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 3e9d24d356..cec775287d 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -36735,6 +36735,97 @@ cont { } } } +cont { + name: "leisure-swimming_pool-private" + element { + scale: 13 + area { + color: 8738 + priority: -15500 + } + } + element { + scale: 14 + area { + color: 8738 + priority: -15500 + } + } + element { + scale: 15 + area { + color: 8738 + priority: -15500 + } + } + element { + scale: 16 + area { + color: 8738 + priority: -15500 + } + } + element { + scale: 17 + area { + color: 8738 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15500 + } + } + element { + scale: 18 + area { + color: 8738 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15500 + } + } + element { + scale: 19 + area { + color: 8738 + priority: -15500 + } + symbol { + name: "zero-icon" + priority: 16500 + min_distance: 10 + } + caption { + primary { + height: 10 + color: 5592405 + offset_y: 1 + } + priority: 15500 + } + } +} cont { name: "leisure-track" element { @@ -49064,38 +49155,6 @@ cont { } cont { name: "power-substation" - element { - scale: 17 - symbol { - name: "power-m" - priority: 16462 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - } - priority: 15462 - } - } - element { - scale: 18 - symbol { - name: "power-m" - priority: 16462 - min_distance: 20 - } - caption { - primary { - height: 11 - color: 5592405 - offset_y: 1 - } - priority: 15462 - } - } element { scale: 19 symbol { @@ -53670,6 +53729,324 @@ cont { } } } +cont { + name: "railway-subway" + element { + scale: 13 + lines { + width: 0.8 + color: 3355443 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 3355443 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 3355443 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 3355443 + priority: 1261 + } + lines { + width: 5.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 1118481 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1268 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 3355443 + priority: 1261 + } + lines { + width: 7.2 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1118481 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1268 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 3355443 + priority: 1261 + } + lines { + width: 8.0 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 8.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1118481 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 3355443 + priority: 1261 + } + lines { + width: 8.0 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 8.4 + dashdot { + } + priority: 999 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1118481 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } +} +cont { + name: "railway-subway-bridge" + element { + scale: 13 + lines { + width: 0.8 + color: 3355443 + priority: 1261 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.0 + color: 3355443 + priority: 1261 + cap: BUTTCAP + } + lines { + width: 4.0 + color: 2236945 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.2 + color: 3355443 + priority: 1261 + cap: BUTTCAP + } + lines { + width: 4.4 + color: 2236945 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.6 + color: 3355443 + priority: 1261 + } + lines { + width: 5.0 + color: 2236945 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 5.4 + color: 4473924 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 1.3 + color: 1118481 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1268 + } + } + element { + scale: 17 + lines { + width: 3.0 + color: 3355443 + priority: 1261 + } + lines { + width: 6.8 + color: 2236945 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 7.2 + color: 4473924 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1118481 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1268 + } + } + element { + scale: 18 + lines { + width: 3.0 + color: 3355443 + priority: 1261 + } + lines { + width: 8.0 + color: 2236945 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 8.4 + color: 4473924 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1118481 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } + element { + scale: 19 + lines { + width: 3.0 + color: 3355443 + priority: 1261 + } + lines { + width: 8.0 + color: 2236945 + dashdot { + } + priority: 1215 + cap: BUTTCAP + } + lines { + width: 8.4 + color: 4473924 + dashdot { + } + priority: 1207 + cap: BUTTCAP + } + lines { + width: 2.0 + color: 1118481 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1268 + } + } +} cont { name: "railway-subway_entrance" element { diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin index f3338819be..269691908d 100644 Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt index 4eeb55a070..229e574226 100644 --- a/data/drules_proto_vehicle_clear.txt +++ b/data/drules_proto_vehicle_clear.txt @@ -22294,6 +22294,58 @@ cont { } } } +cont { + name: "leisure-swimming_pool-private" + element { + scale: 13 + area { + color: 9163744 + priority: -15812 + } + } + element { + scale: 14 + area { + color: 9163744 + priority: -15812 + } + } + element { + scale: 15 + area { + color: 9163744 + priority: -15812 + } + } + element { + scale: 16 + area { + color: 9163744 + priority: -15812 + } + } + element { + scale: 17 + area { + color: 9163744 + priority: -15812 + } + } + element { + scale: 18 + area { + color: 9163744 + priority: -15812 + } + } + element { + scale: 19 + area { + color: 9163744 + priority: -15812 + } + } +} cont { name: "man_made-breakwater" element { @@ -36556,6 +36608,282 @@ cont { } } } +cont { + name: "railway-subway" + element { + scale: 13 + lines { + width: 0.9 + color: 11710882 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.15 + color: 11710882 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.8 + color: 11710882 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.8 + color: 11710882 + priority: 1376 + } + lines { + width: 1.5 + color: 15658734 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1388 + } + } + element { + scale: 17 + lines { + width: 3.2 + color: 11710882 + priority: 1376 + } + lines { + width: 2.4 + color: 15658734 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1388 + } + } + element { + scale: 18 + lines { + width: 4.2 + color: 11710882 + priority: 1376 + } + lines { + width: 3.3 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1388 + } + } + element { + scale: 19 + lines { + width: 5.8 + color: 11710882 + priority: 1376 + } + lines { + width: 5.0 + color: 15658734 + dashdot { + dd: 10.1 + dd: 10.1 + } + priority: 1388 + } + } +} +cont { + name: "railway-subway-bridge" + element { + scale: 13 + lines { + width: 0.9 + color: 11710882 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.15 + color: 11710882 + priority: 1376 + cap: BUTTCAP + } + lines { + width: 4.3 + color: 15066325 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.8 + color: 11710882 + priority: 1376 + cap: BUTTCAP + } + lines { + width: 5.6 + color: 15066325 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.8 + color: 11710882 + priority: 1376 + } + lines { + width: 5.4 + color: 15066325 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 5.8 + color: 8421504 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 15658734 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1388 + } + } + element { + scale: 17 + lines { + width: 3.2 + color: 11710882 + priority: 1376 + } + lines { + width: 7.6 + color: 15066325 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 8.0 + color: 8421504 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 2.4 + color: 15658734 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1388 + } + } + element { + scale: 18 + lines { + width: 4.2 + color: 11710882 + priority: 1376 + } + lines { + width: 10.6 + color: 15066325 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 11.0 + color: 8421504 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 3.3 + color: 15658734 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1388 + } + } + element { + scale: 19 + lines { + width: 5.8 + color: 11710882 + priority: 1376 + } + lines { + width: 14.0 + color: 15066325 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 14.4 + color: 8421504 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 5.0 + color: 15658734 + dashdot { + dd: 10.1 + dd: 10.1 + } + priority: 1388 + } + } +} cont { name: "railway-subway_entrance" element { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 3187dfbfa9..3a94a8e3dc 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index a2a754a8f8..7a434dd810 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -22684,6 +22684,58 @@ cont { } } } +cont { + name: "leisure-swimming_pool-private" + element { + scale: 13 + area { + color: 8738 + priority: -15812 + } + } + element { + scale: 14 + area { + color: 8738 + priority: -15812 + } + } + element { + scale: 15 + area { + color: 8738 + priority: -15812 + } + } + element { + scale: 16 + area { + color: 8738 + priority: -15812 + } + } + element { + scale: 17 + area { + color: 8738 + priority: -15812 + } + } + element { + scale: 18 + area { + color: 8738 + priority: -15812 + } + } + element { + scale: 19 + area { + color: 8738 + priority: -15812 + } + } +} cont { name: "man_made-breakwater" element { @@ -36946,6 +36998,282 @@ cont { } } } +cont { + name: "railway-subway" + element { + scale: 13 + lines { + width: 0.9 + color: 3354672 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.15 + color: 3354672 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.8 + color: 3354672 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.8 + color: 3354672 + priority: 1376 + } + lines { + width: 1.5 + color: 1118481 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1388 + } + } + element { + scale: 17 + lines { + width: 3.2 + color: 3354672 + priority: 1376 + } + lines { + width: 2.4 + color: 1118481 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1388 + } + } + element { + scale: 18 + lines { + width: 4.2 + color: 3354672 + priority: 1376 + } + lines { + width: 3.3 + color: 1118481 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1388 + } + } + element { + scale: 19 + lines { + width: 5.8 + color: 3354672 + priority: 1376 + } + lines { + width: 5.0 + color: 1118481 + dashdot { + dd: 10.1 + dd: 10.1 + } + priority: 1388 + } + } +} +cont { + name: "railway-subway-bridge" + element { + scale: 13 + lines { + width: 0.9 + color: 3354672 + priority: 1376 + cap: BUTTCAP + } + } + element { + scale: 14 + lines { + width: 1.15 + color: 3354672 + priority: 1376 + cap: BUTTCAP + } + lines { + width: 4.3 + color: 1184274 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + } + element { + scale: 15 + lines { + width: 1.8 + color: 3354672 + priority: 1376 + cap: BUTTCAP + } + lines { + width: 5.6 + color: 1184274 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + } + element { + scale: 16 + lines { + width: 2.8 + color: 3354672 + priority: 1376 + } + lines { + width: 5.4 + color: 1184274 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 5.8 + color: 855309 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 1.5 + color: 1118481 + dashdot { + dd: 4.5 + dd: 4.5 + } + priority: 1388 + } + } + element { + scale: 17 + lines { + width: 3.2 + color: 3354672 + priority: 1376 + } + lines { + width: 7.6 + color: 1184274 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 8.0 + color: 855309 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 2.4 + color: 1118481 + dashdot { + dd: 6.3 + dd: 6.3 + } + priority: 1388 + } + } + element { + scale: 18 + lines { + width: 4.2 + color: 3354672 + priority: 1376 + } + lines { + width: 10.6 + color: 1184274 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 11.0 + color: 855309 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 3.3 + color: 1118481 + dashdot { + dd: 8.1 + dd: 8.1 + } + priority: 1388 + } + } + element { + scale: 19 + lines { + width: 5.8 + color: 3354672 + priority: 1376 + } + lines { + width: 14.0 + color: 1184274 + dashdot { + } + priority: 1304 + cap: BUTTCAP + } + lines { + width: 14.4 + color: 855309 + dashdot { + } + priority: 1293 + cap: BUTTCAP + } + lines { + width: 5.0 + color: 1118481 + dashdot { + dd: 10.1 + dd: 10.1 + } + priority: 1388 + } + } +} cont { name: "railway-subway_entrance" element { diff --git a/data/types.txt b/data/types.txt index bf60fad94d..52bc2a8cf2 100644 --- a/data/types.txt +++ b/data/types.txt @@ -124,7 +124,7 @@ mapswithme *tourism|information|guidepost *amenity|parking|fee *amenity|kindergarten -mapswithme +*leisure|swimming_pool|private *place|suburb *landuse|allotments *landuse|forest|coniferous @@ -883,13 +883,13 @@ mapswithme mapswithme mapswithme *tourism|artwork -*railway|subway|red -*railway|subway|blue -*railway|subway|orange -*railway|subway|green -*railway|subway|brown -*railway|subway|yellow -*railway|subway|purple +railway|subway|tunnel +railway|subway|tunnel +railway|subway|tunnel +railway|subway|tunnel +railway|subway|tunnel +railway|subway|tunnel +railway|subway|tunnel mapswithme mapswithme mapswithme @@ -897,17 +897,17 @@ mapswithme mapswithme mapswithme mapswithme -*railway|subway|darkgreen +railway|subway|tunnel mapswithme -*railway|subway|gray +railway|subway|tunnel mapswithme -*railway|subway|lightblue +railway|subway|tunnel mapswithme -*railway|subway|lightgreen +railway|subway|tunnel mapswithme -*railway|subway|violet +railway|subway|tunnel mapswithme -*railway|subway|grey +railway|subway|tunnel mapswithme *historic|ship mapswithme diff --git a/data/visibility.txt b/data/visibility.txt index c3cff18f9f..a48f10e5bb 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -552,7 +552,9 @@ world 00000000000000000000 + yoga 00000000000000000000 - {} stadium 00000000000000011111 - - swimming_pool 00000000000001111111 - + swimming_pool 00000000000001111111 + + private 00000000000001111111 - + {} track 00000000000000000000 - water_park 00000000000000000000 - {} @@ -787,22 +789,9 @@ world 00000000000000000000 + spb 00000000000111111111 - {} {} - subway 00000000000000000000 + - blue 00000000000000000000 - - bridge 00000000000000000000 - - brown 00000000000000000000 - - darkgreen 00000000000000000000 - - gray 00000000000000000000 - - green 00000000000000000000 - - grey 00000000000000000000 - - lightblue 00000000000000000000 - - lightgreen 00000000000000000000 - - orange 00000000000000000000 - - purple 00000000000000000000 - - red 00000000000000000000 - + subway 00000000000001111111 + + bridge 00000000000001111111 - tunnel 00000000000000000000 - - violet 00000000000000000000 - - yellow 00000000000000000000 - {} subway_entrance 00000000000000001111 + barcelona 00000000000000001111 -