4274 Commits

Author SHA1 Message Date
Yuri Astrakhan 2df519567d updated wiki link text 2019-01-16 14:09:22 -05:00
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 1bfb9ac0c0 Updated almost junction issue message and tooltip to be better aligned with other issues
Added a quick fix for setting the almost junction node as noexit
2019-01-16 10:02:05 -05:00
Quincy Morgan c1049b620b Merge branch 'master' into validation 2019-01-16 08:57:21 -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
Yuri Astrakhan 1127a34f94 Add wiki links from tag description
This feature requires P31 property to be present
in the data item. For an example, see
https://wiki.openstreetmap.org/wiki/Item:Q104#P31

Once the bot populates them in the data items,
it will automatically work for all existing keys/tags.
2019-01-15 20:07: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
Quincy Morgan b6805a750e Merge branch 'master' into validation 2019-01-14 16:28:13 -05:00
Bryan Housel 18ea434d02 Update water area presets to use natural=water + water=*
(closes #5591)
2019-01-14 13:09:46 -05:00
Quincy Morgan 21286467fa Merge branch 'master' into validation 2019-01-14 12:04:00 -05:00
Bryan Housel bf79a714f1 "Forest" -> "Managed Forest"
(closes #5709)
2019-01-14 11:42:32 -05:00
Bryan Housel 67ef2bce1c Simplify and fix a few typos 2019-01-14 11:15:56 -05:00
Bryan Housel fd23d13563 Distinguish between "This highway" and "highway" forms of error parts.
(closes #5703)
2019-01-14 10:59:45 -05:00
Quincy Morgan 11b2102761 Merge branch 'master' into validation
# Conflicts:
#	data/core.yaml
#	dist/locales/en.json
#	modules/ui/commit_warnings.js
#	modules/ui/entity_editor.js
#	modules/util/index.js
#	modules/util/util.js
#	modules/validations/index.js
#	modules/validations/many_deletions.js
#	modules/validations/missing_tag.js
2019-01-14 10:13:56 -05:00
Bryan Housel 1f69661b91 Add a preset "RV Dealership" for shop=caravan 2019-01-11 18:02:17 -05:00
Bryan Housel ae8dffa43c Improve URL error messages 411, 412, 413 2019-01-10 21:35:13 -05:00
Bryan Housel 7f321abbaf Add links to the main error object in KeepRight error messages
re: https://github.com/openstreetmap/iD/issues/5679#issuecomment-452281850
2019-01-10 17:38:09 -05:00
Bryan Housel 9c190e83e9 Add quickLinks to preset editor, zoom to selected feature 2019-01-09 21:56:08 -05:00
Xiaoming Gao ecacab3ffe add validation for almost junction
but avoid connect when the edge goes in parallel to the other road.
also added tests for the validation.
2019-01-08 15:44:55 -05:00
Bryan Housel 5f20218f1f Add validation warning for generic names
(closes #5590)
2019-01-08 02:15:28 -05:00
Bryan Housel d9015baa47 Improve links in KeepRight error messages
(re: #5679)

Also move the localizeable string dictionary to data/keepRight.json
2019-01-07 16:10:44 -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 4ed2858cc5 Explicitly include '?' as a fallback key for keyboard shortcuts
(closes #5675)

This allows for a localized version of the key,
but iD will still respond to the '?'
2019-01-07 11:39:12 -05:00
Bryan Housel 826f66a91b Unique values for key codes moved to utilKeybinding, uiShortcuts
This lets us supply lists of keys which might contain duplicates, but will be
made unique.  For example: [t('sidebar.key'), '`', '²']
'sidebar.key' may be one of the other choices, but will be deduplicated.
2019-01-07 11:12:24 -05:00
Bryan Housel da4cb156a0 Fix missing parenthesis in error string 380 2019-01-05 01:15:01 -05:00
Bryan Housel 7986fcbfbf Merge branch 'keep-right_QA' 2019-01-04 21:37:19 -05:00
Bryan Housel 0582faff1d Convert KeepRight error 73 to regex
(re: https://github.com/openstreetmap/iD/pull/5201#discussion_r245349395 )
2019-01-04 20:27:22 -05:00