jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Services/GeoAnalysisViewDataService.php

Indentation +182 added lines, -182 removed lines

@@ -32,186 +32,186 @@
  */
 class GeoAnalysisViewDataService
 {
-    /**
-     * Find a Geographical dispersion analysis view by ID
-     *
-     * @param Tree $tree
-     * @param int $id
-     * @return AbstractGeoAnalysisView|NULL
-     */
-    public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView
-    {
-        return $this->all($tree, $include_disabled)
-            ->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
-    }
-
-    /**
-     * Get all Geographical dispersion analysis views, with or without the disabled ones.
-     *
-     * {@internal It would ignore any view for which the class could not be loaded by the container}
-     *
-     * @param Tree $tree
-     * @param bool $include_disabled
-     * @return Collection<AbstractGeoAnalysisView>
-     */
-    public function all(Tree $tree, bool $include_disabled = false): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'all-geodispersion-views',
-            function () use ($tree, $include_disabled): Collection {
-                return DB::table('maj_geodisp_views')
-                    ->select('maj_geodisp_views.*')
-                    ->where('majgv_gedcom_id', '=', $tree->id())
-                    ->get()
-                    ->map($this->viewMapper($tree))
-                    ->filter()
-                    ->filter($this->enabledFilter($include_disabled));
-            }
-        );
-    }
-
-    /**
-     * Insert a geographical dispersion analysis view object in the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @return int
-     */
-    public function insertGetId(AbstractGeoAnalysisView $view): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->insertGetId([
-                'majgv_gedcom_id' => $view->tree()->id(),
-                'majgv_view_class' => get_class($view),
-                'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
-                'majgv_descr' => mb_substr($view->description(), 0, 248),
-                'majgv_analysis' => get_class($view->analysis()),
-                'majgv_place_depth' => $view->placesDepth()
-            ]);
-    }
-
-    /**
-     * Update a geographical dispersion analysis view object in the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @return int
-     */
-    public function update(AbstractGeoAnalysisView $view): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->where('majgv_id', '=', $view->id())
-            ->update([
-                'majgv_gedcom_id' => $view->tree()->id(),
-                'majgv_view_class' => get_class($view),
-                'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
-                'majgv_descr' => mb_substr($view->description(), 0, 248),
-                'majgv_analysis' => get_class($view->analysis()),
-                'majgv_place_depth' => $view->placesDepth(),
-                'majgv_top_places' => $view->numberTopPlaces(),
-                'majgv_colors' => $view instanceof GeoAnalysisMap ? json_encode($view->colors()) : null
-            ]);
-    }
-
-    /**
-     * Update the status of a geographical dispersion analysis view object in the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @param bool $status
-     * @return int
-     */
-    public function updateStatus(AbstractGeoAnalysisView $view, bool $status): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->where('majgv_id', '=', $view->id())
-            ->update(['majgv_status' => $status ? 'enabled' : 'disabled']);
-    }
-
-    /**
-     * Delete a geographical dispersion analysis view object from the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @return int
-     */
-    public function delete(AbstractGeoAnalysisView $view): int
-    {
-        return DB::table('maj_geodisp_views')
-            ->where('majgv_id', '=', $view->id())
-            ->delete();
-    }
-
-    /**
-     * Get the closure to create a AbstractGeoAnalysisView object from a row in the database.
-     * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
-     * or if the types do not match with the ones expected.
-     *
-     * @param Tree $tree
-     * @return Closure(\stdClass $row):?AbstractGeoAnalysisView
-     */
-    private function viewMapper(Tree $tree): Closure
-    {
-        return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
-            try {
-                $geoanalysis = app($row->majgv_analysis);
-                if (!($geoanalysis instanceof GeoAnalysisInterface)) {
-                    return null;
-                }
-
-                $view = app()->makeWith($row->majgv_view_class, [
-                    'id'                    =>  (int) $row->majgv_id,
-                    'tree'                  =>  $tree,
-                    'enabled'               =>  $row->majgv_status === 'enabled',
-                    'description'           =>  $row->majgv_descr,
-                    'geoanalysis'           =>  $geoanalysis,
-                    'depth'                 =>  (int) $row->majgv_place_depth,
-                    'detailed_top_places'   =>  (int) $row->majgv_top_places
-                ]);
-
-                if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) {
-                    $view = $view->withColors($this->colorsDecoder($row->majgv_colors));
-                }
-
-                return $view instanceof AbstractGeoAnalysisView ? $view : null;
-            } catch (BindingResolutionException $ex) {
-                return null;
-            }
-        };
-    }
-
-    /**
-     * Create a MapColorsConfig object from a JSON column value.
-     * Returns null if the JSON string is invalid, or if the colors are not valid.
-     *
-     * @param string $colors_config
-     * @return MapColorsConfig|NULL
-     */
-    private function colorsDecoder(string $colors_config): ?MapColorsConfig
-    {
-        $colors = json_decode($colors_config, true);
-        if (!is_array($colors) && count($colors) !== 4) {
-            return null;
-        }
-        try {
-            return new MapColorsConfig(
-                \Spatie\Color\Factory::fromString($colors['default'] ?? ''),
-                \Spatie\Color\Factory::fromString($colors['stroke'] ?? ''),
-                \Spatie\Color\Factory::fromString($colors['maxvalue'] ?? ''),
-                \Spatie\Color\Factory::fromString($colors['hover'] ?? '')
-            );
-        } catch (InvalidColorValue $ex) {
-            return null;
-        }
-    }
-
-    /**
-     * Get a closure to filter views by enabled/disabled status
-     *
-     * @param bool $include_disabled
-     *
-     * @return Closure(AbstractGeoAnalysisView $view):bool
-     */
-    private function enabledFilter(bool $include_disabled): Closure
-    {
-        return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool {
-            return $include_disabled || $view->isEnabled();
-        };
-    }
+	/**
+	 * Find a Geographical dispersion analysis view by ID
+	 *
+	 * @param Tree $tree
+	 * @param int $id
+	 * @return AbstractGeoAnalysisView|NULL
+	 */
+	public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView
+	{
+		return $this->all($tree, $include_disabled)
+			->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
+	}
+
+	/**
+	 * Get all Geographical dispersion analysis views, with or without the disabled ones.
+	 *
+	 * {@internal It would ignore any view for which the class could not be loaded by the container}
+	 *
+	 * @param Tree $tree
+	 * @param bool $include_disabled
+	 * @return Collection<AbstractGeoAnalysisView>
+	 */
+	public function all(Tree $tree, bool $include_disabled = false): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'all-geodispersion-views',
+			function () use ($tree, $include_disabled): Collection {
+				return DB::table('maj_geodisp_views')
+					->select('maj_geodisp_views.*')
+					->where('majgv_gedcom_id', '=', $tree->id())
+					->get()
+					->map($this->viewMapper($tree))
+					->filter()
+					->filter($this->enabledFilter($include_disabled));
+			}
+		);
+	}
+
+	/**
+	 * Insert a geographical dispersion analysis view object in the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @return int
+	 */
+	public function insertGetId(AbstractGeoAnalysisView $view): int
+	{
+		return DB::table('maj_geodisp_views')
+			->insertGetId([
+				'majgv_gedcom_id' => $view->tree()->id(),
+				'majgv_view_class' => get_class($view),
+				'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
+				'majgv_descr' => mb_substr($view->description(), 0, 248),
+				'majgv_analysis' => get_class($view->analysis()),
+				'majgv_place_depth' => $view->placesDepth()
+			]);
+	}
+
+	/**
+	 * Update a geographical dispersion analysis view object in the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @return int
+	 */
+	public function update(AbstractGeoAnalysisView $view): int
+	{
+		return DB::table('maj_geodisp_views')
+			->where('majgv_id', '=', $view->id())
+			->update([
+				'majgv_gedcom_id' => $view->tree()->id(),
+				'majgv_view_class' => get_class($view),
+				'majgv_status' => $view->isEnabled() ? 'enabled' : 'disabled',
+				'majgv_descr' => mb_substr($view->description(), 0, 248),
+				'majgv_analysis' => get_class($view->analysis()),
+				'majgv_place_depth' => $view->placesDepth(),
+				'majgv_top_places' => $view->numberTopPlaces(),
+				'majgv_colors' => $view instanceof GeoAnalysisMap ? json_encode($view->colors()) : null
+			]);
+	}
+
+	/**
+	 * Update the status of a geographical dispersion analysis view object in the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @param bool $status
+	 * @return int
+	 */
+	public function updateStatus(AbstractGeoAnalysisView $view, bool $status): int
+	{
+		return DB::table('maj_geodisp_views')
+			->where('majgv_id', '=', $view->id())
+			->update(['majgv_status' => $status ? 'enabled' : 'disabled']);
+	}
+
+	/**
+	 * Delete a geographical dispersion analysis view object from the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @return int
+	 */
+	public function delete(AbstractGeoAnalysisView $view): int
+	{
+		return DB::table('maj_geodisp_views')
+			->where('majgv_id', '=', $view->id())
+			->delete();
+	}
+
+	/**
+	 * Get the closure to create a AbstractGeoAnalysisView object from a row in the database.
+	 * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
+	 * or if the types do not match with the ones expected.
+	 *
+	 * @param Tree $tree
+	 * @return Closure(\stdClass $row):?AbstractGeoAnalysisView
+	 */
+	private function viewMapper(Tree $tree): Closure
+	{
+		return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
+			try {
+				$geoanalysis = app($row->majgv_analysis);
+				if (!($geoanalysis instanceof GeoAnalysisInterface)) {
+					return null;
+				}
+
+				$view = app()->makeWith($row->majgv_view_class, [
+					'id'                    =>  (int) $row->majgv_id,
+					'tree'                  =>  $tree,
+					'enabled'               =>  $row->majgv_status === 'enabled',
+					'description'           =>  $row->majgv_descr,
+					'geoanalysis'           =>  $geoanalysis,
+					'depth'                 =>  (int) $row->majgv_place_depth,
+					'detailed_top_places'   =>  (int) $row->majgv_top_places
+				]);
+
+				if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) {
+					$view = $view->withColors($this->colorsDecoder($row->majgv_colors));
+				}
+
+				return $view instanceof AbstractGeoAnalysisView ? $view : null;
+			} catch (BindingResolutionException $ex) {
+				return null;
+			}
+		};
+	}
+
+	/**
+	 * Create a MapColorsConfig object from a JSON column value.
+	 * Returns null if the JSON string is invalid, or if the colors are not valid.
+	 *
+	 * @param string $colors_config
+	 * @return MapColorsConfig|NULL
+	 */
+	private function colorsDecoder(string $colors_config): ?MapColorsConfig
+	{
+		$colors = json_decode($colors_config, true);
+		if (!is_array($colors) && count($colors) !== 4) {
+			return null;
+		}
+		try {
+			return new MapColorsConfig(
+				\Spatie\Color\Factory::fromString($colors['default'] ?? ''),
+				\Spatie\Color\Factory::fromString($colors['stroke'] ?? ''),
+				\Spatie\Color\Factory::fromString($colors['maxvalue'] ?? ''),
+				\Spatie\Color\Factory::fromString($colors['hover'] ?? '')
+			);
+		} catch (InvalidColorValue $ex) {
+			return null;
+		}
+	}
+
+	/**
+	 * Get a closure to filter views by enabled/disabled status
+	 *
+	 * @param bool $include_disabled
+	 *
+	 * @return Closure(AbstractGeoAnalysisView $view):bool
+	 */
+	private function enabledFilter(bool $include_disabled): Closure
+	{
+		return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool {
+			return $include_disabled || $view->isEnabled();
+		};
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
     public function find(Tree $tree, int $id, bool $include_disabled = false): ?AbstractGeoAnalysisView
     {
         return $this->all($tree, $include_disabled)
-            ->first(fn(AbstractGeoAnalysisView $view): bool => $view->id() === $id);
+            ->first(fn(AbstractGeoAnalysisView $view) : bool => $view->id() === $id);
     }
 
     /**
@@ -58,7 +58,7 @@ 
     {
         return Registry::cache()->array()->remember(
             'all-geodispersion-views',
-            function () use ($tree, $include_disabled): Collection {
+            function() use ($tree, $include_disabled): Collection {
                 return DB::table('maj_geodisp_views')
                     ->select('maj_geodisp_views.*')
                     ->where('majgv_gedcom_id', '=', $tree->id())
@@ -148,7 +148,7 @@ 
      */
     private function viewMapper(Tree $tree): Closure
     {
-        return function (stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
+        return function(stdClass $row) use ($tree): ?AbstractGeoAnalysisView {
             try {
                 $geoanalysis = app($row->majgv_analysis);
                 if (!($geoanalysis instanceof GeoAnalysisInterface)) {
@@ -156,13 +156,13 @@ 
                 }
 
                 $view = app()->makeWith($row->majgv_view_class, [
-                    'id'                    =>  (int) $row->majgv_id,
+                    'id'                    =>  (int)$row->majgv_id,
                     'tree'                  =>  $tree,
                     'enabled'               =>  $row->majgv_status === 'enabled',
                     'description'           =>  $row->majgv_descr,
                     'geoanalysis'           =>  $geoanalysis,
-                    'depth'                 =>  (int) $row->majgv_place_depth,
-                    'detailed_top_places'   =>  (int) $row->majgv_top_places
+                    'depth'                 =>  (int)$row->majgv_place_depth,
+                    'detailed_top_places'   =>  (int)$row->majgv_top_places
                 ]);
 
                 if ($row->majgv_colors !== null && $view instanceof GeoAnalysisMap) {
@@ -210,7 +210,7 @@ 
      */
     private function enabledFilter(bool $include_disabled): Closure
     {
-        return function (AbstractGeoAnalysisView $view) use ($include_disabled): bool {
+        return function(AbstractGeoAnalysisView $view) use ($include_disabled): bool {
             return $include_disabled || $view->isEnabled();
         };
     }

src/Webtrees/Module/GeoDispersion/Services/GeoAnalysisDataService.php

Indentation +56 added lines, -56 removed lines

@@ -26,64 +26,64 @@
  */
 class GeoAnalysisDataService
 {
-    /**
-     * Yields indviduals and family records for a specified tree.
-     *
-     * @param Tree $tree
-     * @return \Generator<\Fisharebest\Webtrees\GedcomRecord>
-     */
-    public function individualsAndFamilies(Tree $tree): Generator
-    {
-        yield from DB::table('individuals')
-            ->where('i_file', '=', $tree->id())
-            ->select(['individuals.*'])
-            ->get()
-            ->map(Registry::individualFactory()->mapper($tree))
-            ->filter(GedcomRecord::accessFilter())
-            ->all();
+	/**
+	 * Yields indviduals and family records for a specified tree.
+	 *
+	 * @param Tree $tree
+	 * @return \Generator<\Fisharebest\Webtrees\GedcomRecord>
+	 */
+	public function individualsAndFamilies(Tree $tree): Generator
+	{
+		yield from DB::table('individuals')
+			->where('i_file', '=', $tree->id())
+			->select(['individuals.*'])
+			->get()
+			->map(Registry::individualFactory()->mapper($tree))
+			->filter(GedcomRecord::accessFilter())
+			->all();
 
-        yield from DB::table('families')
-            ->where('f_file', '=', $tree->id())
-            ->select(['families.*'])
-            ->get()
-            ->map(Registry::familyFactory()->mapper($tree))
-            ->filter(GedcomRecord::accessFilter())
-            ->all();
-    }
+		yield from DB::table('families')
+			->where('f_file', '=', $tree->id())
+			->select(['families.*'])
+			->get()
+			->map(Registry::familyFactory()->mapper($tree))
+			->filter(GedcomRecord::accessFilter())
+			->all();
+	}
 
-    /**
-     * Returns an example of the place hierarchy, from a place within the GEDCOM file, looking for the deepest
-     * hierarchy found. The part order is reversed compared to the normal GEDCOM structure (largest first).
-     *
-     * {@internal The places are taken only from the individuals and families records.}
-     *
-     * @param Tree $tree
-     * @return array
-     */
-    public function placeHierarchyExample(Tree $tree): array
-    {
-        $query_individuals = DB::table('individuals')
-            ->select(['i_gedcom AS g_gedcom'])
-            ->where('i_file', '=', $tree->id())
-            ->where('i_gedcom', 'like', '%2 PLAC %');
+	/**
+	 * Returns an example of the place hierarchy, from a place within the GEDCOM file, looking for the deepest
+	 * hierarchy found. The part order is reversed compared to the normal GEDCOM structure (largest first).
+	 *
+	 * {@internal The places are taken only from the individuals and families records.}
+	 *
+	 * @param Tree $tree
+	 * @return array
+	 */
+	public function placeHierarchyExample(Tree $tree): array
+	{
+		$query_individuals = DB::table('individuals')
+			->select(['i_gedcom AS g_gedcom'])
+			->where('i_file', '=', $tree->id())
+			->where('i_gedcom', 'like', '%2 PLAC %');
 
-        $query_families = DB::table('families')
-            ->select(['f_gedcom AS g_gedcom'])
-            ->where('f_file', '=', $tree->id())
-            ->where('f_gedcom', 'like', '%2 PLAC %');
+		$query_families = DB::table('families')
+			->select(['f_gedcom AS g_gedcom'])
+			->where('f_file', '=', $tree->id())
+			->where('f_gedcom', 'like', '%2 PLAC %');
 
-        return $query_individuals->unionAll($query_families)
-            ->get()->pluck('g_gedcom')
-            ->flatMap(static function (string $gedcom): array {
-                preg_match_all('/\n2 PLAC (.+)/', $gedcom, $matches);
-                return $matches[1] ?? [];
-            })
-            ->sort(I18N::comparator())->reverse()
-            ->mapWithKeys(static function (string $place): array {
-                $place_array = array_reverse(array_filter(array_map('trim', explode(",", $place))));
-                return [ count($place_array) => $place_array ];
-            })
-            ->sortKeys()
-            ->last();
-    }
+		return $query_individuals->unionAll($query_families)
+			->get()->pluck('g_gedcom')
+			->flatMap(static function (string $gedcom): array {
+				preg_match_all('/\n2 PLAC (.+)/', $gedcom, $matches);
+				return $matches[1] ?? [];
+			})
+			->sort(I18N::comparator())->reverse()
+			->mapWithKeys(static function (string $place): array {
+				$place_array = array_reverse(array_filter(array_map('trim', explode(",", $place))));
+				return [ count($place_array) => $place_array ];
+			})
+			->sortKeys()
+			->last();
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -74,14 +74,14 @@
 
         return $query_individuals->unionAll($query_families)
             ->get()->pluck('g_gedcom')
-            ->flatMap(static function (string $gedcom): array {
+            ->flatMap(static function(string $gedcom): array {
                 preg_match_all('/\n2 PLAC (.+)/', $gedcom, $matches);
                 return $matches[1] ?? [];
             })
             ->sort(I18N::comparator())->reverse()
-            ->mapWithKeys(static function (string $place): array {
+            ->mapWithKeys(static function(string $place): array {
                 $place_array = array_reverse(array_filter(array_map('trim', explode(",", $place))));
-                return [ count($place_array) => $place_array ];
+                return [count($place_array) => $place_array];
             })
             ->sortKeys()
             ->last();

src/Webtrees/Module/GeoDispersion/Services/MapAdapterDataService.php

Indentation +142 added lines, -142 removed lines

@@ -30,155 +30,155 @@
  */
 class MapAdapterDataService
 {
-    private MapDefinitionsService $mapdefinition_service;
+	private MapDefinitionsService $mapdefinition_service;
 
-    /**
-     * Constructor for MapAdapterDataService
-     *
-     * @param MapDefinitionsService $mapdefinition_service
-     */
-    public function __construct(MapDefinitionsService $mapdefinition_service)
-    {
-        $this->mapdefinition_service = $mapdefinition_service;
-    }
+	/**
+	 * Constructor for MapAdapterDataService
+	 *
+	 * @param MapDefinitionsService $mapdefinition_service
+	 */
+	public function __construct(MapDefinitionsService $mapdefinition_service)
+	{
+		$this->mapdefinition_service = $mapdefinition_service;
+	}
 
-    /**
-     * Find a GeoAnalysisMapAdapter by ID
-     *
-     * @param int $id
-     * @return GeoAnalysisMapAdapter|NULL
-     */
-    public function find(int $id): ?GeoAnalysisMapAdapter
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->select('maj_geodisp_mapviews.*')
-            ->where('majgm_id', '=', $id)
-            ->get()
-            ->map($this->mapAdapterMapper())
-            ->first();
-    }
+	/**
+	 * Find a GeoAnalysisMapAdapter by ID
+	 *
+	 * @param int $id
+	 * @return GeoAnalysisMapAdapter|NULL
+	 */
+	public function find(int $id): ?GeoAnalysisMapAdapter
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->select('maj_geodisp_mapviews.*')
+			->where('majgm_id', '=', $id)
+			->get()
+			->map($this->mapAdapterMapper())
+			->first();
+	}
 
-    /**
-     * Get all GeoAnalysisMapAdapters linked to a Map View.
-     *
-     * @param GeoAnalysisMap $map_view
-     * @return Collection<GeoAnalysisMapAdapter>
-     */
-    public function allForView(GeoAnalysisMap $map_view): Collection
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->select('maj_geodisp_mapviews.*')
-            ->where('majgm_majgv_id', '=', $map_view->id())
-            ->get()
-            ->map($this->mapAdapterMapper())
-            ->filter();
-    }
+	/**
+	 * Get all GeoAnalysisMapAdapters linked to a Map View.
+	 *
+	 * @param GeoAnalysisMap $map_view
+	 * @return Collection<GeoAnalysisMapAdapter>
+	 */
+	public function allForView(GeoAnalysisMap $map_view): Collection
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->select('maj_geodisp_mapviews.*')
+			->where('majgm_majgv_id', '=', $map_view->id())
+			->get()
+			->map($this->mapAdapterMapper())
+			->filter();
+	}
 
-    /**
-     * Insert a GeoAnalysisMapAdapter in the database.
-     *
-     * @param GeoAnalysisMapAdapter $map_adapter
-     * @return int
-     */
-    public function insertGetId(GeoAnalysisMapAdapter $map_adapter): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->insertGetId([
-                'majgm_majgv_id' => $map_adapter->geoAnalysisViewId(),
-                'majgm_map_id' => $map_adapter->map()->id(),
-                'majgm_mapper' => get_class($map_adapter->placeMapper()),
-                'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
-                'majgm_config' => json_encode($map_adapter->viewConfig()->mapperConfig())
-            ]);
-    }
+	/**
+	 * Insert a GeoAnalysisMapAdapter in the database.
+	 *
+	 * @param GeoAnalysisMapAdapter $map_adapter
+	 * @return int
+	 */
+	public function insertGetId(GeoAnalysisMapAdapter $map_adapter): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->insertGetId([
+				'majgm_majgv_id' => $map_adapter->geoAnalysisViewId(),
+				'majgm_map_id' => $map_adapter->map()->id(),
+				'majgm_mapper' => get_class($map_adapter->placeMapper()),
+				'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
+				'majgm_config' => json_encode($map_adapter->viewConfig()->mapperConfig())
+			]);
+	}
 
-    /**
-     * Update a GeoAnalysisMapAdapter in the database.
-     *
-     * @param GeoAnalysisMapAdapter $map_adapter
-     * @return int
-     */
-    public function update(GeoAnalysisMapAdapter $map_adapter): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->where('majgm_id', '=', $map_adapter->id())
-            ->update([
-                'majgm_map_id' => $map_adapter->map()->id(),
-                'majgm_mapper' => get_class($map_adapter->placeMapper()),
-                'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
-                'majgm_config' => json_encode($map_adapter->placeMapper()->config())
-            ]);
-    }
+	/**
+	 * Update a GeoAnalysisMapAdapter in the database.
+	 *
+	 * @param GeoAnalysisMapAdapter $map_adapter
+	 * @return int
+	 */
+	public function update(GeoAnalysisMapAdapter $map_adapter): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->where('majgm_id', '=', $map_adapter->id())
+			->update([
+				'majgm_map_id' => $map_adapter->map()->id(),
+				'majgm_mapper' => get_class($map_adapter->placeMapper()),
+				'majgm_feature_prop' => $map_adapter->viewConfig()->mapMappingProperty(),
+				'majgm_config' => json_encode($map_adapter->placeMapper()->config())
+			]);
+	}
 
-    /**
-     * Delete a GeoAnalysisMapAdapter from the database.
-     *
-     * @param GeoAnalysisMapAdapter $map_adapter
-     * @return int
-     */
-    public function delete(GeoAnalysisMapAdapter $map_adapter): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->where('majgm_id', '=', $map_adapter->id())
-            ->delete();
-    }
+	/**
+	 * Delete a GeoAnalysisMapAdapter from the database.
+	 *
+	 * @param GeoAnalysisMapAdapter $map_adapter
+	 * @return int
+	 */
+	public function delete(GeoAnalysisMapAdapter $map_adapter): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->where('majgm_id', '=', $map_adapter->id())
+			->delete();
+	}
 
-    /**
-     * Get the closure to create a GeoAnalysisMapAdapter object from a row in the database.
-     * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
-     * or if the types do not match with the ones expected.
-     *
-     * @return Closure(\stdClass $row):?GeoAnalysisMapAdapter
-     */
-    private function mapAdapterMapper(): Closure
-    {
-        return function (stdClass $row): ?GeoAnalysisMapAdapter {
-            if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) {
-                return null;
-            }
-            try {
-                $mapper = app($row->majgm_mapper);
-                if (!($mapper instanceof PlaceMapperInterface)) {
-                    return null;
-                }
+	/**
+	 * Get the closure to create a GeoAnalysisMapAdapter object from a row in the database.
+	 * It returns null if the classes stored in the DB cannot be loaded through the Laravel container,
+	 * or if the types do not match with the ones expected.
+	 *
+	 * @return Closure(\stdClass $row):?GeoAnalysisMapAdapter
+	 */
+	private function mapAdapterMapper(): Closure
+	{
+		return function (stdClass $row): ?GeoAnalysisMapAdapter {
+			if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) {
+				return null;
+			}
+			try {
+				$mapper = app($row->majgm_mapper);
+				if (!($mapper instanceof PlaceMapperInterface)) {
+					return null;
+				}
 
-                return new GeoAnalysisMapAdapter(
-                    (int) $row->majgm_id,
-                    (int) $row->majgm_majgv_id,
-                    $map,
-                    app($row->majgm_mapper),
-                    new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))
-                );
-            } catch (BindingResolutionException $ex) {
-                return null;
-            }
-        };
-    }
+				return new GeoAnalysisMapAdapter(
+					(int) $row->majgm_id,
+					(int) $row->majgm_majgv_id,
+					$map,
+					app($row->majgm_mapper),
+					new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))
+				);
+			} catch (BindingResolutionException $ex) {
+				return null;
+			}
+		};
+	}
 
