Commit Graph

180 Commits

Author SHA1 Message Date
Bryan Housel
8ce6b9e185 Merge branch 'transitioned-actions' 2017-01-04 17:26:22 -05:00
Bryan Housel
c2713c3a3f For node-way merge, preserve original node if possible
(closes #3683)
2016-12-31 02:01:13 -05:00
Bryan Housel
ef96fde38a Add tests for transitioned orthogonalize action 2016-12-23 16:37:17 -05:00
Bryan Housel
5dde5aeded Add tests for transitioned circularize action 2016-12-23 16:14:49 -05:00
Bryan Housel
f9c09c0648 Add tests for transitioned reflect action 2016-12-23 15:05:51 -05:00
Bryan Housel
723f0ca43a Add tests for transitioned straighten action 2016-12-23 14:58:18 -05:00
Bryan Housel
37534aed0e More cleanup of operations and post-paste behavior
* Support move, rotate, reflect, delete post paste on multiselection
* Improve text and error msgs for singular vs multi selections
* Move `disabled` checks from actions to operations
* Reproject center of rotation (closes #3667)
* Cleanup tests
2016-12-21 23:58:13 -05:00
Bryan Housel
2267035dfb Support both reflect long axis and reflect short axis operations 2016-12-16 13:59:33 -05:00
Bryan Housel
5a6045fd3d Merge branch 'master' into Psigio-3375 2016-12-14 11:30:53 -05:00
Bryan Housel
9b7d79a3fe Use live bound object for presets object, change context.presets() getter 2016-11-14 15:44:02 -05:00
Bryan Housel
f800e5afbc Remove unnecessary window parameter to Context 2016-11-10 15:19:03 -05:00
Jon D
73f3069c59 Rename for consistency, add logic to prevent flip if all of object not visible and if linked to hidden. Label does not render for message when not enabled 2016-11-06 11:15:15 +00:00
Jon D
23990214be Update to only flip around the vertical axis. Start renaming to 'reflect' 2016-11-06 10:48:48 +00:00
Jon D
d8f2ce3ed2 More tests 2016-11-05 20:54:43 +00:00
Jon D
c1edd0f3f9 Remove unused projection parameter 2016-11-05 20:39:43 +00:00
Jon D
1eaa284afe More tests, add uniq operator 2016-11-05 20:36:34 +00:00
Jon D
05421e1c25 Start adding tests 2016-11-05 20:20:27 +00:00
Bryan Housel
b3a86329de Use new name iD.actionReverse 2016-10-31 16:17:33 -04:00
Bryan Housel
b054eb31e9 Merge branch '3076' of https://github.com/Psigio/iD into Psigio-3076 2016-10-31 16:06:32 -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
Tom MacWright
9c902dbf71 geoCentroid -> polygonCentroid 2016-09-06 18:13:50 -04:00
Tom MacWright
a436bada3b Circularize expects rawmercator 2016-09-03 20:10:38 -04:00
Tom MacWright
0236389611 Fix Circularize logic 2016-09-03 19:33:19 -04:00
Jon D
95ac00ffbf Add tests for left/right reversal. 2016-08-25 06:54:54 +01:00
Jon D
3c57f7147f Add tests for reverse way-node behaviour. No implementation yet. 2016-08-24 23:59:15 +01:00
Tom MacWright
cdb533fa84 Begin d3 v4 update 2016-08-21 15:19:27 -04:00
Bryan Housel
7ca6d06254 Replace iD global with iD.Context() module (#3254) 2016-07-19 10:15:32 -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
9fd96297c8 Return 'too_bendy' for ways with coincident start/end nodes
(closes #2792)
2016-05-01 15:28:05 -04:00
John Firebaugh
a85361545d Preserve connectivity when pasting
Fixes #2584
2016-02-29 12:09:14 -05:00
John Firebaugh
8a3314e5d3 Disallow disconnecting that would damage relations
Fixes #1714
2016-02-07 20:27:39 -08:00
Bryan Housel
ef2b4271b7 Merge pull request #2809 from openstreetmap/conflicting-tags
Disable joining ways with conflicting tags
2015-10-20 23:06:35 -04:00
Bryan Housel
0aa899a580 Fix turn restrictions involving circular ways (closes #2807) 2015-10-20 22:52:39 -04:00
John Firebaugh
ecb9398d5c Disable joining ways with conflicting tags 2015-10-18 13:42:14 -07:00
John Firebaugh
0517f8e2b3 When reversing tags for joins, include "oneway" 2015-10-18 13:29:16 -07:00
Bryan Housel
7adb0ddbfb Smarter revert of new entities, more tests
re: #2611, #537
2015-04-29 22:47:07 -04:00
Bryan Housel
ca02cf4b96 Graph#revert accept id instead of entity ref
trivial test cases (revert across create/update/delete) all pass
2015-04-28 11:22:46 -04:00
Bryan Housel
c10b83f28f iD.actions.Revert (see #537) 2015-04-26 01:08:31 -04:00
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
c503b9f96c fill remoteGraph with loadMultiple, finally do proper undeletion 2015-03-03 23:43:37 -05:00
Bryan Housel
56449bc589 Pend some failing tests
They should work but they don't.  No idea why.  PhantomJS issue?
2015-03-03 21:06:28 -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
John Firebaugh
9aab74c187 Test; simplify 2015-02-12 10:24:40 -08:00