Commit Graph

55 Commits

Author SHA1 Message Date
Quincy Morgan
21a49bbec8 Initial support for D3 v6.2.0 2020-10-06 15:08:39 -04:00
Quincy Morgan
7b09b6c0dc Enable low-zoom display of focused feature when resolving conflicts (close #7330) 2020-05-18 17:14:50 -04:00
Quincy Morgan
a1af118f0e Ensure locales and presets are loaded before the UI loads (close #7406)
Consolidate localization behavior and init to a coreLocalizer function and singleton
Explicitly support `en-US` locale
Rename coreData to coreFileFetcher and export a singleton rather than using a property of coreContext
Add `apiConnections` property of coreContext to simplify adding a source switcher
Replace some init functions with re-callable, promise-supporting `ensureLoaded` functions
Make coreContext itself load the UI if a container has been specified at init time
Fix code tests
2020-03-31 12:23:31 -07:00
Quincy Morgan
f2a687f68b Convert container from id to class 2020-03-20 15:08:56 -07:00
Quincy Morgan
152d89fa22 Convert some element ids to classes to avoid collisions when embedding iD 2020-03-20 13:10:39 -07:00
Quincy Morgan
5e8d84ec33 Fix eslint warning 2020-03-02 15:58:30 -08:00
Quincy Morgan
abf536aa9b Make commit changes its own collapsible section 2020-02-24 14:03:06 -08:00
Quincy Morgan
1720f7cb93 Organize some code in coreUploader (re: #7333)
Fix lint error
2020-02-05 17:53:28 -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
b8a8927d33 Start preparing uiSuccess early when saving changeset
This gives us some time to fetch and prepare the community index
2020-01-29 15:23:37 -05:00
Bryan Housel
567eeac587 Make several data external instead of bundled:
Also dist/data/* contains minified files now

These are now external and will fetch as needed:
-export { dataAddressFormats } from './address-formats.json';
-export { dataDeprecated } from './deprecated.json';
-export { dataDiscarded } from './discarded.json';
-export { dataLanguages } from './languages.json';
-export { dataPhoneFormats } from './phone-formats.json';
-export { dataShortcuts } from './shortcuts.json';
-export { dataTerritoryLanguages } from './territory-languages.json';
2020-01-28 22:21:31 -05:00
Bryan Housel
8f9dc7afb4 Improve localization of "Thank you for editing the map around.."
(closes #6269)
2019-05-04 13:24:46 -04:00
Quincy Morgan
d01bb78707 Reduce circular dependencies caused by importing from indexes, the location of the validation models, and the location of areaKeys (close #6237) 2019-04-24 13:45:59 -07:00
Bryan Housel
d5abe468b9 Remove rest of the lodash iterators: map, reduce, forEach
(re: #6087)
2019-03-29 15:14:21 -04:00
Bryan Housel
5e1ff74199 Replace lodash difference, intersects, union
(re: 6087)
2019-03-27 01:22:11 -04:00
Bryan Housel
1ce4f0ad6a Remove lodash without
(re: #6087)
2019-03-25 21:56:54 -04:00
Bryan Housel
76e0d13729 Remove lodash every and filter
(re: #6087)
2019-03-23 01:22:56 -04:00
Bryan Housel
0e90167513 Remove lodash clone
(re: #6087)
2019-03-22 23:18:25 -04:00
Bryan Housel
cbcafaee15 Make sure sidebar is expanded before entering walkthrough or saving
(closes #5574)
2018-12-08 10:03:43 -05:00
Bryan Housel
152022aec4 Use context.keybinding for keybindings that don't change
(closes #5487)
2018-11-13 20:57:21 -05:00
Bryan Housel
bb30cbf555 Move lib/d3.keybinding.js -> util/keybinding.js
almost none of the original d3 "plugin" code remains
2018-11-13 13:42:09 -05:00
Bryan Housel
de718002b9 Replace suburb with town on "thank you for editing near"
(closes #4989)
2018-05-13 16:30:12 -04:00
Bryan Housel
2ed2d79aef Thank the user for their contribution 2018-04-04 23:49:42 -04:00
Bryan Housel
300616819d Don't use the same keybind id for modeSave (esc dialog) and uiSave (Ctrl+S)
(closes #4728)
2018-01-24 13:46:01 -05:00
Bryan Housel
590487d237 Fix escape keybind when conflicts ui is active
(re: 4351)
2018-01-06 23:16:48 -05:00
Bryan Housel
a22cfe64b8 Avoid loading circular relations by storing ids in _loaded object
(re: #3056)
2018-01-06 00:30:26 -05:00
Bryan Housel
ac86869b4a Add conflict checking progress, guard code for user authentication 2018-01-05 18:11:49 -05:00
Bryan Housel
a63c4a72fe Improvements to save flow
- Attempt fast save first, only perform conflict resolution if necessary (re: #3056)
- Block reentry of save, and dont keep focus on save button (closes #4641)
- Refactor modeSave() for code clarity (avoid shared state in closure variables)
2018-01-05 15:11:44 -05:00
Bryan Housel
8914d1ce36 Variable cleanups and formatting 2018-01-04 16:13:13 -05:00
Bryan Housel
35a9f77a63 Preserve selected entity when cancelling save mode
(closes #4407)
2017-11-12 12:34:04 -05:00
Bryan Housel
914ef0236a Convert lodah-es and d3 to named imports for modes 2017-09-24 23:25:49 -04:00
Bryan Housel
a43b1e3c0a WIP: fix download changes on save conflicts screen 2017-09-14 22:25:17 -04:00
Bryan Housel
8c9aae1499 Add download changes link to uiCommitChanges summary
(WIP: still need to check IE11 and fix download on conflict screen)
2017-09-14 17:35:06 -04:00
Bryan Housel
c56dc5afc3 In save mode, escape should cancel and return to browse mode
(closes #4230)
2017-08-15 14:32:16 -04:00
Bryan Housel
99a3741b0c Better isolation of services, to avoid hitting network during test runs
1. All services are disabled in testing now to prevent network accesses
2. Only services are enabled when needed to test something
3. Many changes throughout code to allow iD to run with services disabled
   (e.g. check for osm service instead of assuming context.connection() will work)
4. Actually export the services so we can disable and enable them
2017-08-09 22:04:09 -04:00
Bryan Housel
1a8cfcc8b1 Changeset refactor
(closes #2633)

* move osmChangeJXON from osm service to osmChangeset
* cleanup putChangeset for code clarity
* adjust params for callbacks (pass changeset around instead of changeset_id)
* add commit.reset() to reset changeset object after successful save
* improve checks for changeset tags (trim whitespace, etc)
2017-03-15 11:03:43 -04:00
Bryan Housel
16df2f595f Change raw tag editor to embed it on commit pane 2017-03-13 17:32:50 -04:00
Bryan Housel
014b580a44 Force inspector to recreate all of its content after a save
(closes #3844)
2017-03-03 01:37:32 -05:00
Bryan Housel
6b62f40eb6 Improve save flow
(see #3777)

* When entering Save mode, map content transitions inactive: appears grayscale
and dims slightly so colorblind users perceive a change. The sidebar controls
still let the user review their edits, or return to editing to address any
warnings.
* Adjusted the language a little bit "Save" -> "Upload" to make it clear that
an Upload needs to happen. No more 2 Save buttons.
2017-01-24 12:21:05 -05:00
Bryan Housel
3246ca176f Eagerly load user's details and changesets
(closes #3787)

Also, don't redo authentication in save.js if user is already authenticated
2017-01-22 12:43:39 -05:00
Bryan Housel
3102a4ae6a Rename all the things to include pseudonamespaces 2016-10-04 19:06:20 -04:00
Bryan Housel
a86f34b4ef Pacify eslint, get build and tests running again 2016-08-26 01:15:07 -04:00
Bryan Housel
1021f6266f Merge branch 'master' into d3-v4 2016-08-25 16:22:50 -04:00
Bryan Housel
5a045933c6 Rename confirm -> uiconfirm and import to save.js
(closes #3373)
2016-08-24 16:03:23 -04:00
Tom MacWright
cdb533fa84 Begin d3 v4 update 2016-08-21 15:19:27 -04:00
Tom MacWright
af776501d3 Require locale, second pass (#3259)
* Require locale, second pass

* Remove t global, remove t where it isn't needed
2016-07-21 16:20:13 -04:00
Tom MacWright
604d1e2719 import lodash (#3257) 2016-07-19 12:04:16 -04:00
Bryan Housel
7ca6d06254 Replace iD global with iD.Context() module (#3254) 2016-07-19 10:15:32 -04:00