Skip to content

Commit

Permalink
Update scenario configuration (#224)
Browse files Browse the repository at this point in the history
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
This PR updates the sumo mosaic configuration files for the Town04 and
Town04_carma_cloud scenarios.
The following changes are made:
1. The sumo.net.xml file is updated to include a georeference. This is
used by sumo to be able to calculate projections in the geodetic
coordinate frame.
2. The scenario_config.json file is required to include the Cartesian
offset in the sumo.net.xml file. Since the Town04 xodrs that are used to
generate the net file define this offset, it is required to be populated
here.
3. Following the changes made above, the database file for Town04 is
updated.
## Description

<!--- Describe your changes in detail -->

## Related GitHub Issue

<!--- This project only accepts pull requests related to open GitHub
issues or Jira Keys -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please DO NOT name partially fixed issues, instead open an issue
specific to this fix -->
<!--- Please link to the issue here: -->

## Related Jira Key

<!-- e.g. CAR-123 -->
https://usdot-carma.atlassian.net/browse/CXC-85

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->
Integration tested on sim pc.

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [ ] Defect fix (non-breaking change that fixes an issue)
- [x] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [x] I have updated the documentation accordingly.
- [x] I have read the
[**CONTRIBUTING**](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md)
document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
  • Loading branch information
adev4a authored Sep 13, 2024
2 parents 9739e4c + 162f7de commit a40be1a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
Binary file modified co-simulation/bundle/src/assembly/resources/scenarios/Town04/application/Town04.db
100644 → 100755
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"longitude": 0
},
"cartesianOffset": {
"x": 0,
"y": 0
"x": 503.02,
"y": 423.76
}
},
"network": {
Expand All @@ -36,6 +36,6 @@
"carma": true,
"infrastructure": true,
"carma-cloud": true

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<net version="1.9" junctionCornerDetail="5" rectangularLaneCut="true" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="503.02,423.76" convBoundary="0.00,0.00,897.92,800.65" origBoundary="0.00,0.00,0.00,0.00" projParameter="!"/>
<location netOffset="503.02,423.76" convBoundary="0.00,0.00,897.92,800.65" origBoundary="0.00,0.00,0.00,0.00" projParameter="+proj=tmerc +lat_0=0 +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +geoidgrids=egm96_15.gtx +vunits=m +no_defs"/>

<type id="bidirectional" priority="1" speed="1.39" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" width="3.65"/>
<type id="biking" priority="-1" speed="5.56" allow="bicycle" width="1.50"/>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"longitude": 0
},
"cartesianOffset": {
"x": 0,
"y": 0
"x": 503.02,
"y": 423.76
}
},
"network": {
Expand All @@ -36,6 +36,6 @@
"carma": true,
"infrastructure": true,
"carma-cloud": true

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<net version="1.9" junctionCornerDetail="5" rectangularLaneCut="true" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="503.02,423.76" convBoundary="0.00,0.00,897.92,800.65" origBoundary="0.00,0.00,0.00,0.00" projParameter="!"/>
<location netOffset="503.02,423.76" convBoundary="0.00,0.00,897.92,800.65" origBoundary="0.00,0.00,0.00,0.00" projParameter="+proj=tmerc +lat_0=0 +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +geoidgrids=egm96_15.gtx +vunits=m +no_defs"/>

<type id="bidirectional" priority="1" speed="1.39" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" width="3.65"/>
<type id="biking" priority="-1" speed="5.56" allow="bicycle" width="1.50"/>
Expand Down

0 comments on commit a40be1a

Please sign in to comment.