Commit Graph

228 Commits

Author SHA1 Message Date
Ansis Brammanis ec065dca4c Fix flashing, reset transform on mouseup 2013-02-07 17:18:44 -05:00
Ansis Brammanis ec152716fb Fix calls to ui.flash 2013-02-07 01:16:51 -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 4ee620cb09 Namespace selectors to iD-owned elements 2013-02-04 12:23:46 -05:00
John Firebaugh ec602a7db7 Hook up connection and history in context 2013-02-02 19:47:56 -05:00
John Firebaugh fc00f154a9 Dispatch a change event on merge 2013-02-02 19:47:56 -05: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
John Firebaugh 619216b33b Remove double dispatch 2013-02-01 13:13:32 -05:00
John Firebaugh fe49e8fb77 Pass around context rather than map 2013-02-01 12:40:16 -05:00
Ansis Brammanis 559f3c9037 Remove unecessary line 2013-02-01 11:00:55 -05:00
John Firebaugh 9494d8d468 Remove unused 2013-02-01 10:47:40 -05:00
John Firebaugh 2655810efe Remove unused parameter 2013-01-31 12:06:21 -05:00
Ansis Brammanis f0414f7ca1 Fix call to flash 2013-01-31 11:17:32 -05:00
Ansis Brammanis 5c1d3cc18e Preserve label tree between partial redraws 2013-01-31 10:34:57 -05:00
Ansis Brammanis 35cefceba6 Fix partial redraws 2013-01-30 17:43:14 -05:00
Ansis Brammanis b73d18cbf5 Merge remote-tracking branch 'systemed/master' into graph-perf2 2013-01-30 16:58:44 -05:00
John Firebaugh e4c513ae87 midpoint = true -> type = 'midpoint'
Makes it more consistent with entities.
2013-01-30 16:24:33 -05:00
Ansis Brammanis 2fa48df9a1 Small parentWays, parentRelations perf improvements 2013-01-30 16:09:15 -05:00
Ansis Brammanis 1b5a1b8268 Merge takes an entities object, not graph 2013-01-30 14:20:39 -05:00
Tom MacWright 699041019f Pan map when dragging to pad. Fixes #534 2013-01-29 17:02:56 -05:00
Ansis Brammanis 6c1e4e5b4d Working more-efficient parentWays 2013-01-29 13:32:39 -05:00
Ansis Brammanis 7d32af5264 work towards using prototypes for entities 2013-01-29 12:49:00 -05:00
John Firebaugh 3c99d36a76 Fix differenced redraw artifacts during pan/zoom
Fixes #543.
2013-01-28 16:55:30 -05:00
Ansis Brammanis 1d4c04c334 Slightly smarter line label placement 2013-01-28 12:10:25 -05:00
Tom MacWright 50b997599d Fix shared-midpoint dragging. Fixes #432 2013-01-27 16:54:34 -05:00
John Firebaugh 5ea855e18d Replace Graph#fetch with Graph#childNodes
Having two kinds of Ways (fetched and non-fetched)
introduced some accidental complexity. This brings things
more in line with how parentWays/parentRelations work.

Fixes #73.
2013-01-25 15:10:44 -05:00
John Firebaugh 454cf0b16c Close menu on map move (fixes #482) 2013-01-24 19:07:05 -05:00
Ansis Brammanis 6017b9b752 Fix opera dragging 2013-01-24 18:37:24 -05:00
Tom MacWright 2527d57404 Simple map-tail minimalism. Fixes #467 2013-01-24 17:26:52 -05:00
John Firebaugh 18c7267010 Extract Draw behavior
Fixed some bugs but introduced others.
2013-01-24 17:00:48 -05:00
Ansis Brammanis ec72fb39cd Pass dimensions to d3.geo.tile 2013-01-24 12:34:39 -05:00
Tom MacWright 29577f7645 Fix loading inflight requests and clearing history when you switch
sources
2013-01-24 10:28:05 -05:00
Tom MacWright 2b4b8cb5fe Merge pull request #468 from systemed/labels
Labels
2013-01-23 16:21:01 -08:00
John Firebaugh 1eedbecee4 Disable edit modes when zoomed out (fixes #473) 2013-01-23 18:59:04 -05:00
Ansis Brammanis 3a48016e5f Merge remote-tracking branch 'systemed/master' into labels
Conflicts:
	js/id/util.js
2013-01-23 16:15:29 -05:00
Tom MacWright 5c65af512d Test and fixup centerEase 2013-01-23 11:35:31 -05:00
John Firebaugh c263ebd4dc iD.util.geo => iD.geo 2013-01-22 18:20:20 -05:00
Ansis Brammanis 66c0a08d00 Merge remote-tracking branch 'systemed/master' into labels
Conflicts:
	js/id/renderer/map.js
2013-01-22 14:55:15 -05:00
John Firebaugh 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
Tom MacWright 6f73ae48d7 Fix global leak 2013-01-22 14:49:28 -05:00
Tom MacWright 64445e50ac Slow and fast redraw 2013-01-22 14:17:27 -05:00
Tom MacWright 748b597c84 Fast zooming based on transforms.
* Replaces the mouseup-tranformStart method with a redraw debouced by 1/5s
2013-01-22 12:23:51 -05:00
Tom MacWright 3d90801e63 Add willselect to hash, works with non-line features. 2013-01-22 10:22:00 -05:00
Ansis Brammanis 0afb564435 Merge remote-tracking branch 'systemed/master' into labels
Conflicts:
	js/id/svg/lines.js
	js/id/svg/surface.js
2013-01-20 20:37:00 -05:00
Ansis Brammanis 5d283f0698 usecapture for stopping right click propagation 2013-01-20 19:27:20 -05:00
John Firebaugh 5279839ca4 Highway rendering test page
Removing the top-level clip-rect to make this work;
it doesn't seem necessary?
2013-01-19 08:26:13 -08:00
Ansis Brammanis efd829e396 Merge branch 'master' into labels
Conflicts:
	js/id/renderer/map.js
	js/id/svg/lines.js
2013-01-18 17:19:12 -05:00
John Firebaugh e933b9d088 Include parent relations recursively
Fixes drawing when dragging a multipolygon vertex.
2013-01-17 16:32:20 -08:00
Tom MacWright 8c051dc801 Add centerZoom to center and zoom the map with one redraw. Fixes #416
Also throttles redraw and make hash track the map faster.
2013-01-17 18:05:48 -05:00
John Firebaugh 9abe3af312 Fix extent and difference rendering for multi polygons 2013-01-17 14:27:01 -08:00