CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 09:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,308 Commits 2 Branches 0 Tags
09ec7ea80229e91237fccd78da6dea2fc877008e
Commit Graph

119 Commits

Author SHA1 Message Date
Bryan Housel
7aea67fcfe Merge pull request #5745 from jguthrie100/stop_merge_overlapping_self 
Add check to stop joining ways if resulting way intersects itself
 2019-01-29 14:07:34 -05:00
Bryan Housel
0f41913b04 pacify eslint 2019-01-29 14:04:36 -05:00
SilentSpike
20d629ac9e Fix turn:lanes changing when way is reversed 2019-01-29 14:19:35 +00:00
J Guthrie
bc430e4926 Fix loop index bug 2019-01-22 14:50:13 +00:00
J Guthrie
274eaa2e47 Fix eslint issue 2019-01-22 14:39:21 +00:00
J Guthrie
6a3a0251d0 Fix bug where end nodes being on top of each other gave false positive 2019-01-22 14:29:45 +00:00
J Guthrie
631ace27d5 Add check to stop joining ways if resulting way intersects itself 
- Includes new test case
 2019-01-22 03:07:38 +00:00
Bryan Housel
84f96574d7 Add index property to cloned object, not actual member object 
(closes #5458)

This code was adding an `index` property to each member in the relation.
Although the `index` property is ignored by the code that saves to OSM,
the extra property would make the member changed when compared by
`coreDifference`.
 2018-12-12 02:07:03 -05:00
Bryan Housel
ea9e3008a5 addTags() -> setTags() / removeTags() -> unsetTags() 
This avoids overriding the `addTags` and `removeTags` objects with functions
 2018-11-21 12:59:43 -05:00
Bryan Housel
2e6799ac60 Don't reverse cardinal direction roles on relations anymore 
re: https://github.com/openstreetmap/iD/pull/2004#issuecomment-407995998

Per thread https://twitter.com/bhousel/status/1025805098063208448
JOSM has stopped doing this too
 2018-08-04 21:55:14 -04:00
Bryan Housel
a406da953d Remove actionMoveNote 
Notes aren't stored in the graph, so moving them isn't an action
 2018-07-24 14:26:25 -04:00
Thomas Hervey
e1cb25d824 merge from 'master' 2018-07-23 18:24:02 -04:00
Bryan Housel
119792fd22 Cleanups to Detach Node feature 
This commit includes a bunch of minor things:
- change keyboard shortcut to 'E' to not conflict with anything
- move `disabled` check from operation into action and simplify
- use `actionMoveNode` to place the detached node at the mouse cursor
- disable the operation if the node is connected to hidden features
- lots of code simplification
- make the icon more centered
 2018-07-23 13:36:34 -04:00
Bryan Housel
94b0affe8c Merge branch '4320' of https://github.com/Psigio/iD into Psigio-4320 2018-07-23 08:44:19 -04:00
Jon D
90bc0b8537 Update to prevent detachment of node when either a via or 
location_hint role in a turn restriction.
Update to move any other relation to new node.
 2018-07-22 19:35:29 +01:00
Thomas Hervey
baad5f0cc5 added tests for osm/note 2018-07-21 21:44:07 -04:00
Thomas Hervey
c3fe1fedd9 updated categories, added category to note service 2018-07-21 21:09:17 -04:00
Thomas Hervey
1edd9ae92f WIP: added incomplete move note action 2018-07-20 12:08:26 -04:00
Thomas Hervey
b017616993 added new note icon and completed sidebar 2018-07-18 09:38:59 -04:00
Thomas Hervey
af2b67663b added new-note button 2018-07-17 11:35:27 -04:00
Jon D
3bad09d497 Merge Work-In-Progress 4320 to 4320 2018-07-06 22:20:19 +01:00
Bryan Housel
416ae66f71 Support more direction tags for reversal in Reverse action 
(closes #5121)

This commit also refactors some of the logic to make it simpler and more efficient
(removes lodash _transform too) and updates the comment that was out of date.
 2018-07-05 14:47:56 -04:00
Bryan Housel
9f623836cd Handle tooltip disabled reasons 2018-04-25 23:32:57 -04:00
Bryan Housel
6ed20d7762 actionMergeNodes can just use actionConnect 2018-04-25 22:26:34 -04:00
Bryan Housel
2909162158 Rename merge_way_nodes to merge_nodes, update tests 2018-04-25 20:57:40 -04:00
Bryan Housel
9bf4799b56 Merge branch 'merge-way-nodes-feature' of https://github.com/ferdibiflator/iD into ferdibiflator-merge-way-nodes-feature 2018-04-25 16:19:32 -04:00
Bryan Housel
ce77538185 Allow connecting FROM nodes to TO nodes if it's a u-turn 2018-04-16 08:00:44 -04:00
Bryan Housel
b2df343f2d Allow connecting to nodes in the turn restriction from outside 2018-04-14 23:12:19 -04:00
Bryan Housel
87841fc403 Stricter checks to prevent turn restriction breakage when dragging 
(re: #4921)
 2018-04-13 22:50:51 -04:00
Bryan Housel
8fb083578f Prevent drag/connect which could damage relations 
(closes #4921)
 2018-04-12 17:32:16 -04:00
Bryan Housel
b09c712fc5 When connecting nodes, prefer to keep an existing (not new) node 
(closes #4974, closes #4674)
 2018-04-09 14:20:40 -04:00
Bryan Housel
734957f283 Handle variants of 'stop' and 'platform' when identifying PTv2 members 
(closes #4946)
 2018-03-27 21:52:52 -04:00
Bryan Housel
f8bbb995ac Properly split ways which are members of a via way turn restriction 
(closes #4861)
 2018-03-10 15:20:20 -05:00
Bryan Housel
aa1565baf8 Avoid reordering stops and platforms in PTv2 routes 
(closes #4864)
 2018-03-10 00:12:46 -05:00
Bryan Housel
4b1f8a8f61 Merge pull request #4768 from openstreetmap/advanced_intersection 
Add support for complex intersection and via way restrictions
 2018-03-01 01:46:30 -05:00
Bryan Housel
241159b547 Cleanup docs and tests for actionRestrictTurn / actionUnrestrictTurn 
- actionRestrictTurn will no longer "infer" the turn type
- restrictionType *must* be passed in - this is ok because the only code
  we use this action (restrictions.js) already has inferred the type
- this simplifies what the action actually does
- moved the tests from restrict_turn.js that were really just testing
  the restriction type inferrence over to intersection.js
  (and added a few more tests for iD.osmInferRestriction)
 2018-02-28 23:55:59 -05:00
Bryan Housel
d940200ef0 osmInferRestriction can just take a turn, instead of from/to 
This is better because it makes explicit that osmInferRestriction
needs an actual turn now (from/to with vertex, etc)
 2018-02-16 13:27:23 -05:00
Bryan Housel
0cbff57dc9 Cycle through only_ turn restriction states 
(re: #2622)
 2018-02-07 19:04:28 -05:00
Bryan Housel
6c3a02cebe Avoid lodash in hot code in coreDifference 
(closes #2743, closes #4611)
 2018-02-05 13:44:01 -05:00
Bryan Housel
dac753c4ea Speedup hot code in actionDiscardTags 
(re: #4611)
 2018-02-04 14:57:26 -05:00
Bryan Housel
c1378a141f Add support for complex intersection and via way restrictions 2018-02-02 19:58:09 -05:00
Bryan Housel
0b6183e2c5 Remove any duplicate vertex created during replaceMovedVertex 2018-01-29 01:03:03 -05:00
Bryan Housel
9b200cf514 Code cleanups, changes to replaceMovedVertex in moveAction 
Trying to eliminate the minimum 10m distance for replacing the original
junction vertex - this is a small threshold.  When _not_ replacing this
vertex, the unzorro code will wreck havok on a traffic circle.
(If there is no suitable vertex to use, it will snap to a point between
the nearest vertices, see #4146)
 2018-01-28 23:56:03 -05:00
Bryan Housel
7c918ba161 Allow Relation.replaceMember to optionally preserve duplicates 
(closes #4696)
 2018-01-18 16:52:23 -05:00
Bryan Housel
be9bbd9271 Add tests for member ordering: node, way, relation 2018-01-18 15:21:38 -05:00
Bryan Housel
8f9a46b75a Change actionAddMember to rearrange indexed members in place 
This allows it to work around issues where a relation may
not be completely downloaded
 2018-01-17 22:59:55 -05:00
Bryan Housel
be46e85ec0 Move insert way pairing code from osmJoinWays to actionAddMember 
(tests for actionAddMember now passing!)
 2018-01-16 17:41:14 -05:00
Bryan Housel
221158e918 WIP: Add insertHint to actionAddMember, actionSplit 2018-01-15 23:13:59 -05:00
Bryan Housel
03fa6e7be9 Add tryInsert option to osmJoinWays 2018-01-15 22:02:43 -05:00
Bryan Housel
075b85c81d Apply reversal actions in actionJoin 
(closes #4688)
 2018-01-14 14:49:57 -05:00