CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-25 23:13:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,583 Commits 2 Branches 0 Tags
4971a204094de667a88d2fa8eaa8fbb99eb184f3
Commit Graph

1100 Commits

Author SHA1 Message Date
Tom MacWright
72536229c7 Merge branch 'master' into presets 
Conflicts:
	test/index.html
 2013-02-01 12:03:40 -05:00
Saman Bemel-Benrud
5f8e7ec8cc Merge branch 'master' of github.com:systemed/iD 2013-01-31 19:20:32 -05:00
John Firebaugh
bbccec75be Convert Hash to a behavior 2013-01-31 18:28:24 -05:00
Tom MacWright
9f37249393 Merge branch 'master' into presets 2013-01-31 17:20:15 -05:00
John Firebaugh
7ea7326f92 Extract Select behavior 2013-01-31 15:56:24 -05:00
Saman Bemel-Benrud
116289ae53 minor fixes. 2013-01-31 15:54:14 -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
Tom MacWright
9741d28493 Fixing tests 2013-01-31 15:09:07 -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
15e1bee3ec Move controller 2013-01-31 12:45:39 -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
1bfe1359ec AddWayNode -> AddVertex 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
John Firebaugh
639f1b6977 Stub in splash screen (#567) 2013-01-30 16:44:27 -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
6576ec6501 Operation sprites 2013-01-30 11:56:49 -05:00
John Firebaugh
bfa823f71d Fix hover 2013-01-30 10:57:37 -05:00
John Firebaugh
7f0b449307 Add background color slider 2013-01-30 10:57:37 -05:00
John Firebaugh
c787d9f4a2 Add areas to rendering test 2013-01-30 10:36:11 -05:00
John Firebaugh
13e7d03395 Fix build 2013-01-29 19:02:34 -05:00
John Firebaugh
b30acae5c5 Fix tests 2013-01-29 18:49:50 -05:00
Tom MacWright
cdc221323c Fix tests with locale 2013-01-29 18:39:11 -05:00
John Firebaugh
65baf36143 Remove unused DragWay behavior 2013-01-29 13:19:04 -05:00
John Firebaugh
03de3ffba6 Move operation (fixes #536) 2013-01-29 13:18:23 -05:00
John Firebaugh
69d95a6082 Refactor operations 
They're something distinct from actions. Actions are independent
of UI, operations are actions + UI (title, keybinding, modality,
etc.)
 2013-01-29 12:05:52 -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