-
Notifications
You must be signed in to change notification settings - Fork 151
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
base: main
Are you sure you want to change the base?
Crossing refactoring #1201
Commits on Apr 24, 2024
-
crossing/_marked: remove terms
Terms are not used for unsearchable preset so we can remove them.
Configuration menu - View commit details
-
Copy full SHA for 02eb4d0 - Browse repository at this point
Copy the full SHA 02eb4d0View commit details -
cycleway/crossing: add "oneway" field to unmarked in bicycle_foot
This streamlines the presets and makes it easer to review and use them.
Configuration menu - View commit details
-
Copy full SHA for 41a9443 - Browse repository at this point
Copy the full SHA 41a9443View commit details -
cycleway/crossing: add "tactile_paving" to traffic_signal
This streamlines the crossings presets
Configuration menu - View commit details
-
Copy full SHA for 89a1671 - Browse repository at this point
Copy the full SHA 89a1671View commit details
Commits on Apr 25, 2024
-
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.
Configuration menu - View commit details
-
Copy full SHA for ca2b2e5 - Browse repository at this point
Copy the full SHA ca2b2e5View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for e47e4d6 - Browse repository at this point
Copy the full SHA e47e4d6View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 50aeb69 - Browse repository at this point
Copy the full SHA 50aeb69View commit details
Commits on Apr 26, 2024
-
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.
Configuration menu - View commit details
-
Copy full SHA for c624700 - Browse repository at this point
Copy the full SHA c624700View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 99caf27 - Browse repository at this point
Copy the full SHA 99caf27View commit details -
crossing: Add
kerb
to all vertex crossingsThe 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.
Configuration menu - View commit details
-
Copy full SHA for cb4b64e - Browse repository at this point
Copy the full SHA cb4b64eView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 3ab88d0 - Browse repository at this point
Copy the full SHA 3ab88d0View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for cd56a0d - Browse repository at this point
Copy the full SHA cd56a0dView commit details -
crossing: Introduce
highway=path+path=crossing
fieldsAll 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.
Configuration menu - View commit details
-
Copy full SHA for 30a8be9 - Browse repository at this point
Copy the full SHA 30a8be9View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 75d756f - Browse repository at this point
Copy the full SHA 75d756fView commit details -
crossing: Fix marking* templates by allowing
line
geometriesThe 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…
Configuration menu - View commit details
-
Copy full SHA for 8ca0db5 - Browse repository at this point
Copy the full SHA 8ca0db5View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 46ac971 - Browse repository at this point
Copy the full SHA 46ac971View commit details -
crossing: Apply
flashing_light
to allfootway=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.
Configuration menu - View commit details
-
Copy full SHA for 28638cf - Browse repository at this point
Copy the full SHA 28638cfView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 118ae02 - Browse repository at this point
Copy the full SHA 118ae02View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2cec131 - Browse repository at this point
Copy the full SHA 2cec131View commit details -
Configuration menu - View commit details
-
Copy full SHA for 289a57b - Browse repository at this point
Copy the full SHA 289a57bView commit details -
Fix
npm run lint
by ignoring*.md
files indata
Usually prettier can switch automatically to check Markdown and format it. However, this prettier config forces the JSON formatter for all files.
Configuration menu - View commit details
-
Copy full SHA for fa267ab - Browse repository at this point
Copy the full SHA fa267abView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 8bfaef1 - Browse repository at this point
Copy the full SHA 8bfaef1View commit details -
crossing: Re-add
crossing
to all fieldsThis 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
Configuration menu - View commit details
-
Copy full SHA for 6c0174e - Browse repository at this point
Copy the full SHA 6c0174eView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for b1ab6e3 - Browse repository at this point
Copy the full SHA b1ab6e3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4381d3a - Browse repository at this point
Copy the full SHA 4381d3aView commit details
Commits on May 22, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 14e30fa - Browse repository at this point
Copy the full SHA 14e30faView commit details -
Configuration menu - View commit details
-
Copy full SHA for ffef876 - Browse repository at this point
Copy the full SHA ffef876View commit details