Commit Graph

9005 Commits

Author SHA1 Message Date
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
Bryan Housel 94eae89fc3 Merge, continue to tweak note_editor 2018-07-02 12:50:53 -04:00
Bryan Housel a474e3bb9f Working on note editor style and ui, simplify d3 code 2018-07-02 12:35:07 -04:00
Thomas Hervey d81b9c5625 merged: icon update from remote 2018-07-02 10:45:31 -04:00
Thomas Hervey 2c22fe00a2 updated: hacky note hovering; todo: complete note click handling 2018-07-02 10:44:47 -04:00
Thomas Hervey 5b4dde0004 pulled updates from remote 2018-07-02 07:48:56 -04:00
Bryan Housel 3304cc8f5b Remove unused far-comment-alt icon 2018-07-02 00:11:00 -04:00
Bryan Housel 13a30c050f Add some dots if there is a comment thread 2018-07-02 00:00:06 -04:00
Bryan Housel 65b2a42261 Adjust green 2018-07-01 23:39:42 -04:00
Bryan Housel 535208beb5 Move tests to spec/services/osm.js and remove old notes.js files 2018-07-01 23:35:10 -04:00
Bryan Housel 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
Thomas Hervey fc4d800c69 updated: pull from remote 2018-07-01 16:30:32 -04:00
Thomas Hervey 9fc94f5d28 updated: Premium DigitalGlobe description 2018-07-01 16:28:24 -04:00
Bryan Housel 487ec9d837 Better spinner event management
re: https://github.com/openstreetmap/iD/pull/5107#issuecomment-401617938
2018-07-01 12:48:51 -04:00
Bryan Housel 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
Bryan Housel bcc1669716 Move note css from the photos.css into a new css file data.css 2018-06-30 10:05:11 -04:00
Thomas Hervey dcef11459f updated: notes caching 2018-06-30 08:08:12 -04:00
Thomas Hervey eba9bde337 updated: pull from remote 2018-06-30 08:06:46 -04:00
Bryan Housel 2f8efee26a Draw 2x icons (shadow and fill) so they stand out more 2018-06-30 03:47:03 -04:00
Bryan Housel 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
Thomas Hervey 1b06dbd8c9 delete: demo select file (unintentional commit) 2018-06-29 23:36:11 -04:00
Bryan Housel 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
Bryan Housel fd1d2f006b Fix the osmNote initializer 2018-06-29 22:39:40 -04:00
Bryan Housel d034691fb0 Merge remote-tracking branch 'origin/merge_notes_service' into notes 2018-06-29 22:11:39 -04:00
Bryan Housel 9517635d4d Merge branch 'master' into notes 2018-06-29 21:54:24 -04:00
Thomas Hervey b3f7b06f66 merged: services/notes into /osm; todo: fix some caching & rendering 2018-06-29 20:01:30 -04:00
Bryan Housel 9ba517e7f1 Merge pull request #5116 from jgravois/patch-1
use 22 as maxZoom for Esri imagery (selectively)
2018-06-29 17:10:22 -04:00
Bryan Housel 21a7ed2b34 Add doublequotes to iD-sprite input file param so glob works on Windows
(closes #5077)
2018-06-29 20:19:22 +01:00
Thomas Hervey 737ccfcfba updated: siebar displays note details on hover (via svg) 2018-06-29 14:43:01 -04:00
Bryan Housel f02630a8fc Restore rollup-plugin-includepaths dependency for finding d3
Apparently still needed to build the project on Windows
2018-06-29 19:32:50 +01:00
john gravois 50c371f77b continue to catch 404s 2018-06-29 09:57:52 -07:00
john gravois dd951a9b35 use 22 as maxZoom for Esri imagery (selectively) 2018-06-29 09:20:05 -07:00
Bryan Housel 76d21c8293 stub test/spec/svg/gpx.js 2018-06-29 02:23:42 -04:00
Bryan Housel d668f79407 Merge branch 'jgravois-tilemap' 2018-06-28 23:21:24 -04:00
Bryan Housel b6fb3a345d Fetch Esri tilemap at high zoom to determine max zoom
The tilemap is only fetched if the user is at z > 18 and will not fetch again
unless the user has moved more than 1km away from the previous fetch
2018-06-28 23:20:08 -04:00
Bryan Housel 98e4fed829 v2.9.2 2018-06-28 19:02:06 -04:00
Bryan Housel 74e70f5949 npm run translations 2018-06-28 18:55:44 -04:00
Bryan Housel 53a00c0f6c npm run imagery 2018-06-28 18:54:44 -04:00
Bryan Housel 154a49b7cc Upgrade to eslint v5.0.0 2018-06-27 12:20:51 -04:00