Skip to content

Generate the cycling style; fix casing and shield generation - #39

Open
biodranik wants to merge 2 commits into
masterfrom
ab/cycling-style
Open

biodranik wants to merge 2 commits into
masterfrom
ab/cycling-style

Conversation

@biodranik

@biodranik biodranik commented Aug 14, 2026 •

Copy link
Copy Markdown
Member

Companion to organicmaps/organicmaps#13330.

Summary

  • Generate all eight Default, Outdoors, Cycling, and Vehicle variants in the integration test.
  • Honor casing-linecap and casing-width-add on automatic casings and validate line cap/join values.
  • Treat shield-font-size: 0 as suppression of an inherited shield and reject negative sizes during generation.

The casing changes are also required by organicmaps/organicmaps#13463.

Testing

  • python3 -m unittest discover -s tests — 57/57, repeated with stable fixture output
  • ruff check --target-version=py39
  • Full eight-variant production regeneration from Cycling map style organicmaps#13330

@strump strump left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@biodranik biodranik changed the title Generate the cycling style in the integration test Generate the cycling style in the integration test; honour casing-linecap Sep 2, 2026
@biodranik biodranik changed the title Generate the cycling style in the integration test; honour casing-linecap Generate the cycling style; fix casing and shield generation Sep 7, 2026
The main repo gained a fourth style family, so full_drules_gen.py covered only six of its eight variants.

Derive the style and variant matrix from tuples so every family is covered. Keep Vehicle last because each style rewrites visibility.txt and classificator.txt and the apps ship the Vehicle outputs.

Signed-off-by: Alexander Borsuk <me@alex.bio>
Honor casing-linecap on automatic casings, resolve casing-width-add when a line has its own width, and report unsupported line caps and joins as validation errors.

Treat a zero shield font size as suppression of an inherited shield and reject negative sizes during generation. Existing styles remain unchanged except that Cycling no longer serializes its intentionally suppressed z10-14 motorway shields.

Signed-off-by: Alexander Borsuk <me@alex.bio>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants