@@ -102,9 +102,9 @@ |
||
102 | 102 | ->groupBy(['century', 'sex']); |
103 | 103 | |
104 | 104 | return $male->unionAll($female) |
105 | - ->orderBy('century') |
|
106 | - ->get() |
|
107 | - ->all(); |
|
105 | + ->orderBy('century') |
|
106 | + ->get() |
|
107 | + ->all(); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -37,12 +37,12 @@ |
||
37 | 37 | class EditIndividualController extends AbstractEditController |
38 | 38 | { |
39 | 39 | /** |
40 | - * Add a child to an existing individual (creating a one-parent family). |
|
41 | - * |
|
42 | - * @param ServerRequestInterface $request |
|
43 | - * |
|
44 | - * @return ResponseInterface |
|
45 | - */ |
|
40 | + * Add a child to an existing individual (creating a one-parent family). |
|
41 | + * |
|
42 | + * @param ServerRequestInterface $request |
|
43 | + * |
|
44 | + * @return ResponseInterface |
|
45 | + */ |
|
46 | 46 | public function addChild(ServerRequestInterface $request): ResponseInterface |
47 | 47 | { |
48 | 48 | $tree = $request->getAttribute('tree'); |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return array ( |
4 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
5 | - '%j %F %Y' => '%F %j, %Y', |
|
4 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
5 | + '%j %F %Y' => '%F %j, %Y', |
|
6 | 6 | ); |
@@ -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 |