Skip to content
This repository has been archived by the owner on Mar 9, 2023. It is now read-only.

Split of "#111 Fix lane count calculation" #146

Merged
merged 55 commits into from
Apr 25, 2022
Merged

Split of "#111 Fix lane count calculation" #146

merged 55 commits into from
Apr 25, 2022

Commits on Mar 25, 2022

  1. Add a failing test for the case on the website 

    Forward and backward lanes are independently guessed to be half of the lanes, but the tags on the website assume that providing `lanes` and `lanes:backward` is enough.
    @BudgieInWA
    BudgieInWA committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    a491eef View commit details
    Browse the repository at this point in the history

  2. Rewrite driving_lane_directions to consider all tags together

    @BudgieInWA
    BudgieInWA committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    bf5df9d View commit details
    Browse the repository at this point in the history

  3. Add placeholder warn! calls to show how tag validation can be added t… 

    …o this structure
    @BudgieInWA
    BudgieInWA committed Mar 25, 2022
    Configuration menu
    Copy the full SHA
    dc5de27 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2022

  1. replace use of is_some_and 

    Co-authored-by: droogmic <droogmic@gmail.com>
    @BudgieInWA @droogmic
    BudgieInWA and droogmic authored Mar 26, 2022
    Configuration menu
    Copy the full SHA
    f2c96fc View commit details
    Browse the repository at this point in the history

  2. Remove unused #![feature(is_some_with)]

    @BudgieInWA
    BudgieInWA committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    fe479f4 View commit details
    Browse the repository at this point in the history

  3. Add lanes:{forward,backward} to lanes_to_tags

    @BudgieInWA
    BudgieInWA committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    42ae376 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2022

  1. Calculate both_ways in driving_lane_directions too 

    Incorporate lanes:both_ways and centre_turn_lanes.
Add assumption that oneway=no, lanes=1 means lanes:both_ways=1
    @BudgieInWA
    BudgieInWA committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    e3cf57e View commit details
    Browse the repository at this point in the history

  2. Convert temporary warn! calls into RoadMsg warnings. 

    Reveals a bunch of failed tests...
    @BudgieInWA
    BudgieInWA committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    b032684 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2022

  1. Fix misleading panic message when failing to parse data.yaml

    @BudgieInWA
    BudgieInWA committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    4a30b89 View commit details
    Browse the repository at this point in the history

  2. Represent in the tests that odd lane count warns about guessing

    @BudgieInWA
    BudgieInWA committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    295e8bc View commit details
    Browse the repository at this point in the history

  3. Avoid guessing lanes= and lanes:forward= in the tests just yet

    @BudgieInWA
    BudgieInWA committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    f472da3 View commit details
    Browse the repository at this point in the history

  4. guess lanes= and lanes:{forward,backward}= in more situations with bu… 

    …sway and lanes:{bus,psv}
    @BudgieInWA
    BudgieInWA committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    28300bc View commit details
    Browse the repository at this point in the history

  5. fmt

    @BudgieInWA
    BudgieInWA committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    a68efd7 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2022

  1. Start to split parsing into schema understanding, then combining. 

    Probably doesn't compile, but close
    @BudgieInWA
    BudgieInWA committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    c9ca0eb View commit details
    Browse the repository at this point in the history

  2. wip: Experimental top down rewrite of tag parsing and road building s… 

    …tructure.

