From db0c3b902ec6eeb1f6ba4694bf073231a631058c Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Thu, 24 Dec 2015 19:27:15 +0300 Subject: [PATCH 1/2] [styles] Add man_made=water_tower --- data/mapcss-mapping.csv | 1 + data/styles/legacy/include/base_other.mapcss | 2 ++ 2 files changed, 3 insertions(+) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index d28c9734d2..de34f8f784 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1048,3 +1048,4 @@ amenity|place_of_worship|hindu;[amenity=place_of_worship][religion=hindu];;name; amenity|place_of_worship|shinto;[amenity=place_of_worship][religion=shinto];;name;int_name;1048; amenity|place_of_worship|jewish;[amenity=place_of_worship][religion=jewish];;name;int_name;1049; amenity|place_of_worship|taoist;[amenity=place_of_worship][religion=taoist];;name;int_name;1050; +man_made|water_tower;[man_made=water_tower];;name;int_name;1051; diff --git a/data/styles/legacy/include/base_other.mapcss b/data/styles/legacy/include/base_other.mapcss index 6d5efc1b9b..d9584b5417 100644 --- a/data/styles/legacy/include/base_other.mapcss +++ b/data/styles/legacy/include/base_other.mapcss @@ -646,6 +646,8 @@ node|z16-[historic=battlefield] { icon-image: cannon.svg; } +area|z15-[man_made=water_tower], +node|z15-[man_made=water_tower], area|z16-[amenity=hunting_stand], node|z16-[amenity=hunting_stand] { From 7fc6560c0ce9852b07eb714e19c1fe2c5e82071c Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Thu, 24 Dec 2015 19:27:47 +0300 Subject: [PATCH 2/2] [styles] Rebuild the legacy style with water towers --- data/classificator.txt | 1 + data/drules_proto.bin | Bin 208311 -> 208486 bytes data/drules_proto.txt | 38 ++++++++++++++++++++++++++++++++++++++ data/types.txt | 1 + data/visibility.txt | 1 + 5 files changed, 41 insertions(+) diff --git a/data/classificator.txt b/data/classificator.txt index 6b9438277b..a57a29da9d 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -444,6 +444,7 @@ world + {} survey_point - wastewater_plant - + water_tower - windmill - {} mapswithme + diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 603f615b29cce6e249ad3fb5fa5d0a865e6db347..54acf169cd2f36b74f9f55bccd4a2bfb7c66fb4a 100644 GIT binary patch delta 99 zcmdmfo9Edbo`x-q9p_}$Fmj3HCg#QGCZ?q7mM4~^7R8t3m!}p9$#C#b{-+?p)=&#% h3Luz*2&NE-$pTU^`HzAWQ$uZg`#Hw#?dO;b;sFS#BB=lX delta 21 dcmaEMhiCh3o`x-q9p~E3&ogc}KhLBe4*+=I3DW=o diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 431801c501..17f5ce0827 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -38981,6 +38981,44 @@ cont { } } } +cont { + name: "man_made-water_tower" + element { + scale: 15 + symbol { + name: "hunting_closed_high" + priority: 16000 + } + } + element { + scale: 16 + symbol { + name: "hunting_closed_high" + priority: 16000 + } + } + element { + scale: 17 + symbol { + name: "hunting_closed_high" + priority: 16000 + } + } + element { + scale: 18 + symbol { + name: "hunting_closed_high" + priority: 16000 + } + } + element { + scale: 19 + symbol { + name: "hunting_closed_high" + priority: 16000 + } + } +} cont { name: "man_made-windmill" element { diff --git a/data/types.txt b/data/types.txt index 71d9de1ec4..fc88161845 100644 --- a/data/types.txt +++ b/data/types.txt @@ -1048,3 +1048,4 @@ amenity|place_of_worship|hindu amenity|place_of_worship|shinto amenity|place_of_worship|jewish amenity|place_of_worship|taoist +man_made|water_tower diff --git a/data/visibility.txt b/data/visibility.txt index 442a67b403..f0afeb6e05 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -444,6 +444,7 @@ world 00000000000000000000 + {} survey_point 00000000000000000000 - wastewater_plant 00000000000011111111 - + water_tower 00000000000000011111 - windmill 00000000000000000111 - {} mapswithme 00000000000000000000 +