Skip to content

Add OpenDRIVE 1.9 temporary lane layer support#815

Open
johschmitz wants to merge 1 commit into
esmini:devfrom
johschmitz:roadworks
Open

Add OpenDRIVE 1.9 temporary lane layer support#815
johschmitz wants to merge 1 commit into
esmini:devfrom
johschmitz:roadworks

Conversation

@johschmitz

Copy link
Copy Markdown
Contributor

No description provided.

@johschmitz johschmitz force-pushed the roadworks branch 2 times, most recently from 0dc24f4 to 98c1dd3 Compare May 27, 2026 22:45
@johschmitz

Copy link
Copy Markdown
Contributor Author

I ran clang-format put CI still does not pass, can you run locally and tell me which file is failing or what exactly I need to run on my end?

@slundel6

Copy link
Copy Markdown
Collaborator

I checkout out your PR and ran:
pre-commit run clang-format --all-files

These are the files it formatted (the diff per file is too large to paste here):

modified:   EnvironmentSimulator/Modules/RoadManager/RoadManager.cpp
modified:   EnvironmentSimulator/Modules/RoadManager/RoadManager.hpp
modified:   EnvironmentSimulator/Modules/ScenarioEngine/OSCTypeDefs/OSCPrivateAction.hpp
modified:   EnvironmentSimulator/Modules/ViewerBase/roadgeom.cpp
modified:   EnvironmentSimulator/Modules/ViewerBase/viewer.cpp
modified:   EnvironmentSimulator/Modules/ViewerBase/viewer.hpp

If you don't have pre-commit installed, how to do it is part of the user guide.

@johschmitz

Copy link
Copy Markdown
Contributor Author

Hm, strange, I successfully ran clang-format locally on the last PR. I will check it one more time. Maybe I missed some files due to some reason or maybe a wrong version or so, could you say which version you used @slundel6? 15?

@slundel6

Copy link
Copy Markdown
Collaborator

After I ran pre-commit install in esmini root, it generates a bunch of files, among them .pre-commit-config.yaml which has these lines:

      - id: clang-format
        name: ClangFormat
        entry: ./support/script/clang-format-runner.sh -i

./support/script/clang-format-runner.sh runs:

# Detect OS and set the appropriate clang-format command
if [[ "$OSTYPE" == "msys"* || "$OSTYPE" == "cygwin"* || "$OSTYPE" == "win32" ]]; then
    CMD="clang-format"
else
    CMD="clang-format-15"
fi

Maybe you don't have clang-format-15 installed and it fails silently? Or forgot to run pre-commit install maybe?

@eknabevcc eknabevcc changed the base branch from master to dev May 29, 2026 08:38
@johschmitz johschmitz force-pushed the roadworks branch 3 times, most recently from 6db7138 to 37714ec Compare May 29, 2026 15:00
@eknabevcc

Copy link
Copy Markdown
Collaborator

I think the conflict is because your branch is based on a slightly outdated dev branch. See if you can rebase your commit on latest dev and then try push again.

@johschmitz johschmitz force-pushed the roadworks branch 3 times, most recently from fe9e2a5 to f6931fa Compare May 29, 2026 15:17
@johschmitz

Copy link
Copy Markdown
Contributor Author

Finally managed to rebase and pass all the linting stuff. Some tests failing though need to see how to fix it.

@johschmitz johschmitz force-pushed the roadworks branch 7 times, most recently from 6b93265 to b9ca967 Compare June 3, 2026 20:26
@johschmitz

Copy link
Copy Markdown
Contributor Author

Managed to pass CI, please start review if time permits.

Run example with

cd build
./EnvironmentSimulator/Applications/esmini/esmini --osc ../resources/xosc/roadworks_temporary_lane_layer.xosc --window 10 10 1000 1000

@eknabevcc

Copy link
Copy Markdown
Collaborator

Nice! Yes, we will review as soon as we find the time. The feature affects more code than first anticipated.

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.

3 participants