 Bryan Housel
|
b3842d97f4
|
Remove lodash from the test suite
(closes #4378)
|
2017-10-18 14:37:39 -04:00 |
|
|
Bryan Housel
|
07fa5fcc34
|
Refactor Entity, Node, Relation, Tags, Way from core to osm
|
2016-10-11 22:41:24 -04:00 |
|
|
Bryan Housel
|
87950fd472
|
Fix lib export, flatten names in tests and docs
|
2016-10-04 21:56:09 -04:00 |
|
|
Kushan Joshi
|
4609282e04
|
Making spec/actions lint free
|
2016-06-14 16:34:52 +05:30 |
|
|
Kushan Joshi
|
6ef52256f3
|
Migrating to lodash v4
|
2016-05-17 12:37:25 +05:30 |
|
|
Bryan Housel
|
c503b9f96c
|
fill remoteGraph with loadMultiple, finally do proper undeletion
|
2015-03-03 23:43:37 -05:00 |
|
|
Bryan Housel
|
fc94e7775f
|
more tests
|
2015-03-02 22:47:49 -05:00 |
|
|
Bryan Housel
|
e3139e250e
|
improvements to iD.actions.MergeRemoteChanges
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
|
2015-03-02 13:07:24 -05:00 |
|
|
Bryan Housel
|
0730e0432b
|
keep localGraph - UI can now flip between mine/theirs
|
2015-02-20 17:01:19 -05:00 |
|
|
Bryan Housel
|
ad8c381301
|
WIP: handle conflicting local tag deletion
re: https://github.com/openstreetmap/iD/pull/2489#discussion-diff-22490581
|
2015-02-20 12:43:47 -05:00 |
|
|
Bryan Housel
|
38b50a347e
|
WIP: Fix tests, simplify mergeChildNodes
|
2015-02-17 22:10:47 -05:00 |
|
|
Bryan Housel
|
3bbf31902a
|
Add accessor to get conflict details from iD.actions.MergeRemoteChanges
|
2014-12-29 22:47:44 -05:00 |
|
|
Bryan Housel
|
0c881ef9f2
|
merge ways with non-overlapping changes to nodelists
|
2014-12-13 22:50:29 -05:00 |
|
|
Bryan Housel
|
977e29cfdb
|
Most iD.actions.MergeRemoteChanges features complete
(todo: merging ways where nodelist has not been reordered)
|
2014-12-11 23:52:53 -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
|
eff18cb257
|
add tests for iD.actions.MergeRemoteChanges
|
2014-12-09 00:59:25 -05:00 |
|
|
Bryan Housel
|
3e97bd7d89
|
stub out iD.actions.MergeRemoteChanges
|
2014-12-06 22:11:54 -05:00 |
|