Commit Graph

37 Commits

Author SHA1 Message Date
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
7c458513f3 Don't pass extra arguments from map to Entity initializer
fixes #2465
2014-12-02 22:14:31 -05:00
John Firebaugh
f6b7acf9ed Remove conditional that's always true
The base graph never has any ownProperty entities.
2014-02-25 10:03:48 -08:00
tyr
efd3223e0c extend history loading fix to deletions
Deleted objects need to be kept in the base of the history stack, too.

This also improves the respective unit tests.
2014-02-22 14:09:17 +01:00
tyr
fc0a15e6c4 fix duplicate objects after restoring data from localStorage
This makes sure that the originals of changed entities get merged
into the base of the stack after restoring the data from JSON.
This is necessary, because the stack will only have elements for
the current viewport after a restart and previously *modified*
objects will now be falsely detected as *created* ones.

Also removed some ineffective code.
2014-02-21 10:01:26 +01:00
John Firebaugh
089924ac38 Remove unused variable 2014-01-06 16:26:55 -08:00
John Firebaugh
4bf21cbc8a Restore deleted nodes that are discovered to have extant parents
This bug has existed since 1.0!

Fixes #2085
2014-01-06 16:23:15 -08:00
John Firebaugh
492fc88aa4 Make the Graph#rebase argument an array 2013-10-31 16:24:31 -07:00
John Firebaugh
e0e08115e5 Pass entity array to Tree#rebase 2013-10-28 16:34:08 -07:00
John Firebaugh
8323c948a7 jshint fixes 2013-10-24 15:33:52 -07:00
John Firebaugh
697faf0265 Use summary to calculate # in Save button 2013-10-23 13:36:58 -07:00
John Firebaugh
b8e88a7aaf Convert relevantChanges to a method on Difference 2013-10-23 13:36:58 -07:00
Aaron Lidman
594baa18b3 Update save commit dialog to use a feature list 2013-10-18 17:11:52 -04:00
John Firebaugh
81bc280aba More reliable method for mutexed localStorage saves
Fixes #1883
2013-10-10 14:59:48 -07:00
John Firebaugh
2efafa087b Deduplicate entities in serialized history
Fixes #1403
2013-08-14 16:49:53 -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
1db99586c4 Render only new features when a data tile is loaded 2013-05-20 12:05:31 -07:00
John Firebaugh
0ae54abdcc Extract iD.actions.DiscardTags 2013-05-13 09:26:41 -07:00
Ansis Brammanis
0435c4793c better positioned walkthrough tooltips 2013-03-28 11:58:56 -04:00
John Firebaugh
f7fb12be76 Fix #1120, inconsistent undo for line/area drawing
Gulp!
2013-03-27 16:25:10 -07:00
Ansis Brammanis
2b4e260953 walkthrough now runnable in the middle of editing
history.toJSON and .fromJSON are now split out of.
history.save and .restore.
2013-03-27 11:52:50 -04:00
Tom MacWright
7925662079 Avoid writing undefined properties in JSON localStorage 2013-03-08 14:07:02 -05:00
Tom MacWright
ba45582e3c Removing unused arguments 2013-02-27 17:30:05 -05:00
Ansis Brammanis
147fce1f49 Merge branch 'tree-intersects'
Conflicts:
	js/id/behavior/lasso.js
2013-02-15 13:40:01 -05:00
Ansis Brammanis
1050faab8f Only delete saved on hitting reset, fixes #744 2013-02-13 17:42:46 -05:00
Ansis Brammanis
b80bbc1fbe Add tree test 2013-02-13 14:40:37 -05:00
Ansis Brammanis
9a4d4ab9c5 Retry queued entities after rebase 2013-02-13 14:16:18 -05:00
Ansis Brammanis
529b570c89 Merge remote-tracking branch 'systemed/master' into tree-intersects 2013-02-13 13:31:11 -05:00
Ansis Brammanis
a21b973a41 Fix saving deletions to storage, add tests 2013-02-13 12:42:51 -05:00
Ansis Brammanis
f2d6628547 Don't break rebasing with loading 2013-02-13 11:17:29 -05:00
Ansis Brammanis
9c65e58cc1 Tree handles entities with missing children 2013-02-13 10:23:30 -05:00
Ansis Brammanis
6baf6a6dd4 Move intersection tree to iD.Tree 2013-02-12 18:18:58 -05:00
Ansis Brammanis
9bd46af6ad Tree intersect now works with changes 2013-02-12 17:22:25 -05:00
Ansis Brammanis
07eff40223 Add rtree tree to history for intersects 2013-02-12 13:17:07 -05:00
Tom MacWright
38b327fefe jshint fixes, fix global leak 2013-02-11 10:42:49 -05:00
John Firebaugh
843baa11c0 graph -> core
This matches how it's described in ARCHITECTURE.md.
2013-02-09 15:18:54 -08:00