From 1d79740366dcd8893dca1184498ef80ada500939 Mon Sep 17 00:00:00 2001 From: vng Date: Sun, 17 Apr 2011 19:31:27 +0300 Subject: [PATCH] Fix drawing rules for special area features. Some area features that divided into subtypes didn't draw correctly because of pattern filling (we doesn't support it now). --- data/classificator.txt | 70 +++++++++++++++++++++--------------------- data/visibility.txt | 70 +++++++++++++++++++++--------------------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/data/classificator.txt b/data/classificator.txt index 24de537030..a20a5f7c3c 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -48,14 +48,14 @@ world + coastline 0|0|1|100 1|0|1|100 2|0|1|100 3|0|1|100 4|0|1|100 5|0|1|100 6|0|63|100 7|0|64|100 8|0|23|100 9|0|19|100 10|0|61|100 11|0|61|100 12|0|184|100 13|0|191|100 14|0|226|100 15|0|237|100 16|0|366|100 17|0|388|100 - forest 6|1|3|10 7|1|3|11 8|1|3|11 9|1|3|11 10|1|3|11 11|1|3|11 12|1|2|6 13|1|5|11 14|1|10|29 15|1|10|29 15|3|2|2841 15|3|3|2869 16|1|10|29 17|1|10|29 + [wood] - - coniferous 14|1|7|11 15|1|7|11 16|1|7|11 17|1|7|11 - - deciduous 14|1|8|17 15|1|8|17 16|1|8|17 17|1|8|17 - - mixed 14|1|9|23 15|1|9|23 16|1|9|23 17|1|9|23 - + coniferous 6|1|3|10 7|1|3|11 8|1|3|11 9|1|3|11 10|1|3|11 11|1|3|11 12|1|2|6 13|1|5|11 14|1|10|29 15|1|10|29 15|3|2|2841 15|3|3|2869 16|1|10|29 17|1|10|29 - + deciduous 6|1|3|10 7|1|3|11 8|1|3|11 9|1|3|11 10|1|3|11 11|1|3|11 12|1|2|6 13|1|5|11 14|1|10|29 15|1|10|29 15|3|2|2841 15|3|3|2869 16|1|10|29 17|1|10|29 - + mixed 6|1|3|10 7|1|3|11 8|1|3|11 9|1|3|11 10|1|3|11 11|1|3|11 12|1|2|6 13|1|5|11 14|1|10|29 15|1|10|29 15|3|2|2841 15|3|3|2869 16|1|10|29 17|1|10|29 - {} wood 6|1|3|11 7|1|3|12 8|1|3|12 9|1|3|12 10|1|3|12 11|1|3|12 12|1|2|7 13|1|5|12 14|1|10|30 15|1|10|30 16|1|10|30 17|1|10|30 + - coniferous 14|1|7|12 15|1|7|12 16|1|7|12 17|1|7|12 - - deciduous 14|1|8|18 15|1|8|18 16|1|8|18 17|1|8|18 - - mixed 14|1|9|24 15|1|9|24 16|1|9|24 17|1|9|24 - + coniferous 6|1|3|11 7|1|3|12 8|1|3|12 9|1|3|12 10|1|3|12 11|1|3|12 12|1|2|7 13|1|5|12 14|1|10|30 15|1|10|30 16|1|10|30 17|1|10|30 - + deciduous 6|1|3|11 7|1|3|12 8|1|3|12 9|1|3|12 10|1|3|12 11|1|3|12 12|1|2|7 13|1|5|12 14|1|10|30 15|1|10|30 16|1|10|30 17|1|10|30 - + mixed 6|1|3|11 7|1|3|12 8|1|3|12 9|1|3|12 10|1|3|12 11|1|3|12 12|1|2|7 13|1|5|12 14|1|10|30 15|1|10|30 16|1|10|30 17|1|10|30 - {} water 6|1|16|50 7|1|16|51 8|1|9|35 9|1|9|35 10|1|16|55 11|1|16|55 12|1|21|70 13|1|26|80 14|1|32|107 15|1|36|112 16|1|36|114 17|1|36|116 - pond 6|1|16|51 7|1|16|52 8|1|9|36 9|1|9|36 10|1|16|56 11|1|16|56 12|1|21|71 13|1|26|81 14|1|32|108 15|1|36|113 16|1|36|115 17|1|36|117 - @@ -63,9 +63,9 @@ world + glacier 7|0|4|8 8|0|3|8 9|0|0|8 10|0|0|8 11|0|0|8 12|0|0|2 13|0|0|6 14|0|0|8 15|0|0|8 16|0|0|8 17|0|0|8 - scrub 12|1|2|8 13|1|5|13 14|1|10|31 15|1|10|31 16|1|10|31 17|1|10|31 + [wood] - - coniferous 14|1|7|13 15|1|7|13 16|1|7|13 17|1|7|13 - - deciduous 14|1|8|19 15|1|8|19 16|1|8|19 17|1|8|19 - - mixed 14|1|9|25 15|1|9|25 16|1|9|25 17|1|9|25 - + coniferous 12|1|2|8 13|1|5|13 14|1|10|31 15|1|10|31 16|1|10|31 17|1|10|31 - + deciduous 12|1|2|8 13|1|5|13 14|1|10|31 15|1|10|31 16|1|10|31 17|1|10|31 - + mixed 12|1|2|8 13|1|5|13 14|1|10|31 15|1|10|31 16|1|10|31 17|1|10|31 - {} heath 12|1|3|9 13|1|6|14 14|1|11|35 15|1|11|35 16|1|11|35 17|1|11|35 - wetland 14|1|33|111 15|1|37|116 16|1|37|118 17|1|37|120 + @@ -113,18 +113,18 @@ world + commercial 6|1|1|5 7|1|1|5 8|1|1|5 9|1|1|5 10|1|1|5 11|1|1|5 12|1|46|-9573 13|1|54|-9542 14|1|77|-9424 15|1|84|-9225 16|1|86|-8615 16|3|4|3475 16|3|5|3503 17|1|92|-8340 - cemetery 6|1|1|6 7|1|1|6 8|1|1|6 9|1|1|6 10|1|1|6 11|1|1|6 12|1|46|-9572 13|1|1|2 14|1|2|3 15|1|2|3 16|1|2|3 16|3|4|3474 16|3|5|3502 17|1|2|3 + [religion] - - christian 14|1|1|2 15|1|1|2 16|1|1|2 17|1|1|2 - + christian 6|1|1|6 7|1|1|6 8|1|1|6 9|1|1|6 10|1|1|6 11|1|1|6 12|1|46|-9572 13|1|1|2 14|1|2|3 15|1|2|3 16|1|2|3 16|3|4|3474 16|3|5|3502 17|1|2|3 - {} forest 6|1|3|8 7|1|3|9 8|1|3|9 9|1|3|9 10|1|3|9 11|1|3|9 12|1|2|3 13|1|5|8 14|1|10|32 15|1|10|32 16|1|10|32 16|3|4|3480 16|3|5|3508 17|1|10|32 + [wood] - - coniferous 14|1|7|14 15|1|7|14 16|1|7|14 17|1|7|14 - - deciduous 14|1|8|20 15|1|8|20 16|1|8|20 17|1|8|20 - - mixed 14|1|9|26 15|1|9|26 16|1|9|26 17|1|9|26 - + coniferous 6|1|3|8 7|1|3|9 8|1|3|9 9|1|3|9 10|1|3|9 11|1|3|9 12|1|2|3 13|1|5|8 14|1|10|32 15|1|10|32 16|1|10|32 16|3|4|3480 16|3|5|3508 17|1|10|32 - + deciduous 6|1|3|8 7|1|3|9 8|1|3|9 9|1|3|9 10|1|3|9 11|1|3|9 12|1|2|3 13|1|5|8 14|1|10|32 15|1|10|32 16|1|10|32 16|3|4|3480 16|3|5|3508 17|1|10|32 - + mixed 6|1|3|8 7|1|3|9 8|1|3|9 9|1|3|9 10|1|3|9 11|1|3|9 12|1|2|3 13|1|5|8 14|1|10|32 15|1|10|32 16|1|10|32 16|3|4|3480 16|3|5|3508 17|1|10|32 - {} wood 6|1|3|9 7|1|3|10 8|1|3|10 9|1|3|10 10|1|3|10 11|1|3|10 12|1|2|4 13|1|5|9 14|1|10|33 15|1|10|33 16|1|10|33 17|1|10|33 + - coniferous 14|1|7|15 15|1|7|15 16|1|7|15 17|1|7|15 - - deciduous 14|1|8|21 15|1|8|21 16|1|8|21 17|1|8|21 - - mixed 14|1|9|27 15|1|9|27 16|1|9|27 17|1|9|27 - + coniferous 6|1|3|9 7|1|3|10 8|1|3|10 9|1|3|10 10|1|3|10 11|1|3|10 12|1|2|4 13|1|5|9 14|1|10|33 15|1|10|33 16|1|10|33 17|1|10|33 - + deciduous 6|1|3|9 7|1|3|10 8|1|3|10 9|1|3|10 10|1|3|10 11|1|3|10 12|1|2|4 13|1|5|9 14|1|10|33 15|1|10|33 16|1|10|33 17|1|10|33 - + mixed 6|1|3|9 7|1|3|10 8|1|3|10 9|1|3|10 10|1|3|10 11|1|3|10 12|1|2|4 13|1|5|9 14|1|10|33 15|1|10|33 16|1|10|33 17|1|10|33 - {} field 6|1|4|12 7|1|4|13 8|1|4|13 9|1|4|13 10|1|4|13 11|1|4|13 12|1|6|12 13|1|9|17 14|1|14|38 15|1|14|38 16|1|14|38 17|1|14|38 - village_green 6|1|4|13 7|1|4|14 8|1|4|14 9|1|4|14 10|1|4|14 11|1|4|14 12|1|7|18 13|1|10|23 14|1|15|44 15|1|15|44 16|1|15|44 16|3|4|3497 16|3|5|3525 17|1|15|44 - @@ -141,29 +141,29 @@ world + {} reservoir 6|1|16|53 7|1|16|54 8|1|9|38 9|1|9|38 10|1|16|58 11|1|16|58 12|1|21|73 13|1|26|83 14|1|32|117 15|1|36|122 16|1|36|124 16|3|4|3493 16|3|5|3521 17|1|36|126 + [reservoir_type] - - evaporator 14|1|34|112 15|1|38|117 16|1|38|119 17|1|38|121 - - cooling 14|1|35|113 15|1|39|118 16|1|39|120 17|1|39|122 - - sewage 14|1|36|114 15|1|40|119 16|1|40|121 17|1|40|123 - - tailings 14|1|37|115 15|1|41|120 16|1|41|122 17|1|41|124 - - water_storage 14|1|32|116 15|1|36|121 16|1|36|123 17|1|36|125 - + evaporator 6|1|16|53 7|1|16|54 8|1|9|38 9|1|9|38 10|1|16|58 11|1|16|58 12|1|21|73 13|1|26|83 14|1|32|117 15|1|36|122 16|1|36|124 16|3|4|3493 16|3|5|3521 17|1|36|126 - + cooling 6|1|16|53 7|1|16|54 8|1|9|38 9|1|9|38 10|1|16|58 11|1|16|58 12|1|21|73 13|1|26|83 14|1|32|117 15|1|36|122 16|1|36|124 16|3|4|3493 16|3|5|3521 17|1|36|126 - + sewage 6|1|16|53 7|1|16|54 8|1|9|38 9|1|9|38 10|1|16|58 11|1|16|58 12|1|21|73 13|1|26|83 14|1|32|117 15|1|36|122 16|1|36|124 16|3|4|3493 16|3|5|3521 17|1|36|126 - + tailings 6|1|16|53 7|1|16|54 8|1|9|38 9|1|9|38 10|1|16|58 11|1|16|58 12|1|21|73 13|1|26|83 14|1|32|117 15|1|36|122 16|1|36|124 16|3|4|3493 16|3|5|3521 17|1|36|126 - + water_storage 6|1|16|53 7|1|16|54 8|1|9|38 9|1|9|38 10|1|16|58 11|1|16|58 12|1|21|73 13|1|26|83 14|1|32|117 15|1|36|122 16|1|36|124 16|3|4|3493 16|3|5|3521 17|1|36|126 - {} basin 6|1|16|54 7|1|16|55 8|1|9|39 9|1|9|39 10|1|16|59 11|1|16|59 12|1|21|74 13|1|26|84 14|1|32|122 15|1|36|127 16|1|36|129 16|3|4|3472 16|3|5|3500 17|1|36|131 + - infiltration 14|1|38|118 15|1|42|123 16|1|42|125 17|1|42|127 - - detention 14|1|39|119 15|1|43|124 16|1|43|126 17|1|43|128 - - retention 14|1|32|120 14|1|40|121 15|1|36|125 15|1|44|126 16|1|36|127 16|1|44|128 17|1|36|129 17|1|44|130 - + infiltration 6|1|16|54 7|1|16|55 8|1|9|39 9|1|9|39 10|1|16|59 11|1|16|59 12|1|21|74 13|1|26|84 14|1|32|122 15|1|36|127 16|1|36|129 16|3|4|3472 16|3|5|3500 17|1|36|131 - + detention 6|1|16|54 7|1|16|55 8|1|9|39 9|1|9|39 10|1|16|59 11|1|16|59 12|1|21|74 13|1|26|84 14|1|32|122 15|1|36|127 16|1|36|129 16|3|4|3472 16|3|5|3500 17|1|36|131 - + retention 6|1|16|54 7|1|16|55 8|1|9|39 9|1|9|39 10|1|16|59 11|1|16|59 12|1|21|74 13|1|26|84 14|1|32|122 15|1|36|127 16|1|36|129 16|3|4|3472 16|3|5|3500 17|1|36|131 - {} scrub 12|1|2|5 13|1|5|10 14|1|10|34 15|1|10|34 16|1|10|34 17|1|10|34 + [wood] - - coniferous 14|1|7|16 15|1|7|16 16|1|7|16 17|1|7|16 - - deciduous 14|1|8|22 15|1|8|22 16|1|8|22 17|1|8|22 - - mixed 14|1|9|28 15|1|9|28 16|1|9|28 17|1|9|28 - + coniferous 12|1|2|5 13|1|5|10 14|1|10|34 15|1|10|34 16|1|10|34 17|1|10|34 - + deciduous 12|1|2|5 13|1|5|10 14|1|10|34 15|1|10|34 16|1|10|34 17|1|10|34 - + mixed 12|1|2|5 13|1|5|10 14|1|10|34 15|1|10|34 16|1|10|34 17|1|10|34 - {} conservation 12|1|5|11 13|1|8|16 14|1|13|37 15|1|13|37 16|1|13|37 17|1|13|37 + [access] - - private 15|1|80|-9243 16|1|81|-8633 17|1|82|-8359 - - permissive 15|1|81|-9242 16|1|82|-8632 17|1|83|-8358 - - destination 15|1|81|-9241 16|1|83|-8631 17|1|84|-8357 - - no-access 15|1|81|-9240 16|1|83|-8630 17|1|82|-8356 - + private 12|1|5|11 13|1|8|16 14|1|13|37 15|1|13|37 16|1|13|37 17|1|13|37 - + permissive 12|1|5|11 13|1|8|16 14|1|13|37 15|1|13|37 16|1|13|37 17|1|13|37 - + destination 12|1|5|11 13|1|8|16 14|1|13|37 15|1|13|37 16|1|13|37 17|1|13|37 - + no-access 12|1|5|11 13|1|8|16 14|1|13|37 15|1|13|37 16|1|13|37 17|1|13|37 - {} farm 12|1|6|13 13|1|9|18 14|1|14|39 15|1|14|39 16|1|14|39 16|3|4|3477 16|3|5|3505 17|1|14|39 - farmland 12|1|6|14 13|1|9|19 14|1|14|40 15|1|14|40 16|1|14|40 16|3|4|3479 16|3|5|3507 17|1|14|40 - @@ -254,10 +254,10 @@ world + leisure + park 6|1|5|19 7|1|5|20 8|1|5|20 9|1|5|20 10|1|5|20 11|1|5|20 12|1|8|20 13|1|11|25 14|1|16|46 15|1|16|46 16|1|16|46 17|1|16|46 + [access] - - private 15|1|80|-9239 16|1|81|-8629 17|1|82|-8355 - - permissive 15|1|81|-9238 16|1|82|-8628 17|1|83|-8354 - - destination 15|1|81|-9237 16|1|83|-8627 17|1|84|-8353 - - no-access 15|1|81|-9236 16|1|83|-8626 17|1|82|-8352 - + private 6|1|5|19 7|1|5|20 8|1|5|20 9|1|5|20 10|1|5|20 11|1|5|20 12|1|8|20 13|1|11|25 14|1|16|46 15|1|16|46 16|1|16|46 17|1|16|46 - + permissive 6|1|5|19 7|1|5|20 8|1|5|20 9|1|5|20 10|1|5|20 11|1|5|20 12|1|8|20 13|1|11|25 14|1|16|46 15|1|16|46 16|1|16|46 17|1|16|46 - + destination 6|1|5|19 7|1|5|20 8|1|5|20 9|1|5|20 10|1|5|20 11|1|5|20 12|1|8|20 13|1|11|25 14|1|16|46 15|1|16|46 16|1|16|46 17|1|16|46 - + no-access 6|1|5|19 7|1|5|20 8|1|5|20 9|1|5|20 10|1|5|20 11|1|5|20 12|1|8|20 13|1|11|25 14|1|16|46 15|1|16|46 16|1|16|46 17|1|16|46 - {} playing_fields 6|1|5|20 7|1|5|21 8|1|5|21 9|1|5|21 10|1|5|21 11|1|5|21 12|1|8|30 13|1|11|35 14|1|16|56 15|1|16|56 16|1|16|56 17|1|16|60 + [sport] - diff --git a/data/visibility.txt b/data/visibility.txt index 42aab37087..413d56c231 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -589,22 +589,22 @@ world 000000000000000000 + landuse 000000000000000000 + allotments 000000000000111111 - basin 000000000111111111 + - detention 000000000000001111 - - infiltration 000000000000001111 - - retention 000000000000001111 - + detention 000000000111111111 - + infiltration 000000000111111111 - + retention 000000000111111111 - {} brownfield 000000000000111111 - cemetery 000000000111111111 + [religion] 000000000000000000 - - christian 000000000000001111 - + christian 000000000111111111 - {} commercial 000000000111111111 - conservation 000000000000111111 + [access] 000000000000000000 - - destination 000000000000000111 - - no-access 000000000000000111 - - permissive 000000000000000111 - - private 000000000000000111 - + destination 000000000000111111 - + no-access 000000000000111111 - + permissive 000000000000111111 - + private 000000000000111111 - {} construction 000000000000111111 - farm 000000000000111111 - @@ -613,9 +613,9 @@ world 000000000000000000 + field 000000000011111111 - forest 000000000011111111 + [wood] 000000000000000000 - - coniferous 000000000000001111 - - deciduous 000000000000001111 - - mixed 000000000000001111 - + coniferous 000000000011111111 - + deciduous 000000000011111111 - + mixed 000000000011111111 - {} garages 000000000000000111 - grass 000000000000111111 - @@ -636,11 +636,11 @@ world 000000000000000000 + recreation_ground 000000000000111111 - reservoir 000000000111111111 + [reservoir_type] 000000000000000000 - - cooling 000000000000001111 - - evaporator 000000000000001111 - - sewage 000000000000001111 - - tailings 000000000000001111 - - water_storage 000000000000001111 - + cooling 000000000111111111 - + evaporator 000000000111111111 - + sewage 000000000111111111 - + tailings 000000000111111111 - + water_storage 000000000111111111 - {} residential 000000000111111111 - retail 000000000111111111 - @@ -652,17 +652,17 @@ world 000000000000000000 + salt_pond 000000000000000010 - scrub 000000000000111111 + [wood] 000000000000000000 - - coniferous 000000000000001111 - - deciduous 000000000000001111 - - mixed 000000000000001111 - + coniferous 000000000000111111 - + deciduous 000000000000111111 - + mixed 000000000000111111 - {} street 000000000000000010 - village_green 000000000111111111 - vineyard 000000000000011111 - wood 000000000011111111 + - coniferous 000000000000001111 - - deciduous 000000000000001111 - - mixed 000000000000001111 - + coniferous 000000000011111111 - + deciduous 000000000011111111 - + mixed 000000000011111111 - {} {} leisure 000000000000000000 + @@ -678,10 +678,10 @@ world 000000000000000000 + nature_reserve 000000000000111111 - park 000000000111111111 + [access] 000000000000000000 - - destination 000000000000000111 - - no-access 000000000000000111 - - permissive 000000000000000111 - - private 000000000000000111 - + destination 000000000111111111 - + no-access 000000000111111111 - + permissive 000000000111111111 - + private 000000000111111111 - {} pitch 000000000111111111 + [sport] 000000000000000000 - @@ -776,9 +776,9 @@ world 000000000000000000 + farmyard 000000000000000100 - forest 000000000011111111 + [wood] 000000000000000000 - - coniferous 000000000000001111 - - deciduous 000000000000001111 - - mixed 000000000000001111 - + coniferous 000000000011111111 - + deciduous 000000000011111111 - + mixed 000000000011111111 - {} garages 000000000000000100 - glacier 000000000011111111 - @@ -804,9 +804,9 @@ world 000000000000000000 + salt_pond 000000000000000100 - scrub 000000000000111111 + [wood] 000000000000000000 - - coniferous 000000000000001111 - - deciduous 000000000000001111 - - mixed 000000000000001111 - + coniferous 000000000000111111 - + deciduous 000000000000111111 - + mixed 000000000000111111 - {} street 000000000000000100 - tree 000000000000000011 - @@ -818,9 +818,9 @@ world 000000000000000000 + bog 000000000000111111 - {} wood 000000000011111111 + - coniferous 000000000000001111 - - deciduous 000000000000001111 - - mixed 000000000000001111 - + coniferous 000000000011111111 - + deciduous 000000000011111111 - + mixed 000000000011111111 - {} {} noexit 000000000000000000 +