From a9926d4a834881c41b4d1e1dda1e4a476ef3c323 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 20 Mar 2013 14:54:10 -0700 Subject: [PATCH] Few more presets, build --- data/locales.js | 338 +++++ data/presets.yaml | 250 ++++ data/presets/fields.json | 10 + data/presets/presets.json | 1131 +++++++++++++++++ data/presets/presets/amenity/marketplace.json | 11 + data/presets/presets/leisure/marina.json | 13 + data/presets/presets/leisure/slipway.json | 10 + 7 files changed, 1763 insertions(+) create mode 100644 data/presets/presets/amenity/marketplace.json create mode 100644 data/presets/presets/leisure/marina.json create mode 100644 data/presets/presets/leisure/slipway.json diff --git a/data/locales.js b/data/locales.js index c8f52c157..26faed3da 100644 --- a/data/locales.js +++ b/data/locales.js @@ -230,6 +230,10 @@ locale.en = { "imagery": { "provided_by": "Imagery provided by {source}" }, + "gpx": { + "local_layer": "Local GPX file", + "drag_drop": "Drag and drop a .gpx file on the page" + }, "presets": { "fields": { "access": { @@ -253,6 +257,9 @@ locale.en = { "atm": { "label": "ATM" }, + "barrier": { + "label": "Type" + }, "bicycle_parking": { "label": "Type" }, @@ -365,6 +372,9 @@ locale.en = { "place": { "label": "Type" }, + "power": { + "label": "Type" + }, "railway": { "label": "Type" }, @@ -512,6 +522,10 @@ locale.en = { "name": "Library", "terms": "" }, + "amenity/marketplace": { + "name": "Marketplace", + "terms": "" + }, "amenity/parking": { "name": "Parking", "terms": "" @@ -584,6 +598,74 @@ locale.en = { "name": "University", "terms": "" }, + "barrier": { + "name": "Barrier", + "terms": "" + }, + "barrier/block": { + "name": "Block", + "terms": "" + }, + "barrier/bollard": { + "name": "Bollard", + "terms": "" + }, + "barrier/cattle_grid": { + "name": "Cattle Grid", + "terms": "" + }, + "barrier/city_wall": { + "name": "City Wall", + "terms": "" + }, + "barrier/cycle_barrier": { + "name": "Cycle Barrier", + "terms": "" + }, + "barrier/ditch": { + "name": "Ditch", + "terms": "" + }, + "barrier/entrance": { + "name": "Entrance", + "terms": "" + }, + "barrier/fence": { + "name": "Fence", + "terms": "" + }, + "barrier/gate": { + "name": "Gate", + "terms": "" + }, + "barrier/hedge": { + "name": "Hedge", + "terms": "" + }, + "barrier/kissing_gate": { + "name": "Kissing Gate", + "terms": "" + }, + "barrier/lift_gate": { + "name": "Lift Gate", + "terms": "" + }, + "barrier/retaining_wall": { + "name": "Retaining Wall", + "terms": "" + }, + "barrier/stile": { + "name": "Stile", + "terms": "" + }, + "barrier/toll_booth": { + "name": "Toll Booth", + "terms": "" + }, + "barrier/wall": { + "name": "Wall", + "terms": "" + }, "building": { "name": "Building", "terms": "" @@ -672,10 +754,38 @@ locale.en = { "name": "Historic Site", "terms": "" }, + "historic/archaeological_site": { + "name": "Archaeological Site", + "terms": "" + }, + "historic/boundary_stone": { + "name": "Boundary Stone", + "terms": "" + }, + "historic/castle": { + "name": "Castle", + "terms": "" + }, + "historic/memorial": { + "name": "Memorial", + "terms": "" + }, "historic/monument": { "name": "Monument", "terms": "" }, + "historic/ruins": { + "name": "Ruins", + "terms": "" + }, + "historic/wayside_cross": { + "name": "Wayside Cross", + "terms": "" + }, + "historic/wayside_shrine": { + "name": "Wayside Shrine", + "terms": "" + }, "landuse": { "name": "Landuse", "terms": "" @@ -752,6 +862,10 @@ locale.en = { "name": "Golf Course", "terms": "" }, + "leisure/marina": { + "name": "Marina", + "terms": "" + }, "leisure/park": { "name": "Park", "terms": "esplanade,estate,forest,garden,grass,green,grounds,lawn,lot,meadow,parkland,place,playground,plaza,pleasure garden,recreation area,square,tract,village green,woodland" @@ -784,6 +898,10 @@ locale.en = { "name": "Playground", "terms": "" }, + "leisure/slipway": { + "name": "Slipway", + "terms": "" + }, "leisure/stadium": { "name": "Stadium", "terms": "" @@ -908,10 +1026,34 @@ locale.en = { "name": "Village", "terms": "" }, + "power": { + "name": "Power", + "terms": "" + }, + "power/generator": { + "name": "Power Plant", + "terms": "" + }, + "power/line": { + "name": "Power Line", + "terms": "" + }, + "power/pole": { + "name": "Power Pole", + "terms": "" + }, "power/sub_station": { "name": "Substation", "terms": "" }, + "power/tower": { + "name": "High-Voltage Tower", + "terms": "" + }, + "power/transformer": { + "name": "Transformer", + "terms": "" + }, "railway": { "name": "Railway", "terms": "" @@ -936,14 +1078,210 @@ locale.en = { "name": "Shop", "terms": "" }, + "shop/alcohol": { + "name": "Liquor Store", + "terms": "" + }, + "shop/bakery": { + "name": "Bakery", + "terms": "" + }, + "shop/beauty": { + "name": "Beauty Shop", + "terms": "" + }, + "shop/beverages": { + "name": "Beverage Store", + "terms": "" + }, + "shop/bicycle": { + "name": "Bicycle Shop", + "terms": "" + }, + "shop/books": { + "name": "Bookstore", + "terms": "" + }, + "shop/boutique": { + "name": "Boutique", + "terms": "" + }, "shop/butcher": { "name": "Butcher", "terms": "" }, + "shop/car": { + "name": "Car Dealership", + "terms": "" + }, + "shop/car_parts": { + "name": "Car Parts Store", + "terms": "" + }, + "shop/car_repair": { + "name": "Car Repair Shop", + "terms": "" + }, + "shop/chemist": { + "name": "Chemist", + "terms": "" + }, + "shop/clothes": { + "name": "Clothing Store", + "terms": "" + }, + "shop/computer": { + "name": "Computer Store", + "terms": "" + }, + "shop/confectionery": { + "name": "Confectionery", + "terms": "" + }, + "shop/convenience": { + "name": "Convenience Store", + "terms": "" + }, + "shop/deli": { + "name": "Deli", + "terms": "" + }, + "shop/department_store": { + "name": "Department Store", + "terms": "" + }, + "shop/doityourself": { + "name": "DIY Store", + "terms": "" + }, + "shop/dry_cleaning": { + "name": "Dry Cleaners", + "terms": "" + }, + "shop/electronics": { + "name": "Electronics Store", + "terms": "" + }, + "shop/fishmonger": { + "name": "Fishmonger", + "terms": "" + }, + "shop/florist": { + "name": "Florist", + "terms": "" + }, + "shop/furniture": { + "name": "Furniture Store", + "terms": "" + }, + "shop/garden_centre": { + "name": "Garden Center", + "terms": "" + }, + "shop/gift": { + "name": "Gift Shop", + "terms": "" + }, + "shop/greengrocer": { + "name": "Greengrocer", + "terms": "" + }, + "shop/hairdresser": { + "name": "Hairdresser", + "terms": "" + }, + "shop/hardware": { + "name": "Hardware Store", + "terms": "" + }, + "shop/hifi": { + "name": "Hifi Store", + "terms": "" + }, + "shop/jewelry": { + "name": "Jeweler", + "terms": "" + }, + "shop/kiosk": { + "name": "Kiosk", + "terms": "" + }, + "shop/laundry": { + "name": "Laundry", + "terms": "" + }, + "shop/mall": { + "name": "Mall", + "terms": "" + }, + "shop/mobile_phone": { + "name": "Mobile Phone Store", + "terms": "" + }, + "shop/motorcycle": { + "name": "Motorcycle Dealership", + "terms": "" + }, + "shop/music": { + "name": "Music Store", + "terms": "" + }, + "shop/newsagent": { + "name": "Newsagent", + "terms": "" + }, + "shop/optician": { + "name": "Optician", + "terms": "" + }, + "shop/outdoor": { + "name": "Outdoor Store", + "terms": "" + }, + "shop/pet": { + "name": "Pet Store", + "terms": "" + }, + "shop/shoes": { + "name": "Shoe Store", + "terms": "" + }, + "shop/sports": { + "name": "Sporting Goods Store", + "terms": "" + }, + "shop/stationery": { + "name": "Stationery Store", + "terms": "" + }, "shop/supermarket": { "name": "Supermarket", "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,mall,mart,outlet,outlet store,shop,shopping center,shopping plaza,stand,store,supermarket,thrift shop" }, + "shop/toys": { + "name": "Toy Store", + "terms": "" + }, + "shop/travel_agency": { + "name": "Travel Agency", + "terms": "" + }, + "shop/tyres": { + "name": "Tire Store", + "terms": "" + }, + "shop/vacant": { + "name": "Vacant Shop", + "terms": "" + }, + "shop/variety_store": { + "name": "Variety Store", + "terms": "" + }, + "shop/video": { + "name": "Video Store", + "terms": "" + }, "tourism": { "name": "Tourism", "terms": "" diff --git a/data/presets.yaml b/data/presets.yaml index e2666770f..e188cd764 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -16,6 +16,8 @@ en: label: Type atm: label: ATM + barrier: + label: Type bicycle_parking: label: Type building: @@ -92,6 +94,8 @@ en: label: Phone place: label: Type + power: + label: Type railway: label: Type ref: @@ -199,6 +203,9 @@ en: amenity/library: name: Library terms: "" + amenity/marketplace: + name: Marketplace + terms: "" amenity/parking: name: Parking terms: "" @@ -253,6 +260,57 @@ en: amenity/university: name: University terms: "" + barrier: + name: Barrier + terms: "" + barrier/block: + name: Block + terms: "" + barrier/bollard: + name: Bollard + terms: "" + barrier/cattle_grid: + name: Cattle Grid + terms: "" + barrier/city_wall: + name: City Wall + terms: "" + barrier/cycle_barrier: + name: Cycle Barrier + terms: "" + barrier/ditch: + name: Ditch + terms: "" + barrier/entrance: + name: Entrance + terms: "" + barrier/fence: + name: Fence + terms: "" + barrier/gate: + name: Gate + terms: "" + barrier/hedge: + name: Hedge + terms: "" + barrier/kissing_gate: + name: Kissing Gate + terms: "" + barrier/lift_gate: + name: Lift Gate + terms: "" + barrier/retaining_wall: + name: Retaining Wall + terms: "" + barrier/stile: + name: Stile + terms: "" + barrier/toll_booth: + name: Toll Booth + terms: "" + barrier/wall: + name: Wall + terms: "" building: name: Building terms: "" @@ -319,9 +377,30 @@ en: historic: name: Historic Site terms: "" + historic/archaeological_site: + name: Archaeological Site + terms: "" + historic/boundary_stone: + name: Boundary Stone + terms: "" + historic/castle: + name: Castle + terms: "" + historic/memorial: + name: Memorial + terms: "" historic/monument: name: Monument terms: "" + historic/ruins: + name: Ruins + terms: "" + historic/wayside_cross: + name: Wayside Cross + terms: "" + historic/wayside_shrine: + name: Wayside Shrine + terms: "" landuse: name: Landuse terms: "" @@ -379,6 +458,9 @@ en: leisure/golf_course: name: Golf Course terms: "" + leisure/marina: + name: Marina + terms: "" leisure/park: name: Park terms: "esplanade,estate,forest,garden,grass,green,grounds,lawn,lot,meadow,parkland,place,playground,plaza,pleasure garden,recreation area,square,tract,village green,woodland" @@ -403,6 +485,9 @@ en: leisure/playground: name: Playground terms: "" + leisure/slipway: + name: Slipway + terms: "" leisure/stadium: name: Stadium terms: "" @@ -496,9 +581,27 @@ en: place/village: name: Village terms: "" + power: + name: Power + terms: "" + power/generator: + name: Power Plant + terms: "" + power/line: + name: Power Line + terms: "" + power/pole: + name: Power Pole + terms: "" power/sub_station: name: Substation terms: "" + power/tower: + name: "High-Voltage Tower" + terms: "" + power/transformer: + name: Transformer + terms: "" railway: name: Railway terms: "" @@ -517,12 +620,159 @@ en: shop: name: Shop terms: "" + shop/alcohol: + name: Liquor Store + terms: "" + shop/bakery: + name: Bakery + terms: "" + shop/beauty: + name: Beauty Shop + terms: "" + shop/beverages: + name: Beverage Store + terms: "" + shop/bicycle: + name: Bicycle Shop + terms: "" + shop/books: + name: Bookstore + terms: "" + shop/boutique: + name: Boutique + terms: "" shop/butcher: name: Butcher terms: "" + shop/car: + name: Car Dealership + terms: "" + shop/car_parts: + name: Car Parts Store + terms: "" + shop/car_repair: + name: Car Repair Shop + terms: "" + shop/chemist: + name: Chemist + terms: "" + shop/clothes: + name: Clothing Store + terms: "" + shop/computer: + name: Computer Store + terms: "" + shop/confectionery: + name: Confectionery + terms: "" + shop/convenience: + name: Convenience Store + terms: "" + shop/deli: + name: Deli + terms: "" + shop/department_store: + name: Department Store + terms: "" + shop/doityourself: + name: DIY Store + terms: "" + shop/dry_cleaning: + name: Dry Cleaners + terms: "" + shop/electronics: + name: Electronics Store + terms: "" + shop/fishmonger: + name: Fishmonger + terms: "" + shop/florist: + name: Florist + terms: "" + shop/furniture: + name: Furniture Store + terms: "" + shop/garden_centre: + name: Garden Center + terms: "" + shop/gift: + name: Gift Shop + terms: "" + shop/greengrocer: + name: Greengrocer + terms: "" + shop/hairdresser: + name: Hairdresser + terms: "" + shop/hardware: + name: Hardware Store + terms: "" + shop/hifi: + name: Hifi Store + terms: "" + shop/jewelry: + name: Jeweler + terms: "" + shop/kiosk: + name: Kiosk + terms: "" + shop/laundry: + name: Laundry + terms: "" + shop/mall: + name: Mall + terms: "" + shop/mobile_phone: + name: Mobile Phone Store + terms: "" + shop/motorcycle: + name: Motorcycle Dealership + terms: "" + shop/music: + name: Music Store + terms: "" + shop/newsagent: + name: Newsagent + terms: "" + shop/optician: + name: Optician + terms: "" + shop/outdoor: + name: Outdoor Store + terms: "" + shop/pet: + name: Pet Store + terms: "" + shop/shoes: + name: Shoe Store + terms: "" + shop/sports: + name: Sporting Goods Store + terms: "" + shop/stationery: + name: Stationery Store + terms: "" shop/supermarket: name: Supermarket terms: "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,mall,mart,outlet,outlet store,shop,shopping center,shopping plaza,stand,store,supermarket,thrift shop" + shop/toys: + name: Toy Store + terms: "" + shop/travel_agency: + name: Travel Agency + terms: "" + shop/tyres: + name: Tire Store + terms: "" + shop/vacant: + name: Vacant Shop + terms: "" + shop/variety_store: + name: Variety Store + terms: "" + shop/video: + name: Video Store + terms: "" tourism: name: Tourism terms: "" diff --git a/data/presets/fields.json b/data/presets/fields.json index 01032ec86..1d6a62e5e 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -39,6 +39,11 @@ "type": "check", "label": "ATM" }, + "barrier": { + "key": "barrier", + "type": "combo", + "label": "Type" + }, "bicycle_parking": { "key": "bicycle_parking", "type": "combo", @@ -240,6 +245,11 @@ "type": "combo", "label": "Type" }, + "power": { + "key": "power", + "type": "combo", + "label": "Type" + }, "railway": { "key": "railway", "type": "combo", diff --git a/data/presets/presets.json b/data/presets/presets.json index fa7c41333..5b56f4d6e 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -367,6 +367,17 @@ "terms": [], "name": "Library" }, + "amenity/marketplace": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "marketplace" + }, + "name": "Marketplace" + }, "amenity/parking": { "icon": "parking", "fields": [ @@ -822,6 +833,178 @@ "terms": [], "name": "University" }, + "barrier": { + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "barrier": "*" + }, + "fields": [ + "barrier" + ], + "name": "Barrier" + }, + "barrier/block": { + "geometry": [ + "point", + "vertex" + ], + "tags": { + "barrier": "block" + }, + "name": "Block" + }, + "barrier/bollard": { + "geometry": [ + "point", + "vertex", + "line" + ], + "tags": { + "barrier": "bollard" + }, + "name": "Bollard" + }, + "barrier/cattle_grid": { + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "cattle_grid" + }, + "name": "Cattle Grid" + }, + "barrier/city_wall": { + "geometry": [ + "line", + "area" + ], + "tags": { + "barrier": "city_wall" + }, + "name": "City Wall" + }, + "barrier/cycle_barrier": { + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "cycle_barrier" + }, + "name": "Cycle Barrier" + }, + "barrier/ditch": { + "geometry": [ + "line", + "area" + ], + "tags": { + "barrier": "ditch" + }, + "name": "Ditch" + }, + "barrier/entrance": { + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "entrance" + }, + "name": "Entrance" + }, + "barrier/fence": { + "geometry": [ + "line", + "area" + ], + "tags": { + "barrier": "fence" + }, + "name": "Fence" + }, + "barrier/gate": { + "geometry": [ + "point", + "vertex", + "line" + ], + "tags": { + "barrier": "gate" + }, + "name": "Gate" + }, + "barrier/hedge": { + "geometry": [ + "line", + "area" + ], + "tags": { + "barrier": "hedge" + }, + "name": "Hedge" + }, + "barrier/kissing_gate": { + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "kissing_gate" + }, + "name": "Kissing Gate" + }, + "barrier/lift_gate": { + "geometry": [ + "point", + "vertex" + ], + "tags": { + "barrier": "lift_gate" + }, + "name": "Lift Gate" + }, + "barrier/retaining_wall": { + "geometry": [ + "line", + "area" + ], + "tags": { + "barrier": "retaining_wall" + }, + "name": "Retaining Wall" + }, + "barrier/stile": { + "geometry": [ + "point", + "vertex" + ], + "tags": { + "barrier": "stile" + }, + "name": "Stile" + }, + "barrier/toll_booth": { + "geometry": [ + "vertex" + ], + "tags": { + "barrier": "toll_booth" + }, + "name": "Toll Booth" + }, + "barrier/wall": { + "geometry": [ + "line", + "area" + ], + "tags": { + "barrier": "wall" + }, + "name": "Wall" + }, "building": { "icon": "warehouse", "fields": [ @@ -1206,6 +1389,50 @@ }, "name": "Historic Site" }, + "historic/archaeological_site": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "historic": "archaeological_site" + }, + "name": "Archaeological Site" + }, + "historic/boundary_stone": { + "geometry": [ + "point", + "vertex" + ], + "tags": { + "historic": "boundary_stone" + }, + "name": "Boundary Stone" + }, + "historic/castle": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "historic": "castle" + }, + "name": "Castle" + }, + "historic/memorial": { + "icon": "monument", + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "historic": "memorial" + }, + "name": "Memorial" + }, "historic/monument": { "icon": "monument", "geometry": [ @@ -1218,6 +1445,39 @@ }, "name": "Monument" }, + "historic/ruins": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "historic": "ruins" + }, + "name": "Ruins" + }, + "historic/wayside_cross": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "historic": "wayside_cross" + }, + "name": "Wayside Cross" + }, + "historic/wayside_shrine": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "historic": "wayside_shrine" + }, + "name": "Wayside Shrine" + }, "landuse": { "fields": [ "landuse" @@ -1448,6 +1708,19 @@ "terms": [], "name": "Golf Course" }, + "leisure/marina": { + "icon": "marina", + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "leisure": "marina" + }, + "name": "Marina" + }, "leisure/park": { "icon": "park", "geometry": [ @@ -1584,6 +1857,16 @@ }, "name": "Playground" }, + "leisure/slipway": { + "geometry": [ + "point", + "line" + ], + "tags": { + "leisure": "slipway" + }, + "name": "Slipway" + }, "leisure/stadium": { "geometry": [ "point", @@ -2002,6 +2285,50 @@ }, "name": "Village" }, + "power": { + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "power": "*" + }, + "fields": [ + "power" + ], + "name": "Power" + }, + "power/generator": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "power": "generator" + }, + "name": "Power Plant" + }, + "power/line": { + "geometry": [ + "line" + ], + "tags": { + "power": "line" + }, + "name": "Power Line" + }, + "power/pole": { + "geometry": [ + "vertex" + ], + "tags": { + "power": "pole" + }, + "name": "Power Pole" + }, "power/sub_station": { "fields": [ "operator" @@ -2015,6 +2342,26 @@ }, "name": "Substation" }, + "power/tower": { + "geometry": [ + "vertex" + ], + "tags": { + "power": "tower" + }, + "name": "High-Voltage Tower" + }, + "power/transformer": { + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "power": "transformer" + }, + "name": "Transformer" + }, "railway": { "fields": [ "railway" @@ -2105,6 +2452,118 @@ "terms": [], "name": "Shop" }, + "shop/alcohol": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "alcohol" + }, + "name": "Liquor Store" + }, + "shop/bakery": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "bakery" + }, + "name": "Bakery" + }, + "shop/beauty": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "beauty" + }, + "name": "Beauty Shop" + }, + "shop/beverages": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "beverages" + }, + "name": "Beverage Store" + }, + "shop/bicycle": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "bicycle" + }, + "name": "Bicycle Shop" + }, + "shop/books": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "books" + }, + "name": "Bookstore" + }, + "shop/boutique": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "boutique" + }, + "name": "Boutique" + }, "shop/butcher": { "icon": "slaughterhouse", "fields": [ @@ -2122,6 +2581,582 @@ }, "name": "Butcher" }, + "shop/car": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "car" + }, + "name": "Car Dealership" + }, + "shop/car_parts": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "car_parts" + }, + "name": "Car Parts Store" + }, + "shop/car_repair": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "car_repair" + }, + "name": "Car Repair Shop" + }, + "shop/chemist": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "chemist" + }, + "name": "Chemist" + }, + "shop/clothes": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "clothes" + }, + "name": "Clothing Store" + }, + "shop/computer": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "computer" + }, + "name": "Computer Store" + }, + "shop/confectionery": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "confectionery" + }, + "name": "Confectionery" + }, + "shop/convenience": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "convenience" + }, + "name": "Convenience Store" + }, + "shop/deli": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "deli" + }, + "name": "Deli" + }, + "shop/department_store": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "department_store" + }, + "name": "Department Store" + }, + "shop/doityourself": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "doityourself" + }, + "name": "DIY Store" + }, + "shop/dry_cleaning": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "dry_cleaning" + }, + "name": "Dry Cleaners" + }, + "shop/electronics": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "electronics" + }, + "name": "Electronics Store" + }, + "shop/fishmonger": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "fishmonger" + }, + "name": "Fishmonger" + }, + "shop/florist": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "florist" + }, + "name": "Florist" + }, + "shop/furniture": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "furniture" + }, + "name": "Furniture Store" + }, + "shop/garden_centre": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "garden_centre" + }, + "name": "Garden Center" + }, + "shop/gift": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "gift" + }, + "name": "Gift Shop" + }, + "shop/greengrocer": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "greengrocer" + }, + "name": "Greengrocer" + }, + "shop/hairdresser": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "hairdresser" + }, + "name": "Hairdresser" + }, + "shop/hardware": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "hardware" + }, + "name": "Hardware Store" + }, + "shop/hifi": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "hifi" + }, + "name": "Hifi Store" + }, + "shop/jewelry": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "jewelry" + }, + "name": "Jeweler" + }, + "shop/kiosk": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "kiosk" + }, + "name": "Kiosk" + }, + "shop/laundry": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "laundry" + }, + "name": "Laundry" + }, + "shop/mall": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "mall" + }, + "name": "Mall" + }, + "shop/mobile_phone": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "mobile_phone" + }, + "name": "Mobile Phone Store" + }, + "shop/motorcycle": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "motorcycle" + }, + "name": "Motorcycle Dealership" + }, + "shop/music": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "music" + }, + "name": "Music Store" + }, + "shop/newsagent": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "newsagent" + }, + "name": "Newsagent" + }, + "shop/optician": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "optician" + }, + "name": "Optician" + }, + "shop/outdoor": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "outdoor" + }, + "name": "Outdoor Store" + }, + "shop/pet": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "pet" + }, + "name": "Pet Store" + }, + "shop/shoes": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "shoes" + }, + "name": "Shoe Store" + }, + "shop/sports": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "sports" + }, + "name": "Sporting Goods Store" + }, + "shop/stationery": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "stationery" + }, + "name": "Stationery Store" + }, "shop/supermarket": { "icon": "grocery", "fields": [ @@ -2161,6 +3196,102 @@ }, "name": "Supermarket" }, + "shop/toys": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "toys" + }, + "name": "Toy Store" + }, + "shop/travel_agency": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "travel_agency" + }, + "name": "Travel Agency" + }, + "shop/tyres": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "tyres" + }, + "name": "Tire Store" + }, + "shop/vacant": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "vacant" + }, + "name": "Vacant Shop" + }, + "shop/variety_store": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "variety_store" + }, + "name": "Variety Store" + }, + "shop/video": { + "icon": "shop", + "fields": [ + "address", + "opening_hours" + ], + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "shop": "video" + }, + "name": "Video Store" + }, "tourism": { "fields": [ "tourism" diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json new file mode 100644 index 000000000..4c23f7e28 --- /dev/null +++ b/data/presets/presets/amenity/marketplace.json @@ -0,0 +1,11 @@ +{ + "geometry": [ + "point", + "vertex", + "area" + ], + "tags": { + "amenity": "marketplace" + }, + "name": "Marketplace" +} \ No newline at end of file diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json new file mode 100644 index 000000000..e18e8abbd --- /dev/null +++ b/data/presets/presets/leisure/marina.json @@ -0,0 +1,13 @@ +{ + "icon": "marina", + "geometry": [ + "point", + "vertex", + "line", + "area" + ], + "tags": { + "leisure": "marina" + }, + "name": "Marina" +} diff --git a/data/presets/presets/leisure/slipway.json b/data/presets/presets/leisure/slipway.json new file mode 100644 index 000000000..1a50e69c1 --- /dev/null +++ b/data/presets/presets/leisure/slipway.json @@ -0,0 +1,10 @@ +{ + "geometry": [ + "point", + "line" + ], + "tags": { + "leisure": "slipway" + }, + "name": "Slipway" +}