Commit Graph

305 Commits

Author SHA1 Message Date
Ansis Brammanis 8e6e860f87 Fix removing from tree 2013-02-19 18:06:18 -05:00
Yohan Boniface 5d70ba79d3 Taglist: do not addTag when presssing TAB in shiftKey mode 2013-02-19 17:49:01 +01:00
John Firebaugh 88949d6624 Fix altKey behavior with multi-step drawing (fixes #803) 2013-02-18 21:14:41 -08:00
Ansis Brammanis dfeff7e00d Fix svg midpoint tests 2013-02-18 18:38:01 -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 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 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 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 8c1e0212f9 Fix rebasing and test 2013-02-13 16:08:39 -05:00
Ansis Brammanis 64c8ef626f Add general test for spatial tree 2013-02-13 15:10:48 -05: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
Ansis Brammanis 529b570c89 Merge remote-tracking branch 'systemed/master' into tree-intersects 2013-02-13 13:31:11 -05:00
Ansis Brammanis a21b973a41 Fix saving deletions to storage, add tests 2013-02-13 12:42:51 -05:00
Ansis Brammanis 9c65e58cc1 Tree handles entities with missing children 2013-02-13 10:23:30 -05:00
John Firebaugh 5f0bef89e1 Sync translations 2013-02-12 17:39:38 -08:00
John Firebaugh 1e60b0b7fa iD constructors are camel case 2013-02-12 16:51:25 -08:00
John Firebaugh 5c9832e2ef Fix test 2013-02-12 16:18:55 -08:00
John Firebaugh 3cce5b28dd Fix, expand iD.behavior.Select tests 2013-02-12 15:22:38 -08:00
Tom MacWright 61d7ec45b5 Banish function ( style 2013-02-12 16:35:47 -05:00
Tom MacWright d9d05f3e3a Test translations 2013-02-12 16:20:39 -05:00
John Firebaugh 502f35869c Fall back to en strings (fixes #738) 2013-02-12 10:40:41 -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 f15191af2c Update tests 2013-02-09 18:06:35 -05:00
John Firebaugh f1079a644a Fix relation role in Split (#694) 2013-02-08 20:44:14 -08:00
Ansis Brammanis ba47d3183d Fix lasso and add it to select 2013-02-08 17:46:37 -05:00
John Firebaugh e05531ad6c Fix circularize boundary cases (fixes #494)
There are still more boundary cases even farther out. But this is
probably sufficient for the real world.
2013-02-08 12:08:48 -08:00
Ansis Brammanis a804e633f4 Fix tests, silence travis 2013-02-08 11:29:40 -05:00
Tom MacWright 3626534a70 Remove deprecate tags test 2013-02-07 17:10:31 -05:00
John Firebaugh e1bc78871b Handle entities that are already deleted (fixes #672) 2013-02-07 13:46:25 -08:00
Ansis Brammanis 4f6637d58b Fix add_point tests (switch back to mouseup) 2013-02-06 19:11:28 -05:00
John Firebaugh 0af51a0ef6 Improvements to Split
* Split a closed way at selected and antipode point (fixes #651)
* Split an area into a multipolygon (fixes #572)
2013-02-06 16:00:19 -08: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 f6e726bcd6 Join should run Reverse where necessary (fixes #652) 2013-02-06 14:31:11 -08:00
John Firebaugh 104b02eda1 Move common setup to spec_helpers.js 2013-02-06 14:04:19 -08:00
John Firebaugh bd8c9d6a00 Support merging points into an area (#435) 2013-02-06 13:42:34 -08:00
John Firebaugh d7639acb22 Set up iD.actions.Join to be more flexible 2013-02-06 13:42:34 -08:00
John Firebaugh 53ed9df2b7 A no-op Graph#replace should not create a new graph
This is useful for reducing graph churn.
2013-02-06 13:42:34 -08:00
John Firebaugh b62f106be8 Extract Relation#replaceMember 2013-02-06 13:42:34 -08:00
Tom MacWright fbe3a41d57 Update tests for faux click events in more places. 2013-02-06 15:47:16 -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
John Firebaugh 13a784bea5 Better Way#asGeoJSON 2013-02-05 15:20:11 -08:00
John Firebaugh 8735413974 Relation#asGeoJSON 2013-02-05 15:20:11 -08:00
John Firebaugh 72cd6b91fa Relation#multipolygon returns coordinate arrays 2013-02-05 15:20:11 -08:00
Tom MacWright 4b76b136fa Fix tests for faux click 2013-02-05 15:58:54 -05:00
Tom MacWright f70c9037b0 Fix tests, finish work here. Needs a design hit. 2013-02-05 12:52:56 -05:00
Tom MacWright d159b37ab6 Fix tests 2013-02-05 12:10:05 -05:00
Ansis Brammanis d3d0851596 Fix svg/midpoint tests
Proper solution waiting on 369
2013-02-05 00:51:54 -05:00
John Firebaugh c9fb1444db Connect via drag and drop
Fixes #598.
2013-02-04 16:48:54 -08:00