b6d8ddc2f8
Remove unused branch and obsolete test
2013-01-24 11:21:12 -05:00
29577f7645
Fix loading inflight requests and clearing history when you switch
...
sources
2013-01-24 10:28:05 -05:00
79c169b214
Fix unsaved changes warning
2013-01-23 21:59:53 -05:00
2b4b8cb5fe
Merge pull request #468 from systemed/labels
...
Labels
2013-01-23 16:21:01 -08:00
1a752cba64
Merge branch 'master' of github.com:systemed/iD
2013-01-23 19:15:05 -05:00
32ea30c3fb
Use isPoi for determining whether points are pois or not
2013-01-23 19:14:54 -05:00
9008779a18
Fix point label hiding
2013-01-23 19:10:10 -05:00
1eedbecee4
Disable edit modes when zoomed out ( fixes #473 )
2013-01-23 18:59:04 -05:00
99748dba4e
Fix several small label related bugs
2013-01-23 18:54:31 -05:00
d14fdfa828
Remove geo.centroid(), use d3's instead
2013-01-23 18:39:14 -05:00
2b799ddd7b
Improve point rendering
2013-01-23 18:24:17 -05:00
5eabb931ff
Namespace events
...
Fixes an issue where cursor sometimes stopped working.
2013-01-23 18:24:16 -05:00
9041e6470f
Yet another global leak
2013-01-23 18:06:01 -05:00
54903adc2b
No more refnodes
2013-01-23 18:02:38 -05:00
bda41b812c
Optimize and break up parsing
2013-01-23 18:01:56 -05:00
8741e69c10
Add source switch
2013-01-23 17:19:19 -05:00
c337182791
Merge remote-tracking branch 'systemed/master' into labels
2013-01-23 17:00:30 -05:00
1a916ff506
Move keys to separate file, not working on osm.org yet.
2013-01-23 16:56:48 -05:00
b0de58b455
Fix merge (util.geo -> geo)
2013-01-23 16:29:52 -05:00
717af998f6
Undo line IDs
2013-01-23 16:22:38 -05:00
4714763ea3
Add a margin for point labels
2013-01-23 16:18:57 -05:00
3a48016e5f
Merge remote-tracking branch 'systemed/master' into labels
...
Conflicts:
js/id/util.js
2013-01-23 16:15:29 -05:00
b678486c01
Label bugfixes and cleanup
2013-01-23 16:08:43 -05:00
64e8e85187
location.replace ( fixes #462 )
2013-01-23 15:58:09 -05:00
72ba6f52b2
Merge branch 'master' of github.com:systemed/iD
2013-01-23 15:56:02 -05:00
f605ff85ea
Prettier transition for notice, fix notice style. Fixes #438
2013-01-23 15:53:46 -05:00
3138ba2805
Handle incomplete relations in SplitWay ( fixes #466 )
2013-01-23 15:52:35 -05:00
72618574f3
Rename permitted -> enabled and add to more actions
2013-01-23 15:33:30 -05:00
aafcb0df65
Merge branch 'master' of github.com:systemed/iD
2013-01-23 15:28:09 -05:00
fcf15718d1
Restyle flash modal. Fixes #458
2013-01-23 15:27:47 -05:00
ca9900a91c
Halos and proper orientation for line labels
2013-01-23 12:46:39 -05:00
18b3331003
Fix event reference
2013-01-23 12:40:27 -05:00
278bb4a51c
Fix some cases where a degenerate way was created
2013-01-23 12:40:27 -05:00
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
eefa22531c
Simplify indentation, add blocking modals. Fixes #412
2013-01-23 12:30:22 -05:00
4a87ae8298
Point halos and test width calculation/estimation
2013-01-23 11:48:04 -05:00
5c65af512d
Test and fixup centerEase
2013-01-23 11:35:31 -05:00
8e92fffa1a
Freeze loc
2013-01-23 10:07:10 -05:00
29d608970b
UnjoinNode action ( fixes #442 )
2013-01-23 10:07:10 -05:00
df06148355
Look farther up for up tiles
2013-01-22 18:56:09 -05:00
c263ebd4dc
iD.util.geo => iD.geo
2013-01-22 18:20:20 -05:00
7f8ff43a0f
Fix namespaces and unbinding
2013-01-22 18:16:52 -05:00
381794e7a1
Fix Relation#multipolygon for unmatched inner rings ( fixes #461 )
2013-01-22 17:54:57 -05:00
daff9c5a2f
Labels height pulled from font-size css
2013-01-22 17:40:05 -05:00
d74bf1e39a
Use proper prototypal inheritance and less dynamic new
2013-01-22 17:38:52 -05:00
2e6c23d7ef
Fix namespace
2013-01-22 14:58:51 -05:00
66c0a08d00
Merge remote-tracking branch 'systemed/master' into labels
...
Conflicts:
js/id/renderer/map.js
2013-01-22 14:55:15 -05:00
814c3608db
Hook into undos in a different way
...
This way doesn't depend on details of keybindings and
the undo button.
Also, implement this in DrawArea mode.
2013-01-22 14:55:08 -05:00
ff15aa8e7b
Rewrite d3.keybinding
...
A keybinding now represents a set of key commands that can
be unbound as a set. Multiple keybindings are possible, and,
providing a namespace is provided to the constructor, will
not conflict with each other.
Also, key combination strings such as ⌘+A are now supported.
2013-01-22 14:55:08 -05:00
851eae68b8
Match terminology with ReverseWay action
2013-01-22 14:54:30 -05:00
John Firebaugh