CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-15 15:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,036 Commits 2 Branches 0 Tags
4f1cb0dc467033690f5e9b8b149a4baf86582002
Commit Graph

2443 Commits

Author SHA1 Message Date
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
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
Bryan Housel
d54d5bfd89 Move title into keepright error header 2018-12-29 17:55:40 -05:00
Bryan Housel
192b4da9e6 Fix the strings I broke in 3785ffb15 2018-12-29 17:30:35 -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
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
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
3785ffb154 Simplify translation strings 2018-12-22 12:12:28 -05:00
Yuri Astrakhan
b2810105a5 Implement support for multilingual descriptions from wiki data items 
* Takes data directly from the Wikibase data items (OSM Wiki)
     https://wiki.openstreetmap.org/wiki/OpenStreetMap:Data_Items
* Understands the difference in regions - e.g. will show different
  images depending on the local settings
* Perf: Single request will get both the tag and key description
 2018-12-22 00:23:31 -05:00
Quincy Morgan
70d5529a58 Added initial implementation of quick fix for connecting crossing features (still has some bugs) 2018-12-21 17:39:20 -05:00
Quincy Morgan
d9c6bd1f39 Added specialized issue messages for the common types of way crossing issues 
Fixed several linting issues involving crossing way validations
 2018-12-21 14:45:20 -05:00
Quincy Morgan
c9350c632e Add issue fixes UI 
Add two issue fixes for untagged feature
 2018-12-21 12:31:33 -05:00
Bryan Housel
f7150004c0 Refactor things out of util with limited use, move more to service 2018-12-21 11:56:55 -05:00
Bryan Housel
4eb0e4b3a4 Remove more duplicate strings 2018-12-20 16:09:18 -05:00
Bryan Housel
6e1d6bcfda Drop legacy translation keys 2018-12-20 15:38:04 -05:00
Quincy Morgan
d58867df7c Add entity display label util function 
Condense message and tooltip text for for the untagged feature issue
Use lighter border color for error issues
 2018-12-20 14:04:15 -05:00
Quincy Morgan
d7ef2de073 Re-organizes issue messages and tooltips 2018-12-20 12:16:54 -05:00
Quincy Morgan
7416fc7ac3 Fixed typo in crossing ways issue label 2018-12-20 10:40:48 -05:00
Xiaoming Gao
a4e1012c91 add crossing_way validation 
Tests are also added and passed.

One thing to note: I had to add the tree() function to history so that I can
use the tree in the test; hope that's fine.
 2018-12-19 19:23:35 -05:00
Quincy Morgan
2207a6c3a4 Added severity tooltip to issue icon 2018-12-19 18:35:17 -05:00
Bryan Housel
2deadd5d6c Fix merge issues 2018-12-19 17:12:06 -05:00