Commit Graph

469 Commits

Author SHA1 Message Date
samanpwbb
d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -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
93b505259f Mode change code in editOff no longer needed..
(because iD.modes.Select listens for drawn event and knows to exit itself)
2014-12-15 16:16:46 -05:00
Bryan Housel
3e391e87df don't try to call Entity#geometry for midpoints 2014-11-21 10:58: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
d444c907e8 Style 2014-11-11 15:12:08 -08:00
Sajjad Anwar
17fb2f64e5 Configurable minimum editable zoom 2014-11-11 14:37:11 -08:00
John Firebaugh
916a901b8f Show all features as auto-hidden when map is not editable 2014-11-11 14:16:16 -08:00
Bryan Housel
2024e2333d Exit select mode if selected DOM elements have disappeared 2014-11-10 23:23:28 -05:00
Bryan Housel
af3c307b17 cache invalidation and naming things 2014-11-10 22:47:07 -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
d5879fa855 reuse _stats, don't count vertices and relations 2014-11-06 23:04:25 -05:00
Bryan Housel
55e6f9ec93 faster tests for certain geometry (vertex, point) 2014-11-06 12:54:58 -05:00
Bryan Housel
0d6d4b3d24 remove footer "features hidden" warning in editOff 2014-11-06 00:33:45 -05:00
Bryan Housel
788dedc595 more performance improvements for feature filters
* use named filter functions for easier profiling
* remove some unnecessary line/area geometry checks
* replace some lodash code with for loops
* reorder some tests to put cheap condition early
2014-11-06 00:18:45 -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
c941bd5a4b 2 things related to gatherStats auto-hiding..
* skip gatherStats on differenced redraws..
* force full redraw when gatherStats autohides/unhides features
  (before: extent redraws would happen, counts would update,
   but buildings/points would stay on the screen)
2014-10-31 11:58:02 -04:00
Bryan Housel
6b31eab5a7 Deselect features that are hidden.. 2014-10-30 15:01:03 -04:00
Bryan Housel
b20f1495de restore toggle function and add test 2014-10-29 15:06:43 -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
7d9b267858 Show auto-hidden features as disabled checkboxes with tooltip
also rearrange map data panel to put features last
2014-10-28 21:37:03 -04:00
Bryan Housel
a085ce6dc8 Don't hide features that the user just created 2014-10-28 21:37:03 -04:00
Bryan Housel
9666af30c6 better point/building culling based on viewport size 2014-10-28 21:37:03 -04:00
Bryan Housel
e761414a15 'Rail' feature filter should not match if it is also a highway. 2014-10-28 21:37:02 -04:00
Bryan Housel
dcc9812986 prevent most operations on things connected to hidden features.. 2014-10-28 21:37:02 -04:00
Bryan Housel
670c228fc7 put layer-gpx after layer-data
(closes #2352, #2335)
2014-10-28 21:37:01 -04:00
Bryan Housel
8fd177935d Feature filtering (in progress)
(rebased to master post-Mapillary merge)
2014-10-28 21:37:00 -04:00
Aaron Lidman
90b0f1c5bf Select first available imagery layer 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
Bryan Housel
8f5f63d5e9 Eliminate floating point error in zoomIn/zoomOut
(closes #2394)
2014-10-13 22:49:50 -04:00
John Firebaugh
0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00
Peter Neubauer
29dde3f217 Implement Mapillary layer in iD
- adding a temp wikipedia icon from http://upload.wikimedia.org/wikipedia/commons/4/45/Right-facing-Arrow-icon.jpg

Making the click update and rotate an image marker on the map with comapss direction. Needs to be centered etc.

now properly enabling/disabling the different Mapillary layers upon activation/deactivation

Upgrade to faster Mapillary API

better arrow icon, refactoring to have all single-image operations in the image-layer

dist build

adding mapillary translation

adjusting image link

trying to adjust the image link for github deploy

better layout

removing font-awesome, not needed.

https for calls

consistent quotes

taking care of more translation, fix case of no images found on Mapillary

more english translations

- scoping image calls to selection.
- .inspector-wrap and .panewrap are hard to scope, since they are outside the selection, same for the #mapillary-inspector.

-scoping calls in sequences layer

adding translation

fixing jslint errors

more jshint errors

adding mapillary to tests

trying to lay out single markers, please help with the geo translation, @jfirebaugh

- adding the image layer to the active iD SVG instead of background
- add a new mode for selecting Mapillary images
- first stab of adding the image pane in the sidebar itself in order to contain the selections (needs to be layouted)

cleaning

trying to mark and keep selected image between mouseovers

refactoring to contain mapillary into the iamge mode

refactoring to contain mapillary into the iamge mode

adding to test html

cleaning up

handling unset selected image

cleanup

better sidebar

moving image into the lower right

Minor visual adjustment mapillaryImage

better no_image text and toggling of selected image

handling of text disappearing

intendation

fixing test errors

making sequences be below images

open Mapillary links in new tabs

better arrows and selectability on arrows as a workaround for real navigation in panos

more contrast for the selected image

adjusting image style

- adjusting style, removing sequence lines
- adding photos as a mode with shortcut 'm'

- fix test errors

moving switch back to right sidebar, keeping keyboard shortcut.

cleanup

file rename to avoid GIT mess with casing.

- better scoping
- removed unused hover function

- making the checkbox follow mode changes

removing unused icon

handling automatic mode exit
2014-09-11 14:14:57 -07:00
Bryan Housel
83030bed54 test visibility of gpx coords instead of just comparing extents. 2014-07-25 23:54:01 -04:00
Bryan Housel
4d40e8f50b When adding gpx, only rezoom map if gpx not in viewport (closes #2297) 2014-07-25 11:59:33 -04:00
John Firebaugh
9822cb3651 Workaround for chrome crash bug (#2295) 2014-07-24 10:33:23 -07:00
Bryan Housel
08d29e5a8c support desc attribute in gpx files (closes #2113) 2014-07-01 00:17:00 -04:00
Bryan Housel
a9d58fdf74 reenter browse mode in editOff when zoom < 16 (#2263) 2014-06-27 17:55:13 -04:00
Bryan Housel
2c69f7e823 Replace magic numbers in trimmedExtent with variables.. 2014-06-18 11:50:50 -04:00
Bryan Housel
b07cf7c1c1 Always draw midpoint handles within viewport (like #1840) 2014-06-14 01:33:20 -04:00
John Firebaugh
0a83545a76 Simplify and fix midpoint drawing logic (fixes #2136) 2014-05-28 16:48:01 -07:00
John Firebaugh
d6fa8c1e26 Support quartile scheme for any imagery source (fixes #2112) 2014-03-21 17:43:54 -07:00
John Firebaugh
b51e5366cc Zoom to GPX after adding (#2144) 2014-03-21 17:34:46 -07:00
John Firebaugh
69960d75bd Use https where supported
Refs #2129
2014-02-19 09:40:22 -08:00
Vladimir Agafonkin
fc92f34eab dry up code for CSS transforms 2014-01-08 19:55:27 +02:00
John Firebaugh
3f67b1e513 Adjust fix for #2040 2013-12-10 10:17:25 -05:00
Adam Solove
4294ed4561 Fix midpoint missing after undoing split. (#2040) 2013-12-09 20:49:54 -05:00