Commit Graph

73 Commits

Author SHA1 Message Date
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
John Firebaugh 459dc00ce5 Change the midpoint data a bit
Store the ways which share the segment and the index of
the segment. This will be used in both DragWay and Draw
behaviors.
2013-01-30 15:47:33 -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
Ansis Brammanis 62e8d4ed64 Fix area order. Algorithm is direction sensitive 2013-01-27 03:32:05 -05:00
John Firebaugh 269739905a Render areas with separate stroke and fill 2013-01-26 16:43:46 -05:00
Tom MacWright adc302863f jshint please 2013-01-25 17:52:09 -05:00
John Firebaugh 66ac8349ac Stack areas by area (#324)
This doesn't address stacking multipolygons, or interleaving
areas and multipolygons. More and more, I'm thinking we should
just merge the two into a unified "area" geometry.
2013-01-25 17:13: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
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
Tom MacWright 1a752cba64 Merge branch 'master' of github.com:systemed/iD 2013-01-23 19:15:05 -05:00
Tom MacWright 32ea30c3fb Use isPoi for determining whether points are pois or not 2013-01-23 19:14:54 -05:00
Ansis Brammanis 9008779a18 Fix point label hiding 2013-01-23 19:10:10 -05:00
Ansis Brammanis 99748dba4e Fix several small label related bugs 2013-01-23 18:54:31 -05:00
Ansis Brammanis d14fdfa828 Remove geo.centroid(), use d3's instead 2013-01-23 18:39:14 -05:00
John Firebaugh 2b799ddd7b Improve point rendering 2013-01-23 18:24:17 -05:00
Ansis Brammanis b0de58b455 Fix merge (util.geo -> geo) 2013-01-23 16:29:52 -05:00
Ansis Brammanis 717af998f6 Undo line IDs 2013-01-23 16:22:38 -05:00
Ansis Brammanis 4714763ea3 Add a margin for point labels 2013-01-23 16:18:57 -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
Ansis Brammanis b678486c01 Label bugfixes and cleanup 2013-01-23 16:08:43 -05:00
Ansis Brammanis ca9900a91c Halos and proper orientation for line labels 2013-01-23 12:46:39 -05:00
Ansis Brammanis 4a87ae8298 Point halos and test width calculation/estimation 2013-01-23 11:48:04 -05:00
John Firebaugh c263ebd4dc iD.util.geo => iD.geo 2013-01-22 18:20:20 -05:00
Ansis Brammanis daff9c5a2f Labels height pulled from font-size css 2013-01-22 17:40:05 -05:00
Ansis Brammanis 2b7aa93096 Add classes to labels for styling 2013-01-22 14:47:50 -05:00
Ansis Brammanis 0249d6b3eb Try multiple line label positions 2013-01-22 14:04:19 -05:00
Ansis Brammanis 14272ef200 Add label_stack 2013-01-22 13:03:53 -05:00
Ansis Brammanis 00e5ca25ee Split up pathTransform 2013-01-22 12:03:23 -05:00
Ansis Brammanis 397372b505 start rearranging label code 2013-01-22 11:04:39 -05:00
Ansis Brammanis 71f6402df0 add very basic support for area labels 2013-01-20 22:46:30 -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
John Firebaugh 4a084a8b89 Improve midpoints rendering 2013-01-20 12:01:19 -08:00
John Firebaugh fce209131a Improve vertex rendering 2013-01-20 11:37:14 -08:00
John Firebaugh 33b1f4f23c Render more line features 2013-01-20 09:39:25 -08:00
John Firebaugh e5407fa49d Improve highway rendering; render halo in a separate layer 2013-01-19 18:07:39 -08: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
John Firebaugh 3349e1f69c Add some utility methods to Relation 2013-01-18 14:44:28 -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
Ansis Brammanis 9e784b6bc9 mostly working path and point labelling 2013-01-18 16:34:41 -05:00
John Firebaugh c5afec0f98 Add leisure=park rendering 2013-01-17 21:03:25 -08:00
John Firebaugh 3eaf4a46e0 Add CSS classes for relation memberships
An entity that is a member of a relation will have the classes
`member`, `member-role-<member role>`, and `member-type-<relation type>`.

The first use of these classes is to avoid filling multipolygon
member areas.
2013-01-17 15:17:40 -08:00
Ansis Brammanis 8a84dd4c8e start label styles and positioning 2013-01-17 16:10:01 -05:00
Ansis Brammanis 9c007e24e3 Start work on label rendering 2013-01-17 15:14:22 -05:00
John Firebaugh 9a76b81125 First cut on multipolygon rendering 2013-01-17 11:57:30 -08:00
John Firebaugh 545789efcc More area tests 2013-01-17 11:57:30 -08:00
John Firebaugh e24b22b518 Extract iD.svg.LineString 2013-01-17 11:57:29 -08:00