Commit Graph

287 Commits

Author SHA1 Message Date
Bryan Housel c69fbf3e3d In copy/paste, use the graph that entities originally came from
(fixes #2557)
2015-03-18 10:08:36 -04:00
Bryan Housel 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution
Merge Conflict Resolution
2015-03-05 19:49:15 -05:00
Bryan Housel 15bc08795d Don't save history to localstorage in save mode
(to avoid saving remote merges / conflict resolutions)
2015-02-25 23:35:06 -05:00
Bryan Housel 5561ebdb14 version 2015-02-12 06:30:23 -05:00
Bryan Housel 5bff37f11b 1.6.3 2015-02-09 22:24:20 -05:00
samanpwbb d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -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 b9ac4b95d1 Connection.loadFromURL was swallowing all the errors instead of passing them along 2014-12-17 21:39:48 -05:00
Bryan Housel 4088f2e70a properly load changed entities into altgraph and produce diffs. 2014-12-05 11:15:45 -05:00
Bryan Housel 1c3d198b96 add force option for rebase to overwrite existing entities
related: openstreetmap/iD#2467
2014-12-04 19:50:32 -05:00
Bryan Housel 5ca46fbbfb support loading entities into alternate graph.. 2014-11-30 00:55:55 -05:00
Bryan Housel 3974bcf41b Move editable() to be with the other map things 2014-11-19 00:17:50 -05:00
Sajjad Anwar 17fb2f64e5 Configurable minimum editable zoom 2014-11-11 14:37:11 -08:00
John Firebaugh 916a901b8f Show all features as auto-hidden when map is not editable 2014-11-11 14:16:16 -08:00
Bryan Housel 2024e2333d Exit select mode if selected DOM elements have disappeared 2014-11-10 23:23:28 -05:00
Bryan Housel af3c307b17 cache invalidation and naming things 2014-11-10 22:47:07 -05:00
Bryan Housel 43f1cdd3eb decoupled graph from context for better testing
fixed feature matching tests for vertices and relations
2014-10-28 21:37:04 -04:00
Bryan Housel dcc9812986 prevent most operations on things connected to hidden features.. 2014-10-28 21:37:02 -04:00
Bryan Housel 8fd177935d Feature filtering (in progress)
(rebased to master post-Mapillary merge)
2014-10-28 21:37:00 -04:00
Sajjad Anwar dab742a501 Make taginfo configurable and default to disabling taginfo related features 2014-10-24 16:26:37 -07:00
Sajjad Anwar dffeedffc9 Moved area-keys to data, and process it during runtime 2014-10-23 15:52:29 -07:00
John Firebaugh dd0e08b244 Write presets and imagery to standalone files 2014-10-23 15:52:29 -07:00
John Firebaugh edd4f37f52 1.6.1 2014-10-23 15:25:20 -07:00
John Firebaugh 4a51f6769b 1.6.0 2014-10-06 14:55:05 -07:00
John Firebaugh 0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -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
John Firebaugh cbac33ca9a 1.5.4 2014-07-29 11:10:34 -07:00
John Firebaugh feb642989e 1.5.3 2014-07-25 10:03:25 -07:00
John Firebaugh 85656a40cc 1.5.2 2014-07-15 16:50:41 -07:00
John Firebaugh 098a1ac5a7 1.5.1 2014-07-10 10:07:12 -07:00
Aaron Lidman 1c3fcad2f4 1.5.0 2014-07-08 18:32:42 -04:00
John Firebaugh 3e138bf16b 1.4.0 2014-05-29 16:09:54 -07:00
John Firebaugh 48dc768bbb Merge branch 'turn-restrictions' 2014-05-21 14:22:22 -07:00
John Firebaugh 4751c50a2e 1.3.10 2014-05-21 14:14:31 -07:00
John Firebaugh 90bc8dd70a Extract iD.geo.RawMercator 2014-05-18 16:02:46 -07:00
John Firebaugh daa1980aac 1.3.9 2014-04-09 15:02:35 -04:00
John Firebaugh c9d256c9c7 1.3.8 2014-03-28 11:56:18 -07:00
John Firebaugh 33242db40c 1.3.7 2014-02-25 16:01:56 -08:00
John Firebaugh 6c82b1beda 1.3.6 2014-02-05 10:07:52 -08:00
John Firebaugh 949280b736 1.3.5 2014-01-08 17:59:26 -08:00
John Firebaugh ab8a4ffd7b Update GitHub links 2014-01-08 16:14:28 -08:00
John Firebaugh 235b1e3ad7 1.3.4 2013-11-26 19:24:06 -08:00
John Firebaugh 6f4413f3a7 1.3.3 2013-11-22 16:47:58 -08:00
John Firebaugh 3856389a5c 1.3.2 2013-11-14 18:04:55 -08:00
John Firebaugh d9627139d9 1.3.1 2013-10-26 16:54:03 -07:00
John Firebaugh 1e78ee5c87 Stricter jshint 2013-10-24 16:08:48 -07:00
John Firebaugh 8323c948a7 jshint fixes 2013-10-24 15:33:52 -07:00
John Firebaugh f15d6a0e6f 1.3.0 2013-10-24 09:05:40 -07:00
John Firebaugh f9eaed7fb9 Add clipping back 2013-10-21 16:04:59 -07:00