Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Notes #5107

Merged
merged 86 commits into from
Jul 16, 2018
Merged

Notes #5107

merged 86 commits into from
Jul 16, 2018

Commits on Jun 19, 2018

  1. Configuration menu
    Copy the full SHA
    f92bc63 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e3c0fd4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1ed915e View commit details
    Browse the repository at this point in the history
  4. reformatted svg/notes

    thomas-hervey committed Jun 19, 2018
    Configuration menu
    Copy the full SHA
    3de1fd8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    cf2a9ad View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2018

  1. Configuration menu
    Copy the full SHA
    3df01e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2018

  1. Configuration menu
    Copy the full SHA
    473570c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    47ef49d View commit details
    Browse the repository at this point in the history
  3. merged from master

    thomas-hervey committed Jun 21, 2018
    Configuration menu
    Copy the full SHA
    db0fe7e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4576100 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e16b411 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2018

  1. Configuration menu
    Copy the full SHA
    dab46d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2018

  1. Configuration menu
    Copy the full SHA
    1878397 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Configuration menu
    Copy the full SHA
    0859d00 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2018

  1. Configuration menu
    Copy the full SHA
    737ccfc View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2018

  1. Configuration menu
    Copy the full SHA
    b3f7b06 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9517635 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d034691 View commit details
    Browse the repository at this point in the history
  4. Fix the osmNote initializer

    bhousel committed Jun 30, 2018
    1 Configuration menu
    Copy the full SHA
    fd1d2f0 View commit details
    Browse the repository at this point in the history
  5. 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
    bhousel committed Jun 30, 2018
    1 Configuration menu
    Copy the full SHA
    ede5610 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1b06dbd View commit details
    Browse the repository at this point in the history
  7. 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)
    bhousel committed Jun 30, 2018
    2 Configuration menu
    Copy the full SHA
    229484a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2f8efee View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    eba9bde View commit details
    Browse the repository at this point in the history
  10. updated: notes caching

    thomas-hervey committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    dcef114 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    bcc1669 View commit details
    Browse the repository at this point in the history
  12. 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)
    bhousel committed Jun 30, 2018
    Configuration menu
    Copy the full SHA
    f3d31f3 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2018

  1. Configuration menu
    Copy the full SHA
    487ec9d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9fc94f5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fc4d800 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2018

  1. Configuration menu
    Copy the full SHA
    00c8ff4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    535208b View commit details
    Browse the repository at this point in the history
  3. Adjust green

    bhousel committed Jul 2, 2018
    Configuration menu
    Copy the full SHA
    65b2a42 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    13a30c0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3304cc8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5b4dde0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    2c22fe0 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d81b9c5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a474e3b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    94eae89 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    86dc0c9 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7999aca View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    bd8705b View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    2d2845e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2018

  1. 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.
    bhousel committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    d87a2c2 View commit details
    Browse the repository at this point in the history
  2. Switch innerHtml to textContent, which properly unescapes xml

    This commit also fixes a linter error, and switches some
    lodash _forEach to normal for loops.
    bhousel committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    e0cc626 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab8e793 View commit details
    Browse the repository at this point in the history
  4. merged from remote

    thomas-hervey committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    b4c6607 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    61ae541 View commit details
    Browse the repository at this point in the history
  6. 2 Configuration menu
    Copy the full SHA
    8121f58 View commit details
    Browse the repository at this point in the history
  7. 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`
    bhousel committed Jul 3, 2018
    Configuration menu
    Copy the full SHA
    b14d1b5 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    bf499d9 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2018

  1. Configuration menu
    Copy the full SHA
    73ee5c2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f1dc12 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2018

  1. Configuration menu
    Copy the full SHA
    263ec9e View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2018

  1. Linkify the usernames

    bhousel committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    01b33e3 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2018

  1. Configuration menu
    Copy the full SHA
    d137aa0 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2018

  1. Configuration menu
    Copy the full SHA
    3eb3eef View commit details
    Browse the repository at this point in the history
  2. pacify some eslint warnings

    bhousel committed Jul 8, 2018
    Configuration menu
    Copy the full SHA
    7b42743 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0f49514 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    14356ce View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. fixed typo

    thomas-hervey committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    c460c03 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2018

  1. Configuration menu
    Copy the full SHA
    eafae6c View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2018

  1. Refactor out uiNoteHeader and uiNoteComments into separate modules

    uiNoteEditor was getting big!
    bhousel committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    0d7c292 View commit details
    Browse the repository at this point in the history
  2. Implement multi-fetch get for users from OSM API

    Eagerly load user details after loading notes
    (re: openstreetmap/openstreetmap-website#1921)
    bhousel committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    7423d19 View commit details
    Browse the repository at this point in the history
  3. Add noteOptions, default to 10k note limit and 7 days closed

    Also bump note tile zoom to z12. There just aren't that many notes,
    so this reduces API calls.
    bhousel committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    f52f24b View commit details
    Browse the repository at this point in the history
  4. Style note header

    bhousel committed Jul 11, 2018
    Configuration menu
    Copy the full SHA
    e9e2f9b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3454753 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2018

  1. WIP on buttons, simplify, remove some event dispatch

    - I made the buttons work like GitHub comment-on-issue buttons
    before typing:  "Close Note" / "Comment" (disabled)
    after typing:   "Close and Comment" / "Comment" (enabled)
    
    - I removed a bunch of the event dispatches.  These are useful for sending
    events to listeners/observers outside of the module.  In this case I think
    we can handle most of the things from within the uiNoteEditor.  We can still
    dispatch an 'update' event so that modeSelectNote can reselect and redraw
    the note after some change happens to it.
    
    TODO - make the buttons work / check the OSM API stuff.
    bhousel committed Jul 12, 2018
    Configuration menu
    Copy the full SHA
    91add0c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5e5601f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fe7086f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    19560eb View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2018

  1. Add docs about OSM API, finish implementing postNoteUpdate

    `postNoteUpdate` can hangle status changes and comment additions
    (I named it that to be like `putChangeset`)
    
    Also renamed `user` to `loadUser` to be consistent with other calls
    bhousel committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    645cc79 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    57da729 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    775b472 View commit details
    Browse the repository at this point in the history
  4. Update notes on status change

    bhousel committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    8a1079c View commit details
    Browse the repository at this point in the history
  5. Can't skip seen on the userDetails call

    This call really does need for a result to be passed to the callback
    bhousel committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    f825845 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bd15865 View commit details
    Browse the repository at this point in the history
  7. Wrap callbacks with common checks for connection id and auth failure

    This eliminates a lot of the copy-paste code in every callback.
    bhousel committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    33ef9a4 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    1a106f5 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7fb42ac View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. Configuration menu
    Copy the full SHA
    7ad765d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    33de399 View commit details
    Browse the repository at this point in the history
  3. Cleaner note icon rendering

    Before: We drew 2 fontawesome comment icons, on on top of the other
    After: Moved icon into iD spritesheet and gave it an actual `stroke` property that can be styled
    bhousel committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    70f8763 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    47de7b3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    694cc60 View commit details
    Browse the repository at this point in the history