Commit Graph

1552 Commits

Author SHA1 Message Date
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
Christopher Eby
f30dbccc33 add "Building" to name of building=apartments preset 2018-12-12 19:54:32 -05:00
Christopher Eby
dbd7c4eec8 add apartment complex preset 2018-12-12 19:52:35 -05:00
Bryan Housel
3aa7dcfc0c Allow some kinds of traffic calmings to be mapped as areas
(closes #5562)
2018-12-10 10:23:29 -05:00
Quincy Morgan
5d35951f0f Corrects the name of the Internet Access Fee field in the presets README 2018-12-09 20:25:08 -08:00
Bryan Housel
4b3ce2c07c Add basin=* Type and intermittent fields to Basin preset
(closes #5497)
2018-12-09 23:13:15 -05:00
Quincy Morgan
5471b909e2 Added mechanism for displaying fields conditionally based on tags 2018-12-09 20:11:31 -08:00
Bryan Housel
2c0e975955 Add basin=* Type and intermittent fields to Basin preset
(closes #5497)
2018-12-09 23:11:14 -05:00
Bryan Housel
905f362317 Upgrade to maki v6.0.0
(closes #5559)
2018-12-09 22:43:42 -05:00
Bryan Housel
05c24c95df Add an icon for grit bin 2018-12-09 21:32:01 -05:00
Quincy Morgan
4285f2f5c0 Added "moreFields" property to the field schema
The "Add field" dropdown can now be used to add preset-specific fields in addition to universal fields
2018-12-09 13:51:57 -08:00