CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-14 09:42:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,979 Commits 2 Branches 0 Tags
cc9bcba4e6fe4fdcd6ee4e664a6108e0192095c2
Commit Graph

4979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bryan Housel
fc94e7775f more tests 2015-03-02 22:47:49 -05:00
Bryan Housel
38f833d19c Exclude current way when checking if childnode is used 2015-03-02 22:47:13 -05:00
Bryan Housel
e3139e250e improvements to iD.actions.MergeRemoteChanges 
* if remote entity is deleted, log to conflicts() array
* if remote tag was deleted, delete from tags (not set undefined)
* update tests..
 2015-03-02 13:07:24 -05:00
Bryan Housel
78ca4b11f4 Better support for delete/restore 2015-02-28 23:03:44 -05:00
Bryan Housel
98665fef91 Don't allow zoomTo on an entity with degenrate extent 
(because sending the map to NaN/NaN/NaN is not cool)
 2015-02-28 23:00:00 -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
2b3dfef5e7 Fix versions of childnodes when merging force_local 2015-02-27 16:56:00 -05:00
Bryan Housel
1cfc6ad69a Check childNode versions too 2015-02-27 16:35:58 -05:00
Bryan Housel
80f5f65f63 More bugfixes and style updates: 
* working Previous/Next buttons
* remove behaviors from save mode
  (users should not be moving nodes around or selecting at this point)
* clear hover before hovering next object
* enable save button and finished message after reviewing last conflict
* store users choice in __data__.chosen..
* default choices to `keep remote version`
* better message for delete conflicts
* fix undelete action to check localGraph (which will have the entity)
  instead of context.graph() (which may not)
 2015-02-27 15:45:43 -05:00
Bryan Housel
0ed12da6fa WIP: style, replace expand/contract list with prev/next buttons 2015-02-26 22:39:22 -05:00
Bryan Housel
29e1554d5f accessor to expose _features internals 2015-02-26 16:08:39 -05:00
Bryan Housel
e79ff79092 Cleaner code for indeterminate feature checkboxes 
(fixes #2532)
 2015-02-26 14:33:03 -05:00
Bryan Housel
a3617b02cc WIP: fix style, fix choice selection 2015-02-26 00:43:14 -05:00
Bryan Housel
15bc08795d Don't save history to localstorage in save mode 
(to avoid saving remote merges / conflict resolutions)
 2015-02-25 23:35:06 -05:00
Bryan Housel
57e5113b1e Use radio buttons for mine/theirs choice 2015-02-24 23:32:02 -05:00
Bryan Housel
6ecca72eac Unsuppress menu when reselecting 
(fixes #2533)
 2015-02-24 14:16:51 -05:00