Commit Graph

441 Commits

Author SHA1 Message Date
Ansis Brammanis 4c0b03c241 forward on preset ui work
Add maki icons
2013-02-16 18:30:47 -05:00
John Firebaugh 1fec2513e4 Update locale includes 2013-02-16 09:32:28 -08:00
Ansis Brammanis bf3a635da5 Extract tag editor ui 2013-02-15 15:58:05 -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 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 d08decf868 Add vi and nl translations 2013-02-15 10:30:57 -05: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 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 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
Ansis Brammanis 529b570c89 Merge remote-tracking branch 'systemed/master' into tree-intersects 2013-02-13 13:31:11 -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
John Firebaugh a25f2895d0 Rename UserPanel -> Account 2013-02-12 21:04:59 -08:00
John Firebaugh f98cee40a7 Extract iD.ui.Attribution 2013-02-12 20:46:54 -08:00
John Firebaugh 902ae80267 Include all locale files 2013-02-12 16:51:31 -08:00
John Firebaugh dc2dbbe183 Extract iD.ui.Zoom, add tooltips with key hint 2013-02-12 15:48:17 -08:00
Ansis Brammanis 6baf6a6dd4 Move intersection tree to iD.Tree 2013-02-12 18:18:58 -05:00
John Firebaugh e73c19a4e8 Extract iD.ui.UndoRedo 2013-02-12 12:52:11 -08:00
John Firebaugh 5761c31d29 Extract iD.ui.Modes 2013-02-12 12:52:10 -08:00
Tom MacWright 4d6778e159 Update and fix ja translation 2013-02-12 15:21:32 -05:00
John Firebaugh 66afcd9923 Platform-specific keybindings
Specifying keybindings that use a command key (⌘ on Mac,
Ctrl on Win/Linux) using the appropriate Mac binding, e.g.
'⌘Z'. Use iD.ui.cmd to translate it to an appropriate key
string for other platforms, e.g. 'Ctrl+Z'.
2013-02-11 11:24:05 -08:00
Tom MacWright d34863bfc2 Toggle ui elements gracefully. Refs #449 2013-02-11 11:02:58 -05:00
Tom MacWright 9b784cb76e Include spanish translation in index 2013-02-11 10:00:46 -05:00
Ansis Brammanis 14e1ad7147 Add turkish to index.html 2013-02-10 15:48:47 -05:00
Ansis Brammanis be387170f7 start Latvian translation 2013-02-10 00:04:24 -05:00
John Firebaugh 65ab71c3d0 Extract iD.ui.SourceSwitch 2013-02-09 17:04:39 -08:00
John Firebaugh 843baa11c0 graph -> core
This matches how it's described in ARCHITECTURE.md.
2013-02-09 15:18:54 -08:00
Tom MacWright bd8847ba6a Sub french and german translations 2013-02-09 18:18:30 -05:00
Tom MacWright 71fc68ddfa Go live by default. Fixes #653 2013-02-09 18:11:59 -05:00
Tom MacWright 01f2463ed5 Support other locales based on browser language 2013-02-07 18:31:05 -05:00
Tom MacWright 425138e21d Remove discard-tags include 2013-02-07 16:55:06 -05:00
Tom MacWright a8f5ab206e Merge branch 'master' into discard-tags
Inline discardTags

Conflicts:
	index.html
2013-02-07 16:51:38 -05:00
Tom MacWright f0b761b979 Lasso action 2013-02-07 16:21:25 -05:00
Tom MacWright 8008034697 Merge pull request #665 from systemed/dynamic-layers
Dynamic layers
2013-02-06 14:41:21 -08:00
Tom MacWright c84e0713d9 Merge branch 'master' into dynamic-layers
Conflicts:
	js/id/renderer/background_source.js
	js/id/ui/layerswitcher.js
2013-02-06 17:39:55 -05:00
John Firebaugh bd8c9d6a00 Support merging points into an area (#435) 2013-02-06 13:42:34 -08:00
Tom MacWright 3440f4254d Discard tags 2013-02-06 16:22:39 -05:00
Tom MacWright 0d70e466de Add crazyegg, will remove at release 2013-02-06 14:37:04 -05:00
Ansis Brammanis 449c4d235d Add option to restore or reset unsaved changes 2013-02-06 14:03:31 -05:00
Ansis Brammanis a4bf7c689f Merge DragNode and DragMidpoint
Adds shared behaviors such as snapping to DragMidpoint
2013-02-06 10:49:58 -05:00
John Firebaugh 5eb0644242 Improve multipolygon rendering
Multipolygon relations report their geometry as 'area' and are rendered
as such. However, they do not render a stroke. The stroke rendering
will come from the individual lines, which are given the tag
classes of their parent relations, allowing them to have a stroke
style matching the style of simple areas with the same tags.

Untagged circular ways are no longer considered areas. This prevents
an untagged inner way of a multipolygon from rendering as an area and
is consistent with how P2 and JOSM treat them.

In the CSS, it's no longer necessary to deal with multipolygons
explicitly in selectors. But keep in mind that area boundaries can
now be rendered either as lines or as area strokes. In most cases
the selector should be `path.stroke.tag-_____`, i.e. an explicit
`.area` or `.line` classes should not be included.

Finally, the parent ways of selected multipolygons are given the 'selected'
class.
2013-02-05 15:20:11 -08:00
Tom MacWright 8f2157425c Merge branch 'master' into dynamic-layers 2013-02-05 12:03:27 -05:00
Tom MacWright db7f42145e Continue removing any non-scoped selectors. Refs #595
Last hits will be combobox and layerswitcher.
2013-02-05 12:00:10 -05:00
John Firebaugh c9fb1444db Connect via drag and drop
Fixes #598.
2013-02-04 16:48:54 -08:00
Tom MacWright 4d0a42344d Start dynamic layers work in branch 2013-02-04 19:47:25 -05:00
Tom MacWright 3449a680a7 Add tag deprecation action and data, not yet integrated. 2013-02-04 16:02:34 -05:00
Dr Ian 90aa734f53 Merge remote branch 'upstream/master' 2013-02-03 07:40:07 +01:00
John Firebaugh ddc5e324f6 Extract iD.Difference
iD.Difference represents the difference between two graphs.
It knows how to calculate the set of entities that were
created, modified, or deleted, and also contains the logic
for recursively extending a difference to the complete set
of entities that will require a redraw, taking into account
child and parent relationships.

Additionally, all history mutators now return a difference.
2013-02-02 19:47:56 -05:00