Commit Graph

179 Commits

Author SHA1 Message Date
John Firebaugh
87fd5d871c Build data into package 2013-03-06 16:16:12 -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
John Firebaugh
239fa6258a layerswitcher -> background 2013-03-05 12:22:06 -08:00
John Firebaugh
41a197eb9e Fix test 2013-03-05 10:30:03 -08:00
Ansis Brammanis
3a680b027f add tests for iD.presets.Preset 2013-03-05 13:06:21 -05:00
Ansis Brammanis
f452b5b975 update test index 2013-03-05 11:09:03 -05: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
Ansis Brammanis
900c37a652 fix tests 2013-03-01 17:27:53 -05:00
John Firebaugh
f9bf61a6c3 Underscore naming for files 2013-02-28 16:32:23 -08:00
Ansis Brammanis
4e6a3c322f Merge branch 'master' of git://github.com/systemed/iD into rotate2
Conflicts:
	index.html
	test/index.html
2013-02-27 21:41:26 -05:00
John Firebaugh
571edc707d d3.tail -> iD.ui.Tail 2013-02-27 17:55:23 -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
Ian B
aeb5ab5b21 Add rotate to test/index.html 2013-02-26 09:14:45 +01:00
Ansis Brammanis
7222fcb63f Move multiple elements 2013-02-23 20:06:37 -05:00
Ansis Brammanis
4b64b40de6 Remove unused files 2013-02-21 12:34:47 -05:00
John Firebaugh
1fec2513e4 Update locale includes 2013-02-16 09:32:28 -08:00
John Firebaugh
bff0554d05 Fix spec includes 2013-02-16 09:02:16 -08: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
d08decf868 Add vi and nl translations 2013-02-15 10:30:57 -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
Ansis Brammanis
529b570c89 Merge remote-tracking branch 'systemed/master' into tree-intersects 2013-02-13 13:31:11 -05:00
Ansis Brammanis
9c65e58cc1 Tree handles entities with missing children 2013-02-13 10:23:30 -05:00
John Firebaugh
a25f2895d0 Rename UserPanel -> Account 2013-02-12 21:04:59 -08:00
John Firebaugh
6bbea0784a Fix locale includes 2013-02-12 17:39:38 -08: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
Tom MacWright
f1237a9520 Add toggle to tests 2013-02-11 11:10:44 -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
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
Tom MacWright
57493016b6 Remove ref to 404 test, do not discard tags from empty tags 2013-02-07 17:17:24 -05:00
Tom MacWright
3626534a70 Remove deprecate tags test 2013-02-07 17:10:31 -05:00
Tom MacWright
edc4243673 Add includes to test, fixes tests 2013-02-07 16:36:07 -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
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
Tom MacWright
fbe3a41d57 Update tests for faux click events in more places. 2013-02-06 15:47:16 -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
f70c9037b0 Fix tests, finish work here. Needs a design hit. 2013-02-05 12:52:56 -05:00
John Firebaugh
c9fb1444db Connect via drag and drop
Fixes #598.
2013-02-04 16:48:54 -08:00
Tom MacWright
3449a680a7 Add tag deprecation action and data, not yet integrated. 2013-02-04 16:02:34 -05:00
Dr Ian
b912097ee4 Tidy up: fix indents, spaces etc.
- Update orthogonalize to match new circularize.
- Add orthoganalize to test index.html
- Revert whitespace on index.html
2013-02-03 20:12:04 +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
John Firebaugh
f5036db978 Start iD.operations.Merge (#435)
It's currently limited to merging (joining) exactly two lines.

Fixes #370.
2013-02-01 17:32:33 -05:00
John Firebaugh
a8410be6eb iD.actions.Join 2013-02-01 17:31:32 -05:00