Commit Graph

8136 Commits

Author SHA1 Message Date
Bryan Housel
89d8d37576 Drawing all the correct vertices now where I want them, simplify classes
Some highlights
- `getSiblingAndChildVertices` are expensive, so they're saved and called less frequently
- draw touch targets for all the visible vertices
- remove redundant css classes and `setClass` function
2017-12-15 17:28:20 -05:00
Bryan Housel
ba5b3eee9c More work on vertex drawing, add debug for touch targets 2017-12-15 00:26:37 -05:00
Bryan Housel
b9e48d1682 WIP: Move layer-hit to layer-points with explict sublayers, update tests
This is more work to further isolate the layers that entities draw to.
It makes it easier to debug what is going on, and can eventually lead to
deferred drawing, if each draw function is in its own place and not dependant
on anything else.

I've started to replace the vertex-hover with an explicit layer for touch
targets.

Also had to change a lot of the svg tests, which are really brittle.
Things would happen like - the surface would be created, it would kick of a
deferred redraw, which would notice that the zoom was 0 and call
editOff, which would remove the osm layers that were just created and
that the tests were trying to draw to. These tests need proper zoom and
projection otherwise nothing works.
2017-12-14 17:38:43 -05:00
Bryan Housel
bfaf17538e Move text to single group with subgroups for halo,label,debug 2017-12-14 12:32:28 -05:00
Bryan Housel
24baa5390e Adjust some variable names to better match what they do
- `nodes` are for osm nodes
- `points` are the projected locations of those node `loc` in screen space
2017-12-13 18:31:37 -05:00
Bryan Housel
d9e3367836 More improvements to label vertex avoidance
(re: #4271, #3636)

- better classification of "interesting" vertices
  (include tagged, selected, or child of selected)
- now we can draw labels on selected lines again (revert #3636)
  because the labels will avoid the vertices
- if debugging is on, draw a collision box for the mouse
2017-12-13 18:05:06 -05:00
Bryan Housel
006ee691bf Avoid placing labels in interesting points/vertices
(closes #4271)
2017-12-13 14:31:17 -05:00
Bryan Housel
450392d2e5 Fix label placement for directional points rendered as vertices 2017-12-13 10:23:25 -05:00
Bryan Housel
5d5546d54d Minor code formatting 2017-12-13 10:02:39 -05:00
Bryan Housel
789f1e5f6f Make sure points/vertices render the right things at different zooms 2017-12-13 08:57:43 -05:00
Bryan Housel
899abc7ef5 WIP to render vertices while dragging
(re: #3003 / #4602)

For now, drawHover is commented out.  Still not sure what I will do with it.
This means that things flicker a bit when dragging, also connecting nodes
(and closing lines) does not currently work.

There was lot going on preventing the vertices from rendering while dragging.

1. `modeDragNode` needed a proper `selectedIDs()` function that works like other
modes.. Many other places in iD (including the vertex renderer) call `context.selectedIDs()`..
This means that `modeDragNode` needs a new function `restoreSelectedIDs()` to do what
`selectedIDs()` was previously doing (a place to store selectedIDs so that we
can reselect those entities after the user is done dragging a node in select mode)

2. Just so many things in svg/vertices.js
  - siblingAndChildVertices was missing some things for points that we render
    as vertices (points in wireframe, points with directions)
  - the sibling vertices weren't being included in the `filter` function, so
    would disappear when doing differenced/extent redraws
  - probably some other things
2017-12-12 17:39:36 -05:00
Bryan Housel
b394cb6dfa Variable cleanup, elminiate lodash _filter 2017-12-11 17:46:15 -05:00
Bryan Housel
a5bbc21728 Remove unnecessary zoom parameter 2017-12-11 17:34:01 -05:00
Bryan Housel
4b5260a5ab Add wireframe viewfield marker
(styling marker fill in svg is not currently supported)
2017-12-11 15:48:08 -05:00
Bryan Housel
2edbcc4b82 Match any *:direction key, rather than hardcoding a list 2017-12-11 15:17:17 -05:00
Bryan Housel
6b9ccdb45a Add tests for osmNode#direction 2017-12-11 14:33:22 -05:00
Bryan Housel
ee3083b113 Support rendering camera:direction 2017-12-11 11:46:11 -05:00
Bryan Housel
8e19474293 Render directional points (e.g. benches, cameras, signs) as vertices 2017-12-11 10:48:04 -05:00
Bryan Housel
b42c096fe5 Make sure viewfields actually update on update selection 2017-12-10 14:34:50 -05:00
Bryan Housel
2a8bf6c7bf Don't draw viewfields on hover, rearrange code 2017-12-10 00:43:46 -05:00
Bryan Housel
34c98b94e6 Move directions code from vertices to node.js 2017-12-09 12:53:08 -05:00
Bryan Housel
42043b2ce1 Support more tags, cardinal and numeric directions 2017-12-08 16:23:35 -05:00
Bryan Housel
9c649b74cd After switching from arrows to viewfields, forward/backward is different 2017-12-08 14:54:26 -05:00
Bryan Housel
515094cb56 Only add viewfields for an all-way stop on a highway intersection.
Sometimes people tag all-way stop signs at the junction node,
othertimes people tag all-way stop signs at the stop sign location.

What we're doing here is:
- if `stop=all` tagged at the junction, show viewfield in all directions
- if `stop=all` tagged at the sign location, show viewfield according to `direction=` tag
2017-12-08 14:36:45 -05:00
Bryan Housel
6aba27c84a Display directional vertex with a viewfield, not an arrow 2017-12-08 14:29:56 -05:00
Bryan Housel
b79b6ca97a Support rendering direction on vertices (stop sign, traffic_signals, etc)
(closes #3815)
2017-12-07 22:48:03 -05:00
Bryan Housel
6cfe7a2e71 When reversing a way, reverse traffic_signals:direction on child nodes
(closes #4595)
2017-12-06 20:48:21 -05:00
Bryan Housel
18ab596f58 Improve int'l date/time strings on imagery and history tools
(closes #4594)
2017-12-06 15:27:54 -05:00
Bryan Housel
3440b5523c Use ⌘F to focus the feature search box
(closes #4545)
2017-12-06 01:19:02 -05:00
Bryan Housel
c6ab9e593d Flash message if drag not allowed because of a hidden connection
(closes #4493)
2017-12-06 00:11:42 -05:00
Bryan Housel
f247bd1e66 Move icon code into uiFlash, default flash icon to icon-no
Previously it was up to the caller to draw whatever they want into the
footer flash.  With this change, uiFlash creates an icon and a text, so
the caller doesn't need to do as much work.
2017-12-05 23:41:34 -05:00
Bryan Housel
5e19c936f0 Avoid deferred fetching of OSM tiles at low zooms or with layer disabled
(closes #4572)
2017-12-05 14:36:12 -05:00
Bryan Housel
4140535470 Add preset for landuse=greenhouse_horticulture
(closes #4571)

Also adjust matchScores so that odd or generic presets like this one sort lower
2017-12-05 13:59:02 -05:00
Bryan Housel
6920e08737 Don't show building=mosque as house icon
(closes #4586)
2017-12-05 13:46:40 -05:00
Bryan Housel
83f135f2ba Recycling Center / Recycling Container preset cleanups
(closes #4569)
2017-12-05 13:37:13 -05:00
Bryan Housel
b29cc88f36 Add Retail Building to buildings, switch Commercial icon to suitcase
(closes #4590)
2017-12-05 11:38:40 -05:00
greenkeeper[bot]
5b6d645e6d chore(package): update @std/esm to version 0.18.0 2017-12-05 11:15:53 -05:00
greenkeeper[bot]
c05146d55a chore(package): update rollup to version 0.52.1 2017-12-05 11:15:24 -05:00
greenkeeper[bot]
fa629956e5 chore(package): update mapillary-js to version 2.10.0 2017-12-05 11:15:03 -05:00
Bryan Housel
a8d0aae61f Merge pull request #4585 from openstreetmap/pt_v2
Update transit presets for Public Transport v2 schema
2017-12-05 00:36:24 -05:00
Bryan Housel
8ac87f755e Use new icons for the public_transport presets 2017-12-05 00:25:35 -05:00
Bryan Housel
8b1ddb7724 Update public transport icons 2017-12-04 23:55:10 -05:00
Bryan Housel
fef19bc954 Split public_transport=platform presets for line vs area/point
This is done so that the linear presets can have an icon that looks
more like a footway/sidewalk, to encourage people to use them that way
and connect them to the pedestrian network.
2017-12-03 14:05:13 -05:00
Bryan Housel
4caed18118 Add public_transport=stop_area relation preset 2017-12-03 14:04:50 -05:00
Bryan Housel
15ffc20424 Merge pull request #4584 from lucymk/master
Changed tourist attraction icon from monument to star
2017-12-03 09:47:54 -05:00
Bryan Housel
c83eddff10 Update transit presets for Public Transport v2 schema
(closes #3041)
(closes #3508)
(closes #4566)
2017-12-02 18:03:44 -05:00
Lucy King
997a6a2ae7 Changed tourist attraction icon from monument to star 2017-12-02 12:29:52 +00:00
Bryan Housel
efc4f6c88c Mark office=administrative as non-searchable
(closes #4578)
2017-12-01 16:06:22 -05:00
Bryan Housel
e73ae29b02 Add an antenna icon for monitoring station 2017-12-01 15:55:23 -05:00
Bryan Housel
36f9ec85a4 Fix misspellings and make sure files have a .json extension 2017-12-01 15:40:14 -05:00