From e3ac9954cb6da2c4862181cdbf5a301182bbe151 Mon Sep 17 00:00:00 2001 From: Ansis Brammanis Date: Wed, 13 Mar 2013 11:07:51 -0400 Subject: [PATCH] add additional fields to building preset --- data/presets/presets.json | 2 +- data/presets/presets/building.json | 11 +++++++++-- js/id/ui/preset.js | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 589960d62..9a82ae813 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1 +1 @@ -[{"name":"aeroway","match":{"geometry":["point","vertex","line","area"],"tags":{"aeroway":"*"}},"form":["aeroway"]},{"name":"airport","match":{"geometry":["point","area"],"terms":["airplane","airport","aerodrome"],"tags":{"aeroway":"aerodrome"}},"icon":"airport","form":[]},{"name":"helipad","match":{"geometry":["point","area"],"terms":["helicopter","helipad","heliport"],"tags":{"aeroway":"helipad"}},"icon":"heliport","form":[]},{"name":"amenity","match":{"geometry":["point","area"],"tags":{"amenity":"*"}},"form":["amenity"]},{"name":"bank","match":{"geometry":["point","area"],"terms":["coffer","countinghouse","credit union","depository","exchequer","fund","hoard","investment firm","repository","reserve","reservoir","safe","savings","stock","stockpile","store","storehouse","thrift","treasury","trust company","vault"],"tags":{"amenity":"bank"}},"icon":"bank","form":["atm","building_area","address"]},{"name":"bar","match":{"geometry":["point","area"],"tags":{"amenity":"bar"},"terms":[]},"icon":"bar","form":["building_area","address"]},{"name":"bicycle parking","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_parking"}},"icon":"bicycle","form":["bicycle_parking","capacity","operator"]},{"name":"bicycle rental","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_rental"}},"icon":"bicycle","form":["capacity","network","operator"]},{"name":"cafe","match":{"geometry":["point","area"],"terms":["coffee","tea","coffee shop"],"tags":{"amenity":"cafe"}},"icon":"cafe","form":["cuisine","internet_access","building_area","address"]},{"name":"cinema","match":{"geometry":["point","area"],"terms":["big screen","bijou","cine","drive-in","film","flicks","motion pictures","movie house","movie theater","moving pictures","nabes","photoplay","picture show","pictures","playhouse","show","silver screen"],"tags":{"amenity":"cinema"}},"icon":"cinema","form":["building_area","address"]},{"name":"fast food","match":{"geometry":["point","area"],"tags":{"amenity":"fast_food"},"terms":[]},"icon":"fast-food","form":["cuisine","building_area","address"]},{"name":"fire station","match":{"geometry":["point","area"],"tags":{"amenity":"fire_station"},"terms":[]},"icon":"fire-station","form":["operator","building_area","address"]},{"name":"grave yard","match":{"geometry":["point","area"],"tags":{"amenity":"grave_yard"}},"icon":"cemetery","form":["religion"]},{"name":"hospital","match":{"geometry":["point","area"],"terms":["clinic","emergency room","health service","hospice","infirmary","institution","nursing home","rest home","sanatorium","sanitarium","sick bay","surgery","ward"],"tags":{"amenity":"hospital"}},"icon":"hospital","form":["emergency","building_area","address"]},{"name":"library","match":{"geometry":["point","area"],"tags":{"amenity":"library"},"terms":[]},"icon":"library","form":["operator","building_area","address"]},{"name":"parking","match":{"geometry":["point","area"],"tags":{"amenity":"parking"},"terms":[]},"icon":"parking","form":["fee","access","address"]},{"name":"pharmacy","match":{"geometry":["point","area"],"tags":{"amenity":"pharmacy"},"terms":[]},"icon":"pharmacy","form":["operator","building_area","address"]},{"name":"place of worship","match":{"geometry":["point","area"],"terms":["abbey","basilica","bethel","cathedral","chancel","chantry","chapel","church","fold","house of God","house of prayer","house of worship","minster","mission","mosque","oratory","parish","sacellum","sanctuary","shrine","synagogue","tabernacle","temple"],"tags":{"amenity":"place_of_worship"}},"icon":"place-of-worship","form":["religion","denomination","building","address"]},{"name":"church","match":{"geometry":["point","area"],"terms":["christian","abbey","basilica","bethel","cathedral","chancel","chantry","chapel","church","fold","house of God","house of prayer","house of worship","minster","mission","oratory","parish","sacellum","sanctuary","shrine","tabernacle","temple"],"tags":{"amenity":"place_of_worship","religion":"christian"}},"icon":"religious-christian","form":["denomination","building","address"]},{"name":"synagogue","match":{"geometry":["point","area"],"terms":["jewish","synagogue"],"tags":{"amenity":"place_of_worship","religion":"jewish"}},"icon":"religious-jewish","form":["denomination","building","address"]},{"name":"mosque","match":{"geometry":["point","area"],"terms":["muslim","mosque"],"tags":{"amenity":"place_of_worship","religion":"muslim"}},"icon":"religious-muslim","form":["denomination","building","address"]},{"name":"police","match":{"geometry":["point","area"],"terms":["badge","bear","blue","bluecoat","bobby","boy scout","bull","constable","constabulary","cop","copper","corps","county mounty","detective","fed","flatfoot","force","fuzz","gendarme","gumshoe","heat","law","law enforcement","man","narc","officers","patrolman","police"],"tags":{"amenity":"police"}},"icon":"police","form":["operator","building_area","address"]},{"name":"post box","match":{"geometry":["point"],"tags":{"amenity":"post_box"},"terms":["letter drop","letterbox","mail drop","mailbox","pillar box","postbox"]},"icon":"post","form":["operator","collection_times"]},{"name":"pub","match":{"geometry":["point","area"],"tags":{"amenity":"pub"},"terms":[]},"icon":"beer","form":["building_area","address"]},{"name":"restaurant","match":{"geometry":["point","area"],"terms":["bar","cafeteria","café","canteen","chophouse","coffee shop","diner","dining room","dive*","doughtnut shop","drive-in","eatery","eating house","eating place","fast-food place","greasy spoon","grill","hamburger stand","hashery","hideaway","hotdog stand","inn","joint*","luncheonette","lunchroom","night club","outlet*","pizzeria","saloon","soda fountain","watering hole"],"tags":{"amenity":"restaurant"}},"icon":"restaurant","form":["cuisine","building_area","address"]},{"name":"school","match":{"geometry":["point","area"],"terms":["academy","alma mater","blackboard","college","department","discipline","establishment","faculty","hall","halls of ivy","institute","institution","jail*","schoolhouse","seminary","university"],"tags":{"amenity":"school"}},"icon":"school","form":["operator","building","address"]},{"name":"toilets","match":{"geometry":["point","area"],"terms":[],"tags":{"amenity":"toilets"}},"form":["operator","building"]},{"name":"town hall","match":{"geometry":["point","areea"],"terms":["village hall","city government","courthouse","municipal building","municipal center"],"tags":{"amenity":"townhall"}},"icon":"town-hall","form":["building_area","address"]},{"name":"university","match":{"geometry":["point","area"],"tags":{"amenity":"university"},"terms":[]},"icon":"college","form":["operator","address"]},{"name":"building","match":{"geometry":["point","area"],"tags":{"building":"*"},"terms":[]},"icon":"warehouse","form":["building_yes","levels","address"]},{"name":"highway","match":{"geometry":["point","vertex","line","area"],"tags":{"highway":"*"}},"form":["highway"]},{"name":"bus stop","match":{"geometry":["point"],"tags":{"highway":"bus_stop"},"terms":[]},"icon":"bus","form":["operator","shelter"]},{"name":"crossing","match":{"geometry":["vertex"],"tags":{"highway":"crossing"},"terms":["crosswalk","zebra crossing"]},"form":["crossing"]},{"name":"cycle path","match":{"geometry":["line"],"tags":{"highway":"cycleway"},"terms":[]},"icon":"highway-cycleway","form":["oneway","roadtype","access","surface"]},{"name":"foot path","match":{"geometry":["line"],"terms":["beaten path","boulevard","clearing","course","cut*","drag*","footpath","highway","lane","line","orbit","passage","pathway","rail","rails","road","roadway","route","street","thoroughfare","trackway","trail","trajectory","walk"],"tags":{"highway":"footway"}},"icon":"highway-footway","form":["access","surface"]},{"name":"motorway","match":{"geometry":["line"],"tags":{"highway":"motorway"},"terms":[]},"icon":"highway-motorway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"path","match":{"geometry":["line"],"tags":{"highway":"path"},"terms":[]},"icon":"highway-footway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"primary road","match":{"geometry":["line"],"tags":{"highway":"primary"},"terms":[]},"icon":"highway-primary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"residential road","match":{"geometry":["line"],"tags":{"highway":"residential"},"terms":[]},"icon":"highway-residential","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"secondary road","match":{"geometry":["line"],"tags":{"highway":"secondary"},"terms":[]},"icon":"highway-secondary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"service road","match":{"geometry":["line"],"tags":{"highway":"service"},"terms":[]},"icon":"highway-service","form":["service","oneway","roadtype","access","maxspeed","surface"]},{"name":"steps","match":{"geometry":["line"],"tags":{"highway":"steps"},"terms":["stairs","staircase"]},"form":["access","surface"]},{"name":"tertiary road","match":{"geometry":["line"],"tags":{"highway":"tertiary"},"terms":[]},"icon":"highway-tertiary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"track","match":{"geometry":["line"],"tags":{"highway":"track"},"terms":[]},"icon":"highway-track","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"trunk highway","match":{"geometry":["line"],"tags":{"highway":"trunk"},"terms":[]},"icon":"highway-trunk","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"turning circle","match":{"geometry":["vertex"],"tags":{"highway":"turning_circle"},"terms":[]},"icon":"circle"},{"name":"unclassified","match":{"geometry":["line"],"tags":{"highway":"unclassified"},"terms":[]},"icon":"highway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"landuse","match":{"geometry":["point","area"],"tags":{"landuse":"*"}},"form":["landuse"]},{"name":"allotments","match":{"geometry":["point","area"],"tags":{"landuse":"allotments"},"terms":[]},"form":[]},{"name":"cemetery","match":{"geometry":["point","area"],"tags":{"landuse":"cemetery"},"terms":[]},"form":[],"icon":"cemetery"},{"name":"commercial","match":{"geometry":["point","area"],"tags":{"landuse":"commercial"},"terms":[]},"form":[]},{"name":"construction","match":{"geometry":["point","area"],"tags":{"landuse":"construction"},"terms":[]},"form":["construction","operator"]},{"name":"farm","match":{"geometry":["point","area"],"tags":{"landuse":"farm"},"terms":[]},"form":[]},{"name":"farmyard","match":{"geometry":["point","area"],"tags":{"landuse":"farmyard"},"terms":[]},"form":[]},{"name":"forest","match":{"geometry":["point","area"],"tags":{"landuse":"forest"},"terms":[]},"form":["wood"],"icon":"park2"},{"name":"grass","match":{"geometry":["point","area"],"tags":{"landuse":"grass"},"terms":[]},"form":[]},{"name":"industrial","match":{"geometry":["point","area"],"tags":{"landuse":"industrial"},"terms":[]},"form":[]},{"name":"meadow","match":{"geometry":["point","area"],"tags":{"landuse":"meadow"},"terms":[]},"form":[]},{"name":"orchard","match":{"geometry":["point","area"],"tags":{"landuse":"orchard"},"terms":[]},"form":[]},{"name":"quarry","match":{"geometry":["point","area"],"tags":{"landuse":"quarry"},"terms":[]},"form":[]},{"name":"residential","match":{"geometry":["point","area"],"tags":{"landuse":"residential"},"terms":[]},"form":[]},{"name":"vineyard","match":{"geometry":["point","area"],"tags":{"landuse":"vineyard"},"terms":[]},"form":[]},{"name":"leisure","match":{"geometry":["point","area"],"tags":{"leisure":"*"}},"form":["leisure"]},{"name":"golf course","match":{"geometry":["point","area"],"tags":{"leisure":"golf_course"},"terms":[]},"icon":"golf","form":["operator","address"]},{"name":"park","match":{"geometry":["point","area"],"terms":["esplanade","estate","forest","garden","grass","green","grounds","lawn","lot","meadow","parkland","place","playground","plaza","pleasure garden","recreation area","square","tract","village green","woodland"],"tags":{"leisure":"park"}},"icon":"park"},{"name":"sport pitch","match":{"geometry":["point","area"],"tags":{"leisure":"pitch"},"terms":[]},"icon":"pitch","form":["sport","surface"]},{"name":"baseball diamond","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"baseball"},"terms":[]},"icon":"baseball"},{"name":"basketball court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"basketball"},"terms":[]},"icon":"basketball","form":["surface"]},{"name":"soccer field","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"soccer"},"terms":[]},"icon":"soccer","form":["surface"]},{"name":"tennis court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"tennis"},"terms":[]},"icon":"tennis","form":["surface"]},{"name":"playground","match":{"geometry":["point","area"],"tags":{"leisure":"playground"}}},{"name":"man made","match":{"geometry":["point","vertex","line","area"],"tags":{"man_made":"*"}},"form":["man_made"]},{"name":"lighthouse","match":{"geometry":["point","area"],"tags":{"man_made":"lighthouse"}}},{"name":"pier","match":{"geometry":["line","area"],"tags":{"man_made":"pier"}}},{"name":"natural","match":{"geometry":["point","area"],"tags":{"natural":"*"}},"form":["natural"]},{"name":"bay","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"bay"}}},{"name":"beach","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"beach"}},"form":["surface"]},{"name":"cliff","match":{"geometry":["point","vertex","line","area"],"terms":[],"tags":{"natural":"cliff"}}},{"name":"coastline","match":{"geometry":["line"],"terms":["shore"],"tags":{"natural":"coastline"}}},{"name":"glacier","match":{"geometry":["area"],"terms":[],"tags":{"natural":"glacier"}}},{"name":"grassland","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"grassland"}}},{"name":"heath","match":{"geometry":["area"],"terms":[],"tags":{"natural":"heath"}}},{"name":"peak","match":{"geometry":["point","vertex"],"tags":{"natural":"peak"},"terms":["acme","aiguille","alp","climax","crest","crown","hill","mount","mountain","pinnacle","summit","tip","top"]},"icon":"triangle","form":["elevation"]},{"name":"scrub","match":{"geometry":["area"],"tags":{"natural":"scrub"},"terms":[]}},{"name":"spring","match":{"geometry":["point","vertex"],"terms":[],"tags":{"natural":"spring"}}},{"name":"tree","match":{"geometry":["point","vertex"],"terms":[],"tags":{"natural":"tree"}},"form":["denotation"],"icon":"park"},{"name":"water","match":{"geometry":["area"],"tags":{"natural":"water"},"terms":[]},"form":["water"]},{"name":"lake","match":{"geometry":["area"],"tags":{"natural":"water","water":"lake"},"terms":["lakelet","loch","mere"]}},{"name":"pond","match":{"geometry":["area"],"tags":{"natural":"water","water":"pond"},"terms":["lakelet","millpond","tarn","pool","mere"]}},{"name":"reservoir","match":{"geometry":["area"],"tags":{"natural":"water","water":"reservoir"},"terms":[]}},{"name":"wetland","match":{"geometry":["point","area"],"tags":{"natural":"wetland"},"terms":[]},"form":["wetland"]},{"name":"wood","match":{"geometry":["point","area"],"tags":{"natural":"wood"},"terms":[]},"form":["wood"],"icon":"park2"},{"name":"office","match":{"geometry":["point","area"],"tags":{"office":"*"},"terms":[]},"icon":"commercial","form":["office","address","opening_hours"]},{"name":"place","match":{"geometry":["point","area"],"tags":{"place":"*"}},"form":["place"]},{"name":"hamlet","match":{"geometry":["point","area"],"tags":{"place":"hamlet"}},"icon":"triangle-stroked"},{"name":"island","match":{"geometry":["point","area"],"terms":["archipelago","atoll","bar","cay","isle","islet","key","reef"],"tags":{"place":"island"}}},{"name":"locality","match":{"geometry":["point","area"],"tags":{"place":"locality"}},"icon":"marker"},{"name":"village","match":{"geometry":["point","area"],"tags":{"place":"village"}},"icon":"square-stroked"},{"name":"railway","match":{"geometry":["point","vertex","line","area"],"tags":{"railway":"*"}},"form":["railway"]},{"name":"rail","match":{"geometry":["line"],"tags":{"railway":"rail"},"terms":[]},"icon":"railway-rail"},{"name":"subway","match":{"geometry":["line"],"tags":{"railway":"subway"},"terms":[]},"icon":"railway-rail"},{"name":"subway entrance","match":{"geometry":["point"],"tags":{"railway":"subway_entrance"},"terms":[]},"icon":"rail-underground"},{"name":"shop","match":{"geometry":["point","area"],"tags":{"shop":"*"},"terms":[]},"icon":"shop","form":["shop","address","opening_hours"]},{"name":"supermarket","match":{"geometry":["point","area"],"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"],"tags":{"shop":"supermarket"}},"icon":"grocery","form":["operator","building_area","address"]},{"name":"tourism","match":{"geometry":["point","area"],"tags":{"tourism":"*"}},"form":["tourism"]},{"name":"camp site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"camp_site"}},"icon":"campsite","form":["operator","address"]},{"name":"hotel","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"hotel"}},"icon":"lodging","form":["operator","building_area","address"]},{"name":"museum","match":{"geometry":["point","area"],"terms":["exhibition","exhibits archive","foundation","gallery","hall","institution","library","menagerie","repository","salon","storehouse","treasury","vault"],"tags":{"tourism":"museum"}},"icon":"museum","form":["operator","building_area","address"]},{"name":"picnic site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"picnic_site"}},"form":["operator","building_area","address"]},{"name":"waterway","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"*"}},"form":["waterway"]},{"name":"canal","match":{"geometry":["line"],"tags":{"waterway":"canal"}},"icon":"waterway-river"},{"name":"dam","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"dam"}},"icon":"dam"},{"name":"ditch","match":{"geometry":["line"],"tags":{"waterway":"ditch"}},"icon":"waterway-river"},{"name":"drain","match":{"geometry":["line"],"tags":{"waterway":"drain"}},"icon":"waterway-river"},{"name":"river","match":{"geometry":["line"],"terms":["beck","branch","brook","course","creek","estuary","rill","rivulet","run","runnel","stream","tributary","watercourse"],"tags":{"waterway":"river"}},"icon":"waterway-river"},{"name":"riverbank","match":{"geometry":["area"],"tags":{"waterway":"riverbank"}},"icon":"water"},{"name":"stream","match":{"geometry":["line"],"terms":["beck","branch","brook","burn","course","creek","current","drift","flood","flow","freshet","race","rill","rindle","rivulet","run","runnel","rush","spate","spritz","surge","tide","torrent","tributary","watercourse"],"tags":{"waterway":"stream"}},"icon":"waterway-river","form":["layer"]},{"name":"weir","match":{"geometry":["vertex","line"],"tags":{"waterway":"weir"}},"icon":"dam"}] \ No newline at end of file +[{"name":"aeroway","match":{"geometry":["point","vertex","line","area"],"tags":{"aeroway":"*"}},"form":["aeroway"]},{"name":"airport","match":{"geometry":["point","area"],"terms":["airplane","airport","aerodrome"],"tags":{"aeroway":"aerodrome"}},"icon":"airport","form":[]},{"name":"helipad","match":{"geometry":["point","area"],"terms":["helicopter","helipad","heliport"],"tags":{"aeroway":"helipad"}},"icon":"heliport","form":[]},{"name":"amenity","match":{"geometry":["point","area"],"tags":{"amenity":"*"}},"form":["amenity"]},{"name":"bank","match":{"geometry":["point","area"],"terms":["coffer","countinghouse","credit union","depository","exchequer","fund","hoard","investment firm","repository","reserve","reservoir","safe","savings","stock","stockpile","store","storehouse","thrift","treasury","trust company","vault"],"tags":{"amenity":"bank"}},"icon":"bank","form":["atm","building_area","address"]},{"name":"bar","match":{"geometry":["point","area"],"tags":{"amenity":"bar"},"terms":[]},"icon":"bar","form":["building_area","address"]},{"name":"bicycle parking","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_parking"}},"icon":"bicycle","form":["bicycle_parking","capacity","operator"]},{"name":"bicycle rental","match":{"geometry":["point","area"],"tags":{"amenity":"bicycle_rental"}},"icon":"bicycle","form":["capacity","network","operator"]},{"name":"cafe","match":{"geometry":["point","area"],"terms":["coffee","tea","coffee shop"],"tags":{"amenity":"cafe"}},"icon":"cafe","form":["cuisine","internet_access","building_area","address"]},{"name":"cinema","match":{"geometry":["point","area"],"terms":["big screen","bijou","cine","drive-in","film","flicks","motion pictures","movie house","movie theater","moving pictures","nabes","photoplay","picture show","pictures","playhouse","show","silver screen"],"tags":{"amenity":"cinema"}},"icon":"cinema","form":["building_area","address"]},{"name":"fast food","match":{"geometry":["point","area"],"tags":{"amenity":"fast_food"},"terms":[]},"icon":"fast-food","form":["cuisine","building_area","address"]},{"name":"fire station","match":{"geometry":["point","area"],"tags":{"amenity":"fire_station"},"terms":[]},"icon":"fire-station","form":["operator","building_area","address"]},{"name":"grave yard","match":{"geometry":["point","area"],"tags":{"amenity":"grave_yard"}},"icon":"cemetery","form":["religion"]},{"name":"hospital","match":{"geometry":["point","area"],"terms":["clinic","emergency room","health service","hospice","infirmary","institution","nursing home","rest home","sanatorium","sanitarium","sick bay","surgery","ward"],"tags":{"amenity":"hospital"}},"icon":"hospital","form":["emergency","building_area","address"]},{"name":"library","match":{"geometry":["point","area"],"tags":{"amenity":"library"},"terms":[]},"icon":"library","form":["operator","building_area","address"]},{"name":"parking","match":{"geometry":["point","area"],"tags":{"amenity":"parking"},"terms":[]},"icon":"parking","form":["fee","access","address"]},{"name":"pharmacy","match":{"geometry":["point","area"],"tags":{"amenity":"pharmacy"},"terms":[]},"icon":"pharmacy","form":["operator","building_area","address"]},{"name":"place of worship","match":{"geometry":["point","area"],"terms":["abbey","basilica","bethel","cathedral","chancel","chantry","chapel","church","fold","house of God","house of prayer","house of worship","minster","mission","mosque","oratory","parish","sacellum","sanctuary","shrine","synagogue","tabernacle","temple"],"tags":{"amenity":"place_of_worship"}},"icon":"place-of-worship","form":["religion","denomination","building","address"]},{"name":"church","match":{"geometry":["point","area"],"terms":["christian","abbey","basilica","bethel","cathedral","chancel","chantry","chapel","church","fold","house of God","house of prayer","house of worship","minster","mission","oratory","parish","sacellum","sanctuary","shrine","tabernacle","temple"],"tags":{"amenity":"place_of_worship","religion":"christian"}},"icon":"religious-christian","form":["denomination","building","address"]},{"name":"synagogue","match":{"geometry":["point","area"],"terms":["jewish","synagogue"],"tags":{"amenity":"place_of_worship","religion":"jewish"}},"icon":"religious-jewish","form":["denomination","building","address"]},{"name":"mosque","match":{"geometry":["point","area"],"terms":["muslim","mosque"],"tags":{"amenity":"place_of_worship","religion":"muslim"}},"icon":"religious-muslim","form":["denomination","building","address"]},{"name":"police","match":{"geometry":["point","area"],"terms":["badge","bear","blue","bluecoat","bobby","boy scout","bull","constable","constabulary","cop","copper","corps","county mounty","detective","fed","flatfoot","force","fuzz","gendarme","gumshoe","heat","law","law enforcement","man","narc","officers","patrolman","police"],"tags":{"amenity":"police"}},"icon":"police","form":["operator","building_area","address"]},{"name":"post box","match":{"geometry":["point"],"tags":{"amenity":"post_box"},"terms":["letter drop","letterbox","mail drop","mailbox","pillar box","postbox"]},"icon":"post","form":["operator","collection_times"]},{"name":"pub","match":{"geometry":["point","area"],"tags":{"amenity":"pub"},"terms":[]},"icon":"beer","form":["building_area","address"]},{"name":"restaurant","match":{"geometry":["point","area"],"terms":["bar","cafeteria","café","canteen","chophouse","coffee shop","diner","dining room","dive*","doughtnut shop","drive-in","eatery","eating house","eating place","fast-food place","greasy spoon","grill","hamburger stand","hashery","hideaway","hotdog stand","inn","joint*","luncheonette","lunchroom","night club","outlet*","pizzeria","saloon","soda fountain","watering hole"],"tags":{"amenity":"restaurant"}},"icon":"restaurant","form":["cuisine","building_area","address"]},{"name":"school","match":{"geometry":["point","area"],"terms":["academy","alma mater","blackboard","college","department","discipline","establishment","faculty","hall","halls of ivy","institute","institution","jail*","schoolhouse","seminary","university"],"tags":{"amenity":"school"}},"icon":"school","form":["operator","building","address"]},{"name":"toilets","match":{"geometry":["point","area"],"terms":[],"tags":{"amenity":"toilets"}},"form":["operator","building"]},{"name":"town hall","match":{"geometry":["point","areea"],"terms":["village hall","city government","courthouse","municipal building","municipal center"],"tags":{"amenity":"townhall"}},"icon":"town-hall","form":["building_area","address"]},{"name":"university","match":{"geometry":["point","area"],"tags":{"amenity":"university"},"terms":[]},"icon":"college","form":["operator","address"]},{"name":"building","match":{"geometry":["point","area"],"tags":{"building":"*"},"terms":[]},"icon":"warehouse","form":["building_yes","levels"],"additional":["address","telephone","website","wikipedia","elevation","source"]},{"name":"highway","match":{"geometry":["point","vertex","line","area"],"tags":{"highway":"*"}},"form":["highway"]},{"name":"bus stop","match":{"geometry":["point"],"tags":{"highway":"bus_stop"},"terms":[]},"icon":"bus","form":["operator","shelter"]},{"name":"crossing","match":{"geometry":["vertex"],"tags":{"highway":"crossing"},"terms":["crosswalk","zebra crossing"]},"form":["crossing"]},{"name":"cycle path","match":{"geometry":["line"],"tags":{"highway":"cycleway"},"terms":[]},"icon":"highway-cycleway","form":["oneway","roadtype","access","surface"]},{"name":"foot path","match":{"geometry":["line"],"terms":["beaten path","boulevard","clearing","course","cut*","drag*","footpath","highway","lane","line","orbit","passage","pathway","rail","rails","road","roadway","route","street","thoroughfare","trackway","trail","trajectory","walk"],"tags":{"highway":"footway"}},"icon":"highway-footway","form":["access","surface"]},{"name":"motorway","match":{"geometry":["line"],"tags":{"highway":"motorway"},"terms":[]},"icon":"highway-motorway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"path","match":{"geometry":["line"],"tags":{"highway":"path"},"terms":[]},"icon":"highway-footway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"primary road","match":{"geometry":["line"],"tags":{"highway":"primary"},"terms":[]},"icon":"highway-primary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"residential road","match":{"geometry":["line"],"tags":{"highway":"residential"},"terms":[]},"icon":"highway-residential","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"secondary road","match":{"geometry":["line"],"tags":{"highway":"secondary"},"terms":[]},"icon":"highway-secondary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"service road","match":{"geometry":["line"],"tags":{"highway":"service"},"terms":[]},"icon":"highway-service","form":["service","oneway","roadtype","access","maxspeed","surface"]},{"name":"steps","match":{"geometry":["line"],"tags":{"highway":"steps"},"terms":["stairs","staircase"]},"form":["access","surface"]},{"name":"tertiary road","match":{"geometry":["line"],"tags":{"highway":"tertiary"},"terms":[]},"icon":"highway-tertiary","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"track","match":{"geometry":["line"],"tags":{"highway":"track"},"terms":[]},"icon":"highway-track","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"trunk highway","match":{"geometry":["line"],"tags":{"highway":"trunk"},"terms":[]},"icon":"highway-trunk","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"turning circle","match":{"geometry":["vertex"],"tags":{"highway":"turning_circle"},"terms":[]},"icon":"circle"},{"name":"unclassified","match":{"geometry":["line"],"tags":{"highway":"unclassified"},"terms":[]},"icon":"highway","form":["oneway","roadtype","access","maxspeed","surface"]},{"name":"landuse","match":{"geometry":["point","area"],"tags":{"landuse":"*"}},"form":["landuse"]},{"name":"allotments","match":{"geometry":["point","area"],"tags":{"landuse":"allotments"},"terms":[]},"form":[]},{"name":"cemetery","match":{"geometry":["point","area"],"tags":{"landuse":"cemetery"},"terms":[]},"form":[],"icon":"cemetery"},{"name":"commercial","match":{"geometry":["point","area"],"tags":{"landuse":"commercial"},"terms":[]},"form":[]},{"name":"construction","match":{"geometry":["point","area"],"tags":{"landuse":"construction"},"terms":[]},"form":["construction","operator"]},{"name":"farm","match":{"geometry":["point","area"],"tags":{"landuse":"farm"},"terms":[]},"form":[]},{"name":"farmyard","match":{"geometry":["point","area"],"tags":{"landuse":"farmyard"},"terms":[]},"form":[]},{"name":"forest","match":{"geometry":["point","area"],"tags":{"landuse":"forest"},"terms":[]},"form":["wood"],"icon":"park2"},{"name":"grass","match":{"geometry":["point","area"],"tags":{"landuse":"grass"},"terms":[]},"form":[]},{"name":"industrial","match":{"geometry":["point","area"],"tags":{"landuse":"industrial"},"terms":[]},"form":[]},{"name":"meadow","match":{"geometry":["point","area"],"tags":{"landuse":"meadow"},"terms":[]},"form":[]},{"name":"orchard","match":{"geometry":["point","area"],"tags":{"landuse":"orchard"},"terms":[]},"form":[]},{"name":"quarry","match":{"geometry":["point","area"],"tags":{"landuse":"quarry"},"terms":[]},"form":[]},{"name":"residential","match":{"geometry":["point","area"],"tags":{"landuse":"residential"},"terms":[]},"form":[]},{"name":"vineyard","match":{"geometry":["point","area"],"tags":{"landuse":"vineyard"},"terms":[]},"form":[]},{"name":"leisure","match":{"geometry":["point","area"],"tags":{"leisure":"*"}},"form":["leisure"]},{"name":"golf course","match":{"geometry":["point","area"],"tags":{"leisure":"golf_course"},"terms":[]},"icon":"golf","form":["operator","address"]},{"name":"park","match":{"geometry":["point","area"],"terms":["esplanade","estate","forest","garden","grass","green","grounds","lawn","lot","meadow","parkland","place","playground","plaza","pleasure garden","recreation area","square","tract","village green","woodland"],"tags":{"leisure":"park"}},"icon":"park"},{"name":"sport pitch","match":{"geometry":["point","area"],"tags":{"leisure":"pitch"},"terms":[]},"icon":"pitch","form":["sport","surface"]},{"name":"baseball diamond","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"baseball"},"terms":[]},"icon":"baseball"},{"name":"basketball court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"basketball"},"terms":[]},"icon":"basketball","form":["surface"]},{"name":"soccer field","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"soccer"},"terms":[]},"icon":"soccer","form":["surface"]},{"name":"tennis court","match":{"geometry":["point","area"],"tags":{"leisure":"pitch","sport":"tennis"},"terms":[]},"icon":"tennis","form":["surface"]},{"name":"playground","match":{"geometry":["point","area"],"tags":{"leisure":"playground"}}},{"name":"man made","match":{"geometry":["point","vertex","line","area"],"tags":{"man_made":"*"}},"form":["man_made"]},{"name":"lighthouse","match":{"geometry":["point","area"],"tags":{"man_made":"lighthouse"}}},{"name":"pier","match":{"geometry":["line","area"],"tags":{"man_made":"pier"}}},{"name":"natural","match":{"geometry":["point","area"],"tags":{"natural":"*"}},"form":["natural"]},{"name":"bay","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"bay"}}},{"name":"beach","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"beach"}},"form":["surface"]},{"name":"cliff","match":{"geometry":["point","vertex","line","area"],"terms":[],"tags":{"natural":"cliff"}}},{"name":"coastline","match":{"geometry":["line"],"terms":["shore"],"tags":{"natural":"coastline"}}},{"name":"glacier","match":{"geometry":["area"],"terms":[],"tags":{"natural":"glacier"}}},{"name":"grassland","match":{"geometry":["point","area"],"terms":[],"tags":{"natural":"grassland"}}},{"name":"heath","match":{"geometry":["area"],"terms":[],"tags":{"natural":"heath"}}},{"name":"peak","match":{"geometry":["point","vertex"],"tags":{"natural":"peak"},"terms":["acme","aiguille","alp","climax","crest","crown","hill","mount","mountain","pinnacle","summit","tip","top"]},"icon":"triangle","form":["elevation"]},{"name":"scrub","match":{"geometry":["area"],"tags":{"natural":"scrub"},"terms":[]}},{"name":"spring","match":{"geometry":["point","vertex"],"terms":[],"tags":{"natural":"spring"}}},{"name":"tree","match":{"geometry":["point","vertex"],"terms":[],"tags":{"natural":"tree"}},"form":["denotation"],"icon":"park"},{"name":"water","match":{"geometry":["area"],"tags":{"natural":"water"},"terms":[]},"form":["water"]},{"name":"lake","match":{"geometry":["area"],"tags":{"natural":"water","water":"lake"},"terms":["lakelet","loch","mere"]}},{"name":"pond","match":{"geometry":["area"],"tags":{"natural":"water","water":"pond"},"terms":["lakelet","millpond","tarn","pool","mere"]}},{"name":"reservoir","match":{"geometry":["area"],"tags":{"natural":"water","water":"reservoir"},"terms":[]}},{"name":"wetland","match":{"geometry":["point","area"],"tags":{"natural":"wetland"},"terms":[]},"form":["wetland"]},{"name":"wood","match":{"geometry":["point","area"],"tags":{"natural":"wood"},"terms":[]},"form":["wood"],"icon":"park2"},{"name":"office","match":{"geometry":["point","area"],"tags":{"office":"*"},"terms":[]},"icon":"commercial","form":["office","address","opening_hours"]},{"name":"place","match":{"geometry":["point","area"],"tags":{"place":"*"}},"form":["place"]},{"name":"hamlet","match":{"geometry":["point","area"],"tags":{"place":"hamlet"}},"icon":"triangle-stroked"},{"name":"island","match":{"geometry":["point","area"],"terms":["archipelago","atoll","bar","cay","isle","islet","key","reef"],"tags":{"place":"island"}}},{"name":"locality","match":{"geometry":["point","area"],"tags":{"place":"locality"}},"icon":"marker"},{"name":"village","match":{"geometry":["point","area"],"tags":{"place":"village"}},"icon":"square-stroked"},{"name":"railway","match":{"geometry":["point","vertex","line","area"],"tags":{"railway":"*"}},"form":["railway"]},{"name":"rail","match":{"geometry":["line"],"tags":{"railway":"rail"},"terms":[]},"icon":"railway-rail"},{"name":"subway","match":{"geometry":["line"],"tags":{"railway":"subway"},"terms":[]},"icon":"railway-rail"},{"name":"subway entrance","match":{"geometry":["point"],"tags":{"railway":"subway_entrance"},"terms":[]},"icon":"rail-underground"},{"name":"shop","match":{"geometry":["point","area"],"tags":{"shop":"*"},"terms":[]},"icon":"shop","form":["shop","address","opening_hours"]},{"name":"supermarket","match":{"geometry":["point","area"],"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"],"tags":{"shop":"supermarket"}},"icon":"grocery","form":["operator","building_area","address"]},{"name":"tourism","match":{"geometry":["point","area"],"tags":{"tourism":"*"}},"form":["tourism"]},{"name":"camp site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"camp_site"}},"icon":"campsite","form":["operator","address"]},{"name":"hotel","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"hotel"}},"icon":"lodging","form":["operator","building_area","address"]},{"name":"museum","match":{"geometry":["point","area"],"terms":["exhibition","exhibits archive","foundation","gallery","hall","institution","library","menagerie","repository","salon","storehouse","treasury","vault"],"tags":{"tourism":"museum"}},"icon":"museum","form":["operator","building_area","address"]},{"name":"picnic site","match":{"geometry":["point","area"],"terms":[],"tags":{"tourism":"picnic_site"}},"form":["operator","building_area","address"]},{"name":"waterway","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"*"}},"form":["waterway"]},{"name":"canal","match":{"geometry":["line"],"tags":{"waterway":"canal"}},"icon":"waterway-river"},{"name":"dam","match":{"geometry":["point","vertex","line","area"],"tags":{"waterway":"dam"}},"icon":"dam"},{"name":"ditch","match":{"geometry":["line"],"tags":{"waterway":"ditch"}},"icon":"waterway-river"},{"name":"drain","match":{"geometry":["line"],"tags":{"waterway":"drain"}},"icon":"waterway-river"},{"name":"river","match":{"geometry":["line"],"terms":["beck","branch","brook","course","creek","estuary","rill","rivulet","run","runnel","stream","tributary","watercourse"],"tags":{"waterway":"river"}},"icon":"waterway-river"},{"name":"riverbank","match":{"geometry":["area"],"tags":{"waterway":"riverbank"}},"icon":"water"},{"name":"stream","match":{"geometry":["line"],"terms":["beck","branch","brook","burn","course","creek","current","drift","flood","flow","freshet","race","rill","rindle","rivulet","run","runnel","rush","spate","spritz","surge","tide","torrent","tributary","watercourse"],"tags":{"waterway":"stream"}},"icon":"waterway-river","form":["layer"]},{"name":"weir","match":{"geometry":["vertex","line"],"tags":{"waterway":"weir"}},"icon":"dam"}] \ No newline at end of file diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json index 6d4bb8a3c..dabb31fb4 100644 --- a/data/presets/presets/building.json +++ b/data/presets/presets/building.json @@ -13,7 +13,14 @@ "icon": "warehouse", "form": [ "building_yes", - "levels", - "address" + "levels" + ], + "additional": [ + "address", + "telephone", + "website", + "wikipedia", + "elevation", + "source" ] } diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js index 8f2242d45..8f465f9f7 100644 --- a/js/id/ui/preset.js +++ b/js/id/ui/preset.js @@ -34,9 +34,11 @@ iD.ui.preset = function(context) { var wrap = selection.append('div') .attr('class', 'col12 inspector-inner'); + /* wrap.append('div') .attr('class', 'col3 preset-label') .text('Add field'); + */ formbuttonwrap = wrap.append('div') .attr('class', 'col9 preset-input');