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.

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

Crossing refactoring #1201

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

Commits on Apr 24, 2024

  1. crossing/_marked: remove terms

    Terms are not used for unsearchable preset so we can remove them.
    tordans committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    02eb4d0 View commit details
    Browse the repository at this point in the history
  2. cycleway/crossing: add "oneway" field to unmarked in bicycle_foot

    This streamlines the presets and makes it easer to review and use them.
    tordans committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    41a9443 View commit details
    Browse the repository at this point in the history
  3. cycleway/crossing: add "tactile_paving" to traffic_signal

    This streamlines the crossings presets
    tordans committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    89a1671 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2024

  1. crossing: Introduce @templates/crossing/defaults

    This way we have the same fields in all crossing presets:
    - "crossing"
    - "tactile_paving"
    - "crossing/island"
    
    This change the order of things slightly for some footway, cycleway crossing where `surface` is now a bit lower, but that should not be a problem.
    tordans committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    ca2b2e5 View commit details
    Browse the repository at this point in the history
  2. crossing: Introduce @templates/crossing/geometry_line

    This streamlines the fields on all line geometry crossings.
    - "oneway"
    - "surface"
    - "smoothness"
    - "crossing_raised"
    - "access"
    
    Those fields are always the last in the list. For traffic signal those specific fields are put above. Which is also the only change for one vertex preset in this commit, to have the "crossing_raised" come after the traffic signal specific fields and so the order is the same across presets.
    
    This will roll out the smoothness field for all crossings; it was previously only present in some. But given the importance of smoothness for accessibility I think that is OK. This commit also moves the surface (and smoothness where present) fields further down the list which reduces the priority a bit.
    
    The biggest change in priority is the oneway-field which had the first position before and now is below the defaults- and markings-field.
    tordans committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    e47e4d6 View commit details
    Browse the repository at this point in the history
  3. crossing: Introduce @templates/crossing/traffic_signal

    This extract the three fields to be reused in all traffic_signals presets.
    - "button_operated"
    - "traffic_signals/sound"
    - "traffic_signals/vibration"
    
    Nothing else is changed, this is just an extraction into a template.
    tordans committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    50aeb69 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. crossing: Introduce @templates/crossing/traffic_signal_more

    This extract the three moreFields to be reused in all traffic_signals presets.
    - "traffic_signals/arrow"
    - "traffic_signals/countdown"
    - "traffic_signals/minimap"
    
    For unclear reasons the cycleway/crossing/traffic_signals did not have those more fields which are now added to streamline the presets.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    c624700 View commit details
    Browse the repository at this point in the history
  2. crossing: remove "oneway" on highway/crossing vertex

    I added this in openstreetmap@3e5e99f an I think that was a mistake so lets remove it again.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    99caf27 View commit details
    Browse the repository at this point in the history
  3. crossing: Add kerb to all vertex crossings

    The convention is, to tag this on the node _and_/_or_ on the separate `barrier=kerb+kerb=*` node when the path is mapped separately.
    It should be part of all crossing vertex presets.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    cb4b64e View commit details
    Browse the repository at this point in the history
  4. crossing: Use the same property order for fields/crossing/markings*

    All those fields used a different order of properties, which made it hard to compare them.
    
    This commit does not change anything on the fields, it just streamlines the same order of properties across files.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3ab88d0 View commit details
    Browse the repository at this point in the history
  5. crossing: Move the @templates/crossing/markings to first field posi…

    …tion
    
    Using the preset I find the markings field to be the most important to change. The `@templates/crossing/defaults` is less important for all situation except for `data/presets/highway/crossing.json`. The main reasons for this is, that only on the base `highway/crossing` the field `crossing` is actually visible. For the more precise presets this field is hidden by some automatic part of the system.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    cd56a0d View commit details
    Browse the repository at this point in the history
  6. crossing: Introduce highway=path+path=crossing fields

    All fields are unsearchable (for now) so we can learn how to name properly.
    
    The names are adapted from `presets/highway/cycleway/crossing/bicycle_foot.json`.
    
    The terms are removed because the presets are unsearchable.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    30a8be9 View commit details
    Browse the repository at this point in the history
  7. crossing: New approach with @templates/crossing/bicycle_relevance a…

    …nd `@templates/crossing/defaults`
    
    The field "crossing" is removed from the `/defaults` fields.
    - it is only relevant for the geometry line because it is hidden on geometry vertex.
    - but on geometry line, we want it to be on the first position of fields
    - the `/defaults` fields however should be positioned below the `markings` which are more relevant for specifying the kind of crossing
    - the `/defaults` fields now includes `crossing_raised` which was removed from the previous and discontinued `/geomery_line` fields template.
    
    The new `@templates/crossing/bicycle_relevance`
    - is used on all highways that have bicycle relevance which are `highway=path|cycleway` and not on `highway=footway`
    
    For all traffic_signal presets, the order of fields is different to give the `/traffic_signal` more prominence.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    75d756f View commit details
    Browse the repository at this point in the history
  8. crossing: Fix marking* templates by allowing line geometries

    The markings templates are not touched by this PR and it does seem to work without this. However, the fields are used on line and point geometries so either the `geometry` field is ignored during build or something else is happening…
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    8ca0db5 View commit details
    Browse the repository at this point in the history
  9. crossing: New approach with @templates/crossing/bicycle_more, addin…

    …g `segregated`
    
    The fields `oneway` and `access` are important for `highway=cycleway|path` crossings but not essential. They are more of a advanced user setup which should be visible when prev filled in but only added by users that read more about it before. They are moved to the `moreFields` for that reason.
    
    The `segregated` is added here for the same reasons and because of it's importance for highway types that likely have bike traffic.
    Ping openstreetmap#317
    
    The `surface` and `smoothness` is extracted from the `@template` because it makes more sense to split them up in `fields` and `moreFields`. A templates adds too much abstraction in this case.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    46ac971 View commit details
    Browse the repository at this point in the history
  10. crossing: Apply flashing_light to all footway=crossing and crossi…

    …ng notes
    
    The field `flashing_light` was used on some of those presets. It is now more systematic.
    
    I also kept them on the `traffic_signals` presets because those can have additional `flashing_lights` as well.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    28638cf View commit details
    Browse the repository at this point in the history
  11. crossing: Extract tactile_paving from shared @template to node cr…

    …ossings
    
    The common practice is to tag this in the `highway=crossing` nodes and on separate `barrier=kerb` nodes but not on the crossing ways. Same as the `kerb` field.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    118ae02 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    2cec131 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    289a57b View commit details
    Browse the repository at this point in the history
  14. Fix npm run lint by ignoring *.md files in data

    Usually prettier can switch automatically to check Markdown and format it. However, this prettier config forces the JSON formatter for all files.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    fa267ab View commit details
    Browse the repository at this point in the history
  15. Fix "Check file endings" workflow to also allow .md files

    `npm run build` still works, so I don't think this is an issue.
    
    This also removes the second run of very similar code in the prettier workflow which I think is probably a legacy redundancy that can just be deleted.
    
    x
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    8bfaef1 View commit details
    Browse the repository at this point in the history
  16. crossing: Re-add crossing to all fields

    This fixes "crossing: New approach with …`@templates/crossing/defaults`".
    
    We need the "crossing" field on vertex/node fields as well to allow to quickly change the preset.
    
    SQ
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    6c0174e View commit details
    Browse the repository at this point in the history
  17. crossing: Add lit to all crossing "way" geometry presets via new `@…

    …template/geometry_way_more`
    
    The "lit" value was present on some of the presets before and is common to be applied to all kind of ways.
    tordans committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    b1ab6e3 View commit details
    Browse the repository at this point in the history
  18. Configuration menu
    Copy the full SHA
    4381d3a View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. fix typo, minor rewording

    tyrasd committed May 22, 2024
    Configuration menu
    Copy the full SHA
    14e30fa View commit details
    Browse the repository at this point in the history
  2. fix typos, finish sentences

    tyrasd committed May 22, 2024
    Configuration menu
    Copy the full SHA
    ffef876 View commit details
    Browse the repository at this point in the history