Tom MacWright
72536229c7
Merge branch 'master' into presets
...
Conflicts:
test/index.html
2013-02-01 12:03:40 -05:00
John Firebaugh
bbccec75be
Convert Hash to a behavior
2013-01-31 18:28:24 -05:00
Tom MacWright
681bf7c724
Be more specific in tests about which form we are interested in
2013-01-31 15:24:45 -05:00
Tom MacWright
ecb27eaf2f
Merge branch 'master' into presets
...
Conflicts:
js/id/modes/select.js
2013-01-31 15:14:28 -05:00
John Firebaugh
402a9424c0
Make selection an array of entity IDs
...
Should have no visible effect yet.
2013-01-31 13:51:12 -05:00
Ansis Brammanis
846cf6e43d
Add difference tests
2013-01-31 13:37:54 -05:00
John Firebaugh
3605895dfa
ChangeEntityTags -> ChangeTags
2013-01-31 12:41:29 -05:00
John Firebaugh
df72ef254f
ChangeEntityTags -> ChangeTags
2013-01-31 12:07:54 -05:00
John Firebaugh
6f7079d11c
AddWay/AddNode -> AddEntity
2013-01-31 12:06:21 -05:00
John Firebaugh
208ed6a2ed
Move iD.geo tests to own file
2013-01-31 08:30:46 -05:00
John Firebaugh
6ae360a533
These tests now pass
2013-01-31 08:28:10 -05:00
Ansis Brammanis
b73d18cbf5
Merge remote-tracking branch 'systemed/master' into graph-perf2
2013-01-30 16:58:44 -05:00
Ansis Brammanis
a82b81a3c2
Add tests for #replace #remove #rebase
2013-01-30 16:40:00 -05:00
John Firebaugh
e381b6ab26
Extract AddMidpoint action
2013-01-30 15:47:33 -05:00
John Firebaugh
459dc00ce5
Change the midpoint data a bit
...
Store the ways which share the segment and the index of
the segment. This will be used in both DragWay and Draw
behaviors.
2013-01-30 15:47:33 -05:00
Ansis Brammanis
a317859b0f
Don't re-add removed parentways, don't duplicate
2013-01-30 15:44:03 -05:00
Ansis Brammanis
1b5a1b8268
Merge takes an entities object, not graph
2013-01-30 14:20:39 -05:00
Ansis Brammanis
e08364d492
working parentRels
2013-01-30 13:18:44 -05:00
Ansis Brammanis
ba68a238fe
Working rebase
2013-01-30 12:26:40 -05:00
John Firebaugh
b37ef978f4
Snap to ways/vertices/midpoints when drawing ( #240 )
...
Also add anti-snapping behavior when option key is down.
2013-01-29 11:16:12 -05:00
John Firebaugh
c5d691d79d
Graph#rebase
2013-01-28 16:08:08 -05:00
John Firebaugh
e69f613b51
Order deletions in osmChange XML ( fixes #541 )
...
This relies on iteration order of JS objects, which
is technically undefined. But currently all relevant
browsers implement first-defined-first-iterated order
for non-numeric keys. And I've written the specs so that
they will fail on browsers that don't adhere to this.
2013-01-28 11:47:59 -05:00
John Firebaugh
05e3dd73a8
Push JXON.stringify's down for easier testing
2013-01-28 11:24:52 -05:00
John Firebaugh
08bd7e583a
Define Relation#asJXON (allow relations to be saved)
2013-01-28 10:19:11 -05:00
John Firebaugh
2ac0f1dc26
Don't rely on OSM IDs being in range of JS numbers
2013-01-28 10:15:17 -05:00
John Firebaugh
ec0c02a9dc
Whitespace
2013-01-27 21:50:08 -05:00
John Firebaugh
de7fad5803
Move remaining XML stuff to Connection
2013-01-27 21:50:08 -05:00
John Firebaugh
76c108fc92
Remove unused
2013-01-27 21:50:08 -05:00
John Firebaugh
47ef222f38
Convert iD.format.XML to member functions
2013-01-27 21:50:08 -05:00
John Firebaugh
646c746991
Convert iD.format.GeoJSON to member functions
2013-01-27 21:50:07 -05:00
John Firebaugh
e09666bbdc
Fixing draw mode bugs
...
Disabling interactive draw undo for now. I know how to fix it
but it's a bit tricky. So undo will just drop you out to browse
mode for the time being.
Fixes #477 .
Fixes #516 .
2013-01-26 15:24:14 -05:00
John Firebaugh
66ac8349ac
Stack areas by area ( #324 )
...
This doesn't address stacking multipolygons, or interleaving
areas and multipolygons. More and more, I'm thinking we should
just merge the two into a unified "area" geometry.
2013-01-25 17:13:34 -05:00
John Firebaugh
98073b0d26
Add pending tests for #508
...
Update DeleteWay tests to use Graph#update. Eventually we
should do this for all action tests.
2013-01-25 16:35:50 -05:00
John Firebaugh
5ea855e18d
Replace Graph#fetch with Graph#childNodes
...
Having two kinds of Ways (fetched and non-fetched)
introduced some accidental complexity. This brings things
more in line with how parentWays/parentRelations work.
Fixes #73 .
2013-01-25 15:10:44 -05:00
John Firebaugh
3105923371
Wrap all actions in Graph#update
2013-01-25 13:43:35 -05:00
John Firebaugh
4874199401
Add Graph#update
...
This can be used to reduce graph churn when there are
multiple changes to make.
2013-01-25 13:27:33 -05:00
John Firebaugh
454cf0b16c
Close menu on map move ( fixes #482 )
2013-01-24 19:07:05 -05:00
Tom MacWright
ce78e34b34
Merge, rename to radial menu and remove pi
2013-01-24 13:11:52 -05:00
John Firebaugh
1be596c21b
Fix tests
2013-01-24 11:26:57 -05:00
John Firebaugh
b6d8ddc2f8
Remove unused branch and obsolete test
2013-01-24 11:21:12 -05:00
Tom MacWright
2b4b8cb5fe
Merge pull request #468 from systemed/labels
...
Labels
2013-01-23 16:21:01 -08:00
John Firebaugh
f7a10c1ab6
Fix tests
2013-01-23 18:39:18 -05:00
Ansis Brammanis
d14fdfa828
Remove geo.centroid(), use d3's instead
2013-01-23 18:39:14 -05:00
Ansis Brammanis
d387a31177
Add tests for new geo utils
2013-01-23 16:59:08 -05:00
John Firebaugh
3138ba2805
Handle incomplete relations in SplitWay ( fixes #466 )
2013-01-23 15:52:35 -05:00
John Firebaugh
72618574f3
Rename permitted -> enabled and add to more actions
2013-01-23 15:33:30 -05:00
Tom MacWright
671e138fcd
Fix flash test
2013-01-23 15:32:25 -05:00
John Firebaugh
278bb4a51c
Fix some cases where a degenerate way was created
2013-01-23 12:40:27 -05:00
John Firebaugh
292c916cb1
Converting some actions to entity methods
...
The guidelines here are:
Entity methods:
return a modified entity
don't necessarily maintain whole-graph consistency
Actions:
return a modified graph
always maintain whole-graph consistency
call entity methods liberally
generally don't call other actions
2013-01-23 12:40:27 -05:00
Tom MacWright
eefa22531c
Simplify indentation, add blocking modals. Fixes #412
2013-01-23 12:30:22 -05:00
