James Kingdom
7605a05e51
Add "network" field to ATM preset
...
(closes #5119 )
2018-07-09 17:49:44 -04:00
James Kingdom
7acef06e53
Add "cash_in" field to ATM preset
...
(closes #5118 )
2018-07-09 17:37:13 -04:00
James Kingdom
ed9c934322
Add "site_type" to archaeological site preset
...
(closes #5124 )
2018-07-09 16:42:14 -04:00
Bryan Housel
1395e029d9
Add guard code for if Mapillary viewer could not be initialized
2018-07-09 16:17:09 -04:00
Bryan Housel
9c275d58b5
Comment out .mvt data layer for now
2018-07-09 14:36:16 -04:00
Bryan Housel
69e83099a5
Fix icon names in map_data panel
2018-07-09 14:31:20 -04:00
Bryan Housel
99e7366fc2
swap d3_fetch for d3_request (for backward compatability with IE11)
2018-07-09 14:30:51 -04:00
Bryan Housel
a52eeb9733
Fix failing tests, lint errors, merge conflicts
2018-07-09 11:17:57 -04:00
Thomas Hervey
c460c03da5
fixed typo
2018-07-09 10:11:50 -04:00
Bryan Housel
4fda478f57
Merge branch 'check' of https://github.com/vershwal/iD into vershwal-check
2018-07-09 09:32:15 -04:00
Thomas Hervey
14356cefe2
WIP: toggle note status
2018-07-08 12:50:02 -05:00
Thomas Hervey
0f49514fbb
updated: removed centering when clicking a note
2018-07-08 10:27:44 -05:00
Bryan Housel
de12396654
Fix projection so the map is where the point is
...
Also remove gj redundancy
2018-07-08 00:50:26 -04:00
Bryan Housel
ef771211b7
Merge branch 'gpxtext' of https://github.com/vershwal/iD into vershwal-gpxtext
2018-07-07 23:28:48 -04:00
Bryan Housel
fae485860a
npm run build
2018-07-07 23:27:45 -04:00
Bryan Housel
ed7c65297b
Merge pull request #5130 from tohaklim/patch-2
...
Attempt to improve entrance searchability
2018-07-07 23:22:44 -04:00
Bryan Housel
7b42743513
pacify some eslint warnings
2018-07-07 23:00:48 -04:00
Bryan Housel
3eb3eefabd
Combine Osm and Notes layers into the same ul
2018-07-07 22:54:27 -04:00
tohaklim
3e334b11a3
Attempt to improve entrance searchability
...
I am currently unable to bring-up entrance by typing in "entrance" on a vertex, this might help?
2018-07-07 14:56:54 +01:00
Jon D
dd3de593ca
Add tests for Detach Node operation
2018-07-07 11:34:14 +01:00
Jon D
3fe6f16526
Fix keyboard shortcut clash
2018-07-07 10:50:44 +01:00
Jon D
3b6b4bb7be
Clean up SVG
2018-07-07 10:37:58 +01:00
Bryan Housel
d137aa0046
Add "More/Less" toggle for too long comments (curr limit 600 chars)
2018-07-07 00:25:42 -04:00
Jon D
3bad09d497
Merge Work-In-Progress 4320 to 4320
2018-07-06 22:20:19 +01:00
Bryan Housel
01b33e3fb7
Linkify the usernames
2018-07-06 11:28:01 -04:00
Bryan Housel
263ec9e36a
Add code to swap in avatar images for users that have them
2018-07-05 18:42:42 -04:00
Bryan Housel
416ae66f71
Support more direction tags for reversal in Reverse action
...
(closes #5121 )
This commit also refactors some of the logic to make it simpler and more efficient
(removes lodash _transform too) and updates the comment that was out of date.
2018-07-05 14:47:56 -04:00
Bryan Housel
faf12a1587
Merge pull request #5123 from tomhughes/xhr
...
Replace JSONP with XHR where possible
2018-07-04 20:05:41 -04:00
Tom Hughes
d617d9c588
Fix wikipedia UI tests to mock XHR instead of JSONP
2018-07-04 17:07:27 +01:00
Tom Hughes
3819fd6498
Use XHR to access wikidata API instead of JSONP
2018-07-04 17:05:39 +01:00
Tom Hughes
1ab7cf790e
Use XHR to access wikipedia API instead of JSONP
2018-07-04 17:05:26 +01:00
Tom Hughes
4cc080b034
Use XHR to fetch imagery metadata instead of JSONP
2018-07-04 17:00:45 +01:00
vershwal
73ac628880
gpx tests.
2018-07-04 19:56:51 +05:30
Bryan Housel
6f1dc12f99
Add user method to osm service, _userCache, user parser
2018-07-04 03:20:16 -04:00
Thomas Hervey
73ee5c2fc9
fixed select_note mode, cleaned note_editor, TODO: enable note save
2018-07-03 22:45:51 -04:00
Bryan Housel
bf499d9438
Restore modeSelect, and make a new modeSelectNote just for the notes
2018-07-03 18:11:59 -04:00
Bryan Housel
b14d1b5061
resolve conflicts, fix a few minor bugs prob caused by merging:
...
- don't insert multiple times into the rtree in `services/osm.js`
- use `d.id` instead of `d.key` as the key in `svg/notes.js`
2018-07-03 16:40:07 -04:00
Thomas Hervey
8121f585d5
added checks for multiclick and click on notes
2018-07-03 15:39:22 -04:00
Thomas Hervey
61ae541cfc
updated: notes save buttons
2018-07-03 10:57:53 -04:00
Thomas Hervey
b4c6607384
merged from remote
2018-07-03 10:49:36 -04:00
Bryan Housel
68a3e6e69a
npm run build
2018-07-03 09:15:22 -04:00
Bryan Housel
96794d29d7
Merge pull request #5120 from tordans/patch-2
...
Add capacity to playground:swing-preset
2018-07-03 09:14:28 -04:00
Tobias
095ae133c4
Add capacity to playground:swing-preset
...
The capacity defines if there is one swing on the object or more. A lot of playgrounds have one structure with two swings on it.
2018-07-03 14:00:36 +02:00
Bryan Housel
ab8e793a72
Playing with note styling, add avatars and more metadata
2018-07-03 02:41:47 -04:00
Bryan Housel
e0cc6260f5
Switch innerHtml to textContent, which properly unescapes xml
...
This commit also fixes a linter error, and switches some
lodash _forEach to normal for loops.
2018-07-02 23:22:00 -04:00
Bryan Housel
d87a2c2d2d
Adjust pointer css for note markers
...
This sets `pointer-events: none` for the `.note-shadow` class,
to fix an amusing bug where hovering over the filled part of the comment
icon would work ok but hovering over the "dots" would not.
2018-07-02 22:18:42 -04:00
Bryan Housel
2d2845e5d4
If notes are coincident, move them apart slightly
2018-07-02 16:56:05 -04:00
Thomas Hervey
bd8705bf85
updated: reintroduced hovering on notes
2018-07-02 16:32:17 -04:00
Bryan Housel
7999aca9e2
Add getNode and replaceNote methods, refactor caches
2018-07-02 16:02:53 -04:00
Thomas Hervey
86dc0c9012
updated: new comments in notes sidebar ui
2018-07-02 15:51:55 -04:00