Commit Graph

3428 Commits

Author SHA1 Message Date
Bryan Housel
728036be51 Don't write unsavable changes to localStorage (closes #2705) 2015-06-20 12:21:29 -04:00
Bryan Housel
60fdb60a8a Refactor validations 2015-06-19 14:58:09 -04:00
Bryan Housel
ca47d2662d Let conflict resolution restore deleted childnodes if force_local 2015-06-18 11:48:49 -04:00
Bryan Housel
ee6479ff48 During localstorage restore, fetch older version of childnode if needed
This together with 8398fd7 closes #2142
2015-06-18 11:47:14 -04:00
Bryan Housel
f4d93c442e Add connection#loadEntityVersion to fetch specific version 2015-06-18 11:46:43 -04:00
Bryan Housel
8398fd7cf1 Fetch missing childnodes when restoring from localstorage
(see #2142)
TODO: fetch older version if the node has been deleted.
2015-06-18 09:56:11 -04:00
Bryan Housel
4c3ebbec2b Merge branch 'rhokbrisbane-keyboard_shortcuts' 2015-06-17 00:55:32 -04:00
Bryan Housel
d1253c6ef1 use iD.ui.cmd for fast pan and zoom shortcuts 2015-06-17 00:41:35 -04:00
Bryan Housel
a04abacf1e Merge pull request #2694 from 1ec5/1ec5-wikipedia-url
Tighten up Wikipedia URL handling
2015-06-17 00:31:47 -04:00
Bryan Housel
cc9612f3ea jshint 2015-06-15 22:51:15 -04:00
Bryan Housel
6aa4b3a873 Merge branch 'keyboard_shortcuts' of https://github.com/rhokbrisbane/iD into rhokbrisbane-keyboard_shortcuts 2015-06-15 22:32:20 -04:00
Bryan Housel
641cf98e70 Add tooltip to minimap toggle control 2015-06-15 22:28:40 -04:00
Bryan Housel
26ca610d0d Merge branch 'add-task-outline-to-minimap' of https://github.com/rhokbrisbane/iD into rhokbrisbane-add-task-outline-to-minimap 2015-06-15 22:02:42 -04:00
Bryan Housel
fda8146972 Merge pull request #2686 from ebrelsford/cycleway-preset
Add cycleway preset field for highways with bike lanes
2015-06-15 21:35:03 -04:00
Eric Brelsford
95b1eb6cce Use the cycleway's strings.options property to get options 2015-06-15 16:37:42 -04:00
Eric Brelsford
ca9dde8c33 Decide when to use cycleway itself or cycleway:* 2015-06-15 16:32:34 -04:00
Rowan Hogan
336f7420e5 Merge branch master into add-task-outline-to-minimap 2015-06-15 10:14:07 +10:00
Rowan Hogan
42c99a4400 Merge branch 'master' into keyboard_shortcuts 2015-06-15 10:12:31 +10:00
Minh Nguyễn
2d8969dbe3 Fixed test & lint errors
The anchor may not always be present.
2015-06-14 17:11:27 -07:00
Denys Digtiar
be1e3738f1 Error handling is added to the GPX loading callback.
Previously erroneous response was corrupting the GpxLayer, which could
potential corrupt the whole Map, if user were to use 'Zoom to GPX'
feature. Callback logic is wrapped in the error guard to fix this.
2015-06-14 16:46:20 -07:00
Rowan Hogan
21526aff2a Syncs minimap toggle button and keyboard shortcut (using same method). 2015-06-15 09:38:07 +10:00
Rowan Hogan
fb34b953b8 Fix alignment of gpx on minimap when panning 2015-06-15 08:17:25 +10:00
Minh Nguyễn
cc51a2f038 Anchors in Wikipedia URLs
Corrected several issues with section anchors in Wikipedia URLs:

 - When normalizing a pasted-in URL into a tag value, try to decode the anchor.
 - Also when normalizing into a tag value, recognize variant paths such as zh.wikipedia.org/zh-hk/.
 - When the tag value contains an anchor, encode it before adding it to the link.
2015-06-14 10:18:04 -07:00
Minh Nguyễn
ce101bdb02 Allow hyphens in Wikipedia subdomain
When recognizing a Wikipedia tag value as a URL, allow hyphens in the URL subdomain, e.g. zh-min-nan.wikipedia.org.
2015-06-14 09:30:43 -07:00
Rowan Hogan
5c860be877 Moved minimap gpx layer methods to the background gpx layer handlers 2015-06-14 12:37:37 +10:00
Rowan Hogan
bd5eb5e972 Adds minimap toggle to background menu. Also resolves CSS issue with GPX layer in minimap. 2015-06-14 11:11:56 +10:00
Rowan Hogan
adcad80950 WIP on minimap custom GPX 2015-06-13 18:18:52 +10:00
Denys Digtiar
ba4312ed80 [WIP] GPX Layer is added to the mini-map. 2015-06-13 15:27:24 +10:00
Rowan Hogan
9aa1ffa227 Adds increased zoom keyboard shortcuts. 2015-06-13 15:24:48 +10:00
Rowan Hogan
20e619ea21 Adds viewport dimension panning options (and related keyboard shortcuts). 2015-06-13 15:00:54 +10:00
Brad Parker
304ac66c5f [WIP] attempting to add task outline gpxLayer to map_in_map 2015-06-13 12:15:57 +10:00
Pierre GIRAUD
71061a4f5e Better look for mapillary markers 2015-06-12 16:52:20 +02:00
Bryan Housel
7b4c6d2a16 1.7.3 2015-06-10 11:43:55 -04:00
Bryan Housel
78c484a02b Clear localstorage edits after successful save.. 2015-06-10 01:21:38 -04:00
Bryan Housel
5799b7fc33 Enter Browse mode before switching API server
(Because if in Select mode, the selected entity will be missing
and cause an error to be thrown)
2015-06-09 23:26:36 -04:00
Bryan Housel
9311ee64ab Post save delay before fetching new data to allow for postgres replication
re: #2678 #2667 #1646
I cheated a bit by putting half the delay before showing success pane and half after.
2015-06-09 22:38:55 -04:00
Bryan Housel
aaf9267149 Use lodash _.chunk 2015-06-09 21:34:30 -04:00
Bryan Housel
f0d130e6c0 Bump lodash version to latest 3.9.3 2015-06-09 21:22:35 -04:00
Bryan Housel
f5b6433a2f ClientRect is in fact not cloneable, breaks under lodash 3.x 2015-06-09 21:21:16 -04:00
Eric Brelsford
a5dfee71b1 Use "none" as cycleway field placeholder
Ensure "no" is not saved to OSM
2015-06-09 15:15:48 -04:00
Eric Brelsford
31c57c01ce Add cycleway preset for highways with bike lanes 2015-06-09 14:49:50 -04:00
Bryan Housel
76089be464 Don't wait for changeset to close before calling save callback
see #2667
2015-06-03 11:10:34 -04:00
Bryan Housel
a7fca1be23 Set iD.detect().locale to requested locale (closes #2672)
When locale is passed in, we should use that locale in
the parts of the code that are using iD.detect().locale:

* tag reference
* localized name display
* map scale
* info box

The one exception is when iD detects 'en-US' and openstreetmap
website tries to pass 'en', leave it as 'en-US'
2015-06-02 12:34:45 -04:00
Bryan Housel
39895b4c7d Also forward help link as html instead of text
re: #2674
2015-06-02 11:12:14 -04:00
Bryan Housel
9ae9d91a90 Treat help doc titles as html instead of text (closes #2674) 2015-06-02 11:06:23 -04:00
tristen
6316e52b55 Merge pull request #2573 from openstreetmap/distance-measurement
Infobox / distance measurement
2015-05-27 11:11:03 -04:00
tristen
249125ce16 Tweaks to the infobox interface
- Variable height depending on the context list
- Added width that alligns with the grid
- Re-use classnames shared by the interface
- Changes to the unit toggle
  -- Shortened name to current unit of measurement (Accounted for this change in i8n)
  -- Display as a button to match other toggle/button like elements in the interface
2015-05-27 10:17:17 -04:00
Bryan Housel
1287e4cad9 Change distance-measurement hotkey to cmd-I 2015-05-26 12:27:50 -04:00
Bryan Housel
151aba94b2 Fallback to 'en-US' when no language detected (closes #2650) 2015-05-26 12:14:33 -04:00
Bryan Housel
6e27b55061 Don't clean description/note/fixme values (closes #2659) 2015-05-26 11:18:09 -04:00