Commit Graph

3428 Commits

Author SHA1 Message Date
John Firebaugh
f5036db978 Start iD.operations.Merge (#435)
It's currently limited to merging (joining) exactly two lines.

Fixes #370.
2013-02-01 17:32:33 -05:00
John Firebaugh
a8410be6eb iD.actions.Join 2013-02-01 17:31:32 -05:00
John Firebaugh
20730e5f1a Entity#mergeTags 2013-02-01 17:31:32 -05:00
John Firebaugh
9120f33aa7 ReverseWay -> Reverse 2013-02-01 17:31:32 -05:00
John Firebaugh
c86792a77b SplitWay -> Split 2013-02-01 17:31:32 -05:00
John Firebaugh
e1d5a0cb03 Unjoin -> Disconnect 2013-02-01 17:31:32 -05:00
Dr Ian
01e8f5f606 Convert tabs to spaces 2013-02-01 23:08:11 +01:00
Dr Ian
f4975447f8 Limit zoom to 19 if geocode bounding box too small 2013-02-01 23:05:47 +01:00
Dr Ian
839844de27 Convert tabs to spaces 2013-02-01 22:28:43 +01:00
Dr Ian
7bfdf4de1a Change search to use OSM Nominatim API 2013-02-01 22:23:30 +01:00
Ansis Brammanis
2957d799f1 Toggle preset tag view 2013-02-01 15:47:02 -05:00
John Firebaugh
7235632a63 Update logic for multi-select 2013-02-01 15:13:44 -05:00
John Firebaugh
58fcf746a2 Delete multiple 2013-02-01 15:08:41 -05:00
John Firebaugh
7ba31f05d2 Support deleting relations 2013-02-01 14:48:11 -05:00
Ansis Brammanis
ca940d9975 Fix areas vs lines in presets 2013-02-01 14:46:21 -05:00
John Firebaugh
3da0e70c0f Shift-selection 2013-02-01 14:31:47 -05:00
John Firebaugh
ae8891c485 Unused vars 2013-02-01 14:31:47 -05:00
Tom MacWright
7bf725913a Merge branch 'master' of github.com:systemed/iD 2013-02-01 14:11:40 -05:00
Tom MacWright
4fbbd1cf82 Update to pre-release 3.0.5 d3 2013-02-01 14:11:32 -05:00
Ansis Brammanis
d2ab5d7f6d Only show tags not supported by preset; saving 2013-02-01 13:53:55 -05:00
John Firebaugh
cdda561f69 Fix dev/live toggle 2013-02-01 13:39:49 -05:00
Tom MacWright
30bd46635f Merge branch 'master' of github.com:systemed/iD 2013-02-01 13:17:28 -05:00
Tom MacWright
175cdc553d Fix localStorage number of args in oauth 2013-02-01 13:17:19 -05:00
John Firebaugh
619216b33b Remove double dispatch 2013-02-01 13:13:32 -05:00
Tom MacWright
031c8d655e Fallback for browsers that do not support localStorage. Fixes #591 2013-02-01 13:12:46 -05:00
Ansis Brammanis
72675dbb83 Better matching tag format for presets 2013-02-01 12:58:01 -05:00
Ansis Brammanis
f9b6d508da Automatically select matching preset 2013-02-01 12:50:10 -05:00
John Firebaugh
0bcb0520d8 Use iD.version 2013-02-01 12:46:01 -05:00
Ansis Brammanis
73d8b6e206 add presets.matchTags 2013-02-01 12:43:55 -05:00
John Firebaugh
fe49e8fb77 Pass around context rather than map 2013-02-01 12:40:16 -05:00
John Firebaugh
6188d128f8 Arrange 2013-02-01 12:40:16 -05:00
John Firebaugh
a78aeeb625 Merge controller into iD 2013-02-01 12:40:15 -05:00
John Firebaugh
000ceb6467 iD.Context -> iD
All the UI setup code moved to iD.ui.
2013-02-01 12:40:15 -05:00
John Firebaugh
579d632563 Hoist functions up a scope 2013-02-01 12:40:15 -05:00
John Firebaugh
7e68e8e114 Add iD.Context
This is a facade interface that ties together a bunch of
different internal objects and will make it easier to write
tests for behaviors, modes, and operations.
2013-02-01 12:40:15 -05:00
Tom MacWright
72536229c7 Merge branch 'master' into presets
Conflicts:
	test/index.html
2013-02-01 12:03:40 -05:00
Tom MacWright
ab7290a865 Fix re-requesting failed tiles. Fixes #594 2013-02-01 11:31:31 -05:00
Tom MacWright
60850f303f Merge branch 'master' of github.com:systemed/iD 2013-02-01 11:24:38 -05:00
Ansis Brammanis
559f3c9037 Remove unecessary line 2013-02-01 11:00:55 -05:00
John Firebaugh
9494d8d468 Remove unused 2013-02-01 10:47:40 -05:00
Tom MacWright
3334649354 Merge 2013-01-31 19:42:24 -05:00
Tom MacWright
8eb04ddb4d combobox 2013-01-31 19:41:52 -05:00
Saman Bemel-Benrud
5f8e7ec8cc Merge branch 'master' of github.com:systemed/iD 2013-01-31 19:20:32 -05:00
Saman Bemel-Benrud
dcfe8ac85b design pass on alignment toggles. 2013-01-31 19:20:13 -05:00
John Firebaugh
bbccec75be Convert Hash to a behavior 2013-01-31 18:28:24 -05:00
Tom MacWright
fd3ad9e8bd Merge branch 'master' into presets 2013-01-31 17:51:42 -05:00
Ansis Brammanis
9cb0879818 Selecting implicitly sets data 2013-01-31 17:47:24 -05:00
Ansis Brammanis
b9d77a8de6 Set data on midpoint circles 2013-01-31 17:44:14 -05:00
Tom MacWright
9f37249393 Merge branch 'master' into presets 2013-01-31 17:20:15 -05:00
Ansis Brammanis
f430ecd622 Fix keyboard-initiated way moving 2013-01-31 17:12:37 -05:00