Commit Graph

1562 Commits

Author SHA1 Message Date
Quincy Morgan
c3819dac71 Removed the payment_multi field from the universal fields list and added it to moreFields of relevant presets (re #5719)
Added additional fields to the moreFields property of various presets
2019-01-16 12:43:29 -05:00
Quincy Morgan
0e006c3bd5 Added fields to the lighthouse preset 2019-01-16 08:56:47 -05:00
Quincy Morgan
6f72a3a386 Added club=sport preset 2019-01-16 08:23:45 -05:00
Bryan Housel
196f93d735 Merge pull request #5716 from openstreetmap/suggestion-preset-inheritance
Switch brand suggestion preset generation over to inherit fields
2019-01-15 17:25:03 -05:00
Quincy Morgan
7735ecbf1b Updated mast fields to use field inheritance 2019-01-15 16:21:28 -05:00
Quincy Morgan
b9bf1d27c0 Updated the healthcare presets to use field inheritance 2019-01-15 16:10:29 -05:00
Bryan Housel
7c26816a7e Switch brand suggestion preset generation over to inherit fields
This also attempts to use `cuisine` and `vending` tags in the
presetID - in case a more specific preset exists for those things.

This fixes a minor annoyance where only matching `key/value`
would find the "fast food" preset instead of the "chicken fast food"
or "pizza fast food" preset.

So now Chick-fil-a has a chicken icon and Sbarro has a pizza icon. 🍕
2019-01-15 16:02:57 -05:00
Quincy Morgan
5c1bd6ee25 Updated pitch and fitness_station presets to use field inheritance 2019-01-15 16:02:31 -05:00
Quincy Morgan
1bdd1c8e58 Updated the craft presets to use presets to use field inheritance 2019-01-15 15:48:40 -05:00
Quincy Morgan
5dd3d50623 Updated office presets to use field inheritance 2019-01-15 15:37:26 -05:00
Quincy Morgan
512dfaa52c Updated attraction presets to use field inheritance
Added generic attraction preset with attraction typeCombo field
2019-01-15 15:28:01 -05:00
Quincy Morgan
20553dc977 Fix for prior commit 2019-01-15 14:56:30 -05:00
Quincy Morgan
c6dd743f90 Updated social_facility and vending_machine presets to use field inheritance 2019-01-15 14:55:52 -05:00
Quincy Morgan
0b295db7df Converted buoy presets to use field inheritance 2019-01-15 14:39:36 -05:00
Quincy Morgan
0e795ae31d Updated the fast food and restaurant presets to use field inheritance 2019-01-15 14:34:37 -05:00
Quincy Morgan
8f6870336f Converted building presets to use field inheritance 2019-01-15 14:29:04 -05:00
Quincy Morgan
4252c5cb36 Presets no longer inherit fields for keys that define them 2019-01-15 13:52:03 -05:00
Quincy Morgan
4b2c380b18 Changed preset field inheritance to target specific presets rather than just the parent preset 2019-01-15 13:07:58 -05:00
Quincy Morgan
0da15efc10 Merge branch 'master' into preset-field-inheritance
# Conflicts:
#	data/presets/presets.json
2019-01-15 11:44:16 -05:00
Quincy Morgan
d1a7400ed7 Added a field for the building:material key 2019-01-15 11:42:55 -05:00
Quincy Morgan
1ba61140f5 Changed the material field to be non-universal
Added the material field to the fields or moreFields properties of relevant presets
2019-01-15 11:35:56 -05:00
Quincy Morgan
becc087a91 Moved the seamark/type field from a universal field to the fields or moreFields properties of relevant presets 2019-01-15 10:53:35 -05:00
Quincy Morgan
d1c4e22337 Added documentation for preset field inheritance behavior 2019-01-15 10:23:38 -05:00
Quincy Morgan
ae7c099c8a Moved field inheritance resolution from the data build to the preset initialization
Removed the data build check for duplicate values between fields and moreFields
Renamed the shop field from Type to Shop Type
Renamed the beauty field from Shop Type to Beauty Specialty
Added the brand field to the shop preset under moreFields
2019-01-15 09:53:26 -05:00
Quincy Morgan
78853e1dc1 Added mechanism for presets to inherit their fields and moreFields values 2019-01-14 18:27:50 -05:00
Bryan Housel
18ea434d02 Update water area presets to use natural=water + water=*
(closes #5591)
2019-01-14 13:09:46 -05:00
Bryan Housel
bf79a714f1 "Forest" -> "Managed Forest"
(closes #5709)
2019-01-14 11:42:32 -05:00
Bryan Housel
1f69661b91 Add a preset "RV Dealership" for shop=caravan 2019-01-11 18:02:17 -05:00
Bryan Housel
5f20218f1f Add validation warning for generic names
(closes #5590)
2019-01-08 02:15:28 -05:00
Bryan Housel
58665d0d2e Embed name of religion in preset label
(re: #5611)
2019-01-07 12:10:13 -05:00
Bryan Housel
f1b5c4e5b0 Wherever we show 'denomination' field, also show 'religion' field
(closes #5611)
2019-01-07 12:07:15 -05:00
Bryan Housel
21f1891899 Adjust pharmacy/chemist terms so they both appear on searches
(re: 3213)
2019-01-04 01:37:18 -05:00
Bryan Housel
a1bc6b3e31 Rename "Pharmacy" preset to "Pharmacy Counter"
(re: #3213, https://github.com/osmlab/name-suggestion-index/issues/30)
2019-01-04 00:57:18 -05:00
Bryan Housel
495793929f Skip wikidata field test, too time sensitive to work reliably 2018-12-27 12:06:53 -05:00
Bryan Housel
0294596fb2 Merge pull request #5653 from hikemaniac/shop-fuel
Added a preset for shop=fuel
2018-12-24 12:44:48 -05:00
hikemaniac
da95d1ee5a Added a preset for shop=fuel 2018-12-23 17:35:44 +01:00
Bryan Housel
9502c041ff Merge pull request #5651 from hikemaniac/more-shops
Added more presets for shops
2018-12-22 14:52:53 -05:00
Bryan Housel
6d327b3eff Upgrade FontAwesome icons, add more icons for winter sports 2018-12-22 13:02:46 -05:00
Bryan Housel
e06ba3d1d7 Move racetracks to presets/leisure/track - add horse_racing.json
(closes #5620)
2018-12-22 12:28:45 -05:00
Bryan Housel
7db6133666 Merge pull request #5583 from quincylvania/field-prerequisite-tags
Mechanism for displaying fields conditionally based on tags
2018-12-19 12:08:15 -05:00
Bryan Housel
f478fdbfbd Add preset for Enforcement relation type
(closes #5610)
2018-12-19 10:45:54 -05:00
Bryan Housel
007faeae6e Adjust fields, add couplings, simplify labels 2018-12-18 11:31:30 -05:00
Bryan Housel
9f5d2b2e7e Merge branch 'fire-hydrants-shortened' of https://github.com/momu/iD into momu-fire-hydrants-shortened 2018-12-18 10:37:52 -05:00
Quincy Morgan
7e9082b9ff Merge branch 'master' into field-prerequisite-tags 2018-12-18 09:33:46 -05:00
Bryan Housel
029f702d99 Add Road Closed preset and render style
(re: #5599)
2018-12-17 17:53:55 -05:00
Bryan Housel
3f2cf67218 Add preset for Australian Football field
(closes #5605)
2018-12-16 16:34:53 -05:00
Bryan Housel
68a6421191 Add preset for Netball Court 2018-12-16 16:30:33 -05:00
Bryan Housel
c6674449a3 Add diet: multicombo, put it in moreFields with the internet stuff
(closes #5580)
2018-12-16 14:40:28 -05:00
Quincy Morgan
a4b2924e4e Merge branch 'master' into field-prerequisite-tags 2018-12-13 17:23:54 -08:00
Bryan Housel
800d7dc7c4 Upgrade to name-suggestion-index v1.0.2 2018-12-13 09:14:42 -05:00