a52eeb9733
Fix failing tests, lint errors, merge conflicts
2018-07-09 11:17:57 -04:00
c460c03da5
fixed typo
2018-07-09 10:11:50 -04:00
4fda478f57
Merge branch 'check' of https://github.com/vershwal/iD into vershwal-check
2018-07-09 09:32:15 -04:00
14356cefe2
WIP: toggle note status
2018-07-08 12:50:02 -05:00
0f49514fbb
updated: removed centering when clicking a note
2018-07-08 10:27:44 -05:00
de12396654
Fix projection so the map is where the point is
...
Also remove gj redundancy
2018-07-08 00:50:26 -04:00
7b42743513
pacify some eslint warnings
2018-07-07 23:00:48 -04:00
3eb3eefabd
Combine Osm and Notes layers into the same ul
2018-07-07 22:54:27 -04:00
d137aa0046
Add "More/Less" toggle for too long comments (curr limit 600 chars)
2018-07-07 00:25:42 -04:00
3bad09d497
Merge Work-In-Progress 4320 to 4320
2018-07-06 22:20:19 +01:00
01b33e3fb7
Linkify the usernames
2018-07-06 11:28:01 -04:00
263ec9e36a
Add code to swap in avatar images for users that have them
2018-07-05 18:42:42 -04:00
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
3819fd6498
Use XHR to access wikidata API instead of JSONP
2018-07-04 17:05:39 +01:00
1ab7cf790e
Use XHR to access wikipedia API instead of JSONP
2018-07-04 17:05:26 +01:00
4cc080b034
Use XHR to fetch imagery metadata instead of JSONP
2018-07-04 17:00:45 +01:00
6f1dc12f99
Add user method to osm service, _userCache, user parser
2018-07-04 03:20:16 -04:00
73ee5c2fc9
fixed select_note mode, cleaned note_editor, TODO: enable note save
2018-07-03 22:45:51 -04:00
bf499d9438
Restore modeSelect, and make a new modeSelectNote just for the notes
2018-07-03 18:11:59 -04:00
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
8121f585d5
added checks for multiclick and click on notes
2018-07-03 15:39:22 -04:00
61ae541cfc
updated: notes save buttons
2018-07-03 10:57:53 -04:00
ab8e793a72
Playing with note styling, add avatars and more metadata
2018-07-03 02:41:47 -04:00
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
2d2845e5d4
If notes are coincident, move them apart slightly
2018-07-02 16:56:05 -04:00
bd8705bf85
updated: reintroduced hovering on notes
2018-07-02 16:32:17 -04:00
7999aca9e2
Add getNode and replaceNote methods, refactor caches
2018-07-02 16:02:53 -04:00
86dc0c9012
updated: new comments in notes sidebar ui
2018-07-02 15:51:55 -04:00
94eae89fc3
Merge, continue to tweak note_editor
2018-07-02 12:50:53 -04:00
a474e3bb9f
Working on note editor style and ui, simplify d3 code
2018-07-02 12:35:07 -04:00
2c22fe00a2
updated: hacky note hovering; todo: complete note click handling
2018-07-02 10:44:47 -04:00
5b4dde0004
pulled updates from remote
2018-07-02 07:48:56 -04:00
13a30c050f
Add some dots if there is a comment thread
2018-07-02 00:00:06 -04:00
535208beb5
Move tests to spec/services/osm.js and remove old notes.js files
2018-07-01 23:35:10 -04:00
00c8ff4f69
Don't add notes to the _seenEntity cache
...
re: https://github.com/openstreetmap/iD/commit/229484a940eeb1d8ef08495c39642276c599c323#commitcomment-29560519
2018-07-01 22:50:28 -04:00
fc4d800c69
updated: pull from remote
2018-07-01 16:30:32 -04:00
487ec9d837
Better spinner event management
...
re: https://github.com/openstreetmap/iD/pull/5107#issuecomment-401617938
2018-07-01 12:48:51 -04:00
f3d31f3075
Update css styles for notes
...
- open notes are red (default)
- resolved notes are green
- orange on hover
- yellow on select (also added centerEase to note location)
2018-06-30 10:44:28 -04:00
dcef11459f
updated: notes caching
2018-06-30 08:08:12 -04:00
eba9bde337
updated: pull from remote
2018-06-30 08:06:46 -04:00
2f8efee26a
Draw 2x icons (shadow and fill) so they stand out more
2018-06-30 03:47:03 -04:00
229484a940
Cleanup osm service notes and caches, remove state variable
...
This seems like a lot but the main things here are:
- remove the _loadingTiles "global" variable. It was causing problems because
it was being checked from the callbacks, which are async.
- cleanup the caches
- use DOM API getElementsByTagName('id') to get note id
- set a lower tilezoom z13 for notes (meaning: fetch larger bounding boxes)
2018-06-30 03:46:42 -04:00
1b06dbd8c9
delete: demo select file (unintentional commit)
2018-06-29 23:36:11 -04:00
ede561080d
Add update method, remove getters..
...
This makes the osmNote work a bit more like other osm objects in iD.
- When working with the osm objects, we'll treat them as immutable.
So all modifications will be through the update method:
e.g. can do this in a repl, like chrome devtools console:
> n = iD.osmNote()
osmNote { id: -1 }
> n = n.update({ foo: 'bar' });
osmNote { foo: "bar", id: -1, v: 1 }
- none of the other osm objects have getters, and in JavaScript all the
properties are public anyway
2018-06-29 22:47:14 -04:00
fd1d2f006b
Fix the osmNote initializer
2018-06-29 22:39:40 -04:00
d034691fb0
Merge remote-tracking branch 'origin/merge_notes_service' into notes
2018-06-29 22:11:39 -04:00
9517635d4d
Merge branch 'master' into notes
2018-06-29 21:54:24 -04:00
b3f7b06f66
merged: services/notes into /osm; todo: fix some caching & rendering
2018-06-29 20:01:30 -04:00
737ccfcfba
updated: siebar displays note details on hover (via svg)
2018-06-29 14:43:01 -04:00
50c371f77b
continue to catch 404s
2018-06-29 09:57:52 -07:00
Bryan Housel