Commit Graph

190 Commits

Author SHA1 Message Date
John Firebaugh f8a68c879f Adjust tree for force-rebased entities
Previously, entities that already existed in the rtree prior to the rebase
option would end up duplicated in the tree afterward.

Fixes #2637
2015-05-09 14:38:41 -07:00
Bryan Housel d3f3c9a43f Don't allow duplicate ids in multifetch request list
(closes #2626)
2015-05-03 01:01:01 -04:00
Bryan Housel ca02cf4b96 Graph#revert accept id instead of entity ref
trivial test cases (revert across create/update/delete) all pass
2015-04-28 11:22:46 -04:00
Bryan Housel 6b18066dd6 Graph#revert (see #537) 2015-04-26 01:07:48 -04:00
Bryan Housel bfbd1f2d1d Clear cached userDetails when auth events occur (fixes #2588) 2015-04-21 23:11:14 -04:00
Bryan Housel 55c4fce55f Merge pull request #2516 from bhousel/zorrofix
Avoid zorroing connected ways when moving a way
2015-03-20 22:30:34 -04:00
Bryan Housel cfad723893 No need to namespace changeset keys 2015-03-20 22:23:44 -04:00
Bryan Housel 8458ca400b Add basic browser and platform into to changeset tags 2015-03-20 14:24:51 -04:00
Bryan Housel 7cc1d2573a Remove useragent (pnorman is right) 2015-03-19 20:41:11 -04:00
Bryan Housel fbed61fa1e Add host, locale, user_agent to changeset tags (closes #2449) 2015-03-19 14:29:27 -04:00
Bryan Housel 848d19a116 Don't cache array lengths
see https://github.com/openstreetmap/iD/pull/2489#discussion_r22489237
2015-03-09 18:02:05 -04:00
Bryan Housel cb0e8ab66c Initial support for Multi Fetch GET
It will also be much faster to fetch the remote entities in batches
rather than one at a time through LoadEntity.

One bonus/hazard with Multi Fetch GET is that it will get deleted entities
with `visible=false`, rather than returning a HTTP Status Code 410 (Gone).

This will be the only way that we can really do proper undeletion
(Incrementing the current version by 1 is not guaranteed to work.  And
if a way is moved, fetching way/full will tell us whether the childnodes
are part of the way, but not necessarily whether they exist or not.)

We must be careful never to merge deleted entities into the real graph.
e.g, a deleted node will not have a 'loc' attribute, so code that assumes
every node must have a `loc` will be broken.

So because deleted entities are very special, the output from `loadMultiple`
should only be used for conflict resolution for now.
2015-03-03 20:54:09 -05:00
Bryan Housel e7f5691e9b re-enable saving 2015-03-02 22:54:30 -05:00
Bryan Housel 2aae57d361 Save originals of parent entities to localstorage
This prevents strange things from happening when a way is moved,
(affecting only the childnodes but not the way).
2015-02-28 22:52:21 -05:00
Bryan Housel d755145ae6 WIP: usernames in messages, show # of total 2015-02-14 11:20:19 -05:00
samanpwbb d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -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 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 dae0d2d55e Add entity copy methods 2014-12-28 22:00:55 -05:00
Bryan Housel b9ac4b95d1 Connection.loadFromURL was swallowing all the errors instead of passing them along 2014-12-17 21:39:48 -05:00
Bryan Housel 4088f2e70a properly load changed entities into altgraph and produce diffs. 2014-12-05 11:15:45 -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 7c458513f3 Don't pass extra arguments from map to Entity initializer
fixes #2465
2014-12-02 22:14:31 -05:00
Bryan Housel c6ca68ce80 create feature _cache to store matches per entity
also remove old commented code
2014-11-08 00:19:36 -05:00
Bryan Housel 2f6004fcfa performance tuning work-in-progress
* store entity's matched features in a graph transient
* replace fn calls to get commonly used _keys and _hidden arrays
* replace lodash calls with faster for loops (in some places)
* always pass graph/resolver as a param
2014-11-05 00:27:14 -05:00
Bryan Housel dcc9812986 prevent most operations on things connected to hidden features.. 2014-10-28 21:37:02 -04:00
Bryan Housel b0841c1eda missing memo argument (fixes #2421) 2014-10-23 22:21:17 -04:00
Sajjad Anwar dffeedffc9 Moved area-keys to data, and process it during runtime 2014-10-23 15:52:29 -07:00
John Firebaugh 241400faf9 Fix build 2014-10-13 16:55:15 -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 5f1e40561a Fix performance regressions in tree.js (fixes #2396) 2014-10-13 16:34:38 -07:00
Bryan Housel a8840a1075 Better presets for running, motor, non-motor race tracks
closes #2330
2014-08-22 12:34:39 -04:00
John Firebaugh 362d1b4a58 Add preset for amenity=bureau_de_change (fixes #2309) 2014-07-29 14:24:04 -07:00
John Firebaugh 4994566f57 Fix nodeValue deprecation warnings 2014-07-20 16:05:08 -07:00
Bryan Housel 47aa28dc98 man_made=pipeline doesn't imply oneway
thread: https://lists.openstreetmap.org/pipermail/tagging/2014-June/017944.html
2014-06-21 15:20:05 -04:00
Bryan Housel 0c5f563a26 add test for iD.Entity.layer(), fix spelling of man_made. 2014-06-09 23:39:16 -04:00
Bryan Housel 97b189b397 Precreate fixed number of layergroups between -10, 10 2014-06-09 21:20:50 -04:00
Bryan Housel 849363ff8c Group by layer to correctly depth sort lines.. 2014-06-06 16:10:37 -04:00
Bryan Housel 5ee391dd52 Better layer sorting to fix z-depth issues.. 2014-05-30 15:20:36 -04:00
John Firebaugh 38b821bdea Limit imagery_used tag to 255 characters (fixes #2181) 2014-05-28 17:04:49 -07:00
John Firebaugh c0db8b8e67 jshint 2014-05-27 14:42:15 -07:00
John Firebaugh 0c09871c4a Don’t show turn restriction editor for non-highways (fixes #2240) 2014-05-27 14:35:57 -07:00
Bryan Housel 10bd86cb45 Check single source for implied onewayness #2220 2014-05-23 17:07:11 -04:00
Bryan Housel b8501bcf89 iD.Way.isOneWay should return false if oneway=no #2220
i.e. overrides implied oneway tag like `highway=motorway` or `junction=roundabout`
2014-05-20 00:14:23 -04:00
Bryan Housel a757142146 Rename "Entrance" as "Entrance/Exit" and add parking_entrance preset. 2014-05-19 15:39:16 -04:00
Bryan Housel d245121b19 Fix isConvex() to correctly test the angle that closes the way. 2014-04-23 14:12:20 -04:00