-    /**
-     * Create a PlaceMapperConfigInterface object from a JSON column value.
-     * Returns null if the JSON string is invalid/empty or if the extracted mapper class cannot be loaded
-     * through the Laravel container or if the type do not match with the one expected.
-     *
-     * @param string $json_config
-     * @return PlaceMapperConfigInterface|NULL
-     */
-    private function mapperConfigDecoder(?string $json_config): ?PlaceMapperConfigInterface
-    {
-        $config = $json_config === null ? [] : json_decode($json_config, true);
-        $class = $config['class'] ?? null;
-        $json_mapper_config = $config['config'] ?? null;
-        if ($class === null || $json_mapper_config === null) {
-            return null;
-        }
-        try {
-            $mapper_config = app($class);
-            if (!$mapper_config instanceof PlaceMapperConfigInterface) {
-                return null;
-            }
-            return $mapper_config->jsonDeserialize($json_mapper_config);
-        } catch (BindingResolutionException $ex) {
-            return null;
-        }
-    }
+	/**
+	 * Create a PlaceMapperConfigInterface object from a JSON column value.
+	 * Returns null if the JSON string is invalid/empty or if the extracted mapper class cannot be loaded
+	 * through the Laravel container or if the type do not match with the one expected.
+	 *
+	 * @param string $json_config
+	 * @return PlaceMapperConfigInterface|NULL
+	 */
+	private function mapperConfigDecoder(?string $json_config): ?PlaceMapperConfigInterface
+	{
+		$config = $json_config === null ? [] : json_decode($json_config, true);
+		$class = $config['class'] ?? null;
+		$json_mapper_config = $config['config'] ?? null;
+		if ($class === null || $json_mapper_config === null) {
+			return null;
+		}
+		try {
+			$mapper_config = app($class);
+			if (!$mapper_config instanceof PlaceMapperConfigInterface) {
+				return null;
+			}
+			return $mapper_config->jsonDeserialize($json_mapper_config);
+		} catch (BindingResolutionException $ex) {
+			return null;
+		}
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
      */
     private function mapAdapterMapper(): Closure
     {
-        return function (stdClass $row): ?GeoAnalysisMapAdapter {
+        return function(stdClass $row): ?GeoAnalysisMapAdapter {
             if (null === $map = $this->mapdefinition_service->find($row->majgm_map_id)) {
                 return null;
             }
@@ -143,8 +143,8 @@ 
                 }
 
                 return new GeoAnalysisMapAdapter(
-                    (int) $row->majgm_id,
-                    (int) $row->majgm_majgv_id,
+                    (int)$row->majgm_id,
+                    (int)$row->majgm_majgv_id,
                     $map,
                     app($row->majgm_mapper),
                     new MapViewConfig($row->majgm_feature_prop, $this->mapperConfigDecoder($row->majgm_config))

src/Webtrees/Module/GeoDispersion/Services/GeoAnalysisService.php

Indentation +32 added lines, -32 removed lines

@@ -25,38 +25,38 @@
  */
 class GeoAnalysisService
 {
-    private ModuleService $module_service;
+	private ModuleService $module_service;
 
-    /**
-     * Constructor for MapDefinitionsService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $module_service;
-    }
+	/**
+	 * Constructor for MapDefinitionsService
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module_service = $module_service;
+	}
 
-    /**
-     * Get all available geographical dispersion analyses.
-     *
-     * {@internal The list is generated based on the modules exposing ModuleGeoAnalysisProviderInterface
-     *
-     * @param bool $include_disabled
-     * @return Collection
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        return $this->module_service
-            ->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled)
-            ->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses())
-            ->map(static function (string $analysis_class): ?GeoAnalysisInterface {
-                try {
-                    $analysis = app($analysis_class);
-                    return $analysis instanceof GeoAnalysisInterface ? $analysis : null;
-                } catch (BindingResolutionException $ex) {
-                    return null;
-                }
-            })->filter();
-    }
+	/**
+	 * Get all available geographical dispersion analyses.
+	 *
+	 * {@internal The list is generated based on the modules exposing ModuleGeoAnalysisProviderInterface
+	 *
+	 * @param bool $include_disabled
+	 * @return Collection
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		return $this->module_service
+			->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled)
+			->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses())
+			->map(static function (string $analysis_class): ?GeoAnalysisInterface {
+				try {
+					$analysis = app($analysis_class);
+					return $analysis instanceof GeoAnalysisInterface ? $analysis : null;
+				} catch (BindingResolutionException $ex) {
+					return null;
+				}
+			})->filter();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         return $this->module_service
             ->findByInterface(ModuleGeoAnalysisProviderInterface::class, $include_disabled)
             ->flatMap(fn(ModuleGeoAnalysisProviderInterface $module) => $module->listGeoAnalyses())
-            ->map(static function (string $analysis_class): ?GeoAnalysisInterface {
+            ->map(static function(string $analysis_class): ?GeoAnalysisInterface {
                 try {
                     $analysis = app($analysis_class);
                     return $analysis instanceof GeoAnalysisInterface ? $analysis : null;

src/Webtrees/Module/GeoDispersion/Services/PlaceMapperService.php

Indentation +33 added lines, -33 removed lines

@@ -25,39 +25,39 @@
  */
 class PlaceMapperService
 {
-    private ModuleService $module_service;
+	private ModuleService $module_service;
 
-    /**
-     * Constructor for PlaceMapperService
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(ModuleService $module_service)
-    {
-        $this->module_service = $module_service;
-    }
+	/**
+	 * Constructor for PlaceMapperService
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(ModuleService $module_service)
+	{
+		$this->module_service = $module_service;
+	}
 
-    /**
-     * Get all place mappers available.
-     *
-     * {@internal The list is generated based on the modules exposing ModulePlaceMapperProviderInterface}
-     *
-     * @param bool $include_disabled
-     * @return Collection
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        return $this->module_service
-            ->findByInterface(ModulePlaceMapperProviderInterface::class, $include_disabled)
-            ->flatMap(fn(ModulePlaceMapperProviderInterface $module) => $module->listPlaceMappers())
-            ->map(static function (string $mapper_class): ?PlaceMapperInterface {
-                try {
-                    $mapper = app($mapper_class);
-                    return $mapper instanceof PlaceMapperInterface ? $mapper : null;
-                } catch (BindingResolutionException $ex) {
-                    return null;
-                }
-            })->filter();
-        ;
-    }
+	/**
+	 * Get all place mappers available.
+	 *
+	 * {@internal The list is generated based on the modules exposing ModulePlaceMapperProviderInterface}
+	 *
+	 * @param bool $include_disabled
+	 * @return Collection
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		return $this->module_service
+			->findByInterface(ModulePlaceMapperProviderInterface::class, $include_disabled)
+			->flatMap(fn(ModulePlaceMapperProviderInterface $module) => $module->listPlaceMappers())
+			->map(static function (string $mapper_class): ?PlaceMapperInterface {
+				try {
+					$mapper = app($mapper_class);
+					return $mapper instanceof PlaceMapperInterface ? $mapper : null;
+				} catch (BindingResolutionException $ex) {
+					return null;
+				}
+			})->filter();
+		;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         return $this->module_service
             ->findByInterface(ModulePlaceMapperProviderInterface::class, $include_disabled)
             ->flatMap(fn(ModulePlaceMapperProviderInterface $module) => $module->listPlaceMappers())
-            ->map(static function (string $mapper_class): ?PlaceMapperInterface {
+            ->map(static function(string $mapper_class): ?PlaceMapperInterface {
                 try {
                     $mapper = app($mapper_class);
                     return $mapper instanceof PlaceMapperInterface ? $mapper : null;

src/Webtrees/Module/GeoDispersion/GeoAnalyses/AllEventsByTypeGeoAnalysis.php

Indentation +45 added lines, -45 removed lines

@@ -26,55 +26,55 @@
  */
 class AllEventsByTypeGeoAnalysis implements GeoAnalysisInterface
 {
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for AllEventsByTypeGeoAnalysis
-     *
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(GeoAnalysisDataService $geoanalysis_data_service)
-    {
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for AllEventsByTypeGeoAnalysis
+	 *
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(GeoAnalysisDataService $geoanalysis_data_service)
+	{
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('All events places by event type');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('All events places by event type');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('event', 'events', $count);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('event', 'events', $count);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
 
-        foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
-            foreach ($record->facts([]) as $fact) {
-                $place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
-                if ($place->isUnknown()) {
-                    continue;
-                }
-                $results->addPlace($place);
-                $results->addPlaceInCategory($fact->label(), 0, $place);
-            }
-        }
+		foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
+			foreach ($record->facts([]) as $fact) {
+				$place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
+				if ($place->isUnknown()) {
+					continue;
+				}
+				$results->addPlace($place);
+				$results->addPlaceInCategory($fact->label(), 0, $place);
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }

src/Webtrees/Module/GeoDispersion/GeoAnalyses/AllEventsByCenturyGeoAnalysis.php

Indentation +56 added lines, -56 removed lines

@@ -28,66 +28,66 @@
  */
 class AllEventsByCenturyGeoAnalysis implements GeoAnalysisInterface
 {
-    private GeoAnalysisDataService $geoanalysis_data_service;
-    private CenturyService $century_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
+	private CenturyService $century_service;
 
-    /**
-     * Constructor for AllEventsByCenturyGeoAnalysis
-     *
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     * @param CenturyService $century_service
-     */
-    public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
-    {
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-        $this->century_service = $century_service;
-    }
+	/**
+	 * Constructor for AllEventsByCenturyGeoAnalysis
+	 *
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 * @param CenturyService $century_service
+	 */
+	public function __construct(GeoAnalysisDataService $geoanalysis_data_service, CenturyService $century_service)
+	{
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+		$this->century_service = $century_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('All events places by century');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('All events places by century');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
-     */
-    public function itemsDescription(): callable
-    {
-        return fn(int $count): string => I18N::plural('event', 'events', $count);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::itemsDescription()
+	 */
+	public function itemsDescription(): callable
+	{
+		return fn(int $count): string => I18N::plural('event', 'events', $count);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
-     */
-    public function results(Tree $tree, int $depth): GeoAnalysisResults
-    {
-        $results = new GeoAnalysisResults();
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\GeoAnalysisInterface::results()
+	 */
+	public function results(Tree $tree, int $depth): GeoAnalysisResults
+	{
+		$results = new GeoAnalysisResults();
 
-        foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
-            foreach ($record->facts([]) as $fact) {
-                $place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
-                if ($place->isUnknown()) {
-                    continue;
-                }
-                $results->addPlace($place);
-                $date = $fact->date();
-                if ($date->isOK()) {
-                    $century = intdiv($date->gregorianYear(), 100);
-                    $results->addPlaceInCategory(
-                        I18N::translate('%s century', $this->century_service->centuryName($century)),
-                        $century,
-                        $place
-                    );
-                }
-            }
-        }
+		foreach ($this->geoanalysis_data_service->individualsAndFamilies($tree) as $record) {
+			foreach ($record->facts([]) as $fact) {
+				$place = new GeoAnalysisPlace($tree, $fact->place(), $depth);
+				if ($place->isUnknown()) {
+					continue;
+				}
+				$results->addPlace($place);
+				$date = $fact->date();
+				if ($date->isOK()) {
+					$century = intdiv($date->gregorianYear(), 100);
+					$results->addPlaceInCategory(
+						I18N::translate('%s century', $this->century_service->centuryName($century)),
+						$century,
+						$place
+					);
+				}
+			}
+		}
 
-        return $results;
-    }
+		return $results;
+	}
 }

src/Webtrees/Module/GeoDispersion/PlaceMappers/SimplePlaceMapper.php

Indentation +17 added lines, -17 removed lines

@@ -24,23 +24,23 @@
  */
 class SimplePlaceMapper implements PlaceMapperInterface
 {
-    use PlaceMapperTrait;
+	use PlaceMapperTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place name');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place name');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        return $place->firstParts(1)->first();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		return $place->firstParts(1)->first();
+	}
 }

src/Webtrees/Module/GeoDispersion/PlaceMappers/Config/FilteredTopPlaceMapperConfig.php

Indentation +98 added lines, -98 removed lines

@@ -28,110 +28,110 @@
  */
 class FilteredTopPlaceMapperConfig extends GenericPlaceMapperConfig
 {
-    private TreeService $tree_service;
+	private TreeService $tree_service;
 
-    /**
-     * FilteredTopPlaceMapperConfig
-     *
-     * @param TreeService $tree_service
-     */
-    public function __construct(TreeService $tree_service)
-    {
-        $this->tree_service = $tree_service;
-    }
+	/**
+	 * FilteredTopPlaceMapperConfig
+	 *
+	 * @param TreeService $tree_service
+	 */
+	public function __construct(TreeService $tree_service)
+	{
+		$this->tree_service = $tree_service;
+	}
 
-    /**
-     * Get the configured Top Places to filter on
-     *
-     * @return Collection<Place>
-     */
-    public function topPlaces(): Collection
-    {
-        return collect($this->get('topPlaces', []))
-            ->filter(
-                /** @psalm-suppress MissingClosureParamType */
-                fn($item): bool => $item instanceof Place
-            );
-    }
+	/**
+	 * Get the configured Top Places to filter on
+	 *
+	 * @return Collection<Place>
+	 */
+	public function topPlaces(): Collection
+	{
+		return collect($this->get('topPlaces', []))
+			->filter(
+				/** @psalm-suppress MissingClosureParamType */
+				fn($item): bool => $item instanceof Place
+			);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonSerializeConfig()
-     */
-    public function jsonSerializeConfig()
-    {
-        return [
-            'topPlaces' => $this->topPlaces()
-                ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
-                ->toArray()
-        ];
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonSerializeConfig()
+	 */
+	public function jsonSerializeConfig()
+	{
+		return [
+			'topPlaces' => $this->topPlaces()
+				->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+				->toArray()
+		];
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonDeserialize()
-     */
-    public function jsonDeserialize($config): self
-    {
-        if (is_string($config)) {
-            return $this->jsonDeserialize(json_decode($config));
-        }
-        if (is_array($config)) {
-            $this->setConfig([
-                'topPlaces' => collect($config['topPlaces'] ?? [])
-                    ->filter(
-                        /** @psalm-suppress MissingClosureParamType */
-                        fn($item): bool => is_array($item) && count($item) == 2
-                    )->map(function (array $item): ?Place {
-                        try {
-                            return new Place($item[1], $this->tree_service->find($item[0]));
-                        } catch (RuntimeException $ex) {
-                            return null;
-                        }
-                    })
-                    ->filter()
-                    ->toArray()
-                ]);
-        }
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::jsonDeserialize()
+	 */
+	public function jsonDeserialize($config): self
+	{
+		if (is_string($config)) {
+			return $this->jsonDeserialize(json_decode($config));
+		}
+		if (is_array($config)) {
+			$this->setConfig([
+				'topPlaces' => collect($config['topPlaces'] ?? [])
+					->filter(
+						/** @psalm-suppress MissingClosureParamType */
+						fn($item): bool => is_array($item) && count($item) == 2
+					)->map(function (array $item): ?Place {
+						try {
+							return new Place($item[1], $this->tree_service->find($item[0]));
+						} catch (RuntimeException $ex) {
+							return null;
+						}
+					})
+					->filter()
+					->toArray()
+				]);
+		}
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::configContent()
-     */
-    public function configContent(ModuleInterface $module, Tree $tree): string
-    {
-        return view($module->name() . '::mappers/filtered-top-config', [
-            'tree'          =>  $tree,
-            'top_places'    =>  $this->topPlaces()
-        ]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::configContent()
+	 */
+	public function configContent(ModuleInterface $module, Tree $tree): string
+	{
+		return view($module->name() . '::mappers/filtered-top-config', [
+			'tree'          =>  $tree,
+			'top_places'    =>  $this->topPlaces()
+		]);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::withConfigUpdate()
-     */
-    public function withConfigUpdate(ServerRequestInterface $request): self
-    {
-        $tree = $request->getAttribute('tree');
-        if (!($tree instanceof Tree)) {
-            return $this;
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Common\GeoDispersion\Config\GenericPlaceMapperConfig::withConfigUpdate()
+	 */
+	public function withConfigUpdate(ServerRequestInterface $request): self
+	{
+		$tree = $request->getAttribute('tree');
+		if (!($tree instanceof Tree)) {
+			return $this;
+		}
 
-        $params = (array) $request->getParsedBody();
+		$params = (array) $request->getParsedBody();
 
-        $top_places = $params['mapper_filt_top_places'] ?? [];
-        if (is_array($top_places)) {
-            $config = ['topPlaces' => []];
-            foreach ($top_places as $top_place_id) {
-                $place = Place::find((int) $top_place_id, $tree);
-                if (mb_strlen($place->gedcomName()) > 0) {
-                    $config['topPlaces'][] = $place;
-                }
-            }
-            $this->setConfig($config);
-        }
-        return $this;
-    }
+		$top_places = $params['mapper_filt_top_places'] ?? [];
+		if (is_array($top_places)) {
+			$config = ['topPlaces' => []];
+			foreach ($top_places as $top_place_id) {
+				$place = Place::find((int) $top_place_id, $tree);
+				if (mb_strlen($place->gedcomName()) > 0) {
+					$config['topPlaces'][] = $place;
+				}
+			}
+			$this->setConfig($config);
+		}
+		return $this;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
     {
         return [
             'topPlaces' => $this->topPlaces()
-                ->map(fn(Place $place): array => [ $place->tree()->id(), $place->gedcomName() ])
+                ->map(fn(Place $place): array => [$place->tree()->id(), $place->gedcomName()])
                 ->toArray()
         ];
     }
@@ -82,7 +82,7 @@ 
                     ->filter(
                         /** @psalm-suppress MissingClosureParamType */
                         fn($item): bool => is_array($item) && count($item) == 2
-                    )->map(function (array $item): ?Place {
+                    )->map(function(array $item): ?Place {
                         try {
                             return new Place($item[1], $this->tree_service->find($item[0]));
                         } catch (RuntimeException $ex) {
@@ -102,7 +102,7 @@ 
      */
     public function configContent(ModuleInterface $module, Tree $tree): string
     {
-        return view($module->name() . '::mappers/filtered-top-config', [
+        return view($module->name().'::mappers/filtered-top-config', [
             'tree'          =>  $tree,
             'top_places'    =>  $this->topPlaces()
         ]);
@@ -119,13 +119,13 @@ 
             return $this;
         }
 
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $top_places = $params['mapper_filt_top_places'] ?? [];
         if (is_array($top_places)) {
             $config = ['topPlaces' => []];
             foreach ($top_places as $top_place_id) {
-                $place = Place::find((int) $top_place_id, $tree);
+                $place = Place::find((int)$top_place_id, $tree);
                 if (mb_strlen($place->gedcomName()) > 0) {
                     $config['topPlaces'][] = $place;
                 }