The code is a mess, gesturing generally at the idea, without compiling. I feel like
the whole lot should mean close to what it actually says.
    @BudgieInWA
    BudgieInWA committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    0496070 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Split into Hunch: "data with certainty" and Theory: "hunch with history" 

    This is much closer to something useful. Still doesn't compile.
    @BudgieInWA
    BudgieInWA committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    392910c View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Delete experimental Hunch, Theory, and Scheme code from this branch

    @BudgieInWA
    BudgieInWA committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    beec80a View commit details
    Browse the repository at this point in the history

  2. Fix build and tweak comments

    @BudgieInWA
    BudgieInWA committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    538a676 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/main' into rust_guess_lane_count 

     Conflicts:
	rust/osm2lanes/src/transform/lanes_to_tags.rs
	rust/osm2lanes/src/transform/tags_to_lanes/bus.rs
	rust/osm2lanes/src/transform/tags_to_lanes/mod.rs
    @BudgieInWA
    BudgieInWA committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    96d29e1 View commit details
    Browse the repository at this point in the history

  4. Move driving_lane_directions to LanesScheme::new

    @BudgieInWA
    BudgieInWA committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    57fbad0 View commit details
    Browse the repository at this point in the history

  5. Enable passing test :) add TODO

    @BudgieInWA
    BudgieInWA committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    012319d View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2022

  1. fmt

    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    0dd3481 View commit details
    Browse the repository at this point in the history

  2. Add a CentreTurnLaneScheme, add warnings and stuff. 

    Resolves a-b-street#111 (comment)
    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    768e441 View commit details
    Browse the repository at this point in the history

  3. Rename busway.forward_direction to forward_side_direction to be c… 

    …learer
    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    fabbb9d View commit details
    Browse the repository at this point in the history

  4. Remove unused get_and_parse. Not needed now that... 

    each schema parses their own tags, and so we always would want to warn.
    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    a14ccd7 View commit details
    Browse the repository at this point in the history

  5. fix TODO: does it make sense to have a backward lane on the forward_s… 

    …ide????
    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    7b0b139 View commit details
    Browse the repository at this point in the history

  6. Add comments describing the different Infer variants.

    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    fe1024f View commit details
    Browse the repository at this point in the history

  7. remove empty impl

    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    1bfb561 View commit details
    Browse the repository at this point in the history

  8. Support LHT outputting turn:lanes:both_ways

    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    ca818c7 View commit details
    Browse the repository at this point in the history

  9. Add use statement so doctests compile

    @BudgieInWA
    BudgieInWA committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    9f07ce1 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2022

  1. Use new road: lanes: nesting for modified test

    @BudgieInWA
    BudgieInWA committed Apr 10, 2022
    Configuration menu
    Copy the full SHA
    ec7f50d View commit details
    Browse the repository at this point in the history

  2. Use the new road: lanes: nesting for more modified tests.

    @BudgieInWA
    BudgieInWA committed Apr 10, 2022
    Configuration menu
    Copy the full SHA
    9c88ebc View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2022

  1. Merge branch 'main' into rust_guess_lane_count 

    Clippy still broken
    @droogmic
    droogmic committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    5a63091 View commit details
    Browse the repository at this point in the history

  2. Fix Clippy

    @droogmic
    droogmic committed Apr 11, 2022
    Configuration menu
    Copy the full SHA
    5212f2e View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2022

  1. Merge pull request #1 from droogmic/rust_guess_lane_count 

    Fixing Merge
    @BudgieInWA
    BudgieInWA authored Apr 18, 2022
    Configuration menu
    Copy the full SHA
    08884cb View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. Fix support for oneway=yes busway:<backward>=opposite_lane

    @BudgieInWA
    BudgieInWA committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    2b96964 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2022

  1. Merge branch 'main' into rust_guess_lane_count 

    # Conflicts:
#	rust/osm2lanes/src/transform/lanes_to_tags/mod.rs
#	rust/osm2lanes/src/transform/mod.rs
#	rust/osm2lanes/src/transform/tags_to_lanes/mod.rs
#	rust/osm2lanes/src/transform/tags_to_lanes/modes/bus.rs
#	rust/osm2lanes/src/transform/tags_to_lanes/modes/mod.rs
    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    eaf0117 View commit details
    Browse the repository at this point in the history

  2. Fix build after merge, using new TagsToLanesMsg type

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    497b5c7 View commit details
    Browse the repository at this point in the history

  3. fix passing 1 byte type as reference (thanks to Clippy)

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    b890bd2 View commit details
    Browse the repository at this point in the history

  4. Skip new test in python and kotlin, because they fail

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    fb56a07 View commit details
    Browse the repository at this point in the history

  5. add relevant tag to warning

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    551ab2e View commit details
    Browse the repository at this point in the history

  6. warn on calculated inconsistency, as well as direct

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    9c94da2 View commit details
    Browse the repository at this point in the history

  7. Settle on TurnLanesScheme (with #[allow(unused)])

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    7303b56 View commit details
    Browse the repository at this point in the history

  8. Remove commented code and TODOs

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    1267f2d View commit details
    Browse the repository at this point in the history

  9. Remove TurnMarking as struct with bools, do we need a bitset?

    @BudgieInWA
    BudgieInWA committed Apr 20, 2022
    Configuration menu
    Copy the full SHA
    2f36852 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2022

  1. More succinct centre_turn_lane parsing

    @BudgieInWA
    BudgieInWA committed Apr 21, 2022
    Configuration menu
    Copy the full SHA
    c8f2774 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2022

  1. rename bothways to proper both_ways

    @BudgieInWA
    BudgieInWA committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    41694ba View commit details
    Browse the repository at this point in the history

  2. rename bothways proper both_ways

    @BudgieInWA
    BudgieInWA committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    c0df013 View commit details
    Browse the repository at this point in the history

  3. whitespace

    @BudgieInWA
    BudgieInWA committed Apr 22, 2022
    Configuration menu
    Copy the full SHA
    a264b3c View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2022

  1. Merge branch 'rust_refactor_busway' into rust_guess_lane_count_target

    @droogmic
    droogmic committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    c5963f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'lane_count_test' into rust_guess_lane_count_target

    @droogmic
    droogmic committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    5087d2d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'rust_guess_lane_count' into rust_guess_lane_count_source

    @droogmic
    droogmic committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    31ae8d0 View commit details
    Browse the repository at this point in the history

  4. Rework

    @droogmic
    droogmic committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    b18803d View commit details
    Browse the repository at this point in the history

  5. Rework Centre Turn Lanes

    @droogmic
    droogmic committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    38d6dec View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Merge commit '38d6dec77786193001b1cf5408021b12d060ad47' into rust_gue… 

    …ss_lane_count_source
    @droogmic
    droogmic committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    0cba794 View commit details
    Browse the repository at this point in the history