Skip to content
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

Adjust getRepositoryLocations function name #50

Merged
merged 6 commits into from
Oct 25, 2023
Merged

Adjust getRepositoryLocations function name #50

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
942ddee
Adjusted the function so there is no overlap
LuomaJuha Oct 24, 2023
6fe3546
Adjusted the comment to reflect
LuomaJuha Oct 24, 2023
6cb6f7a
Event place location coordinates
LuomaJuha Oct 25, 2023
e72b407
adjust comment
LuomaJuha Oct 25, 2023
2cff2dc
Adjust comment
LuomaJuha Oct 25, 2023
fe3a902
Adjust function name
LuomaJuha Oct 25, 2023
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
12 changes: 6 additions & 6 deletions src/RecordManager/Finna/Record/Lido.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ public function toSolrArray(Database $db = null)
}
}
$data['location_geo'] = [
...$this->getEventPlaceLocations(),
...$this->getRepositoryLocations(),
...$this->getEventPlaceCoordinates(),
...$this->getRepositoryLocationCoordinates(),
];
$data['center_coords']
= $this->metadataUtils->getCenterCoordinates($data['location_geo']);
Expand Down Expand Up @@ -544,11 +544,11 @@ protected function getHierarchicalLocations(\SimpleXMLElement $elem): array
}

/**
* Get repository locations
* Get repository location coordinates
*
* @return array<int, string>
*/
protected function getRepositoryLocations(): array
protected function getRepositoryLocationCoordinates(): array
{
$results = [];
foreach (
Expand Down Expand Up @@ -1025,13 +1025,13 @@ protected function completeDate($date, $end = false)
}

/**
* Return the event place locations associated with specified event
* Return the event place coordinates associated with specified event
*
* @param string|array $event Event type(s) allowed (null = all types)
*
* @return array<int, string> WKT
*/
protected function getEventPlaceLocations($event = null)
protected function getEventPlaceCoordinates($event = null)
{
$results = [];
foreach ($this->getEventNodes($event) as $event) {
Expand Down