Commit Graph

1241 Commits

Author SHA1 Message Date
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 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 1f0087d133 Merge pull request #2525 from openstreetmap/conflict-resolution
Merge Conflict Resolution
2015-03-05 19:49:15 -05:00
Bryan Housel a7e67ccfd9 refactor Conflicts ui into its own component 2015-03-04 11:46:56 -05:00
Bryan Housel e79ff79092 Cleaner code for indeterminate feature checkboxes
(fixes #2532)
2015-02-26 14:33:03 -05:00
samanpwbb a4a5812816 style cleanup 2015-02-10 13:24:10 -05:00
samanpwbb e94d089526 fix modals 2015-02-09 18:11:38 -05:00
samanpwbb 7f9d1437d2 zoom to conflict on active 2015-02-09 17:28:22 -05:00
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