Commit Graph

347 Commits

Author SHA1 Message Date
John Firebaugh
944f44defd Really fix spec 2013-03-13 17:45:16 -07:00
John Firebaugh
71897a53cd Fix spec 2013-03-13 17:42:16 -07:00
John Firebaugh
3787185182 Rendering tagged points
At z16 and below, tagged points are rendered with a small
dot in the center. At z17 and above, they are rendered with
a maki icon.

See the test rendering page for examples.

Fixes #381.
2013-03-13 17:31:25 -07:00
Tom MacWright
b1eef6ad0c Fix hash tests 2013-03-13 17:56:27 -04:00
John Firebaugh
41e696a2c5 Flatten presets match properties 2013-03-13 12:45:20 -07:00
John Firebaugh
c1aa8e0270 form/forms -> field/fields 2013-03-13 11:34:21 -07:00
John Firebaugh
4720a84d38 No-op a null tag merge
Reduces unnecessary node churn in Connect action.
2013-03-12 16:26:40 -07:00
John Firebaugh
4fa88acc85 Fix connecting adjacent vertices
Can't unconditionally delete the node; it may be a member
of other ways.

I didn't preserve the behavior of dragging a midpoint to
an adjacent node being a no-op. In general we don't try to
eliminate compound operations whose net result is a no-op;
I don't think it's important to do so for this special case.

The degenerate case of connecting the endpoints of a two-vertex
line now results in a point. This is what naturally resulted
from the code, and seems ok.

Fixes #983.
2013-03-12 16:26:40 -07:00
John Firebaugh
3b3ee84a84 Specs for Way#areAdjacent 2013-03-12 16:22:30 -07:00
John Firebaugh
107f6cfeba type -> geometry 2013-03-12 13:00:32 -07:00
John Firebaugh
7133d316cd Fix specs 2013-03-12 13:00:32 -07:00
John Firebaugh
68cc99c412 Disable Move operation on incomplete relations (fixes #972) 2013-03-11 16:43:06 -07:00
Ansis Brammanis
609e8b9119 refactor preset inputs 2013-03-09 18:30:54 -05:00
John Firebaugh
da902061d6 Fix tests 2013-03-08 20:37:19 -08:00
John Firebaugh
fa01cfbbf0 Smarter tag conflict merging (fixes #943) 2013-03-08 11:00:14 -08:00
Ansis Brammanis
f72e294156 score wildcard matches as half a match
so that building=* doesn't get prioritized over more
specific one tag presets, like amenity=hospital
2013-03-08 11:36:57 -05:00
Tom MacWright
5838f05116 Merge tags without a space, fixes #941 2013-03-08 10:51:44 -05:00
Tom MacWright
3e69ef6f9e Fix tests and global leak 2013-03-07 17:53:36 -05:00
Tom MacWright
0fafa340fe Start using d3 3.1.0
Update d3, use streams, d3.set, clip
Use clipping, fix side effects
2013-03-07 17:45:16 -05:00
Tom MacWright
e2dc3f46b2 Improve svg and util test coverage 2013-03-07 15:44:23 -05:00
John Firebaugh
27861ca6b2 Implement multiselect cursors (fixes #296) 2013-03-07 11:57:43 -08:00
Tom MacWright
9502f34e08 Merge pull request #918 from systemed/resample-oneway
Resample oneway paths to produce markers.
2013-03-07 11:37:26 -08:00
Tom MacWright
c736f1d312 Fix tests
Way lines are no longer the only paths on the map, so we need to be more
specific.
2013-03-06 21:20:09 -05:00
John Firebaugh
cb0e02d56f Support merging point + line 2013-03-06 17:37:17 -08:00
John Firebaugh
84a4f9e5d2 Eliminate iD.layers 2013-03-06 15:51:16 -08:00
John Firebaugh
98d1ee4f10 Fix rendering of multipolygons with the tags on the outer way
From the wiki:

> If you have one closed way making up the outer ring and it does not
> describe something in its own right, you may also put these tags on
> the outer ring and leave the relation untagged.

During line and area rendering, fix up such ways so that they are
rendered as if the tags were on the relation instead.

Fixes #613.
2013-03-06 13:22:43 -08:00
John Firebaugh
c24fff51e0 Fix test 2013-03-06 11:24:39 -08:00
John Firebaugh
e9b2563ad8 Force natural=coastline not to be an area (fixes #900) 2013-03-05 17:39:14 -08:00
Tom MacWright
7e9a427a2b Test getPrototype, use American spellings, fix test formatting.
* Stub Lasso test
* Add cmd test
2013-03-05 17:59:50 -05:00
Ansis Brammanis
4fb8688d83 add tests for iD.presets.Collection and .Category 2013-03-05 15:37:34 -05:00
Ansis Brammanis
3a680b027f add tests for iD.presets.Preset 2013-03-05 13:06:21 -05:00
Ansis Brammanis
b8f3292c2b fix hash test 2013-03-05 11:18:36 -05:00
John Firebaugh
8aaa91d96f Fix tests 2013-03-04 08:00:12 -08:00
John Firebaugh
60a290282c Clip lines with Cohen-Sutherland algorithm
This yields a 10x paint performance increase at
#map=18.88/38.85208/-76.72632, as measured with
Chrome Canary's "Continuous Page Repainting" mode.

Fixes #885.
2013-03-03 18:25:42 -08:00
John Firebaugh
cf4e022cc2 Fix global leak 2013-03-01 11:48:57 -08:00
John Firebaugh
56a3edcf7f Fix tests
Disabling translation test, it's just too painful
2013-02-27 20:47:49 -08:00
John Firebaugh
b7894ceaf0 Calculate participating ways in AddMidpoint
Due to differenced redraw, midpoint.ways was getting stale,
so sometimes dragging a midpoint didn't add the new node to
all ways. Better to calculate participating ways when needed.
This also simplifies the code for adding a midpoint via double
click. It does make filtering midpoints on redraw a bit more
expensive, but a cursory profile didn't show it being a problem.

Fixes #763.
2013-02-27 20:41:38 -08:00
John Firebaugh
78f6a00029 Fix moving multiple entities which share nodes
While here, implement moving multipolygons too.
2013-02-27 17:12:39 -08:00
John Firebaugh
7a1800fd68 Delete orphaned relation members 2013-02-27 16:32:52 -08:00
John Firebaugh
b751c1ece9 Simplify, fix spec 2013-02-27 16:32:26 -08:00
John Firebaugh
89ee4244ff Pass context directly 2013-02-26 17:22:16 -08:00
Ansis Brammanis
87564bc0e2 Fix taginfo tests 2013-02-26 15:03:20 -05:00
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