diff options
| author | Lev Dragunov <lgardster@gmail.com> | 2016-03-29 16:06:09 +0300 |
|---|---|---|
| committer | Lev Dragunov <lgardster@gmail.com> | 2016-03-29 16:06:09 +0300 |
| commit | 29976cc2dfb53a2d5b556a06b89311c971311211 (patch) | |
| tree | b545eb766465ee68b6e99da6210a021941957c9d | |
| parent | 95dcb600f6270722173462e24bc86574aeaeae7d (diff) | |
| parent | 199e4f8564a21b319858089d7a7ac7ccab45ad73 (diff) | |
Merge pull request #2609 from vng/releaseios-prerelease-601
Fixed styles.
| -rw-r--r-- | data/classificator.txt | 2 | ||||
| -rw-r--r-- | data/drules_proto.bin | bin | 229747 -> 228886 bytes | |||
| -rw-r--r-- | data/drules_proto.txt | 547 | ||||
| -rw-r--r-- | data/drules_proto_clear.bin | bin | 214099 -> 212840 bytes | |||
| -rw-r--r-- | data/drules_proto_clear.txt | 684 | ||||
| -rw-r--r-- | data/drules_proto_dark.bin | bin | 211412 -> 210207 bytes | |||
| -rw-r--r-- | data/drules_proto_dark.txt | 684 | ||||
| -rw-r--r-- | data/drules_proto_legacy.bin | bin | 208492 -> 208650 bytes | |||
| -rw-r--r-- | data/drules_proto_legacy.txt | 195 | ||||
| -rw-r--r-- | data/mapcss-mapping.csv | 3 | ||||
| -rw-r--r-- | data/styles/clear/include/POI.mapcss | 4 | ||||
| -rw-r--r-- | data/styles/clear/include/labels.mapcss | 85 | ||||
| -rw-r--r-- | data/styles/clear/include/natural.mapcss | 110 | ||||
| -rw-r--r-- | data/types.txt | 3 | ||||
| -rw-r--r-- | data/visibility.txt | 2 |
15 files changed, 665 insertions, 1654 deletions
diff --git a/data/classificator.txt b/data/classificator.txt index 0a22d7b594..603ae586c4 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -478,7 +478,6 @@ world + heath - lake - land - - marsh - meadow - orchard - peak - @@ -495,6 +494,7 @@ world + waterfall - wetland + bog - + marsh - {} wood + coniferous - diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex 9ed02f08fb..80d7a26929 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 1903e26bda..6d134c7367 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -43197,65 +43197,6 @@ cont { } } cont { - name: "natural-marsh" - element { - scale: 11 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 12 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 13 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 14 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 15 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 16 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 17 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 18 - area { - color: 13229526 - priority: -15795 - } - } -} -cont { name: "natural-meadow" element { scale: 15 @@ -44906,47 +44847,113 @@ cont { } } cont { + name: "natural-wetland-marsh" + element { + scale: 11 + area { + color: 10535864 + priority: -16376 + } + } + element { + scale: 12 + area { + color: 10535864 + priority: -16376 + } + } + element { + scale: 13 + area { + color: 10535864 + priority: -16376 + } + } + element { + scale: 14 + area { + color: 10535864 + priority: -16376 + } + } + element { + scale: 15 + area { + color: 10535864 + priority: -16377 + } + } + element { + scale: 16 + area { + color: 10535864 + priority: -16378 + } + } + element { + scale: 17 + area { + color: 10535864 + priority: -16379 + } + } + element { + scale: 18 + area { + color: 10535864 + priority: -16380 + } + } + element { + scale: 19 + area { + color: 10535864 + priority: -16381 + } + } +} +cont { name: "natural-wood" element { scale: 10 area { color: 11720357 - priority: -16376 + priority: -16382 } } element { scale: 11 area { color: 11720357 - priority: -16377 + priority: -16383 } } element { scale: 12 area { color: 11720357 - priority: -16378 + priority: -16384 } } element { scale: 13 area { color: 11720357 - priority: -16379 + priority: -16385 } } element { scale: 14 area { color: 11720357 - priority: -16380 + priority: -16386 } } element { scale: 15 area { color: 11720357 - priority: -16381 + priority: -16387 } caption { primary { @@ -44960,7 +44967,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16382 + priority: -16388 } caption { primary { @@ -44975,7 +44982,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16383 + priority: -16389 } caption { primary { @@ -44990,7 +44997,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16384 + priority: -16390 } caption { primary { @@ -45005,7 +45012,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16385 + priority: -16391 } caption { primary { @@ -45023,42 +45030,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16386 + priority: -16392 } } element { scale: 11 area { color: 11720357 - priority: -16387 + priority: -16393 } } element { scale: 12 area { color: 11720357 - priority: -16388 + priority: -16394 } } element { scale: 13 area { color: 11720357 - priority: -16389 + priority: -16395 } } element { scale: 14 area { color: 11720357 - priority: -16390 + priority: -16396 } } element { scale: 15 area { color: 11720357 - priority: -16391 + priority: -16397 } caption { primary { @@ -45072,7 +45079,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16392 + priority: -16398 } caption { primary { @@ -45087,7 +45094,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16393 + priority: -16399 } caption { primary { @@ -45102,7 +45109,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16394 + priority: -16400 } caption { primary { @@ -45117,7 +45124,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16395 + priority: -16401 } caption { primary { @@ -45135,42 +45142,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16396 + priority: -16402 } } element { scale: 11 area { color: 11720357 - priority: -16397 + priority: -16403 } } element { scale: 12 area { color: 11720357 - priority: -16398 + priority: -16404 } } element { scale: 13 area { color: 11720357 - priority: -16399 + priority: -16405 } } element { scale: 14 area { color: 11720357 - priority: -16400 + priority: -16406 } } element { scale: 15 area { color: 11720357 - priority: -16401 + priority: -16407 } caption { primary { @@ -45184,7 +45191,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16402 + priority: -16408 } caption { primary { @@ -45199,7 +45206,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16403 + priority: -16409 } caption { primary { @@ -45214,7 +45221,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16404 + priority: -16410 } caption { primary { @@ -45229,7 +45236,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16405 + priority: -16411 } caption { primary { @@ -45247,42 +45254,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16406 + priority: -16412 } } element { scale: 11 area { color: 11720357 - priority: -16407 + priority: -16413 } } element { scale: 12 area { color: 11720357 - priority: -16408 + priority: -16414 } } element { scale: 13 area { color: 11720357 - priority: -16409 + priority: -16415 } } element { scale: 14 area { color: 11720357 - priority: -16410 + priority: -16416 } } element { scale: 15 area { color: 11720357 - priority: -16411 + priority: -16417 } caption { primary { @@ -45296,7 +45303,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16412 + priority: -16418 } caption { primary { @@ -45311,7 +45318,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16413 + priority: -16419 } caption { primary { @@ -45326,7 +45333,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16414 + priority: -16420 } caption { primary { @@ -45341,7 +45348,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16415 + priority: -16421 } caption { primary { @@ -50921,7 +50928,7 @@ cont { scale: 14 area { color: 14539465 - priority: -16416 + priority: -16422 } caption { primary { @@ -50935,7 +50942,7 @@ cont { scale: 15 area { color: 14539465 - priority: -16417 + priority: -16423 } caption { primary { @@ -50949,7 +50956,7 @@ cont { scale: 16 area { color: 14539465 - priority: -16418 + priority: -16424 } caption { primary { @@ -50963,7 +50970,7 @@ cont { scale: 17 area { color: 14539465 - priority: -16419 + priority: -16425 } caption { primary { @@ -50977,7 +50984,7 @@ cont { scale: 18 area { color: 14539465 - priority: -16420 + priority: -16426 } caption { primary { @@ -50991,7 +50998,7 @@ cont { scale: 19 area { color: 14539465 - priority: -16421 + priority: -16427 } caption { primary { @@ -52388,14 +52395,14 @@ cont { scale: 11 area { color: 14539465 - priority: -16422 + priority: -16428 } } element { scale: 12 area { color: 14539465 - priority: -16423 + priority: -16429 } caption { primary { @@ -52410,7 +52417,7 @@ cont { scale: 13 area { color: 14539465 - priority: -16424 + priority: -16430 } caption { primary { @@ -52432,7 +52439,7 @@ cont { scale: 14 area { color: 14539465 - priority: -16425 + priority: -16431 } caption { primary { @@ -52454,7 +52461,7 @@ cont { scale: 15 area { color: 14539465 - priority: -16426 + priority: -16432 } caption { primary { @@ -52476,7 +52483,7 @@ cont { scale: 16 area { color: 14539465 - priority: -16427 + priority: -16433 } caption { primary { @@ -52498,7 +52505,7 @@ cont { scale: 17 area { color: 14539465 - priority: -16428 + priority: -16434 } caption { primary { @@ -52520,7 +52527,7 @@ cont { scale: 18 area { color: 14539465 - priority: -16429 + priority: -16435 } caption { primary { @@ -52542,7 +52549,7 @@ cont { scale: 19 area { color: 14539465 - priority: -16430 + priority: -16436 } caption { primary { @@ -72266,21 +72273,21 @@ cont { scale: 12 area { color: 13626551 - priority: -16431 + priority: -16437 } } element { scale: 13 area { color: 13626551 - priority: -16432 + priority: -16438 } } element { scale: 14 area { color: 13626551 - priority: -16433 + priority: -16439 } symbol { name: "campsite" @@ -72291,7 +72298,7 @@ cont { scale: 15 area { color: 13626551 - priority: -16434 + priority: -16440 } symbol { name: "campsite" @@ -72302,7 +72309,7 @@ cont { scale: 16 area { color: 13626551 - priority: -16435 + priority: -16441 } symbol { name: "campsite" @@ -72376,35 +72383,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16436 + priority: -16442 } } element { scale: 13 area { color: 13626551 - priority: -16437 + priority: -16443 } } element { scale: 14 area { color: 13626551 - priority: -16438 + priority: -16444 } } element { scale: 15 area { color: 13626551 - priority: -16439 + priority: -16445 } } element { scale: 16 area { color: 13626551 - priority: -16440 + priority: -16446 } } element { @@ -73229,35 +73236,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16441 + priority: -16447 } } element { scale: 13 area { color: 13626551 - priority: -16442 + priority: -16448 } } element { scale: 14 area { color: 13626551 - priority: -16443 + priority: -16449 } } element { scale: 15 area { color: 13626551 - priority: -16444 + priority: -16450 } } element { scale: 16 area { color: 13626551 - priority: -16445 + priority: -16451 } } element { @@ -73413,35 +73420,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16446 + priority: -16452 } } element { scale: 13 area { color: 13626551 - priority: -16447 + priority: -16453 } } element { scale: 14 area { color: 13626551 - priority: -16448 + priority: -16454 } } element { scale: 15 area { color: 13626551 - priority: -16449 + priority: -16455 } } element { scale: 16 area { color: 13626551 - priority: -16450 + priority: -16456 } } element { @@ -73640,111 +73647,6 @@ cont { } } cont { - name: "waterway-canal-tunnel" - element { - scale: 13 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 14 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 15 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 16 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 17 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 18 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } -} -cont { name: "waterway-dam" element { scale: 14 @@ -73926,37 +73828,6 @@ cont { } } cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-dock" element { scale: 0 @@ -74253,37 +74124,6 @@ cont { } } cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-lock" element { scale: 14 @@ -75127,111 +74967,6 @@ cont { } } cont { - name: "waterway-stream-tunnel" - element { - scale: 13 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 14 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 15 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 16 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 17 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 18 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } -} -cont { name: "waterway-waterfall" element { scale: 11 diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin Binary files differindex 39e1208721..57ba69020b 100644 --- a/data/drules_proto_clear.bin +++ b/data/drules_proto_clear.bin diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt index 672b03ff09..8eeb20006e 100644 --- a/data/drules_proto_clear.txt +++ b/data/drules_proto_clear.txt @@ -2958,7 +2958,7 @@ cont { element { scale: 15 symbol { - name: "car_wash-m" + name: "car-wash-m" apply_for_type: 1 priority: 16849 } @@ -2974,7 +2974,7 @@ cont { element { scale: 16 symbol { - name: "car_wash-m" + name: "car-wash-m" apply_for_type: 1 priority: 16849 } @@ -2990,7 +2990,7 @@ cont { element { scale: 17 symbol { - name: "car_wash-l" + name: "car-wash-l" apply_for_type: 1 priority: 16849 } @@ -3006,7 +3006,7 @@ cont { element { scale: 18 symbol { - name: "car_wash-l" + name: "car-wash-l" apply_for_type: 1 priority: 16849 } @@ -3022,7 +3022,7 @@ cont { element { scale: 19 symbol { - name: "car_wash-l" + name: "car-wash-l" priority: 16849 } caption { @@ -41666,100 +41666,6 @@ cont { } } cont { - name: "natural-marsh" - element { - scale: 11 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 12 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 13 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 14 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 15 - area { - color: 13229526 - priority: -15795 - } - } - element { - scale: 16 - area { - color: 13229526 - priority: -15795 - } - caption { - primary { - height: 11 - color: 4495803 - } - priority: 15205 - } - } - element { - scale: 17 - area { - color: 13229526 - priority: -15795 - } - caption { - primary { - height: 11 - color: 4495803 - } - priority: 15205 - } - } - element { - scale: 18 - area { - color: 13229526 - priority: -15795 - } - caption { - primary { - height: 11 - color: 4495803 - } - priority: 15205 - } - } - element { - scale: 19 - area { - color: 13229526 - priority: -15795 - } - caption { - primary { - height: 11 - color: 4495803 - } - priority: 15205 - } - } -} -cont { name: "natural-peak" element { scale: 12 @@ -43303,6 +43209,100 @@ cont { } } cont { + name: "natural-wetland-marsh" + element { + scale: 11 + area { + color: 13229526 + priority: -15795 + } + } + element { + scale: 12 + area { + color: 13229526 + priority: -15795 + } + } + element { + scale: 13 + area { + color: 13229526 + priority: -15795 + } + } + element { + scale: 14 + area { + color: 13229526 + priority: -15795 + } + } + element { + scale: 15 + area { + color: 13229526 + priority: -15795 + } + } + element { + scale: 16 + area { + color: 13229526 + priority: -15795 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15205 + } + } + element { + scale: 17 + area { + color: 13229526 + priority: -15795 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15205 + } + } + element { + scale: 18 + area { + color: 13229526 + priority: -15795 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15205 + } + } + element { + scale: 19 + area { + color: 13229526 + priority: -15795 + } + caption { + primary { + height: 11 + color: 4495803 + } + priority: 15205 + } + } +} +cont { name: "natural-wood" element { scale: 10 @@ -68365,129 +68365,7 @@ cont { lines { width: 0.7 color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 11 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 16 - lines { - width: 1.5 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 16972 - } - } -} -cont { - name: "waterway-canal-tunnel" - element { - scale: 13 - lines { - width: 0.7 - color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -68504,7 +68382,7 @@ cont { lines { width: 1.0 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -68521,7 +68399,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -68538,7 +68416,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68555,7 +68433,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68572,7 +68450,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68589,7 +68467,7 @@ cont { lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68736,51 +68614,6 @@ cont { } } cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-dock" element { scale: 0 @@ -68969,60 +68802,15 @@ cont { } } cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 3584191 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-lock" element { scale: 16 lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } element { @@ -69030,9 +68818,9 @@ cont { lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } element { @@ -69040,9 +68828,9 @@ cont { lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } element { @@ -69050,9 +68838,9 @@ cont { lines { width: 1.5 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } } @@ -69098,28 +68886,20 @@ cont { lines { width: 1.0 color: 3584191 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } - area { - color: 9163744 - priority: -15028 - } } element { scale: 11 lines { width: 1.2 color: 3584191 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 10 @@ -69133,14 +68913,10 @@ cont { lines { width: 1.2 color: 3584191 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 10 @@ -69154,14 +68930,10 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 10 @@ -69175,14 +68947,10 @@ cont { lines { width: 1.8 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 10 @@ -69196,14 +68964,10 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 12 @@ -69217,14 +68981,10 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 12 @@ -69238,14 +68998,10 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 12 @@ -69259,14 +69015,10 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 12 @@ -69280,14 +69032,10 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 9163744 - priority: -15028 - } path_text { primary { height: 12 @@ -69374,7 +69122,7 @@ cont { lines { width: 1.0 color: 3584191 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } @@ -69388,7 +69136,7 @@ cont { lines { width: 1.2 color: 3584191 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } @@ -69409,7 +69157,7 @@ cont { lines { width: 1.2 color: 3584191 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } @@ -69430,7 +69178,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69451,7 +69199,7 @@ cont { lines { width: 1.8 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69472,7 +69220,7 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69493,7 +69241,7 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69514,7 +69262,7 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69535,7 +69283,7 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69556,7 +69304,7 @@ cont { lines { width: 2.2 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69580,7 +69328,7 @@ cont { lines { width: 0.7 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69597,7 +69345,7 @@ cont { lines { width: 1.0 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69614,7 +69362,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69631,7 +69379,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69648,7 +69396,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69665,7 +69413,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69682,7 +69430,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69702,7 +69450,7 @@ cont { lines { width: 0.7 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69719,7 +69467,7 @@ cont { lines { width: 1.0 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69736,7 +69484,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69753,7 +69501,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69770,7 +69518,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69787,7 +69535,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69804,7 +69552,7 @@ cont { lines { width: 1.6 color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69828,7 +69576,7 @@ cont { dd: 2.7 dd: 2.7 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69849,7 +69597,7 @@ cont { dd: 2.7 dd: 2.7 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69869,7 +69617,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69889,7 +69637,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69909,7 +69657,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69929,7 +69677,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69949,129 +69697,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 16972 - } - } -} -cont { - name: "waterway-stream-tunnel" - element { - scale: 13 - lines { - width: 0.7 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 11 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 17 - lines { - width: 1.6 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 18 - lines { - width: 1.6 - color: 3584191 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 4495803 - } - priority: 16972 - } - } - element { - scale: 19 - lines { - width: 1.6 - color: 3584191 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin Binary files differindex eb04b5975f..fb3ef25367 100644 --- a/data/drules_proto_dark.bin +++ b/data/drules_proto_dark.bin diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt index 9504e467c6..be60414a9c 100644 --- a/data/drules_proto_dark.txt +++ b/data/drules_proto_dark.txt @@ -2958,7 +2958,7 @@ cont { element { scale: 15 symbol { - name: "car_wash-m" + name: "car-wash-m" apply_for_type: 1 priority: 16849 } @@ -2974,7 +2974,7 @@ cont { element { scale: 16 symbol { - name: "car_wash-m" + name: "car-wash-m" apply_for_type: 1 priority: 16849 } @@ -2990,7 +2990,7 @@ cont { element { scale: 17 symbol { - name: "car_wash-l" + name: "car-wash-l" apply_for_type: 1 priority: 16849 } @@ -3006,7 +3006,7 @@ cont { element { scale: 18 symbol { - name: "car_wash-l" + name: "car-wash-l" apply_for_type: 1 priority: 16849 } @@ -3022,7 +3022,7 @@ cont { element { scale: 19 symbol { - name: "car_wash-l" + name: "car-wash-l" priority: 16849 } caption { @@ -41666,100 +41666,6 @@ cont { } } cont { - name: "natural-marsh" - element { - scale: 11 - area { - color: 6425 - priority: -15795 - } - } - element { - scale: 12 - area { - color: 6425 - priority: -15795 - } - } - element { - scale: 13 - area { - color: 6425 - priority: -15795 - } - } - element { - scale: 14 - area { - color: 6425 - priority: -15795 - } - } - element { - scale: 15 - area { - color: 6425 - priority: -15795 - } - } - element { - scale: 16 - area { - color: 6425 - priority: -15795 - } - caption { - primary { - height: 11 - color: 19033 - } - priority: 15205 - } - } - element { - scale: 17 - area { - color: 6425 - priority: -15795 - } - caption { - primary { - height: 11 - color: 19033 - } - priority: 15205 - } - } - element { - scale: 18 - area { - color: 6425 - priority: -15795 - } - caption { - primary { - height: 11 - color: 19033 - } - priority: 15205 - } - } - element { - scale: 19 - area { - color: 6425 - priority: -15795 - } - caption { - primary { - height: 11 - color: 19033 - } - priority: 15205 - } - } -} -cont { name: "natural-peak" element { scale: 12 @@ -43303,6 +43209,100 @@ cont { } } cont { + name: "natural-wetland-marsh" + element { + scale: 11 + area { + color: 6425 + priority: -15795 + } + } + element { + scale: 12 + area { + color: 6425 + priority: -15795 + } + } + element { + scale: 13 + area { + color: 6425 + priority: -15795 + } + } + element { + scale: 14 + area { + color: 6425 + priority: -15795 + } + } + element { + scale: 15 + area { + color: 6425 + priority: -15795 + } + } + element { + scale: 16 + area { + color: 6425 + priority: -15795 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15205 + } + } + element { + scale: 17 + area { + color: 6425 + priority: -15795 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15205 + } + } + element { + scale: 18 + area { + color: 6425 + priority: -15795 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15205 + } + } + element { + scale: 19 + area { + color: 6425 + priority: -15795 + } + caption { + primary { + height: 11 + color: 19033 + } + priority: 15205 + } + } +} +cont { name: "natural-wood" element { scale: 10 @@ -68365,129 +68365,7 @@ cont { lines { width: 0.7 color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 11 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 16 - lines { - width: 1.5 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 17 - lines { - width: 1.5 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 18 - lines { - width: 1.5 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 19 - lines { - width: 1.5 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 19033 - } - priority: 16972 - } - } -} -cont { - name: "waterway-canal-tunnel" - element { - scale: 13 - lines { - width: 0.7 - color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -68504,7 +68382,7 @@ cont { lines { width: 1.0 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -68521,7 +68399,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -68538,7 +68416,7 @@ cont { lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68555,7 +68433,7 @@ cont { lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68572,7 +68450,7 @@ cont { lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68589,7 +68467,7 @@ cont { lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -68736,51 +68614,6 @@ cont { } } cont { - name: "waterway-ditch-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-dock" element { scale: 0 @@ -68969,60 +68802,15 @@ cont { } } cont { - name: "waterway-drain-tunnel" - element { - scale: 17 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 18 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } - element { - scale: 19 - lines { - width: 1.8 - color: 401446 - dashdot { - dd: 1.0 - dd: 1.0 - } - priority: 1972 - join: ROUNDJOIN - cap: ROUNDCAP - } - } -} -cont { name: "waterway-lock" element { scale: 16 lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } element { @@ -69030,9 +68818,9 @@ cont { lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } element { @@ -69040,9 +68828,9 @@ cont { lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } element { @@ -69050,9 +68838,9 @@ cont { lines { width: 1.5 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN - cap: BUTTCAP + cap: ROUNDCAP } } } @@ -69098,28 +68886,20 @@ cont { lines { width: 1.0 color: 401446 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } - area { - color: 8738 - priority: -15028 - } } element { scale: 11 lines { width: 1.2 color: 401446 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 10 @@ -69133,14 +68913,10 @@ cont { lines { width: 1.2 color: 401446 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 10 @@ -69154,14 +68930,10 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 10 @@ -69175,14 +68947,10 @@ cont { lines { width: 1.8 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 10 @@ -69196,14 +68964,10 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 12 @@ -69217,14 +68981,10 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 12 @@ -69238,14 +68998,10 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 12 @@ -69259,14 +69015,10 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 12 @@ -69280,14 +69032,10 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } - area { - color: 8738 - priority: -15028 - } path_text { primary { height: 12 @@ -69374,7 +69122,7 @@ cont { lines { width: 1.0 color: 401446 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } @@ -69388,7 +69136,7 @@ cont { lines { width: 1.2 color: 401446 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } @@ -69409,7 +69157,7 @@ cont { lines { width: 1.2 color: 401446 - priority: -15800 + priority: -15600 join: BEVELJOIN cap: BUTTCAP } @@ -69430,7 +69178,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69451,7 +69199,7 @@ cont { lines { width: 1.8 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69472,7 +69220,7 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69493,7 +69241,7 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69514,7 +69262,7 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69535,7 +69283,7 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69556,7 +69304,7 @@ cont { lines { width: 2.2 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69580,7 +69328,7 @@ cont { lines { width: 0.7 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69597,7 +69345,7 @@ cont { lines { width: 1.0 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69614,7 +69362,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69631,7 +69379,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69648,7 +69396,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69665,7 +69413,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69682,7 +69430,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69702,7 +69450,7 @@ cont { lines { width: 0.7 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69719,7 +69467,7 @@ cont { lines { width: 1.0 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69736,7 +69484,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69753,7 +69501,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69770,7 +69518,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69787,7 +69535,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69804,7 +69552,7 @@ cont { lines { width: 1.6 color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69828,7 +69576,7 @@ cont { dd: 2.7 dd: 2.7 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69849,7 +69597,7 @@ cont { dd: 2.7 dd: 2.7 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69869,7 +69617,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: BUTTCAP } @@ -69889,7 +69637,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69909,7 +69657,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69929,7 +69677,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } @@ -69949,129 +69697,7 @@ cont { dashdot { dd: 4.95 } - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 19033 - } - priority: 16972 - } - } -} -cont { - name: "waterway-stream-tunnel" - element { - scale: 13 - lines { - width: 0.7 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 14 - lines { - width: 1.0 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 10 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 15 - lines { - width: 1.6 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: BUTTCAP - } - path_text { - primary { - height: 11 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 16 - lines { - width: 1.6 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 17 - lines { - width: 1.6 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 11 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 18 - lines { - width: 1.6 - color: 401446 - priority: -15800 - join: ROUNDJOIN - cap: ROUNDCAP - } - path_text { - primary { - height: 12 - color: 19033 - } - priority: 16972 - } - } - element { - scale: 19 - lines { - width: 1.6 - color: 401446 - priority: -15800 + priority: -15600 join: ROUNDJOIN cap: ROUNDCAP } diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin Binary files differindex 6d545fc92d..04795e6479 100644 --- a/data/drules_proto_legacy.bin +++ b/data/drules_proto_legacy.bin diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt index d48bce75f4..c6e4713bc8 100644 --- a/data/drules_proto_legacy.txt +++ b/data/drules_proto_legacy.txt @@ -41868,47 +41868,92 @@ cont { } } cont { + name: "natural-wetland-marsh" + element { + scale: 14 + area { + color: 10535864 + priority: -16376 + } + } + element { + scale: 15 + area { + color: 10535864 + priority: -16377 + } + } + element { + scale: 16 + area { + color: 10535864 + priority: -16378 + } + } + element { + scale: 17 + area { + color: 10535864 + priority: -16379 + } + } + element { + scale: 18 + area { + color: 10535864 + priority: -16380 + } + } + element { + scale: 19 + area { + color: 10535864 + priority: -16381 + } + } +} +cont { name: "natural-wood" element { scale: 10 area { color: 11720357 - priority: -16376 + priority: -16382 } } element { scale: 11 area { color: 11720357 - priority: -16377 + priority: -16383 } } element { scale: 12 area { color: 11720357 - priority: -16378 + priority: -16384 } } element { scale: 13 area { color: 11720357 - priority: -16379 + priority: -16385 } } element { scale: 14 area { color: 11720357 - priority: -16380 + priority: -16386 } } element { scale: 15 area { color: 11720357 - priority: -16381 + priority: -16387 } caption { primary { @@ -41922,7 +41967,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16382 + priority: -16388 } caption { primary { @@ -41937,7 +41982,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16383 + priority: -16389 } caption { primary { @@ -41952,7 +41997,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16384 + priority: -16390 } caption { primary { @@ -41967,7 +42012,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16385 + priority: -16391 } caption { primary { @@ -41985,42 +42030,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16386 + priority: -16392 } } element { scale: 11 area { color: 11720357 - priority: -16387 + priority: -16393 } } element { scale: 12 area { color: 11720357 - priority: -16388 + priority: -16394 } } element { scale: 13 area { color: 11720357 - priority: -16389 + priority: -16395 } } element { scale: 14 area { color: 11720357 - priority: -16390 + priority: -16396 } } element { scale: 15 area { color: 11720357 - priority: -16391 + priority: -16397 } caption { primary { @@ -42034,7 +42079,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16392 + priority: -16398 } caption { primary { @@ -42049,7 +42094,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16393 + priority: -16399 } caption { primary { @@ -42064,7 +42109,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16394 + priority: -16400 } caption { primary { @@ -42079,7 +42124,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16395 + priority: -16401 } caption { primary { @@ -42097,42 +42142,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16396 + priority: -16402 } } element { scale: 11 area { color: 11720357 - priority: -16397 + priority: -16403 } } element { scale: 12 area { color: 11720357 - priority: -16398 + priority: -16404 } } element { scale: 13 area { color: 11720357 - priority: -16399 + priority: -16405 } } element { scale: 14 area { color: 11720357 - priority: -16400 + priority: -16406 } } element { scale: 15 area { color: 11720357 - priority: -16401 + priority: -16407 } caption { primary { @@ -42146,7 +42191,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16402 + priority: -16408 } caption { primary { @@ -42161,7 +42206,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16403 + priority: -16409 } caption { primary { @@ -42176,7 +42221,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16404 + priority: -16410 } caption { primary { @@ -42191,7 +42236,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16405 + priority: -16411 } caption { primary { @@ -42209,42 +42254,42 @@ cont { scale: 10 area { color: 11720357 - priority: -16406 + priority: -16412 } } element { scale: 11 area { color: 11720357 - priority: -16407 + priority: -16413 } } element { scale: 12 area { color: 11720357 - priority: -16408 + priority: -16414 } } element { scale: 13 area { color: 11720357 - priority: -16409 + priority: -16415 } } element { scale: 14 area { color: 11720357 - priority: -16410 + priority: -16416 } } element { scale: 15 area { color: 11720357 - priority: -16411 + priority: -16417 } caption { primary { @@ -42258,7 +42303,7 @@ cont { scale: 16 area { color: 11720357 - priority: -16412 + priority: -16418 } caption { primary { @@ -42273,7 +42318,7 @@ cont { scale: 17 area { color: 11720357 - priority: -16413 + priority: -16419 } caption { primary { @@ -42288,7 +42333,7 @@ cont { scale: 18 area { color: 11720357 - priority: -16414 + priority: -16420 } caption { primary { @@ -42303,7 +42348,7 @@ cont { scale: 19 area { color: 11720357 - priority: -16415 + priority: -16421 } caption { primary { @@ -46265,7 +46310,7 @@ cont { scale: 14 area { color: 14539465 - priority: -16416 + priority: -16422 } caption { primary { @@ -46279,7 +46324,7 @@ cont { scale: 15 area { color: 14539465 - priority: -16417 + priority: -16423 } caption { primary { @@ -46293,7 +46338,7 @@ cont { scale: 16 area { color: 14539465 - priority: -16418 + priority: -16424 } caption { primary { @@ -46307,7 +46352,7 @@ cont { scale: 17 area { color: 14539465 - priority: -16419 + priority: -16425 } caption { primary { @@ -46321,7 +46366,7 @@ cont { scale: 18 area { color: 14539465 - priority: -16420 + priority: -16426 } caption { primary { @@ -46335,7 +46380,7 @@ cont { scale: 19 area { color: 14539465 - priority: -16421 + priority: -16427 } caption { primary { @@ -47380,14 +47425,14 @@ cont { scale: 11 area { color: 14539465 - priority: -16422 + priority: -16428 } } element { scale: 12 area { color: 14539465 - priority: -16423 + priority: -16429 } caption { primary { @@ -47402,7 +47447,7 @@ cont { scale: 13 area { color: 14539465 - priority: -16424 + priority: -16430 } caption { primary { @@ -47424,7 +47469,7 @@ cont { scale: 14 area { color: 14539465 - priority: -16425 + priority: -16431 } caption { primary { @@ -47446,7 +47491,7 @@ cont { scale: 15 area { color: 14539465 - priority: -16426 + priority: -16432 } caption { primary { @@ -47468,7 +47513,7 @@ cont { scale: 16 area { color: 14539465 - priority: -16427 + priority: -16433 } caption { primary { @@ -47490,7 +47535,7 @@ cont { scale: 17 area { color: 14539465 - priority: -16428 + priority: -16434 } caption { primary { @@ -47512,7 +47557,7 @@ cont { scale: 18 area { color: 14539465 - priority: -16429 + priority: -16435 } caption { primary { @@ -47534,7 +47579,7 @@ cont { scale: 19 area { color: 14539465 - priority: -16430 + priority: -16436 } caption { primary { @@ -65419,21 +65464,21 @@ cont { scale: 12 area { color: 13626551 - priority: -16431 + priority: -16437 } } element { scale: 13 area { color: 13626551 - priority: -16432 + priority: -16438 } } element { scale: 14 area { color: 13626551 - priority: -16433 + priority: -16439 } symbol { name: "campsite" @@ -65444,7 +65489,7 @@ cont { scale: 15 area { color: 13626551 - priority: -16434 + priority: -16440 } symbol { name: "campsite" @@ -65455,7 +65500,7 @@ cont { scale: 16 area { color: 13626551 - priority: -16435 + priority: -16441 } symbol { name: "campsite" @@ -65529,35 +65574,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16436 + priority: -16442 } } element { scale: 13 area { color: 13626551 - priority: -16437 + priority: -16443 } } element { scale: 14 area { color: 13626551 - priority: -16438 + priority: -16444 } } element { scale: 15 area { color: 13626551 - priority: -16439 + priority: -16445 } } element { scale: 16 area { color: 13626551 - priority: -16440 + priority: -16446 } } element { @@ -66058,35 +66103,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16441 + priority: -16447 } } element { scale: 13 area { color: 13626551 - priority: -16442 + priority: -16448 } } element { scale: 14 area { color: 13626551 - priority: -16443 + priority: -16449 } } element { scale: 15 area { color: 13626551 - priority: -16444 + priority: -16450 } } element { scale: 16 area { color: 13626551 - priority: -16445 + priority: -16451 } } element { @@ -66221,35 +66266,35 @@ cont { scale: 12 area { color: 13626551 - priority: -16446 + priority: -16452 } } element { scale: 13 area { color: 13626551 - priority: -16447 + priority: -16453 } } element { scale: 14 area { color: 13626551 - priority: -16448 + priority: -16454 } } element { scale: 15 area { color: 13626551 - priority: -16449 + priority: -16455 } } element { scale: 16 area { color: 13626551 - priority: -16450 + priority: -16456 } } element { diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index eeb57b6fa5..cec8dc1172 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -202,7 +202,7 @@ highway|motorway_link;[highway=motorway_link];;name;int_name;201; leisure|golf_course;[leisure=golf_course];;name;int_name;202; highway|service|bridge;[highway=service][bridge?];;name;int_name;203; power|minor_line;[power=minor_line];;name;int_name;204; -natural|marsh;[natural=marsh];;name;int_name;205; +natural|marsh;[natural=marsh];x;name;int_name;205;natural|wetland|marsh leisure|stadium;[leisure=stadium];;name;int_name;206; amenity|doctors;[amenity=doctors];;name;int_name;207; railway|disused;[railway=disused];;name;int_name;208; @@ -1067,3 +1067,4 @@ amenity|car_wash;[amenity=car_wash];;name;int_name;1066; amenity|veterinary;[amenity=veterinary];;name;int_name;1067; amenity|charging_station;[amenity=charging_station];;name;int_name;1068; amenity|childcare;[amenity=childcare];;name;int_name;1069; +natural|wetland|marsh;[natural=wetland][wetland=marsh];;name;int_name;1070; diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss index b818285e72..8e881e4f6b 100644 --- a/data/styles/clear/include/POI.mapcss +++ b/data/styles/clear/include/POI.mapcss @@ -467,7 +467,7 @@ node|z15-[shop=bicycle], area|z15-[shop=bicycle] { icon-image: shop-bicycle-m.sv node|z15-[shop=butcher], area|z15-[shop=butcher] { icon-image: butcher-m.svg; } node|z15-[shop=car], area|z15-[shop=car] { icon-image: car_sharing-m.svg; } node|z15-[shop=car_repair], area|z15-[shop=car_repair] { icon-image: car-repair-m.svg; } -node|z15-[amenity=car_wash], area|z15-[amenity=car_wash ] { icon-image: car_wash-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; } +node|z15-[amenity=car_wash], area|z15-[amenity=car_wash ] { icon-image: car-wash-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; } node|z15-[shop=chemist], area|z15-[shop=chemist] { icon-image: chemist-m.svg; } node|z15-[shop=clothes], area|z15-[shop=clothes] { icon-image: clothes-m.svg; } node|z15-[shop=computer], area|z15-[shop=computer] { icon-image: computer-m.svg; } @@ -527,7 +527,7 @@ node|z17-[shop=bicycle], area|z17-[shop=bicycle]{ icon-image: shop-bicycle-l.svg node|z17-[shop=butcher], area|z17-[shop=butcher] { icon-image: butcher-l.svg; } node|z17-[shop=car], area|z17-[shop=car]{ icon-image: car_sharing-l.svg; } node|z17-[shop=car_repair], area|z17-[shop=car_repair] { icon-image: car-repair-l.svg; } -node|z17-[amenity=car_wash], area|z17-[amenity=car_wash ] { icon-image: car_wash-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; } +node|z17-[amenity=car_wash], area|z17-[amenity=car_wash ] { icon-image: car-wash-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; } node|z17-[shop=chemist], area|z17-[shop=chemist] { icon-image: chemist-l.svg; } node|z17-[shop=clothes], area|z17-[shop=clothes] { icon-image: clothes-l.svg; } node|z17-[shop=computer], area|z17-[shop=computer]{ icon-image: computer-l.svg; } diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss index f533e6ddc0..01bf07aa45 100644 --- a/data/styles/clear/include/labels.mapcss +++ b/data/styles/clear/include/labels.mapcss @@ -1517,9 +1517,7 @@ node|z16-[natural=bay], area|z16-[natural=water], area|z16-[natural=bay], node|z16-[natural=wetland], -node|z16-[natural=marsh] area|z16-[natural=wetland], -area|z16-[natural=marsh] { text: name; font-size: 11; @@ -1562,22 +1560,15 @@ area|z12-[natural=water][bbox_area<10000000] {} */ -line[waterway] { - text-position: line; - z-index:10000; -} - -line|z11-[waterway=river][!tunnel?] { - text: name; - font-size: 10; - text-color: @water_label; - text-halo-opacity: 0.1; - text-halo-color: @halo_water_lable; - text-halo-radius: 0; - z-index: 10000; +line[waterway] +{ + text-position: line; + z-index:10000; } -line|z11-[waterway=riverbank] { +line|z11-[waterway=river], +line|z11-[waterway=riverbank], +{ text: name; font-size: 10; text-color: @water_label; @@ -1588,7 +1579,8 @@ line|z11-[waterway=riverbank] { } line|z13-[waterway=riverbank], -line|z13-[waterway=river][!tunnel?] { +line|z13-[waterway=river], +{ text: name; font-size: 10; text-color: @water_label; @@ -1599,7 +1591,8 @@ line|z13-[waterway=river][!tunnel?] { } line|z13-[waterway=stream], -line|z13-[waterway=canal] { +line|z13-[waterway=canal], +{ text: name; font-size: 10; text-color: @water_label; @@ -1608,17 +1601,10 @@ line|z13-[waterway=canal] { text-halo-radius: 0; z-index: 10000; } -line|z15-[waterway=river][!tunnel?] { - text: name; - font-size: 12; - text-color: @water_label; - text-halo-opacity: 0.1; - text-halo-color: @halo_water_lable; - text-halo-radius: 0; - z-index: 10000; -} -line|z15-[waterway=riverbank] { +line|z15-[waterway=river], +line|z15-[waterway=riverbank], +{ text: name; font-size: 12; text-color: @water_label; @@ -1629,7 +1615,8 @@ line|z15-[waterway=riverbank] { } line|z15-[waterway=stream], -line|z15-[waterway=canal] { +line|z15-[waterway=canal], +{ text: name; font-size: 11; text-color: @water_label; @@ -1638,17 +1625,10 @@ line|z15-[waterway=canal] { text-halo-radius: 0; z-index: 10000; } -line|z17-[waterway=river][!tunnel?] { - text: name; - font-size: 12; - text-color: @water_label; - text-halo-opacity: 0.1; - text-halo-color: @halo_water_lable; - text-halo-radius: 0; - z-index: 10000; -} -line|z17-[waterway=riverbank] { +line|z17-[waterway=river], +line|z17-[waterway=riverbank], +{ text: name; font-size: 12; text-color: @water_label; @@ -1659,7 +1639,8 @@ line|z17-[waterway=riverbank] { } line|z17-[waterway=stream], -line|z17-[waterway=canal] { +line|z17-[waterway=canal], +{ text: name; font-size: 11; text-color: @water_label; @@ -1668,17 +1649,10 @@ line|z17-[waterway=canal] { text-halo-radius: 0; z-index: 10000; } -line|z18-[waterway=river][!tunnel?] { - text: name; - font-size: 12; - text-color: @water_label; - text-halo-opacity: 0.1; - text-halo-color: @halo_water_lable; - text-halo-radius: 0; - z-index: 10000; -} -line|z18-[waterway=riverbank] { +line|z18-[waterway=river], +line|z18-[waterway=riverbank], +{ text: name; font-size: 12; text-color: @water_label; @@ -1689,7 +1663,8 @@ line|z18-[waterway=riverbank] { } line|z18-[waterway=stream], -line|z18-[waterway=canal] { +line|z18-[waterway=canal], +{ text: name; font-size: 12; text-color: @water_label; @@ -1698,6 +1673,14 @@ line|z18-[waterway=canal] { text-halo-radius: 0; z-index: 10000; } + +/* Do not draw tunnel waterways */ + +line[waterway][tunnel] +{ + text: none; +} + /* FERRY */ line|z10-[route=ferry], diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss index e762ada69a..d9b4f39c4e 100644 --- a/data/styles/clear/include/natural.mapcss +++ b/data/styles/clear/include/natural.mapcss @@ -62,7 +62,6 @@ area|z0-[natural=salt_pond], area|z0-[landuse=salt_pond], area|z0-[waterway=dock], area|z0-[waterway=riverbank], -area|z10-[waterway=river][!tunnel?], area|z10-[natural=bay], { fill-color: @water; @@ -72,163 +71,151 @@ area|z10-[natural=bay], area|z11-19[natural=wetland], -area|z11-19[natural=marsh] { +{ z-index: 49; fill-opacity: 1; fill-color: @wetland; fill-position: background; - } /* rivers */ -line|z10[waterway=river][!tunnel?], -line|z10[waterway=riverbank] { +line|z10[waterway=river], +line|z10[waterway=riverbank], +{ width: 1; opacity: 1; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } - -line|z11-12[waterway=river][!tunnel?], -line|z11-12[waterway=riverbank] { +line|z11-12[waterway=river], +line|z11-12[waterway=riverbank], +{ width: 1.2; opacity: 1; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } - line|z13[waterway=stream], -line|z13[waterway=canal]{ +line|z13[waterway=canal], +{ width: 0.7; opacity: 1; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } - -line|z13[waterway=stream][intermittent=yes] { +line|z13[waterway=stream][intermittent=yes] +{ width: 0.7; opacity: 1; color: @river; dashes: 2.7,2.7; z-index: 49; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } -line|z13[waterway=river][!tunnel?] { +line|z13[waterway=river], +line|z13[waterway=riverbank], +{ width: 1.6; opacity: 1; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } -line|z13[waterway=riverbank] { - width: 1.6; - opacity: 1; - color: @river; - z-index: 50; - -x-me-line-priority: -15800; -} line|z14[waterway=stream], -line|z14[waterway=canal]{ +line|z14[waterway=canal], +{ width: 1; opacity: 1; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } - -line|z14[waterway=stream][intermittent=yes] { +line|z14[waterway=stream][intermittent=yes] +{ width: 1; opacity: 1; color: @river; dashes: 2.7,2.7; z-index: 49; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } -line|z14[waterway=river][!tunnel?]{ +line|z14[waterway=river], +line|z14[waterway=riverbank], +{ width: 1.8; opacity: 1; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } -line|z14[waterway=riverbank] { - width: 1.8; - opacity: 1; - color: @river; - z-index: 50; - -x-me-line-priority: -15800; -} line|z15-[waterway=stream], -line|z15-[waterway=canal] - { +line|z15-[waterway=canal], +{ width: 1.6; opacity: 1; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } -line|z15-[waterway=stream][intermittent=yes] { +line|z15-[waterway=stream][intermittent=yes] +{ dashes: 4.95; width: 1.4; opacity: 1; color: @river; z-index: 49; - -x-me-line-priority: -15800; -} -line|z15-[waterway=river][!tunnel?] { - width: 2.2; - color: @river; - z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } -line|z15-[waterway=riverbank] { +line|z15-[waterway=river], +line|z15-[waterway=riverbank], +{ width: 2.2; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } - area|z15-[waterway=dam], line|z15-[waterway=dam], line|z15-[waterway=weir], - { +{ width: 1; opacity: 1; color: @bridge_casing; z-index: 110; } line|z16-[waterway=canal], -node|z16-[waterway=lock] +line|z16-[waterway=lock], { width: 1.5; color: @river; z-index: 50; - -x-me-line-priority: -15800; + -x-me-line-priority: -15600; } node|z16-[waterway=lock_gate], - { +{ icon-image: dot-m.svg; z-index: 110; } line|z17-[waterway=ditch], -line|z17-[waterway=drain] { +line|z17-[waterway=drain], +{ width: 1.8; opacity: 1; color: @river; @@ -236,6 +223,13 @@ line|z17-[waterway=drain] { dashes: 0.9,0.9; } +/* Do not draw tunnel waterways */ + +line[waterway][tunnel] +{ + width: 0; +} + /* VEGETATION */ area|z10[natural=wood], diff --git a/data/types.txt b/data/types.txt index b100a50251..d0963c7564 100644 --- a/data/types.txt +++ b/data/types.txt @@ -202,7 +202,7 @@ highway|motorway_link leisure|golf_course highway|service|bridge power|minor_line -natural|marsh +natural|wetland|marsh leisure|stadium amenity|doctors railway|disused @@ -1067,3 +1067,4 @@ amenity|car_wash amenity|veterinary amenity|charging_station amenity|childcare +natural|wetland|marsh diff --git a/data/visibility.txt b/data/visibility.txt index 60068a0d67..88f376ce6e 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -478,7 +478,6 @@ world 00000000000000000000 + heath 00000000000011111111 - lake 11111111111111111111 - land 00000011111111111111 - - marsh 00000000000000000000 - meadow 00000000000000011111 - orchard 00000000000000011111 - peak 00000000000011111111 - @@ -495,6 +494,7 @@ world 00000000000000000000 + waterfall 00000000000000111111 - wetland 00000000000000111111 + bog 00000000000011111111 - + marsh 00000000000000111111 - {} wood 00000000001111111111 + coniferous 00000000001111111111 - |