Commit Graph

8501 Commits

Author SHA1 Message Date
Bryan Housel 668c17ad1e Do not localize decimalCoordinatePair appearing in info panels
(closes #4765)
2018-03-02 00:21:24 -05:00
Bryan Housel cc79e2170b Only draw targets for lines and areas that have a valid path
Before, it was drawing svg path elements for all the segments,
even those that were clipped out of view (getPath returns null).
This was putting a lot of junk into the DOM.
2018-03-01 22:49:56 -05:00
Bryan Housel 69a1a75b49 Improve rendering of tree row, use a thicker line
(closes #4825)
2018-03-01 22:33:49 -05:00
Bryan Housel 410197ce00 Vertex navigation for home/end should work with way selected
(closes #4841)

Before, first/last keyboard shortcuts only worked if you had a vertex selected.
Now you can navigate to the first/last vertices even if you have the way selected.
2018-03-01 22:23:55 -05:00
Bryan Housel d9ebdda105 Polyfill sinh for IE11, add tests for wms replacement tokens
(see #4814)
2018-03-01 22:08:39 -05:00
Bryan Housel 429c3b7929 Merge pull request #4839 from MaciejWWojcik/issue4826-farm-presets
changed farm preset name, added farm_auxiliary preset (#4826)
2018-03-01 15:47:32 -05:00
Bryan Housel a065f2f214 Revert @std/esm to 0.22.0 so we can continue to support Node 4 until EOL
We can bump this dependency when Node 4 goes EOL after Apr 2018
For now we don't _really_ use @std/esm for much anyway.
(It just lets use the es6 modular lodash in build scripts)
2018-03-01 15:38:51 -05:00
Bryan Housel 67c2dec800 Merge pull request #4814 from openstreetmap/wms-tiles
Load WMS tiles if EPSG:3857 (or equivalent) is supported by source
2018-03-01 15:16:31 -05:00
Bryan Housel 5f85d43110 Merge pull request #4831 from SteevenBosse/master
Issue #4819 : Increase max height of combobox, so they can show more…
2018-03-01 15:11:34 -05:00
Bryan Housel 1e3a62d4b7 Bump all dependency versions 2018-03-01 14:19:55 -05:00
Bryan Housel 4b1f8a8f61 Merge pull request #4768 from openstreetmap/advanced_intersection
Add support for complex intersection and via way restrictions
2018-03-01 01:46:30 -05:00
Bryan Housel 78170f8fe9 Improve hint text to aid in localization
- change the "Up to {num} ways" to "Up to 2 ways"
  (we don't plan to go above 2 for now)
- enumerate all the turn types No/Only/Allowed x Left/Right/Straight/U
- Add a line for "Click for" to let user know they can click to toggle

see https://github.com/openstreetmap/iD/pull/4768#pullrequestreview-100256196
2018-03-01 00:58:53 -05:00
Bryan Housel 241159b547 Cleanup docs and tests for actionRestrictTurn / actionUnrestrictTurn
- actionRestrictTurn will no longer "infer" the turn type
- restrictionType *must* be passed in - this is ok because the only code
  we use this action (restrictions.js) already has inferred the type
- this simplifies what the action actually does
- moved the tests from restrict_turn.js that were really just testing
  the restriction type inferrence over to intersection.js
  (and added a few more tests for iD.osmInferRestriction)
2018-02-28 23:55:59 -05:00
MaciejWojcik 7a10474ad1 changed farm preset name, added farm_auxiliary preset
changed farm preset name,
added farm_auxiliary preset
2018-02-28 23:30:06 +01:00
Bryan Housel e1cf49eaff Remove the "excludes coincident highways" check
These should not be a thing, and if they are, I'm ok with them
being treated as 2 separate ways.  We can add code back in later
if it turns out to be a widespread issue in OSM.
2018-02-28 13:42:26 -05:00
Bryan Housel f9d000a8a5 When switching to ONLY restriction remove all other restrictions
But we keep them around in `_oldTurns` and will put them back if the
user clicks again to unrestrict the ONLY.
2018-02-27 22:53:46 -05:00
Bryan Housel fb4098754c Adjust wording of some of the restriction help sections 2018-02-27 21:14:09 -05:00
Bryan Housel e9750140ec Finish help, improve text and styling 2018-02-27 15:51:51 -05:00
Bryan Housel d87a43d33a Increase box shadow slightly so help popup stands out more 2018-02-27 09:11:39 -05:00
Bryan Housel a700d42e7d Much improved field help
- absolutely positioned attach to inspector,
- float slightly above field
- looks much better
2018-02-26 21:42:45 -05:00
Bryan Housel 6c6b1378b2 Add some restriction help images, adjust styles 2018-02-26 16:31:00 -05:00
Bryan Housel de1fdaa21f Add close button, remove _showing state variable 2018-02-26 13:58:50 -05:00
Bryan Housel 97cbfc5c67 Add icons and improve css styles for restriction field help 2018-02-25 22:38:13 -05:00
Martin Raifer 2b96a8ee0b load WMS tiles if EPSG:3857 (or equivalent) is supported 2018-02-25 20:17:21 +01:00
Bryan Housel b3b2be95b1 WIP: Add content for turn restriction field help 2018-02-24 12:14:18 -05:00
Bryan Housel 57d2aee6c8 Add uiFieldHelp component, currently just for turn restrictions field 2018-02-23 15:09:05 -05:00
Bryan Housel 7fa27217b6 Return an indirect u-turn restriction for an only restriction 2018-02-23 11:59:44 -05:00
Bryan Housel 46cc6cc262 Update tests to use '_' id separators instead of ','
(using ',' with css selectors was problematic)
2018-02-23 11:30:54 -05:00
Bryan Housel c63f79a753 Remove isComplex, not used
This was used to decide whether to show the "Max Via" control.
(It's not really needed for a simple intersection)

However since we added the "Max Distance" control, it just makes
sense to show both sliders, since the distance can affect the
complexity.
2018-02-22 22:36:04 -05:00
Bryan Housel aaed678468 Localize all the strings 2018-02-22 22:26:45 -05:00
Steeven Bosse 8a7a4cb33d Issue #4819 : Increase max height of combobox, so they can show more item 2018-02-22 21:20:55 -05:00
Bryan Housel 156d0fd681 Drop confusing fromOnly code, consolidate path highlighting code 2018-02-21 00:33:41 -05:00
Bryan Housel 419d1e124b Remove fromOnly highlighting (was confusing), try to simplify 2018-02-20 17:01:11 -05:00
Bryan Housel 104e8cea5c Adjust color for better visibility 2018-02-20 16:16:10 -05:00
Bryan Housel 7559ff68df Highlight all the paths when hoving on the from 2018-02-20 15:45:44 -05:00
Bryan Housel bd46d0cc4a Highlight restriction when hovering on from 2018-02-20 13:57:51 -05:00
Bryan Housel bbeb34626b Show really thick path shadows in the turn restriction editor 2018-02-20 10:47:03 -05:00
Bryan Housel 4ce0b62d05 Remove unneeded hover behavior, don't hover a way that can't be a FROM 2018-02-20 10:38:50 -05:00
Bryan Housel eb3c1f07ec Always restyle a selected from way (don't reset it to grey) 2018-02-20 09:10:17 -05:00
Bryan Housel 200098dff9 Render restriction paths with red/green/blue shadow 2018-02-19 21:30:47 -05:00
greenkeeper[bot] 63a41956db chore(package): update @std/esm to version 0.22.0 2018-02-19 09:39:52 -05:00
Bryan Housel d940200ef0 osmInferRestriction can just take a turn, instead of from/to
This is better because it makes explicit that osmInferRestriction
needs an actual turn now (from/to with vertex, etc)
2018-02-16 13:27:23 -05:00
Bryan Housel b84b64c79c Avoid user-select as a byproduct of using the control and clicking 2018-02-16 13:26:41 -05:00
Bryan Housel aff9258dee Indirect restrictions now include only the partial path
This lets us properly infer the actual turn taken through the indirect
restriction using osmInferRestriction (an improvement over 5e9db0d)
2018-02-16 11:42:44 -05:00
Bryan Housel 14e904b38f Merge pull request #4808 from bencostamagna/boatbuilder_priority
reduced search priority for boat builder
2018-02-16 09:15:15 -05:00
Bryan Housel 725099e6bd Merge pull request #4809 from fritruc/4804_Mapillary_photo_overlay_can_t_get_disabled
do not stop mapillary autoplaying if _mlyViewer is not initialized (closes #4804)
2018-02-16 09:07:10 -05:00
Jordane Pelloux-Prayer ca493ec47c fixes #4804: do not stop mapillary autoplaying if _mlyViewer is not initialized 2018-02-16 13:01:32 +01:00
Benoit Costamagna 28cb6aa1e1 reduced search priority for boat builder 2018-02-16 11:52:05 +01:00
Bryan Housel 5e9db0d409 Move help display code, fix display of indirect only restrictions
"indirect only" means an only restriction elsewhere in the intersection
that affects the selected from way.

    |     |
 ---+--F--+---
    A     |
 ---v--T--+---
    B     |

In the above example

 - 'only_straight_on' restriction "FROM way A VIA node V TO way B"
 - way F is selected

This would indirectly prevent a u-turn "FROM way F VIA way A TO way T"
We want to display the straight on restriction in the UI as
  "only_straight_on FROM way A VIA node V TO way B"
not
  "only_left_turn FROM way F VIA way A TO way B"
2018-02-16 00:03:04 -05:00
Bryan Housel a2b6a3b09b Flag restriction as indirect if from doesn't match 2018-02-15 22:18:01 -05:00