diff --git a/css/map.css b/css/map.css index 888088cee..fe5df7290 100644 --- a/css/map.css +++ b/css/map.css @@ -241,6 +241,10 @@ path.stroke.tag-landuse-quarry { stroke: #a6957b; } +path.stroke.tag-landuse-landfill { + stroke: #ff9933; +} + path.stroke.tag-landuse-residential, path.stroke.tag-landuse-construction { stroke: #e06e5f; @@ -309,6 +313,12 @@ path.fill.tag-landuse-reservoir { path.fill.tag-landuse-quarry { fill: #a6957b; + fill-opacity: 0.2; +} + +path.fill.tag-landuse-landfill { + fill: #ff8800; + fill-opacity: 0.2; } path.fill.tag-landuse-residential { diff --git a/data/presets.yaml b/data/presets.yaml index 862c17709..e887eda20 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -118,6 +118,8 @@ en: label: Country covered: label: Covered + crop: + label: Crop crossing: label: Type cuisine: @@ -163,6 +165,9 @@ en: label: Type historic: label: Type + hoops: + label: Hoops + placeholder: "1, 2, 4..." iata: label: IATA icao: @@ -279,6 +284,8 @@ en: label: Type shop: label: Type + smoking: + label: Smoking social_facility_for: label: People served placeholder: "Homeless, Disabled, Child, etc" @@ -312,6 +319,8 @@ en: label: Trail Visibility tree_type: label: Type + trees: + label: Trees tunnel: label: Tunnel vending: @@ -488,6 +497,9 @@ en: amenity/marketplace: name: Marketplace terms: "" + amenity/nightclub: + name: Nightclub + terms: "" amenity/parking: name: Car Parking terms: "" @@ -1091,6 +1103,9 @@ en: landuse/industrial: name: Industrial terms: "" + landuse/landfill: + name: Landfill + terms: "" landuse/meadow: name: Meadow terms: "" diff --git a/data/presets/fields.json b/data/presets/fields.json index 5754ec726..6d0e6ec02 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -255,6 +255,11 @@ "type": "check", "label": "Covered" }, + "crop": { + "key": "crop", + "type": "combo", + "label": "Crop" + }, "crossing": { "key": "crossing", "type": "combo", @@ -378,6 +383,12 @@ "type": "typeCombo", "label": "Type" }, + "hoops": { + "key": "hoops", + "type": "number", + "label": "Hoops", + "placeholder": "1, 2, 4..." + }, "iata": { "key": "iata", "type": "text", @@ -690,6 +701,17 @@ "type": "typeCombo", "label": "Type" }, + "smoking": { + "key": "smoking", + "type": "combo", + "options": [ + "no", + "outside", + "separated", + "yes" + ], + "label": "Smoking" + }, "social_facility_for": { "key": "social_facility:for", "type": "radio", @@ -797,6 +819,11 @@ ], "label": "Type" }, + "trees": { + "key": "trees", + "type": "combo", + "label": "Trees" + }, "tunnel": { "key": "tunnel", "type": "combo", diff --git a/data/presets/fields/crop.json b/data/presets/fields/crop.json new file mode 100644 index 000000000..10c0a721c --- /dev/null +++ b/data/presets/fields/crop.json @@ -0,0 +1,5 @@ +{ + "key": "crop", + "type": "combo", + "label": "Crop" +} diff --git a/data/presets/fields/hoops.json b/data/presets/fields/hoops.json new file mode 100644 index 000000000..4b7fe169a --- /dev/null +++ b/data/presets/fields/hoops.json @@ -0,0 +1,6 @@ +{ + "key": "hoops", + "type": "number", + "label": "Hoops", + "placeholder": "1, 2, 4..." +} diff --git a/data/presets/fields/smoking.json b/data/presets/fields/smoking.json new file mode 100644 index 000000000..9c660c961 --- /dev/null +++ b/data/presets/fields/smoking.json @@ -0,0 +1,11 @@ +{ + "key": "smoking", + "type": "combo", + "options": [ + "no", + "outside", + "separated", + "yes" + ], + "label": "Smoking" +} diff --git a/data/presets/fields/trees.json b/data/presets/fields/trees.json new file mode 100644 index 000000000..3111f5cdc --- /dev/null +++ b/data/presets/fields/trees.json @@ -0,0 +1,5 @@ +{ + "key": "trees", + "type": "combo", + "label": "Trees" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index d0abf7c1e..d6f0081df 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -410,7 +410,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -493,7 +494,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -745,7 +747,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -909,6 +912,30 @@ ], "name": "Marketplace" }, + "amenity/nightclub": { + "icon": "bar", + "fields": [ + "building_area", + "address", + "opening_hours", + "smoking" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "nightclub" + }, + "terms": [ + "disco*", + "night club", + "dancing", + "dance club" + ], + "name": "Nightclub" + }, "amenity/parking": { "icon": "parking", "fields": [ @@ -1198,7 +1225,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -1262,7 +1290,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "geometry": [ "point", @@ -1885,7 +1914,8 @@ "fields": [ "building", "levels", - "address" + "address", + "smoking" ], "geometry": [ "area" @@ -2010,6 +2040,10 @@ }, "building/commercial": { "icon": "commercial", + "fields": [ + "address", + "smoking" + ], "geometry": [ "point", "vertex", @@ -2056,7 +2090,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", @@ -2145,7 +2180,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", @@ -2203,7 +2239,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", @@ -2235,7 +2272,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", @@ -4399,6 +4437,9 @@ "name": "Construction" }, "landuse/farm": { + "fields": [ + "crop" + ], "geometry": [ "point", "area" @@ -4411,6 +4452,9 @@ "icon": "farm" }, "landuse/farmland": { + "fields": [ + "crop" + ], "geometry": [ "point", "area" @@ -4424,6 +4468,9 @@ "searchable": false }, "landuse/farmyard": { + "fields": [ + "crop" + ], "geometry": [ "point", "area" @@ -4473,6 +4520,18 @@ "terms": [], "name": "Industrial" }, + "landuse/landfill": { + "geometry": [ + "area" + ], + "tags": { + "landuse": "landfill" + }, + "terms": [ + "dump" + ], + "name": "Landfill" + }, "landuse/meadow": { "geometry": [ "point", @@ -4485,7 +4544,9 @@ "name": "Meadow" }, "landuse/orchard": { - "icon": "park2", + "fields": [ + "trees" + ], "geometry": [ "point", "area" @@ -4494,7 +4555,8 @@ "landuse": "orchard" }, "terms": [], - "name": "Orchard" + "name": "Orchard", + "icon": "park2" }, "landuse/quarry": { "geometry": [ @@ -4702,7 +4764,8 @@ "leisure/pitch/basketball": { "icon": "basketball", "fields": [ - "surface" + "surface", + "hoops" ], "geometry": [ "point", @@ -5374,7 +5437,8 @@ "fields": [ "office", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -5442,7 +5506,8 @@ "icon": "commercial", "fields": [ "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -5612,7 +5677,8 @@ "icon": "commercial", "fields": [ "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -7340,7 +7406,8 @@ "icon": "campsite", "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -7358,7 +7425,8 @@ "tourism/caravan_site": { "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -7375,7 +7443,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -7391,7 +7460,8 @@ "icon": "lodging", "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -7413,7 +7483,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -7430,7 +7501,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -7465,7 +7537,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -7513,7 +7586,8 @@ "icon": "park", "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -11530,7 +11604,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11549,7 +11624,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11568,7 +11644,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11587,7 +11664,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11606,7 +11684,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11625,7 +11704,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11644,7 +11724,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11663,7 +11744,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11682,7 +11764,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11701,7 +11784,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11720,7 +11804,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11739,7 +11824,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11758,7 +11844,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11777,7 +11864,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11796,7 +11884,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11815,7 +11904,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11834,7 +11924,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11853,7 +11944,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11872,7 +11964,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11891,7 +11984,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11910,7 +12004,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11929,7 +12024,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11948,7 +12044,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11967,7 +12064,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -11986,7 +12084,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12005,7 +12104,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12024,7 +12124,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12043,7 +12144,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12062,7 +12164,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12081,7 +12184,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12100,7 +12204,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12119,7 +12224,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12138,7 +12244,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12157,7 +12264,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12176,7 +12284,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12195,7 +12304,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12214,7 +12324,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12233,7 +12344,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12252,7 +12364,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12271,7 +12384,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12290,7 +12404,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12309,7 +12424,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12328,7 +12444,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12347,7 +12464,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12366,7 +12484,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12386,7 +12505,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12407,7 +12527,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12428,7 +12549,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12448,7 +12570,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12469,7 +12592,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12489,7 +12613,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12510,7 +12635,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12531,7 +12657,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12551,7 +12678,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12571,7 +12699,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12591,7 +12720,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12611,7 +12741,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12632,7 +12763,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12652,7 +12784,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12672,7 +12805,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12693,7 +12827,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12713,7 +12848,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12733,7 +12869,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12753,7 +12890,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12773,7 +12911,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12793,7 +12932,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12813,7 +12953,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12833,7 +12974,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12853,7 +12995,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12873,7 +13016,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12894,7 +13038,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12914,7 +13059,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12934,7 +13080,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12954,7 +13101,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12974,7 +13122,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -12994,7 +13143,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13015,7 +13165,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13036,7 +13187,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13056,7 +13208,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13077,7 +13230,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13097,7 +13251,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13117,7 +13272,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13138,7 +13294,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13158,7 +13315,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13178,7 +13336,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13198,7 +13357,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13219,7 +13379,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13239,7 +13400,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13259,7 +13421,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13280,7 +13443,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13302,7 +13466,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13322,7 +13487,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13342,7 +13508,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13362,7 +13529,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13382,7 +13550,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13402,7 +13571,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13424,7 +13594,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13444,7 +13615,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13464,7 +13636,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13485,7 +13658,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13505,7 +13679,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13525,7 +13700,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13545,7 +13721,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13565,7 +13742,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13585,7 +13763,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13606,7 +13785,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13626,7 +13806,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13646,7 +13827,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13666,7 +13848,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13686,7 +13869,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13706,7 +13890,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13726,7 +13911,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13746,7 +13932,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13767,7 +13954,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13787,7 +13975,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13807,7 +13996,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13827,7 +14017,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13848,7 +14039,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13869,7 +14061,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13889,7 +14082,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13909,7 +14103,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -13930,7 +14125,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -13951,7 +14147,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -13972,7 +14169,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -13993,7 +14191,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14014,7 +14213,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14035,7 +14235,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14056,7 +14257,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14077,7 +14279,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14098,7 +14301,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14119,7 +14323,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14140,7 +14345,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14161,7 +14367,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14182,7 +14389,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14203,7 +14411,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14224,7 +14433,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14245,7 +14455,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14266,7 +14477,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14287,7 +14499,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14308,7 +14521,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14329,7 +14543,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14350,7 +14565,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14371,7 +14587,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14392,7 +14609,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14413,7 +14631,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14434,7 +14653,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14455,7 +14675,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14476,7 +14697,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14497,7 +14719,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14518,7 +14741,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14539,7 +14763,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14560,7 +14785,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14581,7 +14807,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14602,7 +14829,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14623,7 +14851,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14644,7 +14873,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14665,7 +14895,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14686,7 +14917,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14707,7 +14939,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14728,7 +14961,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14749,7 +14983,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14770,7 +15005,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14791,7 +15027,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14812,7 +15049,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14833,7 +15071,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14854,7 +15093,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14875,7 +15115,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14896,7 +15137,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14917,7 +15159,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14938,7 +15181,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14959,7 +15203,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -14980,7 +15225,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15001,7 +15247,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15022,7 +15269,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15043,7 +15291,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15064,7 +15313,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15085,7 +15335,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15106,7 +15357,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15127,7 +15379,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15148,7 +15401,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15169,7 +15423,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15190,7 +15445,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15211,7 +15467,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15232,7 +15489,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15253,7 +15511,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15274,7 +15533,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15295,7 +15555,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15316,7 +15577,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15337,7 +15599,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15358,7 +15621,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15379,7 +15643,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15400,7 +15665,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15421,7 +15687,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15442,7 +15709,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15463,7 +15731,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15484,7 +15753,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15505,7 +15775,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15526,7 +15797,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15547,7 +15819,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15568,7 +15841,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15589,7 +15863,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15610,7 +15885,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15631,7 +15907,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15652,7 +15929,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15673,7 +15951,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15694,7 +15973,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15715,7 +15995,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15736,7 +16017,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15757,7 +16039,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15778,7 +16061,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15799,7 +16083,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15820,7 +16105,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15841,7 +16127,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15862,7 +16149,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15883,7 +16171,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15904,7 +16193,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15925,7 +16215,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15946,7 +16237,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15967,7 +16259,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -15988,7 +16281,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16009,7 +16303,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16030,7 +16325,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16051,7 +16347,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16072,7 +16369,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16094,7 +16392,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16115,7 +16414,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16136,7 +16436,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16157,7 +16458,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16178,7 +16480,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16199,7 +16502,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16220,7 +16524,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16241,7 +16546,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16262,7 +16568,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16283,7 +16590,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16304,7 +16612,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16325,7 +16634,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16346,7 +16656,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16367,7 +16678,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16388,7 +16700,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16409,7 +16722,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16430,7 +16744,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16451,7 +16766,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16472,7 +16788,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16493,7 +16810,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16514,7 +16832,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -16535,7 +16854,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "suggestion": true }, @@ -23196,7 +23516,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23217,7 +23538,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23238,7 +23560,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23259,7 +23582,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23280,7 +23604,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23301,7 +23626,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23322,7 +23648,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23343,7 +23670,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23365,7 +23693,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23386,7 +23715,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23407,7 +23737,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23428,7 +23759,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23449,7 +23781,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23470,7 +23803,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23492,7 +23826,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23513,7 +23848,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23534,7 +23870,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23555,7 +23892,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23577,7 +23915,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23598,7 +23937,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23619,7 +23959,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23640,7 +23981,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23661,7 +24003,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23682,7 +24025,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23703,7 +24047,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23724,7 +24069,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23746,7 +24092,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, @@ -23767,7 +24114,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "suggestion": true }, diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json index 5d94485f0..b231b4d62 100644 --- a/data/presets/presets/amenity/bar.json +++ b/data/presets/presets/amenity/bar.json @@ -3,7 +3,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -15,4 +16,4 @@ }, "terms": [], "name": "Bar" -} \ No newline at end of file +} diff --git a/data/presets/presets/amenity/cafe.json b/data/presets/presets/amenity/cafe.json index 23b4cc5c5..91ca99e64 100644 --- a/data/presets/presets/amenity/cafe.json +++ b/data/presets/presets/amenity/cafe.json @@ -5,7 +5,8 @@ "internet_access", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -21,4 +22,4 @@ "amenity": "cafe" }, "name": "Cafe" -} \ No newline at end of file +} diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json index 5fb684195..d7b4ac284 100644 --- a/data/presets/presets/amenity/fast_food.json +++ b/data/presets/presets/amenity/fast_food.json @@ -4,7 +4,8 @@ "cuisine", "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -16,4 +17,4 @@ }, "terms": [], "name": "Fast Food" -} \ No newline at end of file +} diff --git a/data/presets/presets/amenity/nightclub.json b/data/presets/presets/amenity/nightclub.json new file mode 100644 index 000000000..48f0f038e --- /dev/null +++ b/data/presets/presets/amenity/nightclub.json @@ -0,0 +1,24 @@ +{ + "icon": "bar", + "fields": [ + "building_area", + "address", + "opening_hours", + "smoking" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "nightclub" + }, + "terms": [ + "disco*", + "night club", + "dancing", + "dance club" + ], + "name": "Nightclub" +} diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json index 784817a31..ccb8a194f 100644 --- a/data/presets/presets/amenity/pub.json +++ b/data/presets/presets/amenity/pub.json @@ -3,7 +3,8 @@ "fields": [ "building_area", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -15,4 +16,4 @@ }, "terms": [], "name": "Pub" -} \ No newline at end of file +} diff --git a/data/presets/presets/amenity/restaurant.json b/data/presets/presets/amenity/restaurant.json index 30bb9db51..e1180566b 100644 --- a/data/presets/presets/amenity/restaurant.json +++ b/data/presets/presets/amenity/restaurant.json @@ -5,7 +5,8 @@ "building_area", "address", "opening_hours", - "capacity" + "capacity", + "smoking" ], "geometry": [ "point", @@ -50,4 +51,4 @@ "amenity": "restaurant" }, "name": "Restaurant" -} \ No newline at end of file +} diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json index e25911488..299267c1b 100644 --- a/data/presets/presets/building.json +++ b/data/presets/presets/building.json @@ -3,7 +3,8 @@ "fields": [ "building", "levels", - "address" + "address", + "smoking" ], "geometry": [ "area" diff --git a/data/presets/presets/building/commercial.json b/data/presets/presets/building/commercial.json index 577b5064a..27c035de4 100644 --- a/data/presets/presets/building/commercial.json +++ b/data/presets/presets/building/commercial.json @@ -1,5 +1,9 @@ { "icon": "commercial", + "fields": [ + "address", + "smoking" + ], "geometry": [ "point", "vertex", @@ -9,4 +13,4 @@ "building": "commercial" }, "name": "Commercial Building" -} \ No newline at end of file +} diff --git a/data/presets/presets/building/dormitory.json b/data/presets/presets/building/dormitory.json index c6539f2aa..f4dc8d32d 100644 --- a/data/presets/presets/building/dormitory.json +++ b/data/presets/presets/building/dormitory.json @@ -2,7 +2,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", diff --git a/data/presets/presets/building/hotel.json b/data/presets/presets/building/hotel.json index b2a9399cd..e192a3ce7 100644 --- a/data/presets/presets/building/hotel.json +++ b/data/presets/presets/building/hotel.json @@ -2,7 +2,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", diff --git a/data/presets/presets/building/public.json b/data/presets/presets/building/public.json index fb704c23f..8cc37e20f 100644 --- a/data/presets/presets/building/public.json +++ b/data/presets/presets/building/public.json @@ -2,7 +2,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", diff --git a/data/presets/presets/building/retail.json b/data/presets/presets/building/retail.json index 8e0217f0f..2deef24ed 100644 --- a/data/presets/presets/building/retail.json +++ b/data/presets/presets/building/retail.json @@ -2,7 +2,8 @@ "icon": "building", "fields": [ "address", - "levels" + "levels", + "smoking" ], "geometry": [ "point", diff --git a/data/presets/presets/landuse/farm.json b/data/presets/presets/landuse/farm.json index e10908e5d..b27292562 100644 --- a/data/presets/presets/landuse/farm.json +++ b/data/presets/presets/landuse/farm.json @@ -1,4 +1,7 @@ { + "fields": [ + "crop" + ], "geometry": [ "point", "area" @@ -9,4 +12,4 @@ "terms": [], "name": "Farm", "icon": "farm" -} \ No newline at end of file +} diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json index 0fc3e29cd..9e92de83d 100644 --- a/data/presets/presets/landuse/farmland.json +++ b/data/presets/presets/landuse/farmland.json @@ -1,4 +1,7 @@ { + "fields": [ + "crop" + ], "geometry": [ "point", "area" @@ -10,4 +13,4 @@ "name": "Farmland", "icon": "farm", "searchable": false -} \ No newline at end of file +} diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json index c2587ceb3..1d6e93d15 100644 --- a/data/presets/presets/landuse/farmyard.json +++ b/data/presets/presets/landuse/farmyard.json @@ -1,4 +1,7 @@ { + "fields": [ + "crop" + ], "geometry": [ "point", "area" @@ -9,4 +12,4 @@ "terms": [], "name": "Farmyard", "icon": "farm" -} \ No newline at end of file +} diff --git a/data/presets/presets/landuse/landfill.json b/data/presets/presets/landuse/landfill.json new file mode 100644 index 000000000..b6cfcb1ef --- /dev/null +++ b/data/presets/presets/landuse/landfill.json @@ -0,0 +1,12 @@ +{ + "geometry": [ + "area" + ], + "tags": { + "landuse": "landfill" + }, + "terms": [ + "dump" + ], + "name": "Landfill" +} diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json index b2bd719e0..ca6cb0ebd 100644 --- a/data/presets/presets/landuse/orchard.json +++ b/data/presets/presets/landuse/orchard.json @@ -1,5 +1,7 @@ { - "icon": "park2", + "fields": [ + "trees" + ], "geometry": [ "point", "area" @@ -8,5 +10,6 @@ "landuse": "orchard" }, "terms": [], - "name": "Orchard" -} \ No newline at end of file + "name": "Orchard", + "icon": "park2" +} diff --git a/data/presets/presets/leisure/pitch/basketball.json b/data/presets/presets/leisure/pitch/basketball.json index a0a25e838..189b1dd5f 100644 --- a/data/presets/presets/leisure/pitch/basketball.json +++ b/data/presets/presets/leisure/pitch/basketball.json @@ -1,7 +1,8 @@ { "icon": "basketball", "fields": [ - "surface" + "surface", + "hoops" ], "geometry": [ "point", @@ -13,4 +14,4 @@ }, "terms": [], "name": "Basketball Court" -} \ No newline at end of file +} diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json index e077ef635..b301d3519 100644 --- a/data/presets/presets/office.json +++ b/data/presets/presets/office.json @@ -3,7 +3,8 @@ "fields": [ "office", "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -15,4 +16,4 @@ }, "terms": [], "name": "Office" -} \ No newline at end of file +} diff --git a/data/presets/presets/office/company.json b/data/presets/presets/office/company.json index 32f3c06b7..2826cce55 100644 --- a/data/presets/presets/office/company.json +++ b/data/presets/presets/office/company.json @@ -2,7 +2,8 @@ "icon": "commercial", "fields": [ "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -14,4 +15,4 @@ }, "terms": [], "name": "Company Office" -} \ No newline at end of file +} diff --git a/data/presets/presets/office/ngo.json b/data/presets/presets/office/ngo.json index d31d7a0c4..15a2ca009 100644 --- a/data/presets/presets/office/ngo.json +++ b/data/presets/presets/office/ngo.json @@ -2,7 +2,8 @@ "icon": "commercial", "fields": [ "address", - "opening_hours" + "opening_hours", + "smoking" ], "geometry": [ "point", @@ -14,4 +15,4 @@ }, "terms": [], "name": "NGO Office" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json index c0a4ca634..eeed6142f 100644 --- a/data/presets/presets/tourism/camp_site.json +++ b/data/presets/presets/tourism/camp_site.json @@ -2,7 +2,8 @@ "icon": "campsite", "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -16,4 +17,4 @@ "tourism": "camp_site" }, "name": "Camp Site" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/caravan_site.json b/data/presets/presets/tourism/caravan_site.json index 8cca34bd1..eab8789f2 100644 --- a/data/presets/presets/tourism/caravan_site.json +++ b/data/presets/presets/tourism/caravan_site.json @@ -1,7 +1,8 @@ { "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -12,4 +13,4 @@ "tourism": "caravan_site" }, "name": "RV Park" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json index 9dd19d86a..df1b91dd6 100644 --- a/data/presets/presets/tourism/chalet.json +++ b/data/presets/presets/tourism/chalet.json @@ -3,7 +3,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -14,4 +15,4 @@ "tourism": "chalet" }, "name": "Chalet" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json index 1bf1cf6b6..a980b5d71 100644 --- a/data/presets/presets/tourism/guest_house.json +++ b/data/presets/presets/tourism/guest_house.json @@ -2,7 +2,8 @@ "icon": "lodging", "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -18,4 +19,4 @@ "Bed and Breakfast" ], "name": "Guest House" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json index 1f817a840..eeac6d508 100644 --- a/data/presets/presets/tourism/hostel.json +++ b/data/presets/presets/tourism/hostel.json @@ -3,7 +3,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -14,4 +15,4 @@ "tourism": "hostel" }, "name": "Hostel" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json index 5ba36bdd6..38e0765d6 100644 --- a/data/presets/presets/tourism/hotel.json +++ b/data/presets/presets/tourism/hotel.json @@ -3,7 +3,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -15,4 +16,4 @@ "tourism": "hotel" }, "name": "Hotel" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json index 6db399b28..6567bead0 100644 --- a/data/presets/presets/tourism/motel.json +++ b/data/presets/presets/tourism/motel.json @@ -3,7 +3,8 @@ "fields": [ "operator", "building_area", - "address" + "address", + "smoking" ], "geometry": [ "point", @@ -14,4 +15,4 @@ "tourism": "motel" }, "name": "Motel" -} \ No newline at end of file +} diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json index c13bc7854..d3444cde1 100644 --- a/data/presets/presets/tourism/picnic_site.json +++ b/data/presets/presets/tourism/picnic_site.json @@ -2,7 +2,8 @@ "icon": "park", "fields": [ "operator", - "address" + "address", + "smoking" ], "geometry": [ "point", diff --git a/dist/locales/en.json b/dist/locales/en.json index 65d73cc3d..f8939938f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -565,6 +565,9 @@ "covered": { "label": "Covered" }, + "crop": { + "label": "Crop" + }, "crossing": { "label": "Type" }, @@ -631,6 +634,10 @@ "historic": { "label": "Type" }, + "hoops": { + "label": "Hoops", + "placeholder": "1, 2, 4..." + }, "iata": { "label": "IATA" }, @@ -797,6 +804,9 @@ "shop": { "label": "Type" }, + "smoking": { + "label": "Smoking" + }, "social_facility_for": { "label": "People served", "placeholder": "Homeless, Disabled, Child, etc" @@ -844,6 +854,9 @@ "tree_type": { "label": "Type" }, + "trees": { + "label": "Trees" + }, "tunnel": { "label": "Tunnel" }, @@ -1082,6 +1095,10 @@ "name": "Marketplace", "terms": "" }, + "amenity/nightclub": { + "name": "Nightclub", + "terms": "disco*,night club,dancing,dance club" + }, "amenity/parking": { "name": "Car Parking", "terms": "" @@ -1886,6 +1903,10 @@ "name": "Industrial", "terms": "" }, + "landuse/landfill": { + "name": "Landfill", + "terms": "dump" + }, "landuse/meadow": { "name": "Meadow", "terms": ""