Commit Graph

5003 Commits

Author SHA1 Message Date
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
John Firebaugh
b6a3e8a58c login ⇢ log in 2015-03-24 12:44:45 -07:00
Harkirat Singh
643370de34 fixes issue #2504 2015-03-25 00:27:48 +05:30
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
1d2b613bd6 Merge pull request #2559 from openstreetmap/changeset-info
Add basic browser and platform into to changeset tags
2015-03-20 22:30:10 -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
0ced23eaaf Make lasso css rules more selective 2015-03-18 22:18:13 -04:00
Bryan Housel
cc9bcba4e6 Add drive_through preset to fast_food, atm, etc
Thanks @brianegge (closes #2459)
2015-03-18 10:50:00 -04:00
Bryan Housel
dffff73d39 Use combo not checkbox for building field (fixes #2553) 2015-03-18 10:25:59 -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
def08cab23 Tag motorway_link with explicit oneway=yes (closes #2555) 2015-03-17 09:51:42 -04:00
Bryan Housel
b6f428a89f Merge pull request #2554 from openstreetmap/map-in-map
Map-in-Map
2015-03-17 01:33:25 -04:00
Bryan Housel
7a3e4b05fc move minimap z-index below #bar (and its tooltips) 2015-03-17 01:08:50 -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
b6136b9a7c fix z-index for modals to be above sidebar, map-in-map 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
50a3fe320e Add service field for railways (closes #2552) 2015-03-12 14:33:06 -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
20943cf3a9 rebuild presets.json 2015-03-09 17:29:01 -04:00
Bryan Housel
696f33f65b Merge branch 'master' of github.com:openstreetmap/iD 2015-03-09 17:27:33 -04:00
Bryan Housel
2485d74d5b Use interpolated D3 zooming for zoomIn/zoomOut 2015-03-09 16:34:07 -04:00
Bryan Housel
e4809baa5f Merge pull request #2549 from gileri/master
Add/Prioritize network=* tag in public transport presets
2015-03-08 20:27:24 -04:00
Éric Gillet
b71261e39a Add/Prioritize network tag in public_transport 2015-03-08 20:17:27 +01: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
81798423c0 Add incline field for highway=steps (fixes #2456) 2015-03-06 10:08:33 -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
d4643b1b89 Change link text: "Or download your changes" 2015-03-05 19:47:48 -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
56449bc589 Pend some failing tests
They should work but they don't.  No idea why.  PhantomJS issue?
2015-03-03 21:06:28 -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