Commit Graph

12707 Commits

Author SHA1 Message Date
Quincy Morgan
4f82463db4 Wrap long preset button labels 2020-02-11 15:11:58 -08:00
Bryan Housel
3608659d21 Restore field inheritance 2020-02-10 16:22:13 -05:00
Quincy Morgan
7364cb38fe Add "Cycle & Foot Crossing" preset (close #7321) 2020-02-10 13:04:46 -05:00
Bryan Housel
0357c2b80c Rework presets.js file - WIP to fix resolving field inheritance 2020-02-07 14:17:19 -05:00
Quincy Morgan
2003f7804b Update to temaki 3.16.0 (re: #7068) 2020-02-07 13:46:06 -05:00
Bryan Housel
2149692bee Make sure the addablePresetIDs can be reset back to null too 2020-02-07 12:55:16 -05:00
Bryan Housel
1155498766 Restore the addablePresetID feature 2020-02-07 12:06:59 -05:00
Bryan Housel
a9a1f945f8 Move the qa_data external
- this means that QAItem now asks the service for the icon rather than knowing it directly
2020-02-07 10:06:47 -05:00
Bryan Housel
4c5e7db2dd Move the iD.data export from data/index.js to coreData
coreData now owns all the data, and data/index.js should eventually go away
(re: #4994)
2020-02-07 09:27:23 -05:00
Bryan Housel
fe00a40e9a Move the keepRight data extrnal 2020-02-07 09:16:34 -05:00
SilentSpike
f8a4a0b3ad Use d3_json Promise directly for Osmose requests 2020-02-07 11:29:48 +00:00
SilentSpike
8bb2dc7fa6 Return Promise for Osmose string requests 2020-02-07 11:21:33 +00:00
SilentSpike
7d76e0ac5c Fix Osmose request resolving after UI moves on
- Previously caused minor unexpected renderer behaviour by forcing elements
visible when the user had moved on (potentially interfering with
whatever they're currently doing)
2020-02-07 10:43:44 +00:00
SilentSpike
f86837d637 Fix use of double quotes 2020-02-06 23:12:18 +00:00
SilentSpike
51efd5b714 Update and standardise QA implementations
- ES6ify (now using class syntax to define QAItem objects)
- Fix bug with KeepRight marker rendering not updating properly
- Use `qa-` prefix for the UI element classes to differentiate from iD
validation error related UI element classes
- Move away from "error" where possible in source
- Move away from snake_case naming where possible

Note that some function/method names have been untouched to make life
easier for v3 development. Have added note comments where appropriate.
2020-02-06 23:07:50 +00:00
Bryan Housel
9faf8c0fe5 Test that fallback presets are there before data is loaded
Also, we don't actually need a vertex preset anymore, it was removed a while ago
2020-02-06 17:04:11 -05:00
Bryan Housel
2edf81605c Remove fallback presets from the test data
presetIndex has them already
2020-02-06 16:26:31 -05:00
Bryan Housel
3f1f85a1e9 Restore some odd but necessary workarounds to the presetCollection test 2020-02-06 16:10:55 -05:00
Bryan Housel
12e3b7df6d Setup fake data so that coreUploader doesn't fire off requests 2020-02-06 14:06:40 -05:00
Bryan Housel
ed19ce5bb1 When testing, pick modern or legacy build depending on which browser
This also lets us remove the special phantom.html tests
2020-02-06 13:05:18 -05:00
Bryan Housel
dc168c401e npm run build:stats 2020-02-06 11:33:02 -05:00
Bryan Housel
de0ac9d451 Upgrade to name-suggestion-index v4.0.0
(closes #7336)

- json data files are distributed both regular and minified
- json data is no longer exported by index.mjs
2020-02-06 11:28:02 -05:00
Bryan Housel
0ffc7ca19a Merge branch '7313' of https://github.com/animesh-007/iD into animesh-007-7313 2020-02-06 11:17:03 -05:00
animesh-007
7d4c513446 removed facility.json 2020-02-06 21:30:04 +05:30
animesh-007
76033a77a2 changed file name 2020-02-06 13:42:13 +05:30
Bryan Housel
13ead25654 Merge branch 'external_presets' into 2.x
(re: #4994)
2020-02-05 21:32:51 -05:00
Bryan Housel
d68b6090cf Remove extra level of nesting in presets.json, fields.json 2020-02-05 21:22:32 -05:00
Bryan Housel
3c6ba9703a presetIndex.build -> presetIndex.merge, and make it merge data 2020-02-05 21:13:15 -05:00
Quincy Morgan
1720f7cb93 Organize some code in coreUploader (re: #7333)
Fix lint error
2020-02-05 17:53:28 -05:00
Quincy Morgan
ea0d666b96 Merge pull request #7333 from openstreetmap/uploader
Add upload controller
2020-02-05 16:43:54 -05:00
Quincy Morgan
237a382c51 Merge branch '2.x' into uploader
# Conflicts:
#	modules/modes/save.js
2020-02-05 16:23:09 -05:00
Quincy Morgan
3b19cc32fd Don't grey out the map during conflict resolution (close #6547) 2020-02-05 16:16:50 -05:00
Quincy Morgan
0e14241fcf Move some upload code from modeSave to new coreUploader object (re: #7247) 2020-02-05 15:28:23 -05:00
Bryan Housel
426565d6de Include dist/data/* in release instructions 2020-02-05 13:52:12 -05:00
Bryan Housel
c4f0700309 Fix data urls 2020-02-05 13:27:25 -05:00
Bryan Housel
3fec4a260e npm run build:stats 2020-02-05 12:27:40 -05:00
Bryan Housel
147af19626 Seed presetIndex collection with fallback presets
- amazingly, this passes all tests, but iD ends up pretty non-functional
2020-02-05 12:21:33 -05:00
animesh-007
9ab525f198 added new preset 2020-02-05 21:15:43 +05:30
Bryan Housel
e3e7cd3003 Memoize presetCollection.item (it's an Array.find)
Also add tests for `matchAllGeometry`
2020-02-05 10:32:20 -05:00
Quincy Morgan
4194194e14 Prefix file variables in operations/orthogonalize.js with underscores
Simplify multiple disabled reasons code for circularize and orthogonalize operaitons
2020-02-05 10:10:12 -05:00
Quincy Morgan
4ff634b90f Enable the circularize operation for multiple selected features (close #7326) 2020-02-05 09:57:33 -05:00
Bryan Housel
0fe766d9a4 WIP on external presets
- preset data is no longer bundled into iD.js
- some code pathways commented out re: external presets
- many changes so that tests can run without presets at start, or async
- still need to make sure fallbacks are always there (point, line, area, etc)
2020-02-05 09:38:26 -05:00
Quincy Morgan
f2638c0c1e Merge pull request #7290 from openstreetmap/error-button-strings
Update QA button strings
2020-02-04 17:01:42 -05:00
SilentSpike
4c843f60db Merge pull request #7095 from openstreetmap/osmose
Add Osmose Q/A layer
2020-02-04 21:47:28 +00:00
SilentSpike
03a097c847 Move Osmose translation link below details box 2020-02-04 21:44:20 +00:00
SilentSpike
3745c06d62 Hide Osmose issue description if no string 2020-02-04 21:22:44 +00:00
Quincy Morgan
870cfa2ca5 Merge branch '2.x' of https://github.com/openstreetmap/iD into 2.x 2020-02-04 16:22:32 -05:00
Quincy Morgan
9f1fc63acf Show Hours field by default on recycling containers (close #7259) 2020-02-04 16:21:58 -05:00
SilentSpike
087867d5c8 Use Promises for Osmose issue detail requests
Also ES6ify the details script
2020-02-04 21:08:02 +00:00
SilentSpike
02f088e5a9 Update some QA translation strings 2020-02-04 21:03:34 +00:00