Commit Graph

344 Commits

Author SHA1 Message Date
samanpwbb d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -05:00
samanpwbb 78e4271071 finish basic layout/style pass 2015-02-06 19:07:57 -05:00
Bryan Housel 3fc99e1df5 Allow undeletions 2015-01-13 16:28:06 -05:00
Bryan Housel a3459714b8 Styling for conflict resolution buttons 2015-01-12 22:29:59 -05:00
Bryan Housel fb0d17e713 WIP: Add choices ui for resolving conflicts 2015-01-11 23:13:31 -05:00
Bryan Housel c420650ac8 "Try Again" and "Download Changeset" buttons 2015-01-10 22:16:07 -05:00
Bryan Housel 95c92e9a59 WIP: conflict save dialog
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
Bryan Housel d6b0e0a8bb WIP: Differentiate between errors and conflicts.
This will allow the conflicts dialog to have different
explanation text, buttons, etc..
2015-01-08 22:59:08 -05:00
Bryan Housel ed4929273d Return entities from iD.Connection via callbacks
(instead of dispatching `load` event to merge them into `history`)

This is cleaner becuase now `context` doesn't need to keep an
`altGraph` state used only for Conflict Resolution.

The conflict resolution code calls the `iD.Connection` methods directly,
and other places in the code call `loadEntity` and `loadTiles` wrappers
that merge the entities into the main history.
2015-01-08 14:44:58 -05:00
Bryan Housel 1603b638f6 Add Copy/Paste behaviors, context copybuffer 2015-01-07 10:41:05 -05:00
Bryan Housel d527c46108 Display conflict details on error confirmation box 2014-12-29 22:49:49 -05:00
Bryan Housel de6d24f41a Don't exit mode when selected elements are gone until after a draw pass
(fixes #2476)
2014-12-15 16:08:01 -05:00
Bryan Housel a3fc0d62e5 free radialMenu in exit (fixes #2477) 2014-12-15 10:10:52 -05:00
Bryan Housel c74629ede8 handle relation selections, cleanup code,
closes #2469, #2470
2014-12-10 23:30:09 -05:00
Bryan Housel dc1221b8ba pass graphs instead of entities to iD.actions.MergeRemoteChanges
(realized that I will need to compare more stuff from the
local and remote graphs in order to merge ways/relations)
2014-12-10 00:12:32 -05:00
Bryan Housel 3e97bd7d89 stub out iD.actions.MergeRemoteChanges 2014-12-06 22:11:54 -05:00
Bryan Housel 4088f2e70a properly load changed entities into altgraph and produce diffs. 2014-12-05 11:15:45 -05:00
Bryan Housel ba919b8168 Conflict Resolution WIP: check server versions of modified nodes before sending changeset 2014-11-30 00:56:40 -05:00
Bryan Housel ebaaa4ba5a Initialize radialMenu earlier
This prevents it from being undefined when exiting back to browse mode:
  in selectElements() (re 2024e233 crash if element id passed in url hash)
  in update() (possible re #2151?)
2014-11-19 00:18:39 -05:00
Bryan Housel 2024e2333d Exit select mode if selected DOM elements have disappeared 2014-11-10 23:23:28 -05:00
Bryan Housel 2f6004fcfa performance tuning work-in-progress
* store entity's matched features in a graph transient
* replace fn calls to get commonly used _keys and _hidden arrays
* replace lodash calls with faster for loops (in some places)
* always pass graph/resolver as a param
2014-11-05 00:27:14 -05:00
Bryan Housel dcc9812986 prevent most operations on things connected to hidden features.. 2014-10-28 21:37:02 -04:00
Jakub Wieczorek dfa442903d Improve the error message on saving when offline (fixes #2373) 2014-10-20 17:14:28 -07:00
John Firebaugh 0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00
samanpwbb 3c9ec76b33 add missing semicolons 2014-09-16 15:16:26 -04:00
samanpwbb e721e93a31 cleanup mapillary UI 2014-09-16 13:49:13 -04:00
Tom MacWright 88bb6967d9 Style and usability simplifications 2014-09-11 14:14:57 -07:00
Peter Neubauer 29dde3f217 Implement Mapillary layer in iD
- adding a temp wikipedia icon from http://upload.wikimedia.org/wikipedia/commons/4/45/Right-facing-Arrow-icon.jpg

Making the click update and rotate an image marker on the map with comapss direction. Needs to be centered etc.

now properly enabling/disabling the different Mapillary layers upon activation/deactivation

Upgrade to faster Mapillary API

better arrow icon, refactoring to have all single-image operations in the image-layer

dist build

adding mapillary translation

adjusting image link

trying to adjust the image link for github deploy

better layout

removing font-awesome, not needed.

https for calls

consistent quotes

taking care of more translation, fix case of no images found on Mapillary

more english translations

- scoping image calls to selection.
- .inspector-wrap and .panewrap are hard to scope, since they are outside the selection, same for the #mapillary-inspector.

-scoping calls in sequences layer

adding translation

fixing jslint errors

more jshint errors

adding mapillary to tests

trying to lay out single markers, please help with the geo translation, @jfirebaugh

- adding the image layer to the active iD SVG instead of background
- add a new mode for selecting Mapillary images
- first stab of adding the image pane in the sidebar itself in order to contain the selections (needs to be layouted)

cleaning

trying to mark and keep selected image between mouseovers

refactoring to contain mapillary into the iamge mode

refactoring to contain mapillary into the iamge mode

adding to test html

cleaning up

handling unset selected image

cleanup

better sidebar

moving image into the lower right

Minor visual adjustment mapillaryImage

better no_image text and toggling of selected image

handling of text disappearing

intendation

fixing test errors

making sequences be below images

open Mapillary links in new tabs

better arrows and selectability on arrows as a workaround for real navigation in panos

more contrast for the selected image

adjusting image style

- adjusting style, removing sequence lines
- adding photos as a mode with shortcut 'm'

- fix test errors

moving switch back to right sidebar, keeping keyboard shortcut.

cleanup

file rename to avoid GIT mess with casing.

- better scoping
- removed unused hover function

- making the checkbox follow mode changes

removing unused icon

handling automatic mode exit
2014-09-11 14:14:57 -07:00
Bryan Housel 52903c509d iD.behavior.Hash handles selected id parameter
(this is better than having `iD.modes.Select` mess with `location.hash`)
2014-06-30 00:33:19 -04:00
Bryan Housel a9d58fdf74 reenter browse mode in editOff when zoom < 16 (#2263) 2014-06-27 17:55:13 -04:00
Bryan Housel 839b08aff7 Browse mode does not use '1' hotkey 2014-06-27 15:44:19 -04:00
John Firebaugh 0ac200ec38 IE compatibility 2013-10-25 15:31:40 -07:00
John Firebaugh 1e78ee5c87 Stricter jshint 2013-10-24 16:08:48 -07:00
Aaron Lidman b74ba194f2 Added ability to zoom to changeset list items 2013-10-16 12:43:25 -04:00
Aaron Lidman ab1b6a508a Multiselection list UI 2013-10-15 18:30:30 -04:00
John Firebaugh 7e94473e23 Add additional check to prevent snapping to area fills (fixes #1887) 2013-10-14 15:52:32 -04:00
John Firebaugh ecfe8ce943 Adjust the timing of localStorage saves
If localStorage writes were free, we'd want to just save
on every history change. Second best is to debounce the
write.

Writing on mode change is problematic; it sometimes happens
when not desired and sometimes doesn't happen when desired.

Fixes #1857.
2013-09-30 14:45:02 -07:00
John Firebaugh 75b6ec746b Clean up 2013-09-29 07:55:59 -07:00
John Firebaugh 4728622d87 Don't auto-save intro tutorial edits
Fixes #1745
Fixes #1795
2013-09-25 15:32:56 -07:00
John Firebaugh a32ce33238 Add Way#affix 2013-08-30 13:59:29 -07:00
John Firebaugh 1a166ec9b7 Suppress menu in more places 2013-08-29 14:38:42 -07:00
John Firebaugh 2197fbc25b Stop nudge when exiting move mode (fixes #1766) 2013-08-29 14:34:13 -07:00
John Firebaugh 8a215cac81 Add "Continue" operation 2013-08-28 09:30:28 -07:00
John Firebaugh 34fdc8de42 Save history more frequently (#1345) 2013-08-14 16:50:10 -07:00
John Firebaugh 0844223492 Null-check document.activeElement 2013-08-13 16:54:30 -07:00
John Firebaugh 18829ee482 Fix radial menu tooltip positioning 2013-08-07 11:44:09 -07:00
John Firebaugh c3ec3569b5 Leave save mode when displaying success message 2013-07-25 13:53:15 -07:00
John Firebaugh 5f02f348de Include GPX and overlay layers in imagery_used
Fixes #1463
2013-07-25 11:51:55 -07:00
John Firebaugh 48bd8264f7 Disable toolbar during save (fixes #1563) 2013-07-22 12:12:00 -07:00
John Firebaugh bba761d8ea size -> dimensions
D3 3.2 adds selection.size, where size means "number
of selected elements".
2013-06-20 13:05:20 -07:00