Commit Graph

3361 Commits

Author SHA1 Message Date
Bryan Housel b087e78528 Allow zoomToEntity to be called w/o Extent
In case user clicks on Entity description - line 102
2015-04-27 11:49:33 -04:00
Bryan Housel cecdc012ee Don't commit empty changesets.. (closes #1483)
instead, silently flush context and return to browse mode
2015-04-27 11:39:13 -04:00
Bryan Housel a565b72f7d Before saving, revert entities where user chose "keep theirs" 2015-04-27 10:18:07 -04:00
Bryan Housel 00c0641f06 Make view extent include both local and remote versions of the change 2015-04-27 10:16:47 -04:00
Bryan Housel c10b83f28f iD.actions.Revert (see #537) 2015-04-26 01:08:31 -04:00
Bryan Housel 6b18066dd6 Graph#revert (see #537) 2015-04-26 01:07:48 -04:00
Bryan Housel 3b18f1d33a Fix corruption of conflicts array introduced in 06c0a7d 2015-04-24 16:33:49 -04:00
Bryan Housel de5bac0a85 Don't unzorro ways that are overly connected (closes #2598) 2015-04-22 22:36:55 -04:00
Bryan Housel 99d037e97f Better logic for adding area=yes (closes #2578)
This fixes a few issues:

1. before: checked first key in applyTags and break loop, now: check all of them
(this was what caused `area=yes` to be added to 'branded' presets:
the first key is for these is `name` which isn't in areaKeys.)

2. add `area=yes` if user is drawing an area but the preset can be an
area or a line (e.g. `barrier=city_wall`)

3. remove `area=yes` when switching to another preset
2015-04-22 17:04:18 -04:00
Bryan Housel 8bacf9858a Exclude barrier from areaKeys
Because like the others, they are generally
lines but can occasionally be areas or lines
2015-04-22 15:13:48 -04:00
Bryan Housel 420647f503 Remove LRM character, etc from websites and emails (closes #2323) 2015-04-22 11:57:50 -04:00
Bryan Housel 0313064e22 Use '; ' seperator for opening_hours-like tags (closes #2301) 2015-04-22 09:52:49 -04:00
Bryan Housel bfbd1f2d1d Clear cached userDetails when auth events occur (fixes #2588) 2015-04-21 23:11:14 -04:00
Bryan Housel 61bfc1d993 Style for barriers (closes #2592) 2015-04-21 11:41:45 -04:00
Bryan Housel aa24891428 In wireframe mode, draw points like vertices (closes #2591) 2015-04-20 22:33:32 -04:00
Bryan Housel 54d30a18eb Invert background opacity widget display values (closes #2595) 2015-04-20 21:22:10 -04:00
Bryan Housel f8bd67c169 Save custom background to localstorage (closes #2566) 2015-03-31 20:11:41 -04:00
Olaf Veerman 89b354ddba Allow overzoom to be set on overlays
The default behaviour is to overzoom overlays past their max
scaleExtent. When 'overzoom':false is defined in imagery.json,
the layer will disappear on the max scaleExtent.
2015-03-26 12:04:54 -07:00
Bryan Housel 2520b217a0 Detect Opera 15+ (it's a Chrome fork now)
(detected.opera only true for older Opera versions)
2015-03-22 23:19:29 -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 ace428ce41 Don't reenter Browse mode on every click 2015-03-19 10:58:35 -04:00
Bryan Housel d7a6b6916c Suppress radial menu when selecting from selection list 2015-03-18 22:19:23 -04:00
Bryan Housel c69fbf3e3d In copy/paste, use the graph that entities originally came from
(fixes #2557)
2015-03-18 10:08:36 -04:00
Bryan Housel bf3d5d8386 Show solid marker when bbox is too small to see 2015-03-17 00:51:48 -04:00
Bryan Housel 5190c0b857 Minimap can now zoom/unzoom 2015-03-16 23:03:25 -04:00
Bryan Housel ea0bca9914 setup zoom behavior to use Mercator space
Also, a few optimizations:
* don't redraw the minimap unless mainmap dispatched a full redraw event
* don't recenter mainmap on zoomend unless minimap actually got panned
2015-03-16 16:35:58 -04:00
Bryan Housel ba12127e8a Use '/' key for map-in-map (because 'M' = Move) 2015-03-16 00:23:22 -04:00
Bryan Housel 2ad69870e7 Panning map-in-map now recenters main map 2015-03-16 00:23:22 -04:00
Bryan Housel d216afd59f Map-in-Map overview
* press 'M' to toggle
* shows current zoom-6
* with locator overlay and bounding box
2015-03-16 00:23:22 -04:00
Bryan Housel 06c0a7dd8b Conflict Resolution childnode fixes.
* don't try to fetch newly created childnodes from the remote server
* a modified way with new childnodes will safely merge, but will
  return the same graph (no diff), so check conflicts.length instead
2015-03-14 20:48:50 -04:00
Bryan Housel 05ff86e5c2 Prevent no-match parent relations from breaking getMatches
(e.g. a site relation with a fence in it)
Also, updated the test graph to contain one of these.
see https://github.com/openstreetmap/iD/pull/2554#issuecomment-78517442
2015-03-12 13:59:48 -04:00
Bryan Housel 3308b5507b Feature Filtering: don't match multipolygon lines as 'others'
(fixes #2548)

If the entity is a way that is a member of a parent relation,
use that parent relation's matches instead of matching 'other'
2015-03-10 00:06:29 -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 2485d74d5b Use interpolated D3 zooming for zoomIn/zoomOut 2015-03-09 16:34:07 -04:00
Bryan Housel b4cd1d67d8 Adjust double click handler for new D3 zoom behavior
D3 v3.5+ has changed the zoom behavior to emit tweened zoom events
rather than a single zoom event with a dblclick source event.
2015-03-07 15:22:37 -05:00
Bryan Housel 27d3a3d60a Upgrade D3 to support node v0.12.0 (fixes #2535)
(Also lock a good combination of mocha/mocha-phantomjs)
2015-03-05 21:54:18 -05:00
Bryan Housel 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution
Merge Conflict Resolution
2015-03-05 19:49:15 -05:00
Bryan Housel bf1270908b Don't attempt clever way movement with areas. 2015-03-05 16:49:47 -05:00
Bryan Housel 3adcd85c89 Fix nudging, cleanup code.. 2015-03-05 16:20:50 -05:00
Bryan Housel 7232e0d769 Restrict delta so that user can not move way across intersection 2015-03-04 16:05:33 -05:00
Bryan Housel a7e67ccfd9 refactor Conflicts ui into its own component 2015-03-04 11:46:56 -05:00
Bryan Housel c503b9f96c fill remoteGraph with loadMultiple, finally do proper undeletion 2015-03-03 23:43:37 -05: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 edda24360a Fix undeletion version, don't undelete twice 2015-03-03 20:51:33 -05:00
Bryan Housel e7f5691e9b re-enable saving 2015-03-02 22:54:30 -05:00
Bryan Housel 38f833d19c Exclude current way when checking if childnode is used 2015-03-02 22:47:13 -05:00