diff options
| -rw-r--r-- | data/categories.txt | 8 | ||||
| -rw-r--r-- | data/classificator.txt | 2 | ||||
| -rw-r--r-- | data/drules_proto-bw.bin | bin | 152858 -> 153027 bytes | |||
| -rw-r--r-- | data/drules_proto-bw.txt | 78 | ||||
| -rw-r--r-- | data/drules_proto.bin | bin | 187044 -> 187231 bytes | |||
| -rw-r--r-- | data/drules_proto.txt | 78 | ||||
| -rw-r--r-- | data/mapcss-mapping.csv | 3 | ||||
| -rw-r--r-- | data/types.txt | 2 |
8 files changed, 171 insertions, 0 deletions
diff --git a/data/categories.txt b/data/categories.txt index c9eb968bf5..fda095aeae 100644 --- a/data/categories.txt +++ b/data/categories.txt @@ -1901,3 +1901,11 @@ zh:海洋 pl:ocean pt:oceano hu:óceán + +amenity-brothel +en:brothel +ru:бордель + +amenity-casino +en:casino|entertainment +ru:казино|развлечения diff --git a/data/classificator.txt b/data/classificator.txt index fe6e069386..8d15c9ea58 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -22,11 +22,13 @@ world + bar - bench - bicycle_rental - + brothel - bureau_de_change - bus_station - cafe - car_rental - car_sharing - + casino - cinema - college - doctors - diff --git a/data/drules_proto-bw.bin b/data/drules_proto-bw.bin Binary files differindex 558980177e..ebd16fb307 100644 --- a/data/drules_proto-bw.bin +++ b/data/drules_proto-bw.bin diff --git a/data/drules_proto-bw.txt b/data/drules_proto-bw.txt index 6852561aeb..fb8fa8660f 100644 --- a/data/drules_proto-bw.txt +++ b/data/drules_proto-bw.txt @@ -1300,6 +1300,45 @@ cont { } } cont { + name: "amenity-brothel" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "amenity-bureau_de_change" element { scale: 16 @@ -1590,6 +1629,45 @@ cont { } } cont { + name: "amenity-casino" + element { + scale: 17 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 0 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "amenity-cinema" element { scale: 16 diff --git a/data/drules_proto.bin b/data/drules_proto.bin Binary files differindex 7e3d0b419f..9ed67e61a2 100644 --- a/data/drules_proto.bin +++ b/data/drules_proto.bin diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 6ff2fdc9ac..dbe55ee99c 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -1495,6 +1495,45 @@ cont { } } cont { + name: "amenity-brothel" + element { + scale: 17 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "amenity-bureau_de_change" element { scale: 16 @@ -1803,6 +1842,45 @@ cont { } } cont { + name: "amenity-casino" + element { + scale: 17 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 18 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } + element { + scale: 19 + caption { + primary { + height: 11 + color: 4473924 + stroke_color: 16777215 + offset_y: 10 + } + priority: 15002 + } + } +} +cont { name: "amenity-cinema" element { scale: 16 diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 4e074b311f..29cf3aed06 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -956,3 +956,6 @@ shop|furniture;[shop=furniture];;name;int_name;955; natural|grassland;[natural=grassland];;name;int_name;956; natural|waterfall;[natural=waterfall];;name;int_name;957; waterway|waterfall;[waterway=waterfall];;name;int_name;958; +railway|proposed;[railway=proposed];name;int_name;959; +amenity|casino;[amenity=casino];;name;int_name;960; +amenity|brothel;[amenity=brothel];;name;int_name;961; diff --git a/data/types.txt b/data/types.txt index 42dd37ee25..33becadc34 100644 --- a/data/types.txt +++ b/data/types.txt @@ -957,3 +957,5 @@ natural|grassland natural|waterfall waterway|waterfall railway|proposed +amenity|casino +amenity|brothel |