Commit Graph

1562 Commits

Author SHA1 Message Date
Ansis Brammanis
876a406e70 Fix combobox bugs
- size and position is recalculated for each
  update so that it works even if input
  isn't rendered when combobox is called
- adds caret differently, for same reason as above
- adds combobox to body to prevent scrolling issues
2013-02-18 16:56:11 -05:00
Ansis Brammanis
f99a80b52f Use taginfo for preset comboboxes 2013-02-18 16:52:40 -05:00
Ansis Brammanis
f568985bcf misc preset work 2013-02-18 14:42:54 -05:00
Ansis Brammanis
47f23f8284 Add help buttons for type, name 2013-02-18 10:55:27 -05:00
Ansis Brammanis
abe7ce1064 Fix setting preset's tags 2013-02-18 10:37:37 -05:00
Ansis Brammanis
79af340892 Fix added preset's match tags to tags 2013-02-18 02:00:06 -05:00
John Firebaugh
e154a94ef0 Draw only visible midpoints (#804) 2013-02-17 11:27:36 -08:00
Ansis Brammanis
9fcda7ffc2 Strip old preset's main tags when switching 2013-02-16 20:24:38 -05:00
Ansis Brammanis
83c2fb5c67 Merge branch 'master' of github.com:systemed/iD 2013-02-16 18:54:59 -05:00
Ansis Brammanis
4c0b03c241 forward on preset ui work
Add maki icons
2013-02-16 18:30:47 -05:00
John Firebaugh
766a0f5ce3 Work even if localStorage throws a SECURITY_ERR (fixes #772) 2013-02-16 10:14:05 -08:00
John Firebaugh
4fd8024553 Lint, whitespace 2013-02-16 09:24:59 -08:00
John Firebaugh
4acbe38dd8 Merge pull request #794 from porjo/master
Fix #790 #791
2013-02-16 09:22:36 -08:00
John Firebaugh
eadf460b55 Fix global leaks 2013-02-16 09:02:23 -08:00
Ian B
74cfb750bb Fix save error causing modal to break (#790) 2013-02-16 15:06:57 +01:00
Ian B
90308b3a75 Fix missing OK button on confirm modal (#791) 2013-02-16 15:02:35 +01:00
Ansis Brammanis
984fa76907 Temporarily switch back to dev as default
Preset work is causing stability issues.
2013-02-15 23:31:55 -05:00
Ansis Brammanis
87ef7ecf91 Make use of message area 2013-02-15 16:18:54 -05:00
Ansis Brammanis
bf3a635da5 Extract tag editor ui 2013-02-15 15:58:05 -05:00
Ansis Brammanis
6a1ef84546 Usecapture when blocking click 2013-02-15 15:45:24 -05:00
Ansis Brammanis
147fce1f49 Merge branch 'tree-intersects'
Conflicts:
	js/id/behavior/lasso.js
2013-02-15 13:40:01 -05:00
Ansis Brammanis
56ed48f0a3 Fix switch to tag view 2013-02-15 13:22:48 -05:00
Ansis Brammanis
af6377dc32 Merge branch 'presets' 2013-02-15 13:16:37 -05:00
Ansis Brammanis
51976ff0a1 Very rough preset selection grid 2013-02-15 13:15:03 -05:00
Ansis Brammanis
a3f895dd72 Switching between preset and tag view 2013-02-15 11:42:12 -05:00
Ansis Brammanis
9547fdd510 reorganize inspector 2013-02-15 10:53:35 -05:00
Ansis Brammanis
97679c7679 taglist and presetui coexist 2013-02-14 18:13:28 -05:00
Ansis Brammanis
8c89efe563 Extract ui.Taglist 2013-02-14 16:59:07 -05:00
Ansis Brammanis
342e0071d8 Update version 2013-02-14 14:20:53 -05:00
Ansis Brammanis
0bb805f557 Merge remote-tracking branch 'systemed/master' into presets
Conflicts:
	css/app.css
	index.html
	js/id/connection.js
	js/id/modes/select.js
	js/id/ui/inspector.js
	js/id/util.js
	test/spec/modes/add_point.js
2013-02-14 11:38:18 -05:00
John Firebaugh
d7d3f174ae Lasso only nodes for now (fixes #734)
Given the (lack of) operations available on mixed node/way
selections, this seems just as good as selecting contained
ways as well.
2013-02-13 16:53:40 -08:00
John Firebaugh
e3d9d3a4c4 Refine Way#isArea
Closed ways that are multipolygon inners shouldn't be
rendered as areas just because they have a source=* tag,
for example.
2013-02-13 16:44:36 -08:00
John Firebaugh
c0b8cd74de Reopen radial menu when clicking on selected entity (fixes #758) 2013-02-13 16:23:58 -08:00
John Firebaugh
5e66307500 Fix incorrect parentWays after reloading a split way
When recalculating parent ways/relations during rebase, a
graph should not add modified or deleted entities as parents.
Such entities will already be correctly marked as parents or
not.

Graph had the correct behavior for deleted entities, but not for
modified entities. This had the effect that if you split a way
that was partially off screen, and then panned so that the way was
re-retrieved, Graph#rebase would mistakenly add back the original
way as a parent of all the nodes that were split into the new
section, making them appear as shared.

Fixes #751.
2013-02-13 16:03:23 -08:00
Ansis Brammanis
7102fea04d add history.intersects to context 2013-02-13 18:12:53 -05:00
Tom MacWright
b8c79b8b48 Fix map.extent 2013-02-13 18:12:38 -05:00
Tom MacWright
eb2a133ac6 Hate multiline bracketless ifs 2013-02-13 17:57:58 -05:00
Ansis Brammanis
1050faab8f Only delete saved on hitting reset, fixes #744 2013-02-13 17:42:46 -05:00
Ansis Brammanis
e60c9ab16b Fix zoom limitation while drawing 2013-02-13 17:31:23 -05:00
John Firebaugh
3be61a65e6 Manual redraw debouncing
This avoids a duplicate full redraw at the end of a drag pan. The
redraw triggered by mouseup.zoom now cancels the pending debounced
redraw.

Also, bump the debounce interval to 300ms, which helps avoid full
redraws during scroll zoom, making it more responsive.
2013-02-13 14:27:01 -08:00
Tom MacWright
8538339b44 Fix zooming to validated features. Fixes #748 2013-02-13 17:21:21 -05:00
Ansis Brammanis
8c1e0212f9 Fix rebasing and test 2013-02-13 16:08:39 -05:00
Ansis Brammanis
fd423f4db7 Don't drag when shiftKey 2013-02-13 15:39:22 -05:00
Ansis Brammanis
64c8ef626f Add general test for spatial tree 2013-02-13 15:10:48 -05:00
John Firebaugh
d50f7f13ab Cache properties in fastMouse 2013-02-13 12:03:41 -08:00
John Firebaugh
a53e604b5b Avoid unnecessary style recalculation 2013-02-13 11:57:32 -08:00
Ansis Brammanis
b80bbc1fbe Add tree test 2013-02-13 14:40:37 -05:00
Ansis Brammanis
9a4d4ab9c5 Retry queued entities after rebase 2013-02-13 14:16:18 -05:00
John Firebaugh
7fcf329ee8 Fix browser_notice style 2013-02-13 10:39:48 -08:00
John Firebaugh
65fbc808a1 Map#pan redraws 2013-02-13 10:39:48 -08:00