Commit Graph

3404 Commits

Author SHA1 Message Date
Rowan Hogan 336f7420e5 Merge branch master into add-task-outline-to-minimap 2015-06-15 10:14:07 +10: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
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
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
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
Bryan Housel 51dfbb18cf Only urlencode tag values that start with http (closes #2657) 2015-05-26 09:57:46 -04:00
Peter Schwindt 2a29864a58 Update connection.js
removed browser and platform as changeset tags
2015-05-13 11:13:53 +02:00
John Firebaugh 6eb075c0e7 Clip oneway markers to viewport (fixes #2638) 2015-05-11 14:45:11 -07:00
John Firebaugh 20a75ac983 Performance improvement for iD.Difference
Avoid creating lots of unnecessary temporaries by short circuiting in a
common case.
2015-05-09 14:57:42 -07:00
John Firebaugh f8a68c879f Adjust tree for force-rebased entities
Previously, entities that already existed in the rtree prior to the rebase
option would end up duplicated in the tree afterward.

Fixes #2637
2015-05-09 14:38:41 -07:00
Bryan Housel 1a3e2c0ebf 1.7.2 2015-05-03 10:24:04 -04:00
Bryan Housel d3f3c9a43f Don't allow duplicate ids in multifetch request list
(closes #2626)
2015-05-03 01:01:01 -04:00
Bryan Housel 12e4e60f45 1.7.1 2015-04-30 14:15:19 -04:00
Bryan Housel 8eae273bde Correctly restore new local childnodes when choosing "keep local" 2015-04-30 14:10:32 -04:00
Bryan Housel bff8266f19 Load children into remotegraph before conflict checks
Because loadMultiple doesn't download /full like loadEntity,
need to also load children that aren't already being checked..
2015-04-30 14:10:20 -04:00
Bryan Housel 7adb0ddbfb Smarter revert of new entities, more tests
re: #2611, #537
2015-04-29 22:47:07 -04:00
Bryan Housel ca02cf4b96 Graph#revert accept id instead of entity ref
trivial test cases (revert across create/update/delete) all pass
2015-04-28 11:22:46 -04:00
Bryan Housel d85e6c260e Only check childnode versions of nodes that exist both locally and remote
The old code was causing false positives, flagging any added or removed
childnode as a conflict.
2015-04-28 09:37:52 -04:00
Bryan Housel b087e78528 Allow zoomToEntity to be called w/o Extent
In case user clicks on Entity description - line 102
2015-04-27 11:49:33 -04:00
Bryan Housel cecdc012ee Don't commit empty changesets.. (closes #1483)
instead, silently flush context and return to browse mode
2015-04-27 11:39:13 -04:00
Bryan Housel a565b72f7d Before saving, revert entities where user chose "keep theirs" 2015-04-27 10:18:07 -04:00
Bryan Housel 00c0641f06 Make view extent include both local and remote versions of the change 2015-04-27 10:16:47 -04:00
Bryan Housel c10b83f28f iD.actions.Revert (see #537) 2015-04-26 01:08:31 -04:00
Bryan Housel 6b18066dd6 Graph#revert (see #537) 2015-04-26 01:07:48 -04:00
Bryan Housel 3b18f1d33a Fix corruption of conflicts array introduced in 06c0a7d 2015-04-24 16:33:49 -04:00
Bryan Housel de5bac0a85 Don't unzorro ways that are overly connected (closes #2598) 2015-04-22 22:36:55 -04:00
Bryan Housel 99d037e97f Better logic for adding area=yes (closes #2578)
This fixes a few issues:

1. before: checked first key in applyTags and break loop, now: check all of them
(this was what caused `area=yes` to be added to 'branded' presets:
the first key is for these is `name` which isn't in areaKeys.)

2. add `area=yes` if user is drawing an area but the preset can be an
area or a line (e.g. `barrier=city_wall`)

3. remove `area=yes` when switching to another preset
2015-04-22 17:04:18 -04:00
Bryan Housel 8bacf9858a Exclude barrier from areaKeys
Because like the others, they are generally
lines but can occasionally be areas or lines
2015-04-22 15:13:48 -04:00
Bryan Housel 420647f503 Remove LRM character, etc from websites and emails (closes #2323) 2015-04-22 11:57:50 -04:00