Skip to content

Read different target location keys for Lacey grids from GridSquare.dm files #481

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.

Sign up for GitHub

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

Merged
stephen-riggs merged 1 commit into from
Feb 10, 2025
Merged

Read different target location keys for Lacey grids from GridSquare.dm files #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/murfey/client/contexts/spa_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@
for_parsing = xml.read()
data = xmltodict.parse(for_parsing)
data = data["GridSquareXml"]
serialization_array = data["TargetLocations"]["TargetLocationsEfficient"][
"a:m_serializationArray"
]
if "TargetLocationsEfficient" in data["TargetLocations"].keys():
# Grids with regular foil holes
serialization_array = data["TargetLocations"]["TargetLocationsEfficient"][

Check warning on line 26 in src/murfey/client/contexts/spa_metadata.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/contexts/spa_metadata.py#L26 

Added line #L26 was not covered by tests
"a:m_serializationArray"
]
elif "TargetLocations" in data["TargetLocations"].keys():
# Lacey grids
serialization_array = data["TargetLocations"]["TargetLocations"][

Check warning on line 31 in src/murfey/client/contexts/spa_metadata.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/contexts/spa_metadata.py#L31 

Added line #L31 was not covered by tests
"a:m_serializationArray"
]
else:
logger.warning(f"Target locations not found for {str(xml_path)}")
return {}

Check warning on line 36 in src/murfey/client/contexts/spa_metadata.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/contexts/spa_metadata.py#L35-L36 

Added lines #L35 - L36 were not covered by tests
required_key = ""
for key in serialization_array.keys():
if key.startswith("b:KeyValuePairOfintTargetLocation"):
Expand Down
17 changes: 14 additions & 3 deletions src/murfey/util/spa_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,20 @@
for_parsing = xml.read()
data = xmltodict.parse(for_parsing)
data = data["GridSquareXml"]
serialization_array = data["TargetLocations"]["TargetLocationsEfficient"][
"a:m_serializationArray"
]
if "TargetLocationsEfficient" in data["TargetLocations"].keys():
# Grids with regular foil holes
serialization_array = data["TargetLocations"]["TargetLocationsEfficient"][

Check warning on line 162 in src/murfey/util/spa_metadata.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/util/spa_metadata.py#L162 

Added line #L162 was not covered by tests
"a:m_serializationArray"
]
elif "TargetLocations" in data["TargetLocations"].keys():
# Lacey grids
serialization_array = data["TargetLocations"]["TargetLocations"][

Check warning on line 167 in src/murfey/util/spa_metadata.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/util/spa_metadata.py#L167 

Added line #L167 was not covered by tests
"a:m_serializationArray"
]
else:
logger.warning(f"Target locations not found for {str(xml_path)}")
return FoilHoleInfo(id=foil_hole, grid_square_id=grid_square)

Check warning on line 172 in src/murfey/util/spa_metadata.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/util/spa_metadata.py#L171-L172 

Added lines #L171 - L172 were not covered by tests

if len(serialization_array.keys()) == 0:
return FoilHoleInfo(id=foil_hole, grid_square_id=grid_square)
for key in serialization_array.keys():
Expand Down