CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-03 09:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,014 Commits 2 Branches 0 Tags
3fe6c0dbe7cb019dbb4e5f0d2b9ecc6a31d62fd4
Commit Graph

2452 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
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
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
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
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
d0343c9fa7 Reintroduce some error localization, fix some nagging parse issues 2019-01-03 18:16:28 -05:00
Bryan Housel
35f8078f98 Reduce number of marker colors, increase contrast, tweak language 2019-01-03 15:30:36 -05:00
Bryan Housel
69ce5ee964 Remove user details and auth and adjust button texts for commenting 
The user details and auth are not needed
because KeepRight accepts only anonymous updating
 2019-01-03 00:07:55 -05:00
Bryan Housel
ee92758801 KeepRight only allows one anonymous comment per issue - simplify 2019-01-02 16:15:21 -05:00
Bryan Housel
9557c0204a Relax some more regex for tag parsing, (to support 'key=*') 
Also implement parsing error 231 - layer conflict
 2019-01-02 13:39:21 -05:00
Bryan Housel
2ec02f369f Simplify regex matching - goal is to have fewer, simpler rules 2019-01-02 11:46:13 -05:00