16273 Commits

Author SHA1 Message Date
John Firebaugh
5b9c6e2531 Update discarded tags to match P2 2013-02-14 16:24:38 -08:00
John Firebaugh
c663ed243e Merge pull request #764 from saleiva/master
Some changes to the spanish translation
2013-02-14 15:59:52 -08:00
John Firebaugh
6e7ac40e6a Merge pull request #767 from Neogeografen/patch-3
Update locale/da.js
2013-02-14 15:59:20 -08:00
Ansis Brammanis
97679c7679 taglist and presetui coexist 2013-02-14 18:13:28 -05:00
Neogeografen
01700bf32e Update locale/da.js
Finish Danish translation.
2013-02-14 23:34:22 +01:00
Ansis Brammanis
8c89efe563 Extract ui.Taglist 2013-02-14 16:59:07 -05:00
Ansis Brammanis
b7d398ab81 add it translation 2013-02-14 16:08:16 -05:00
Ansis Brammanis
19dd354a8b Merge pull request #765 from sabas/master
Italian translation
2013-02-14 13:04:47 -08:00
sabas
9f861b7458 Italian translation 2013-02-14 21:54:59 +01:00
saleiva
0d2b37315f Update locale/es.js
Unifying zona and área - línea and ruta. 
Removing unnecessary articles.
Making some texts shorter.
2013-02-14 21:48:55 +01:00
Ansis Brammanis
c103c79c29 Merge branch 'master' into release 2013-02-14 14:22:25 -05:00
Ansis Brammanis
342e0071d8 Update version 2013-02-14 14:20:53 -05:00
Ansis Brammanis
a3d5b4b83e Merge branch 'master' into release
Conflicts:
	index.html
2013-02-14 14:07:01 -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
Tom MacWright
2ebc938127 Merge pull request #762 from papuass/lv-locale
Updated lv locale
2013-02-14 05:20:56 -08:00
Martins Brunenieks
4a761cbb8c Updated lv locale
Translations and spelling fixes
2013-02-14 11:35:39 +02: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
372e009888 Assign id at top level
So you can do id.graph(), etc. in the console for debugging.
2013-02-13 16:15:49 -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
bf50403c43 Merge branch 'master' of github.com:systemed/iD 2013-02-13 18:12:49 -05:00
Tom MacWright
b8c79b8b48 Fix map.extent 2013-02-13 18:12:38 -05:00
John Firebaugh
d71f9dcec9 Merge pull request #757 from LuisGC/patch-1
Completed Spanish translations
2013-02-13 15:05:54 -08:00
Luis GC
b2f1de654c Completed Spanish translations 2013-02-14 00:01:56 +01: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
Saman Bemel-Benrud
a6ccedd17d removed unecessary rule. 2013-02-13 15:53:10 -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
Ansis Brammanis
529b570c89 Merge remote-tracking branch 'systemed/master' into tree-intersects 2013-02-13 13:31:11 -05:00
Ansis Brammanis
95e6b840ee Fix key reference 2013-02-13 13:14:57 -05:00
Ansis Brammanis
a21b973a41 Fix saving deletions to storage, add tests 2013-02-13 12:42:51 -05:00
Ansis Brammanis
f2d6628547 Don't break rebasing with loading 2013-02-13 11:17:29 -05:00
Tom MacWright
a60ace18cd Merge branch 'master' of github.com:systemed/iD 2013-02-13 11:13:43 -05:00
Tom MacWright
7c10d37c1e GA-based js error logging. Fixes #660 for the time being. 2013-02-13 11:13:37 -05:00
Ansis Brammanis
9c65e58cc1 Tree handles entities with missing children 2013-02-13 10:23:30 -05:00
Tom MacWright
b3cf141ed5 Merge pull request #752 from m0rix/patch-1
Update locale/de.js
2013-02-13 05:41:53 -08:00
m0rix
5d11770e7e Update locale/de.js 2013-02-13 11:33:34 +01:00