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.

Sign up for GitHub

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

Jump to bottom

Do not ask for surface of complicated roads (which already have surface:lanes* taged) #5453

Draft
wants to merge 40 commits into
base: master
Choose a base branch
from
Draft

Do not ask for surface of complicated roads (which already have surface:lanes* taged) #5453

wants to merge 40 commits into from

Commits on Jan 22, 2024

  1. surface road quest: skip surface:lanes* too

    @mnalis
    mnalis committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    bcf2199 View commit details
    Browse the repository at this point in the history

  2. surface overlay: color surface:lanes* in black, same as other complex… 

    … surfaces with surface:note
    @mnalis
    mnalis committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    0e5d011 View commit details
    Browse the repository at this point in the history

  3. typo

    @mnalis
    mnalis committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    1ca1302 View commit details
    Browse the repository at this point in the history

  4. check if string is not null

    @mnalis
    mnalis committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    e622c45 View commit details
    Browse the repository at this point in the history

  5. always check for surface:lanes*

    @mnalis
    mnalis committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    f460fd0 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. create tests for surface:lanes* tagging

    @mnalis
    mnalis committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    ac3d1c5 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. never asks surface quest when surface:lanes* is present

    @mnalis
    mnalis committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    f7ec889 View commit details
    Browse the repository at this point in the history

  2. more tests for surface:lanes:*, both_ways

    @mnalis
    mnalis committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    99a9fd6 View commit details
    Browse the repository at this point in the history

  3. fix "Name contains illegal characters" (no ":" permitted in test name)

    @mnalis
    mnalis committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    773325d View commit details
    Browse the repository at this point in the history

  4. really always skip surface:lanes*

    @mnalis
    mnalis committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    5aa1ff3 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Revert "really always skip surface:lanes*" 

    This reverts commit 5aa1ff3.
as asked in streetcomplete#5453 (comment)
    @mnalis
    mnalis committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    574b256 View commit details
    Browse the repository at this point in the history

  2. Manually revert "never asks surface quest when surface:lanes* is pres… 

    …ent"

as asked in streetcomplete#5453 (comment)
    @mnalis
    mnalis committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    d94e38e View commit details
    Browse the repository at this point in the history

  3. do not ask for surface:note is sufrace:lanes* is present

    @mnalis
    mnalis committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    771f658 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. move isComplexSurfaceLanes() to hasSurfaceLanes() in SurfaceUtils.kt

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    568e5bc View commit details
    Browse the repository at this point in the history

  2. updated tests

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    c98f5d2 View commit details
    Browse the repository at this point in the history

  3. reuse hasSurfaceLanes()

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    ea66699 View commit details
    Browse the repository at this point in the history

  4. better place to skip asking surface:note; update tests 

    see streetcomplete#5453 (comment)
and streetcomplete#5453 (comment)
    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    db7583d View commit details
    Browse the repository at this point in the history

  5. whitespaces, comments 

    see streetcomplete#5453 (comment)
    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    1bfc7a9 View commit details
    Browse the repository at this point in the history

  6. fix tests

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    973bc54 View commit details
    Browse the repository at this point in the history

  7. Test: not applicable to generic unpaved track with a note and nonconf… 

    …licting tracktype
    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    03a51b7 View commit details
    Browse the repository at this point in the history

  8. add missing include

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    3c23eb1 View commit details
    Browse the repository at this point in the history

  9. try to fix compilation failures

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    69f1dfc View commit details
    Browse the repository at this point in the history

  10. Merge branch 'upstream-westnordost' into complicated-surface-lanes

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    ea559ec View commit details
    Browse the repository at this point in the history

  11. fix function names

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0f5f442 View commit details
    Browse the repository at this point in the history

  12. re-remove tests removed in master

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    082f908 View commit details
    Browse the repository at this point in the history

  13. try to fix compilation

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    9341541 View commit details
    Browse the repository at this point in the history

  14. remove invalid chars from test

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    5a5aa3c View commit details
    Browse the repository at this point in the history

  15. merge test rules

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    6d07d94 View commit details
    Browse the repository at this point in the history

  16. comment out failing test for now 

    > Task :app:testDebugUnitTest
de.westnordost.streetcomplete.quests.surface.AddRoadSurfaceTest > applicable to tagged complex surface lanes with specific surface tag FAILED
    java.lang.AssertionError at AddRoadSurfaceTest.kt:76

see https://github.com/mnalis/StreetComplete/actions/runs/8072071853/job/22053071582#step:5:467
    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    e1f7f24 View commit details
    Browse the repository at this point in the history

  17. reenable failing test

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    534bbe1 View commit details
    Browse the repository at this point in the history

  18. fix incorrect test

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    32f7b35 View commit details
    Browse the repository at this point in the history

  19. cleanups, reordering

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    d57bab6 View commit details
    Browse the repository at this point in the history

  20. try better location for test 

    previous one was disallowing ever pressing "OK" to select surface, and not just avoiding surface:note
    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    340045f View commit details
    Browse the repository at this point in the history

  21. did not compile, try better location for check

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    0116e21 View commit details
    Browse the repository at this point in the history

  22. try override onClickOk logic 

    (from AddCrossingForm.kt)
    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    ab3405c View commit details
    Browse the repository at this point in the history

  23. add missing parenthesis

    @mnalis
    mnalis committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    2cb0c1a View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. move test to more reasonable place in collectSurfaceDescriptionIfNece… 

    …ssary()
    @mnalis
    mnalis committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    40da2cf View commit details
    Browse the repository at this point in the history

  2. try to check hasSurfaceLanes with yet another way

    @mnalis
    mnalis committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    0dea7bc View commit details
    Browse the repository at this point in the history

  3. if hasSurfaceLanes, save just surface without surface note

    @mnalis
    mnalis committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    0643958 View commit details
    Browse the repository at this point in the history

  4. try to check hasSurfaceLanes for overlay too

    @mnalis
    mnalis committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    c41ff5c View commit details
    Browse the repository at this point in the history