1560 Commits

Author SHA1 Message Date
Bryan Housel
6d82ae4146 add iD.geo.Extent#contains 2015-02-06 13:56:51 -05:00
Bryan Housel
147e369c3b Add graph#overwrite (same as pop followed by perform)
to remove some of the overhead in creating difference and dispatching
change event multiple times..
2015-02-02 22:01:49 -05:00
Bryan Housel
cac0258baf Merge pull request #2498 from bhousel/copy-paste
Copy paste map features with Cmd-C, Cmd-V
2015-01-15 21:24:58 -05:00
Bryan Housel
ef2d6e75cf Add minzoom check to map.zoom() (closes #2499) 2015-01-13 23:09:19 -05:00
Bryan Housel
ed4929273d Return entities from iD.Connection via callbacks
(instead of dispatching `load` event to merge them into `history`)

This is cleaner becuase now `context` doesn't need to keep an
`altGraph` state used only for Conflict Resolution.

The conflict resolution code calls the `iD.Connection` methods directly,
and other places in the code call `loadEntity` and `loadTiles` wrappers
that merge the entities into the main history.
2015-01-08 14:44:58 -05:00
Bryan Housel
d9f204cf45 Remove Graph#freeze 2015-01-07 11:52:17 -05:00
Bryan Housel
90147b23db Make copy handle circular and other degenerate Relations 2015-01-04 23:15:47 -05:00
Bryan Housel
f6d144c151 Improvements, and simplify code
* don't worry about deep copying, because immutability
* don't need `attrs` parameter which is usually empty
* don't worry about resetting `v` entity version
2015-01-01 22:49:44 -05:00
Bryan Housel
3bbf31902a Add accessor to get conflict details from iD.actions.MergeRemoteChanges 2014-12-29 22:47:44 -05:00
Bryan Housel
4b6abf7a42 Added iD.actions.CopyEntity 2014-12-28 22:01:10 -05:00
Bryan Housel
dae0d2d55e Add entity copy methods 2014-12-28 22:00:55 -05:00
Bryan Housel
0c881ef9f2 merge ways with non-overlapping changes to nodelists 2014-12-13 22:50:29 -05:00
Bryan Housel
381142356b add Diff3 library 2014-12-13 22:49:44 -05:00
Bryan Housel
977e29cfdb Most iD.actions.MergeRemoteChanges features complete
(todo: merging ways where nodelist has not been reordered)
2014-12-11 23:52:53 -05:00
Bryan Housel
dc1221b8ba pass graphs instead of entities to iD.actions.MergeRemoteChanges
(realized that I will need to compare more stuff from the
local and remote graphs in order to merge ways/relations)
2014-12-10 00:12:32 -05:00
Bryan Housel
d85da08cfe fix "inherits entities from base prototypally" test 2014-12-10 00:11:09 -05:00
Bryan Housel
eff18cb257 add tests for iD.actions.MergeRemoteChanges 2014-12-09 00:59:25 -05:00
Bryan Housel
3e97bd7d89 stub out iD.actions.MergeRemoteChanges 2014-12-06 22:11:54 -05:00
Bryan Housel
1c3d198b96 add force option for rebase to overwrite existing entities
related: openstreetmap/iD#2467
2014-12-04 19:50:32 -05:00
Bryan Housel
dfe8fd1e90 features performance enhancements
1. reusue entity.geometry where possible
2. cache entity parents
2014-11-18 22:05:08 -05:00
John Firebaugh
9e9a4b3cc0 Fix tests 2014-11-11 14:32:50 -08:00
Bryan Housel
b20f1495de restore toggle function and add test 2014-10-29 15:06:43 -04:00
Bryan Housel
a2703f10c8 fix tests affected by change in equality testing re #2388 2014-10-28 21:49:31 -04:00
Bryan Housel
927c533bb4 add feature tests for auto-hiding 2014-10-28 21:37:04 -04:00
Bryan Housel
43f1cdd3eb decoupled graph from context for better testing
fixed feature matching tests for vertices and relations
2014-10-28 21:37:04 -04:00
Bryan Housel
2b260f9a6c added tests for feature filtering
(some tests failing because I need to decouple graph from context)
2014-10-28 21:37:04 -04:00
Bryan Housel
6b6ca8d523 initial checkin of features unit tests 2014-10-28 21:37:04 -04:00
Bryan Housel
1f544e883b bump chai to 1.9.2 and fix tests affected by change in equality testing
re #2388
2014-10-28 21:37:04 -04:00
John Firebaugh
e0020c37e2 Add test for #2421 2014-10-24 10:34:39 -07:00
Sajjad Anwar
c8d4b73b15 Add tests and documentation for custom presets 2014-10-23 15:52:29 -07:00
Sajjad Anwar
dffeedffc9 Moved area-keys to data, and process it during runtime 2014-10-23 15:52:29 -07:00
John Firebaugh
dd0e08b244 Write presets and imagery to standalone files 2014-10-23 15:52:29 -07:00
John Firebaugh
a7fb35663c Optimize Way#area 2014-10-13 16:46:32 -07:00
John Firebaugh
69af20e44d Add mutating extent extend, for performance 2014-10-13 16:34:38 -07:00
John Firebaugh
0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00
Bryan Housel
43777d5259 Better inferRestriction for no_u_turn
* where from.node === to.node
* where from.way and to.way are oneways joined at a narrow angle
2014-09-02 16:43:31 -04:00
Bryan Housel
7a6641a5aa Better polygon intersection test
(see also my comment on 83030be)
2014-08-12 22:40:43 -04:00
Bryan Housel
26f8849c3a render triangular midpoints to show direction of way #1085 2014-07-16 00:30:21 -04:00
Bryan Housel
874a3e2ad6 disable Move and Rotate operations if area < 80% contained in the viewport
see #542.
Also included:
1. DRY up code for "% contained in" extent testing.
2. If action.disabled() returns a better reason, show that instead of the too_large one.
2014-07-11 17:11:50 -04:00
Christian Schwarz
138b012c4b Fixed countrycode spec 2014-07-10 10:48:58 +02:00
Bryan Housel
a9d58fdf74 reenter browse mode in editOff when zoom < 16 (#2263) 2014-06-27 17:55:13 -04:00
John Firebaugh
eb55e36c3c Delete relations that become empty (#2270) 2014-06-26 10:21:03 -07:00
John Firebaugh
bf1e50df49 Merge pull request #2266 from bhousel/bhousel-scale
Add linear map scale to footer section
2014-06-25 12:23:53 -07:00
Bryan Housel
e34e299fd0 add dLat/dLon <-> meters tests, narrower limits for distance tests. 2014-06-23 17:12:02 -04:00
Bryan Housel
1a2b9c82f6 add tests, jshint cleanup 2014-06-16 11:49:07 -04:00
John Firebaugh
203381694b Merge branch 'refs/heads/bhousel-bhousel-layers' 2014-06-13 12:03:16 -07:00
John Firebaugh
a3c7b5956d Remove obsolete tests 2014-06-13 12:03:08 -07:00
Bryan Housel
38cb42e0bc Add tests for line z-indexing. 2014-06-11 22:30:36 -04:00
Bryan Housel
7f35ab6125 separate svg group for areas and their related strokes/fills
(for consistency)
2014-06-11 13:01:27 -04:00
Christian Schwarz
ff0357b927 Added countrycode spec 2014-06-10 19:09:53 +02:00