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
20553dc977
Fix for prior commit
2019-01-15 14:56:30 -05:00
c6dd743f90
Updated social_facility and vending_machine presets to use field inheritance
2019-01-15 14:55:52 -05:00
0b295db7df
Converted buoy presets to use field inheritance
2019-01-15 14:39:36 -05:00
0e795ae31d
Updated the fast food and restaurant presets to use field inheritance
2019-01-15 14:34:37 -05:00
8f6870336f
Converted building presets to use field inheritance
2019-01-15 14:29:04 -05:00
4252c5cb36
Presets no longer inherit fields for keys that define them
2019-01-15 13:52:03 -05:00
4b2c380b18
Changed preset field inheritance to target specific presets rather than just the parent preset
2019-01-15 13:07:58 -05:00
0da15efc10
Merge branch 'master' into preset-field-inheritance
...
# Conflicts:
# data/presets/presets.json
2019-01-15 11:44:16 -05:00
d1a7400ed7
Added a field for the building:material key
2019-01-15 11:42:55 -05:00
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
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
d1c4e22337
Added documentation for preset field inheritance behavior
2019-01-15 10:23:38 -05:00
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
78853e1dc1
Added mechanism for presets to inherit their fields and moreFields values
2019-01-14 18:27:50 -05:00
18ea434d02
Update water area presets to use natural=water + water=*
...
(closes #5591 )
2019-01-14 13:09:46 -05:00
bf79a714f1
"Forest" -> "Managed Forest"
...
(closes #5709 )
2019-01-14 11:42:32 -05:00
67ef2bce1c
Simplify and fix a few typos
2019-01-14 11:15:56 -05:00
fd23d13563
Distinguish between "This highway" and "highway" forms of error parts.
...
(closes #5703 )
2019-01-14 10:59:45 -05:00
1f69661b91
Add a preset "RV Dealership" for shop=caravan
2019-01-11 18:02:17 -05:00
ae8dffa43c
Improve URL error messages 411, 412, 413
2019-01-10 21:35:13 -05:00
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
9c190e83e9
Add quickLinks to preset editor, zoom to selected feature
2019-01-09 21:56:08 -05:00
5f20218f1f
Add validation warning for generic names
...
(closes #5590 )
2019-01-08 02:15:28 -05:00
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
58665d0d2e
Embed name of religion in preset label
...
(re: #5611 )
2019-01-07 12:10:13 -05:00
f1b5c4e5b0
Wherever we show 'denomination' field, also show 'religion' field
...
(closes #5611 )
2019-01-07 12:07:15 -05:00
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
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
da4cb156a0
Fix missing parenthesis in error string 380
2019-01-05 01:15:01 -05:00
7986fcbfbf
Merge branch 'keep-right_QA'
2019-01-04 21:37:19 -05:00
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
21f1891899
Adjust pharmacy/chemist terms so they both appear on searches
...
(re: 3213)
2019-01-04 01:37:18 -05:00
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
d0343c9fa7
Reintroduce some error localization, fix some nagging parse issues
2019-01-03 18:16:28 -05:00
35f8078f98
Reduce number of marker colors, increase contrast, tweak language
2019-01-03 15:30:36 -05:00
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
ee92758801
KeepRight only allows one anonymous comment per issue - simplify
2019-01-02 16:15:21 -05:00
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
2ec02f369f
Simplify regex matching - goal is to have fewer, simpler rules
2019-01-02 11:46:13 -05:00
d54d5bfd89
Move title into keepright error header
2018-12-29 17:55:40 -05:00
192b4da9e6
Fix the strings I broke in 3785ffb15
2018-12-29 17:30:35 -05:00
495793929f
Skip wikidata field test, too time sensitive to work reliably
2018-12-27 12:06:53 -05:00
bc72c387e4
Merge pull request #5647 from nyurik/osm_wikibase
...
OSM Multilingual data directly from wiki (wikibase data items)
2018-12-26 14:48:39 -05:00
0294596fb2
Merge pull request #5653 from hikemaniac/shop-fuel
...
Added a preset for shop=fuel
2018-12-24 12:44:48 -05:00
da95d1ee5a
Added a preset for shop=fuel
2018-12-23 17:35:44 +01:00
9502c041ff
Merge pull request #5651 from hikemaniac/more-shops
...
Added more presets for shops
2018-12-22 14:52:53 -05:00
6d327b3eff
Upgrade FontAwesome icons, add more icons for winter sports
2018-12-22 13:02:46 -05:00
e06ba3d1d7
Move racetracks to presets/leisure/track - add horse_racing.json
...
(closes #5620 )
2018-12-22 12:28:45 -05:00
3785ffb154
Simplify translation strings
2018-12-22 12:12:28 -05:00
Bryan Housel