@@ -250,9 +250,9 @@ discard block |
||
| 250 | 250 | $facts = $this->getPedigreeMapFacts($request, $this->chart_service); |
| 251 | 251 | |
| 252 | 252 | $geojson = [ |
| 253 | - 'type' => 'FeatureCollection', |
|
| 254 | - 'features' => [], |
|
| 255 | - ]; |
|
| 253 | + 'type' => 'FeatureCollection', |
|
| 254 | + 'features' => [], |
|
| 255 | + ]; |
|
| 256 | 256 | |
| 257 | 257 | $sosa_points = []; |
| 258 | 258 | |
@@ -280,30 +280,30 @@ discard block |
||
| 280 | 280 | // rather than generate polylines but the MarkerCluster library |
| 281 | 281 | // doesn't seem to like them |
| 282 | 282 | $polyline = [ |
| 283 | - 'points' => [ |
|
| 284 | - $sosa_points[$sosa_child], |
|
| 285 | - [$latitude, $longitude], |
|
| 286 | - ], |
|
| 287 | - 'options' => [ |
|
| 288 | - 'color' => $color, |
|
| 289 | - ], |
|
| 290 | - ]; |
|
| 283 | + 'points' => [ |
|
| 284 | + $sosa_points[$sosa_child], |
|
| 285 | + [$latitude, $longitude], |
|
| 286 | + ], |
|
| 287 | + 'options' => [ |
|
| 288 | + 'color' => $color, |
|
| 289 | + ], |
|
| 290 | + ]; |
|
| 291 | 291 | } |
| 292 | 292 | $geojson['features'][] = [ |
| 293 | - 'type' => 'Feature', |
|
| 294 | - 'id' => $id, |
|
| 295 | - 'geometry' => [ |
|
| 296 | - 'type' => 'Point', |
|
| 297 | - 'coordinates' => [$longitude, $latitude], |
|
| 298 | - ], |
|
| 299 | - 'properties' => [ |
|
| 300 | - 'polyline' => $polyline, |
|
| 301 | - 'iconcolor' => $color, |
|
| 302 | - 'tooltip' => strip_tags($fact->record()->fullName()) . "\n" . ucfirst($this->getSosaName($id)), |
|
| 303 | - 'summary' => view('modules/pedigree-map/events', $this->summaryData($individual, $fact, $id)), |
|
| 304 | - 'zoom' => $location->zoom() ?: self::MINZOOM, |
|
| 305 | - ], |
|
| 306 | - ]; |
|
| 293 | + 'type' => 'Feature', |
|
| 294 | + 'id' => $id, |
|
| 295 | + 'geometry' => [ |
|
| 296 | + 'type' => 'Point', |
|
| 297 | + 'coordinates' => [$longitude, $latitude], |
|
| 298 | + ], |
|
| 299 | + 'properties' => [ |
|
| 300 | + 'polyline' => $polyline, |
|
| 301 | + 'iconcolor' => $color, |
|
| 302 | + 'tooltip' => strip_tags($fact->record()->fullName()) . "\n" . ucfirst($this->getSosaName($id)), |
|
| 303 | + 'summary' => view('modules/pedigree-map/events', $this->summaryData($individual, $fact, $id)), |
|
| 304 | + 'zoom' => $location->zoom() ?: self::MINZOOM, |
|
| 305 | + ], |
|
| 306 | + ]; |
|
| 307 | 307 | } |
| 308 | 308 | } |
| 309 | 309 | |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | { |
| 53 | 53 | use ModuleChartTrait; |
| 54 | 54 | |
| 55 | - protected const ROUTE_URL = '/tree/{tree}/pedigree-map-{generations}/{xref}'; |
|
| 55 | + protected const ROUTE_URL = '/tree/{tree}/pedigree-map-{generations}/{xref}'; |
|
| 56 | 56 | |
| 57 | 57 | // Defaults |
| 58 | 58 | public const DEFAULT_GENERATIONS = '4'; |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | 'properties' => [ |
| 300 | 300 | 'polyline' => $polyline, |
| 301 | 301 | 'iconcolor' => $color, |
| 302 | - 'tooltip' => strip_tags($fact->record()->fullName()) . "\n" . ucfirst($this->getSosaName($id)), |
|
| 302 | + 'tooltip' => strip_tags($fact->record()->fullName()) . "\n" . ucfirst($this->getSosaName($id)), |
|
| 303 | 303 | 'summary' => view('modules/pedigree-map/events', $this->summaryData($individual, $fact, $id)), |
| 304 | 304 | 'zoom' => $location->zoom() ?: self::MINZOOM, |
| 305 | 305 | ], |