Commit Graph

133 Commits

Author SHA1 Message Date
samanpwbb
d141827c3e Merge branch 'master' into conflict-resolution-ui 2015-02-06 19:08:50 -05:00
samanpwbb
78e4271071 finish basic layout/style pass 2015-02-06 19:07:57 -05:00
Bryan Housel
1200919fb3 quote "yes" and "no" in YAML
(re: #2286)
2015-01-24 22:38:37 -05:00
Bryan Housel
3fc99e1df5 Allow undeletions 2015-01-13 16:28:06 -05:00
Bryan Housel
fb0d17e713 WIP: Add choices ui for resolving conflicts 2015-01-11 23:13:31 -05:00
Bryan Housel
95c92e9a59 WIP: conflict save dialog
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
Bryan Housel
3bbf31902a Add accessor to get conflict details from iD.actions.MergeRemoteChanges 2014-12-29 22:47:44 -05:00
John Firebaugh
c66091c00c Merge pull request #2357 from bhousel/feature-filtering
Feature filtering
2014-11-11 12:16:42 -08:00
samanpwbb
140b56a68a style adjustments + clean out unused code 2014-10-31 17:09:49 -04:00
Bryan Housel
224db06ca4 design enhancements..
* replace full width bottom bar with subtle list item
* move hidden feature details to list item tooltip
* simplify some of the text labels on the Map Data panel
* progressively hide some footer elements with media queries
2014-10-31 10:55:00 -04:00
Aaron Lidman
ced0158327 Fix .more-fields string 2014-10-30 16:07:38 -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
8c423651b2 Update help text because GPS tracks are purple now 2014-10-28 21:37:03 -04:00
Bryan Housel
dcc9812986 prevent most operations on things connected to hidden features.. 2014-10-28 21:37:02 -04:00
Bryan Housel
8a98339bc2 Add area fill selector (wireframe/partial/full) to map data panel
also:
* style dark tooltips with shortcut keys
* use uppercase for shortcut keys
2014-10-28 21:37:01 -04:00
Bryan Housel
35e7474829 Rename Features to Map Data..
* move GPX and Mapillary layers to Map Data
* put feature filters and layer data into show/hide containers
* cleanup css
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
John Firebaugh
eb9876c2de Use interpolation rather than concatenation 2014-10-22 11:16:37 -07:00
Bryan Housel
712f533212 Translate text in changes section on save panel. (fixes #2417) 2014-10-22 10:27:59 -04:00
Jakub Wieczorek
dfa442903d Improve the error message on saving when offline (fixes #2373) 2014-10-20 17:14:28 -07:00
John Firebaugh
0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00
samanpwbb
e721e93a31 cleanup mapillary UI 2014-09-16 13:49:13 -04: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
John Firebaugh
0221c9b877 Rewrite area intro sentence (#2336) 2014-08-25 10:26:27 -07:00
simonpoole
b1b3bc73eb Reword description for delete action
The current text implies that deleting hides a feature on the map, and not what it really does.
2014-07-22 10:42:14 +02:00
Bryan Housel
874a3e2ad6 disable Move and Rotate operations if area < 80% contained in the viewport
see #542.
Also included:
1. DRY up code for "% contained in" extent testing.
2. If action.disabled() returns a better reason, show that instead of the too_large one.
2014-07-11 17:11:50 -04:00
John Firebaugh
11acf216c3 Don’t interpolate geometry type 2014-06-15 09:56:00 -07:00
John Firebaugh
eaaff52d62 Help text 2014-05-18 16:02:48 -07:00
John Firebaugh
3d210ac3c1 Implement basic restriction toggling 2014-05-18 16:02:47 -07:00
John Firebaugh
1fee019d72 Remember last custom tile layer (fixes #2094) 2014-04-07 19:19:53 -04:00
John Firebaugh
629f93c250 Update translation in correct place 2014-03-28 11:56:08 -07:00
Bryan Housel
1df54a700a Disable circularize and orthogonalize operations when way is <80% contained in the viewport 2014-03-27 22:47:34 -04:00
tyr
90fd8b6e51 disable merge operation if at least one relation is incomplete
Incomplete multipolygons were harmed in the merge operation (which
relies on completely loaded relations to determine inner/outer
status for example).

This disables the operation and adds an appropriate tooltip.
2014-02-09 18:41:31 +01:00
John Firebaugh
ab8a4ffd7b Update GitHub links 2014-01-08 16:14:28 -08:00
Christian Schwarz
5aede6f323 Added support for ids and locations as search input
e.g.:
n123
w456
r789
48.123 16.456
2013-12-12 21:02:46 +01:00
Aaron Lidman
e6f741836b Fix commit warning tooltip string 2013-12-04 10:42:00 -05:00
John Firebaugh
7a844f8f33 Fix misalignment -> Fix alignment (fixes #1913) 2013-10-24 11:17:38 -07:00
John Firebaugh
1374b5bc5d Update help text 2013-10-16 09:03:02 -04:00
Aaron Lidman
ab1b6a508a Multiselection list UI 2013-10-15 18:30:30 -04:00
John Firebaugh
e20a9f6734 Improve GPX related tooltips 2013-10-15 13:15:35 -04:00
Aaron Lidman
fd44a6f381 Fixes blank hover state for Structure field, closes #1891 2013-10-15 10:06:50 -04:00
John Firebaugh
29469ffb86 Update translation 2013-10-15 09:30:22 -04:00
Aaron Lidman
1899eb361c Add None tile layer
Fixes #1472
2013-10-14 12:08:36 -04:00
John Firebaugh
c7f085e93f Allow "yes" and "no" check values to be translated (fixes #1819) 2013-10-09 17:44:53 -07:00
Paul Mach
0e080b3ed6 Limit squaring to near square or near straight nodes 2013-09-29 13:44:30 -07:00
John Firebaugh
690a04e538 Make straighten/orthogonalize act like a single operation
- Display only one or the other in the radial menu
- Rename "Orthogonalize" to "Square"
- Use "S" as shortcut for both

Refs #1839
2013-09-25 14:26:30 -07:00
Paul Mach
b8efb00cfc Add straighten way operation and action 2013-09-20 12:14:16 -07:00
Tom MacWright
56ab10ed3e Merge pull request #1790 from pnorman/gpx_help
Expand help text on GPX, providing a link to upload GPX files
2013-09-13 18:59:21 -07:00
Paul Norman
8180487c07 Convert some remaining en-GB to en-US
Also added alternete dialects to preset search terms

en-US and en-GB are close enough that there's value in having en-GB terms
in the en-US terms list.
2013-09-13 18:43:13 -07:00
Tom MacWright
da866d6c42 Update string to match UI. Fixes #1803 2013-09-13 17:30:07 -04:00