Skip to content

Support URI in the Model DOM#786

Merged
nkoenig merged 7 commits intosdf12from
model_include_uri
Dec 17, 2021
Merged

Support URI in the Model DOM#786
nkoenig merged 7 commits intosdf12from
model_include_uri

Conversation

@nkoenig
Copy link
Copy Markdown
Contributor

@nkoenig nkoenig commented Dec 14, 2021

Signed-off-by: Nate Koenig nate@openrobotics.org

🎉 New feature

Summary

The SdfGenerator code in Ignition Gazebo has a map that associates URIs to models. In order to use the DOM to generate SDF with model <include> elements we need a way to set a model's URI and use the URI in the ToElement function.

This PR support setting a model's URI, and updates the ToElement to use the URI. This won't break ABI because the Model::ToElement has not been released.

Test it

Run the tests.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge

Signed-off-by: Nate Koenig <nate@openrobotics.org>
@github-actions github-actions bot added 🌱 garden Ignition Garden 🏯 fortress Ignition Fortress labels Dec 14, 2021
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Nate Koenig added 2 commits December 14, 2021 17:03
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Dec 15, 2021

Codecov Report

Merging #786 (972aa0c) into sdf12 (4a6b5b6) will increase coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##            sdf12     #786      +/-   ##
==========================================
+ Coverage   89.53%   89.56%   +0.03%     
==========================================
  Files          76       76              
  Lines       12585    12603      +18     
==========================================
+ Hits        11268    11288      +20     
+ Misses       1317     1315       -2     
Impacted Files Coverage Δ
src/Model.cc 91.46% <100.00%> (+1.02%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4a6b5b6...972aa0c. Read the comment docs.

Signed-off-by: Nate Koenig <nate@openrobotics.org>
@nkoenig nkoenig requested a review from azeey December 16, 2021 17:53
Nate Koenig added 2 commits December 17, 2021 09:42
Signed-off-by: Nate Koenig <nate@openrobotics.org>
Signed-off-by: Nate Koenig <nate@openrobotics.org>
@nkoenig nkoenig merged commit 1a88972 into sdf12 Dec 17, 2021
@nkoenig nkoenig deleted the model_include_uri branch December 17, 2021 18:42
@osrf-triage
Copy link
Copy Markdown

This pull request has been mentioned on Gazebo Community. There might be relevant details there:

https://community.gazebosim.org/t/new-ignition-releases-2022-04-13-fortress-edifice/1367/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🏯 fortress Ignition Fortress 🌱 garden Ignition Garden

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants