Commit Graph

1229 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 62f7681370 Remove row when clicking trash icon in raw tag editor
(closes #2418)

Dispatching `event.change(tag)` does update the tag editor in most
cases, but it is not sufficient to remove a blank row with no tags..
2015-01-14 09:57:23 -05:00
Bryan Housel 95c92e9a59 WIP: conflict save dialog
* multiple buttons
* help text
2015-01-10 20:35:43 -05:00
Bryan Housel e5d6c34efb No default OK button on iD.ui.confirm
This allows the calling code to either keep the OK button or to override
with other buttons as needed.
2015-01-08 22:56:39 -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 037bd19ebf Fix help pane button toggling (closes #2471)
(and cleanup code to make background, map_data, help panes more consistent)
2014-12-10 13:30:11 -05:00
Christian Schwarz 1d580d3ca2 Fixed address input while nominatim is not available 2014-11-30 22:16:03 +01:00
Bryan Housel 81ea0276f8 Don't show "0 Hidden Features" warning after editOff
(regressed in 916a901)
2014-11-18 22:05:20 -05:00
Sajjad Anwar 17fb2f64e5 Configurable minimum editable zoom 2014-11-11 14:37:11 -08:00
John Firebaugh 9e9a4b3cc0 Fix tests 2014-11-11 14:32:50 -08:00
John Firebaugh 916a901b8f Show all features as auto-hidden when map is not editable 2014-11-11 14:16:16 -08:00
John Firebaugh c66091c00c Merge pull request #2357 from bhousel/feature-filtering
Feature filtering
2014-11-11 12:16:42 -08:00
samanpwbb 8ca46516e4 more straightforward preset form insertion 2014-10-31 17:15:59 -04: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
Aaron Lidman 554dc77cef Dropdown fixes 2014-10-29 18:24:32 -04:00
Aaron Lidman 5c5649f3d8 Replace buttons with dropdown 2014-10-29 17:13:05 -04:00
Bryan Housel 9c32b89e6a When showing mapdata, background, or help panel, hide others 2014-10-29 16:14:43 -04:00
Bryan Housel 7c50c01bd3 mapdata checkboxes should use features.enabled() 2014-10-29 16:06:41 -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
samanpwbb 70e7987943 add data icon, fix button style 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 7d5189f3b0 Area filling options: wireframe, partial, full..
* implemented as css classes on surface element
* patterned fills can be done with css too.. removed the
  code from areas.js to set patterned fill on each element)
* dummy test code in `map_data.js` uses 'w' key to toggle..
2014-10-28 21:37:01 -04:00
Bryan Housel 51cadd5b82 initial wireframe style (key 'w')
(also fix gpx layer, now on top of data, to not steal pointer events)
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
Sajjad Anwar dab742a501 Make taginfo configurable and default to disabling taginfo related features 2014-10-24 16:26:37 -07:00
John Firebaugh eb9876c2de Use interpolation rather than concatenation 2014-10-22 11:16:37 -07:00
John Firebaugh 0b1a54acca Remember raw tag editor expansion state across sessions (fixes #2416) 2014-10-22 11:14:01 -07:00
Bryan Housel 712f533212 Translate text in changes section on save panel. (fixes #2417) 2014-10-22 10:27:59 -04:00
John Firebaugh 15e0c0a235 Capture ⌘-S even in input fields (fixes #2409) 2014-10-20 17:55:12 -07:00
John Firebaugh a9964aaa1d Adjust width of state input 2014-10-20 17:19:13 -07:00
Minh Nguyễn 8b896b8b84 maxlength="255" on commit comment textarea
Per API 0.6 limit. Fixes #2410.
2014-10-19 15:52:43 -07:00
John Firebaugh 9a2054272c Fix build 2014-10-13 16:48:59 -07:00
Bryan Housel 5782761e48 support zoom in/out with shifted or unshifted keys +,-,=,_
also add new Firefox-specific keycodes to `d3.keybinding.js`
closes #2389
2014-10-12 00:43:39 -04:00
John Firebaugh 0b1ec49402 Rewrite as a separate layer 2014-09-19 14:51:44 -07:00
samanpwbb 3c9ec76b33 add missing semicolons 2014-09-16 15:16:26 -04:00
samanpwbb e721e93a31 cleanup mapillary UI 2014-09-16 13:49:13 -04:00
Tom MacWright 88bb6967d9 Style and usability simplifications 2014-09-11 14:14:57 -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 43777d5259 Better inferRestriction for no_u_turn
* where from.node === to.node
* where from.way and to.way are oneways joined at a narrow angle
2014-09-02 16:43:31 -04:00
Bryan Housel 2b96064ed3 Continue support for options array of keys 2014-07-22 12:14:13 -04:00
Bryan Housel 804a523388 handle async loading of strings from taginfo 2014-07-21 19:03:13 -04:00
Bryan Housel 0d5d0b19fc Try to use strings when generating placeholder 2014-07-21 15:56:03 -04:00
Bryan Housel a68cb30fd2 Support option strings for combo fields (#1259, #1709) 2014-07-21 14:37:42 -04:00
Bryan Housel bcbb68ddb7 case insensitive locale check 2014-07-16 10:27:42 -04:00
John Firebaugh 0a4192e591 Simplify 2014-07-13 09:22:19 -07:00
John Firebaugh ed6416d4a3 Use correct translation keys 2014-07-13 09:16:14 -07:00