jon48 / webtrees-lib

app/Module/GeoDispersion/Http/RequestHandlers/GeoAnalysisViewsList.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
             ->all($tree)
             ->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
+        return $this->viewResponse($this->module->name().'::geoanalysisviews-list', [
             'module'        =>  $this->module,
             'title'         =>  I18N::translate('Geographical dispersion'),
             'tree'          =>  $tree,

Indentation +36 added lines, -36 removed lines

@@ -33,46 +33,46 @@
  */
 class GeoAnalysisViewsList implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisViewsList Request Handler
-     *
-     * @param ModuleService $module_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoviewdata_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoviewdata_service = $geoviewdata_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewsList Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoviewdata_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoviewdata_service = $geoviewdata_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
 
-        $tree = Validator::attributes($request)->tree();
+		$tree = Validator::attributes($request)->tree();
 
-        $views_list = $this->geoviewdata_service
-            ->all($tree)
-            ->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
+		$views_list = $this->geoviewdata_service
+			->all($tree)
+			->sortBy(fn(AbstractGeoAnalysisView $view) => $view->description());
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Geographical dispersion'),
-            'tree'          =>  $tree,
-            'views_list'    =>  $views_list,
-            'js_script_url' =>  $this->module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::geoanalysisviews-list', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Geographical dispersion'),
+			'tree'          =>  $tree,
+			'views_list'    =>  $views_list,
+			'js_script_url' =>  $this->module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
 }

app/Module/GeoDispersion/Http/RequestHandlers/AdminConfigPage.php

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
             throw new HttpAccessDeniedException();
         }
 
-        return $this->viewResponse($this->module->name() . '::admin/config', [
+        return $this->viewResponse($this->module->name().'::admin/config', [
             'module_name'       =>  $this->module->name(),
             'title'             =>  $this->module->title(),
             'tree'              =>  $tree,

Indentation +60 added lines, -60 removed lines

@@ -35,64 +35,64 @@
  */
 class AdminConfigPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
-
-    private ?GeoDispersionModule $module;
-
-    private TreeService $tree_service;
-
-    private GeoAnalysisDataService $geoanalysis_data_service;
-
-    /**
-     * Constructor for the AdminConfigPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param TreeService $tree_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        TreeService $tree_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->tree_service = $tree_service;
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
-
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-
-        $user = Validator::attributes($request)->user();
-
-        $all_trees = $this->tree_service->all()->filter(fn(Tree $tree) => Auth::isManager($tree, $user));
-        if ($all_trees->count() === 0) {
-            throw new HttpAccessDeniedException();
-        }
-
-        $tree = Validator::attributes($request)->treeOptional() ?? $all_trees->first();
-
-        $same_tree = fn(Tree $tree_collection): bool => $tree->id() === $tree_collection->id();
-        if (!$all_trees->contains($same_tree)) {
-            throw new HttpAccessDeniedException();
-        }
-
-        return $this->viewResponse($this->module->name() . '::admin/config', [
-            'module_name'       =>  $this->module->name(),
-            'title'             =>  $this->module->title(),
-            'tree'              =>  $tree,
-            'other_trees'       =>  $all_trees->reject($same_tree),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
-            'js_script_url'     =>  $this->module->assetUrl('js/geodispersion.min.js')
-        ]);
-    }
+	use ViewResponseTrait;
+
+	private ?GeoDispersionModule $module;
+
+	private TreeService $tree_service;
+
+	private GeoAnalysisDataService $geoanalysis_data_service;
+
+	/**
+	 * Constructor for the AdminConfigPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param TreeService $tree_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		TreeService $tree_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->tree_service = $tree_service;
+		$this->geoanalysis_data_service = $geoanalysis_data_service;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/administration';
+
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+
+		$user = Validator::attributes($request)->user();
+
+		$all_trees = $this->tree_service->all()->filter(fn(Tree $tree) => Auth::isManager($tree, $user));
+		if ($all_trees->count() === 0) {
+			throw new HttpAccessDeniedException();
+		}
+
+		$tree = Validator::attributes($request)->treeOptional() ?? $all_trees->first();
+
+		$same_tree = fn(Tree $tree_collection): bool => $tree->id() === $tree_collection->id();
+		if (!$all_trees->contains($same_tree)) {
+			throw new HttpAccessDeniedException();
+		}
+
+		return $this->viewResponse($this->module->name() . '::admin/config', [
+			'module_name'       =>  $this->module->name(),
+			'title'             =>  $this->module->title(),
+			'tree'              =>  $tree,
+			'other_trees'       =>  $all_trees->reject($same_tree),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree),
+			'js_script_url'     =>  $this->module->assetUrl('js/geodispersion.min.js')
+		]);
+	}
 }

app/Module/GeoDispersion/Views/AbstractGeoAnalysisView.php

Spacing +1 added lines, -1 removed lines

@@ -111,7 +111,7 @@
      */
     public function detailedTabContent(ModuleInterface $module, Collection $results, array $params): string
     {
-        return view($module->name() . '::geoanalysisview-tab-detailed', $params + [ 'results'   =>  $results ]);
+        return view($module->name().'::geoanalysisview-tab-detailed', $params + ['results'   =>  $results]);
     }
 
     /**

Indentation +220 added lines, -220 removed lines

@@ -27,224 +27,224 @@
  */
 abstract class AbstractGeoAnalysisView
 {
-    private int $id;
-    private Tree $tree;
-    private bool $enabled;
-    private string $description;
-    private GeoAnalysisInterface $geoanalysis;
-    private int $depth;
-    private int $detailed_top_places;
-    private bool $use_flags;
-
-    /**
-     * Constructor for AbstractGeoAnalysisView
-     *
-     * @param int $id
-     * @param Tree $tree
-     * @param bool $enabled
-     * @param string $description
-     * @param GeoAnalysisInterface $geoanalysis
-     * @param int $depth
-     * @param int $detailed_top_places
-     * @param bool $use_flags
-     */
-    final public function __construct(
-        int $id,
-        Tree $tree,
-        bool $enabled,
-        string $description,
-        GeoAnalysisInterface $geoanalysis,
-        int $depth,
-        int $detailed_top_places = 0,
-        bool $use_flags = false
-    ) {
-        $this->id = $id;
-        $this->tree = $tree;
-        $this->enabled = $enabled;
-        $this->description = $description;
-        $this->geoanalysis = $geoanalysis;
-        $this->depth = $depth;
-        $this->detailed_top_places = $detailed_top_places;
-        $this->use_flags = $use_flags;
-    }
-
-    /**
-     * Create a copy of the view with a new ID.
-     *
-     * @param int $id
-     * @return static
-     */
-    public function withId(int $id): self
-    {
-        $new = clone $this;
-        $new->id = $id;
-        return $new;
-    }
-
-    /**
-     * Create a copy of the view with new properties.
-     *
-     * @param bool $enabled
-     * @param string $description
-     * @param GeoAnalysisInterface $geoanalysis
-     * @param int $depth
-     * @param int $detailed_top_places
-     * @param bool $use_flags
-     * @return static
-     */
-    public function with(
-        bool $enabled,
-        string $description,
-        GeoAnalysisInterface $geoanalysis,
-        int $depth,
-        int $detailed_top_places = 0,
-        bool $use_flags = false
-    ): self {
-        $new = clone $this;
-        $new->enabled = $enabled;
-        $new->description = $description;
-        $new->geoanalysis = $geoanalysis;
-        $new->depth = $depth;
-        $new->detailed_top_places = $detailed_top_places;
-        $new->use_flags = $use_flags;
-        return $new;
-    }
-
-    /**
-     * Get the view ID
-     *
-     * @return int
-     */
-    public function id(): int
-    {
-        return $this->id;
-    }
-
-    /**
-     * Get the view type for display
-     *
-     * @return string
-     */
-    abstract public function type(): string;
-
-    /**
-     * Get the icon for the view type
-     *
-     * @param ModuleInterface $module
-     * @return string
-     */
-    abstract public function icon(ModuleInterface $module): string;
-
-    /**
-     * Return the content of the global settings section of the config page
-     *
-     * @param ModuleInterface $module
-     * @return string
-     */
-    abstract public function globalSettingsContent(ModuleInterface $module): string;
-
-    /**
-     * Return a view with global settings updated according to the view rules
-     *
-     * @param ServerRequestInterface $request
-     * @return static
-     */
-    abstract public function withGlobalSettingsUpdate(ServerRequestInterface $request): self;
-
-    /**
-     * Returns the content of the view global tab
-     *
-     * @param GeoDispersionModule $module
-     * @param GeoAnalysisResult $result
-     * @param array<string, mixed> $params
-     * @return string
-     */
-    abstract public function globalTabContent(
-        GeoDispersionModule $module,
-        GeoAnalysisResult $result,
-        array $params
-    ): string;
-
-    /**
-     * Returns the content of the view detailed tab
-     *
-     * @param ModuleInterface $module
-     * @param Collection<string, GeoAnalysisResult> $results
-     * @param array<string, mixed> $params
-     * @return string
-     */
-    public function detailedTabContent(ModuleInterface $module, Collection $results, array $params): string
-    {
-        return view($module->name() . '::geoanalysisview-tab-detailed', $params + [ 'results'   =>  $results ]);
-    }
-
-    /**
-     * Get the tree to which the view belongs
-     *
-     * @return Tree
-     */
-    public function tree(): Tree
-    {
-        return $this->tree;
-    }
-
-    /**
-     * Get the description of the view
-     *
-     * @return string
-     */
-    public function description(): string
-    {
-        return $this->description;
-    }
-
-    /**
-     * Get whether the view is enabled
-     *
-     * @return bool
-     */
-    public function isEnabled(): bool
-    {
-        return $this->enabled;
-    }
-
-    /**
-     * Get the geographical dispersion analysis for the view
-     *
-     * @return GeoAnalysisInterface
-     */
-    public function analysis(): GeoAnalysisInterface
-    {
-        return $this->geoanalysis;
-    }
-
-    /**
-     * Get the place hierarchy depth for the view
-     *
-     * @return int
-     */
-    public function placesDepth(): int
-    {
-        return $this->depth;
-    }
-
-    /**
-     * Get the number of places to display in the detailed tab
-     *
-     * @return int
-     */
-    public function numberTopPlaces(): int
-    {
-        return $this->detailed_top_places;
-    }
-
-    /**
-     * Get whether flags should be used in the detailed tab
-     *
-     * @return bool
-     */
-    public function useFlags(): bool
-    {
-        return $this->use_flags;
-    }
+	private int $id;
+	private Tree $tree;
+	private bool $enabled;
+	private string $description;
+	private GeoAnalysisInterface $geoanalysis;
+	private int $depth;
+	private int $detailed_top_places;
+	private bool $use_flags;
+
+	/**
+	 * Constructor for AbstractGeoAnalysisView
+	 *
+	 * @param int $id
+	 * @param Tree $tree
+	 * @param bool $enabled
+	 * @param string $description
+	 * @param GeoAnalysisInterface $geoanalysis
+	 * @param int $depth
+	 * @param int $detailed_top_places
+	 * @param bool $use_flags
+	 */
+	final public function __construct(
+		int $id,
+		Tree $tree,
+		bool $enabled,
+		string $description,
+		GeoAnalysisInterface $geoanalysis,
+		int $depth,
+		int $detailed_top_places = 0,
+		bool $use_flags = false
+	) {
+		$this->id = $id;
+		$this->tree = $tree;
+		$this->enabled = $enabled;
+		$this->description = $description;
+		$this->geoanalysis = $geoanalysis;
+		$this->depth = $depth;
+		$this->detailed_top_places = $detailed_top_places;
+		$this->use_flags = $use_flags;
+	}
+
+	/**
+	 * Create a copy of the view with a new ID.
+	 *
+	 * @param int $id
+	 * @return static
+	 */
+	public function withId(int $id): self
+	{
+		$new = clone $this;
+		$new->id = $id;
+		return $new;
+	}
+
+	/**
+	 * Create a copy of the view with new properties.
+	 *
+	 * @param bool $enabled
+	 * @param string $description
+	 * @param GeoAnalysisInterface $geoanalysis
+	 * @param int $depth
+	 * @param int $detailed_top_places
+	 * @param bool $use_flags
+	 * @return static
+	 */
+	public function with(
+		bool $enabled,
+		string $description,
+		GeoAnalysisInterface $geoanalysis,
+		int $depth,
+		int $detailed_top_places = 0,
+		bool $use_flags = false
+	): self {
+		$new = clone $this;
+		$new->enabled = $enabled;
+		$new->description = $description;
+		$new->geoanalysis = $geoanalysis;
+		$new->depth = $depth;
+		$new->detailed_top_places = $detailed_top_places;
+		$new->use_flags = $use_flags;
+		return $new;
+	}
+
+	/**
+	 * Get the view ID
+	 *
+	 * @return int
+	 */
+	public function id(): int
+	{
+		return $this->id;
+	}
+
+	/**
+	 * Get the view type for display
+	 *
+	 * @return string
+	 */
+	abstract public function type(): string;
+
+	/**
+	 * Get the icon for the view type
+	 *
+	 * @param ModuleInterface $module
+	 * @return string
+	 */
+	abstract public function icon(ModuleInterface $module): string;
+
+	/**
+	 * Return the content of the global settings section of the config page
+	 *
+	 * @param ModuleInterface $module
+	 * @return string
+	 */
+	abstract public function globalSettingsContent(ModuleInterface $module): string;
+
+	/**
+	 * Return a view with global settings updated according to the view rules
+	 *
+	 * @param ServerRequestInterface $request
+	 * @return static
+	 */
+	abstract public function withGlobalSettingsUpdate(ServerRequestInterface $request): self;
+
+	/**
+	 * Returns the content of the view global tab
+	 *
+	 * @param GeoDispersionModule $module
+	 * @param GeoAnalysisResult $result
+	 * @param array<string, mixed> $params
+	 * @return string
+	 */
+	abstract public function globalTabContent(
+		GeoDispersionModule $module,
+		GeoAnalysisResult $result,
+		array $params
+	): string;
+
+	/**
+	 * Returns the content of the view detailed tab
+	 *
+	 * @param ModuleInterface $module
+	 * @param Collection<string, GeoAnalysisResult> $results
+	 * @param array<string, mixed> $params
+	 * @return string
+	 */
+	public function detailedTabContent(ModuleInterface $module, Collection $results, array $params): string
+	{
+		return view($module->name() . '::geoanalysisview-tab-detailed', $params + [ 'results'   =>  $results ]);
+	}
+
+	/**
+	 * Get the tree to which the view belongs
+	 *
+	 * @return Tree
+	 */
+	public function tree(): Tree
+	{
+		return $this->tree;
+	}
+
+	/**
+	 * Get the description of the view
+	 *
+	 * @return string
+	 */
+	public function description(): string
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Get whether the view is enabled
+	 *
+	 * @return bool
+	 */
+	public function isEnabled(): bool
+	{
+		return $this->enabled;
+	}
+
+	/**
+	 * Get the geographical dispersion analysis for the view
+	 *
+	 * @return GeoAnalysisInterface
+	 */
+	public function analysis(): GeoAnalysisInterface
+	{
+		return $this->geoanalysis;
+	}
+
+	/**
+	 * Get the place hierarchy depth for the view
+	 *
+	 * @return int
+	 */
+	public function placesDepth(): int
+	{
+		return $this->depth;
+	}
+
+	/**
+	 * Get the number of places to display in the detailed tab
+	 *
+	 * @return int
+	 */
+	public function numberTopPlaces(): int
+	{
+		return $this->detailed_top_places;
+	}
+
+	/**
+	 * Get whether flags should be used in the detailed tab
+	 *
+	 * @return bool
+	 */
+	public function useFlags(): bool
+	{
+		return $this->use_flags;
+	}
 }

app/Module/GeoDispersion/Schema/Migration2.php

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
 
         foreach ($existing_views as $old_view) {
             try {
-                $tree = $tree_service->find((int) $old_view->majgd_file);
+                $tree = $tree_service->find((int)$old_view->majgd_file);
             } catch (RuntimeException $ex) {
                 continue;
             }
@@ -134,8 +134,8 @@ 
             $old_view->majgd_status === 'enabled',
             $old_view->majgd_descr,
             app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
+            (int)$old_view->majgd_sublevel,
+            (int)$old_view->majgd_detailsgen
         );
 
         return $geoview_data_service->insertGetId($new_view) > 0;
@@ -165,8 +165,8 @@ 
             $old_view->majgd_status === 'enabled',
             $old_view->majgd_descr,
             app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
+            (int)$old_view->majgd_sublevel,
+            (int)$old_view->majgd_detailsgen
         );
 
         $view_id = $geoview_data_service->insertGetId($new_view);
@@ -203,7 +203,7 @@ 
     private function mapIdsFromOld(string $map_xml): array
     {
         $mapping = self::MAPS_XML_MAPPING[$map_xml] ?? [];
-        return is_array($mapping) ? $mapping : [ $mapping ];
+        return is_array($mapping) ? $mapping : [$mapping];
     }
 
     /**

Indentation +193 added lines, -193 removed lines

@@ -39,219 +39,219 @@
  */
 class Migration2 implements MigrationInterface
 {
-    /**
-     * Mapping from old map definitions to new ones
-     * @var array<string,mixed> MAPS_XML_MAPPING
-     */
-    private const MAPS_XML_MAPPING = [
-        'aubracmargeridebycommunes.xml' =>  'fr-area-aubrac-lot-margeride-planeze-communes',
-        'calvadosbycommunes.xml'        =>  'fr-dpt-14-communes',
-        'cantalbycommunes.xml'          =>  'fr-dpt-15-communes',
-        'cotesdarmorbycommunes.xml'     =>  'fr-dpt-22-communes',
-        'essonnebycommunes.xml'         =>  'fr-dpt-91-communes',
-        'eurebycommunes.xml'            =>  'fr-dpt-27-communes',
-        'eureetloirbycommunes.xml'      =>  'fr-dpt-28-communes',
-        'francebydepartements.xml'      =>  'fr-metropole-departements',
-        'francebyregions1970.xml'       =>  'fr-metropole-regions-1970',
-        'francebyregions2016.xml'       =>  'fr-metropole-regions-2016',
-        'hauteloirebycommunes.xml'      =>  'fr-dpt-43-communes',
-        'illeetvilainebycommunes.xml'   =>  'fr-dpt-35-communes',
-        'loiretbycommunes.xml'          =>  'fr-dpt-45-communes',
-        'lozerebycodepostaux.xml'       =>  'fr-dpt-48-codespostaux',
-        'lozerebycommunes.xml'          =>  'fr-dpt-48-communes',
-        'mayennebycommunes.xml'         =>  'fr-dpt-53-communes',
-        'oisebycommunes.xml'            =>  'fr-dpt-60-communes',
-        'ornebycommunes.xml'            =>  'fr-dpt-61-communes',
-        'puydedomebycommunes.xml'       =>  'fr-dpt-63-communes',
-        'sarthebycommunes.xml'          =>  'fr-dpt-72-communes',
-        'seinemaritimebycommunes.xml'   =>  'fr-dpt-76-communes',
-        'seinesommeoisebycommunes.xml'  =>  ['fr-dpt-60-communes', 'fr-dpt-76-communes', 'fr-dpt-80-communes'],
-        'valdoisebycommunes.xml'        =>  'fr-dpt-95-communes',
-        'yvelinesbycommunes.xml'        =>  'fr-dpt-78-communes'
-    ];
+	/**
+	 * Mapping from old map definitions to new ones
+	 * @var array<string,mixed> MAPS_XML_MAPPING
+	 */
+	private const MAPS_XML_MAPPING = [
+		'aubracmargeridebycommunes.xml' =>  'fr-area-aubrac-lot-margeride-planeze-communes',
+		'calvadosbycommunes.xml'        =>  'fr-dpt-14-communes',
+		'cantalbycommunes.xml'          =>  'fr-dpt-15-communes',
+		'cotesdarmorbycommunes.xml'     =>  'fr-dpt-22-communes',
+		'essonnebycommunes.xml'         =>  'fr-dpt-91-communes',
+		'eurebycommunes.xml'            =>  'fr-dpt-27-communes',
+		'eureetloirbycommunes.xml'      =>  'fr-dpt-28-communes',
+		'francebydepartements.xml'      =>  'fr-metropole-departements',
+		'francebyregions1970.xml'       =>  'fr-metropole-regions-1970',
+		'francebyregions2016.xml'       =>  'fr-metropole-regions-2016',
+		'hauteloirebycommunes.xml'      =>  'fr-dpt-43-communes',
+		'illeetvilainebycommunes.xml'   =>  'fr-dpt-35-communes',
+		'loiretbycommunes.xml'          =>  'fr-dpt-45-communes',
+		'lozerebycodepostaux.xml'       =>  'fr-dpt-48-codespostaux',
+		'lozerebycommunes.xml'          =>  'fr-dpt-48-communes',
+		'mayennebycommunes.xml'         =>  'fr-dpt-53-communes',
+		'oisebycommunes.xml'            =>  'fr-dpt-60-communes',
+		'ornebycommunes.xml'            =>  'fr-dpt-61-communes',
+		'puydedomebycommunes.xml'       =>  'fr-dpt-63-communes',
+		'sarthebycommunes.xml'          =>  'fr-dpt-72-communes',
+		'seinemaritimebycommunes.xml'   =>  'fr-dpt-76-communes',
+		'seinesommeoisebycommunes.xml'  =>  ['fr-dpt-60-communes', 'fr-dpt-76-communes', 'fr-dpt-80-communes'],
+		'valdoisebycommunes.xml'        =>  'fr-dpt-95-communes',
+		'yvelinesbycommunes.xml'        =>  'fr-dpt-78-communes'
+	];
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        if (!DB::schema()->hasTable('maj_geodispersion')) {
-            return;
-        }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		if (!DB::schema()->hasTable('maj_geodispersion')) {
+			return;
+		}
 
-        /** @var TreeService $tree_service */
-        $tree_service = app(TreeService::class);
-        /** @var GeoAnalysisViewDataService $geoview_data_service */
-        $geoview_data_service = app(GeoAnalysisViewDataService::class);
+		/** @var TreeService $tree_service */
+		$tree_service = app(TreeService::class);
+		/** @var GeoAnalysisViewDataService $geoview_data_service */
+		$geoview_data_service = app(GeoAnalysisViewDataService::class);
 
-        $existing_views = DB::table('maj_geodispersion')
-            ->select()
-            ->get();
+		$existing_views = DB::table('maj_geodispersion')
+			->select()
+			->get();
 
-        foreach ($existing_views as $old_view) {
-            try {
-                $tree = $tree_service->find((int) $old_view->majgd_file);
-            } catch (RuntimeException $ex) {
-                continue;
-            }
+		foreach ($existing_views as $old_view) {
+			try {
+				$tree = $tree_service->find((int) $old_view->majgd_file);
+			} catch (RuntimeException $ex) {
+				continue;
+			}
 
-            if ($old_view->majgd_map === null) {
-                $this->migrateGeoAnalysisTable($old_view, $tree, $geoview_data_service);
-            } else {
-                DB::connection()->beginTransaction();
-                if ($this->migrateGeoAnalysisMap($old_view, $tree, $geoview_data_service)) {
-                    DB::connection()->commit();
-                } else {
-                    DB::connection()->rollBack();
-                }
-            }
-        }
+			if ($old_view->majgd_map === null) {
+				$this->migrateGeoAnalysisTable($old_view, $tree, $geoview_data_service);
+			} else {
+				DB::connection()->beginTransaction();
+				if ($this->migrateGeoAnalysisMap($old_view, $tree, $geoview_data_service)) {
+					DB::connection()->commit();
+				} else {
+					DB::connection()->rollBack();
+				}
+			}
+		}
 
-        $in_transaction = DB::connection()->getPdo()->inTransaction();
+		$in_transaction = DB::connection()->getPdo()->inTransaction();
 
-        DB::schema()->drop('maj_geodispersion');
+		DB::schema()->drop('maj_geodispersion');
 
-        if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
-            DB::connection()->beginTransaction();
-        }
+		if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
+			DB::connection()->beginTransaction();
+		}
 
-        FlashMessages::addMessage(I18N::translate(
-            'The geographical dispersion analyses have been migrated for webtrees 2. Please review their settings.'
-        ));
-    }
+		FlashMessages::addMessage(I18N::translate(
+			'The geographical dispersion analyses have been migrated for webtrees 2. Please review their settings.'
+		));
+	}
 
-    /**
-     * Create a Table geographical analysis view from a migrated item.
-     *
-     * @param stdClass $old_view
-     * @param Tree $tree
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @return bool
-     */
-    private function migrateGeoAnalysisTable(
-        stdClass $old_view,
-        Tree $tree,
-        GeoAnalysisViewDataService $geoview_data_service
-    ): bool {
-        $new_view = new GeoAnalysisTable(
-            0,
-            $tree,
-            $old_view->majgd_status === 'enabled',
-            $old_view->majgd_descr,
-            app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
-        );
+	/**
+	 * Create a Table geographical analysis view from a migrated item.
+	 *
+	 * @param stdClass $old_view
+	 * @param Tree $tree
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @return bool
+	 */
+	private function migrateGeoAnalysisTable(
+		stdClass $old_view,
+		Tree $tree,
+		GeoAnalysisViewDataService $geoview_data_service
+	): bool {
+		$new_view = new GeoAnalysisTable(
+			0,
+			$tree,
+			$old_view->majgd_status === 'enabled',
+			$old_view->majgd_descr,
+			app(SosaByGenerationGeoAnalysis::class),
+			(int) $old_view->majgd_sublevel,
+			(int) $old_view->majgd_detailsgen
+		);
 
-        return $geoview_data_service->insertGetId($new_view) > 0;
-    }
+		return $geoview_data_service->insertGetId($new_view) > 0;
+	}
 
-    /**
-     * Create a Map geographical analysis view from a migrated item.
-     *
-     * @param stdClass $old_view
-     * @param Tree $tree
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @return bool
-     */
-    private function migrateGeoAnalysisMap(
-        stdClass $old_view,
-        Tree $tree,
-        GeoAnalysisViewDataService $geoview_data_service
-    ): bool {
-        /** @var MapDefinitionsService $map_definition_service */
-        $map_definition_service = app(MapDefinitionsService::class);
-        /** @var MapAdapterDataService $mapadapter_data_service */
-        $mapadapter_data_service = app(MapAdapterDataService::class);
+	/**
+	 * Create a Map geographical analysis view from a migrated item.
+	 *
+	 * @param stdClass $old_view
+	 * @param Tree $tree
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @return bool
+	 */
+	private function migrateGeoAnalysisMap(
+		stdClass $old_view,
+		Tree $tree,
+		GeoAnalysisViewDataService $geoview_data_service
+	): bool {
+		/** @var MapDefinitionsService $map_definition_service */
+		$map_definition_service = app(MapDefinitionsService::class);
+		/** @var MapAdapterDataService $mapadapter_data_service */
+		$mapadapter_data_service = app(MapAdapterDataService::class);
 
-        $new_view = new GeoAnalysisMap(
-            0,
-            $tree,
-            $old_view->majgd_status === 'enabled',
-            $old_view->majgd_descr,
-            app(SosaByGenerationGeoAnalysis::class),
-            (int) $old_view->majgd_sublevel,
-            (int) $old_view->majgd_detailsgen
-        );
+		$new_view = new GeoAnalysisMap(
+			0,
+			$tree,
+			$old_view->majgd_status === 'enabled',
+			$old_view->majgd_descr,
+			app(SosaByGenerationGeoAnalysis::class),
+			(int) $old_view->majgd_sublevel,
+			(int) $old_view->majgd_detailsgen
+		);
 
-        $view_id = $geoview_data_service->insertGetId($new_view);
-        if ($view_id === 0) {
-            return false;
-        }
-        $new_view = $new_view->withId($view_id);
+		$view_id = $geoview_data_service->insertGetId($new_view);
+		if ($view_id === 0) {
+			return false;
+		}
+		$new_view = $new_view->withId($view_id);
 
-        $colors = $new_view->colors();
-        foreach ($this->mapIdsFromOld($old_view->majgd_map) as $new_map_id) {
-            $map = $map_definition_service->find($new_map_id);
-            if ($map === null) {
-                return false;
-            }
-            $colors = $this->colorsFromMap($new_map_id);
+		$colors = $new_view->colors();
+		foreach ($this->mapIdsFromOld($old_view->majgd_map) as $new_map_id) {
+			$map = $map_definition_service->find($new_map_id);
+			if ($map === null) {
+				return false;
+			}
+			$colors = $this->colorsFromMap($new_map_id);
 
-            /** @var SimplePlaceMapper $mapper */
-            $mapper = app(SimplePlaceMapper::class);
-            $mapview_config = new MapViewConfig($this->mappingPropertyForMap($new_map_id), $mapper->config());
-            $map_adapter = new GeoAnalysisMapAdapter(0, $view_id, $map, $mapper, $mapview_config);
+			/** @var SimplePlaceMapper $mapper */
+			$mapper = app(SimplePlaceMapper::class);
+			$mapview_config = new MapViewConfig($this->mappingPropertyForMap($new_map_id), $mapper->config());
+			$map_adapter = new GeoAnalysisMapAdapter(0, $view_id, $map, $mapper, $mapview_config);
 
-            $mapadapter_data_service->insertGetId($map_adapter);
-        }
+			$mapadapter_data_service->insertGetId($map_adapter);
+		}
 
-        return $geoview_data_service->update($new_view->withColors($colors)) > 0;
-    }
+		return $geoview_data_service->update($new_view->withColors($colors)) > 0;
+	}
 
-    /**
-     * Get all new map definitions IDs representing an old map definition
-     *
-     * @param string $map_xml
-     * @return string[]
-     */
-    private function mapIdsFromOld(string $map_xml): array
-    {
-        $mapping = self::MAPS_XML_MAPPING[$map_xml] ?? [];
-        return is_array($mapping) ? $mapping : [ $mapping ];
-    }
+	/**
+	 * Get all new map definitions IDs representing an old map definition
+	 *
+	 * @param string $map_xml
+	 * @return string[]
+	 */
+	private function mapIdsFromOld(string $map_xml): array
+	{
+		$mapping = self::MAPS_XML_MAPPING[$map_xml] ?? [];
+		return is_array($mapping) ? $mapping : [ $mapping ];
+	}
 
-    /**
-     * Get the mapping property to be used for the migrated map adapter
-     *
-     * @param string $map_id
-     * @return string
-     */
-    private function mappingPropertyForMap(string $map_id): string
-    {
-        switch ($map_id) {
-            case 'fr-metropole-regions-1970':
-            case 'fr-metropole-regions-2016':
-                return 'region_insee_libelle';
-            case 'fr-metropole-departements':
-                return 'dpt_insee_libelle';
-            case 'fr-dpt-48-codespostaux':
-                return 'code_postal';
-            default:
-                return 'commune_insee_libelle';
-        }
-    }
+	/**
+	 * Get the mapping property to be used for the migrated map adapter
+	 *
+	 * @param string $map_id
+	 * @return string
+	 */
+	private function mappingPropertyForMap(string $map_id): string
+	{
+		switch ($map_id) {
+			case 'fr-metropole-regions-1970':
+			case 'fr-metropole-regions-2016':
+				return 'region_insee_libelle';
+			case 'fr-metropole-departements':
+				return 'dpt_insee_libelle';
+			case 'fr-dpt-48-codespostaux':
+				return 'code_postal';
+			default:
+				return 'commune_insee_libelle';
+		}
+	}
 
-    /**
-     * Get the color configuration to be used for the migrated map view
-     *
-     * @param string $map_id
-     * @return MapColorsConfig
-     */
-    private function colorsFromMap(string $map_id): MapColorsConfig
-    {
-        $default = Hex::fromString('#f5f5f5');
-        $stroke = Hex::fromString('#d5d5d5');
-        $hover = Hex::fromString('#ff6600');
+	/**
+	 * Get the color configuration to be used for the migrated map view
+	 *
+	 * @param string $map_id
+	 * @return MapColorsConfig
+	 */
+	private function colorsFromMap(string $map_id): MapColorsConfig
+	{
+		$default = Hex::fromString('#f5f5f5');
+		$stroke = Hex::fromString('#d5d5d5');
+		$hover = Hex::fromString('#ff6600');
 
-        switch ($map_id) {
-            case 'fr-metropole-departements':
-                return new MapColorsConfig($default, $stroke, Hex::fromString('#0493ab'), $hover);
-            case 'fr-dpt-48-codespostaux':
-                return new MapColorsConfig($default, $stroke, Hex::fromString('#44aa00'), $hover);
-            default:
-                return new MapColorsConfig($default, $stroke, Hex::fromString('#e2a61d'), $hover);
-        }
-    }
+		switch ($map_id) {
+			case 'fr-metropole-departements':
+				return new MapColorsConfig($default, $stroke, Hex::fromString('#0493ab'), $hover);
+			case 'fr-dpt-48-codespostaux':
+				return new MapColorsConfig($default, $stroke, Hex::fromString('#44aa00'), $hover);
+			default:
+				return new MapColorsConfig($default, $stroke, Hex::fromString('#e2a61d'), $hover);
+		}
+	}
 }

app/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();
         };
     }

app/Module/GeoDispersion/Services/PlacesReferenceTableService.php

Spacing +5 added lines, -5 removed lines

@@ -49,14 +49,14 @@ 
         if ($source_parts === false) {
             return null;
         }
-        $source_parts = array_map(function (string $part): string {
+        $source_parts = array_map(function(string $part): string {
             if (preg_match('/^#([^#]+)#$/i', $part, $column_id) === 1) {
                 return $this->columnName($column_id[1]);
             }
             return $this->sanitizeString(str_replace(['?', '*'], ['_', '%'], $part));
         }, array_filter($source_parts));
         $source_parts[] = "'%'";
-        $concat_statement = 'CONCAT(' . implode(', ', $source_parts) . ')';
+        $concat_statement = 'CONCAT('.implode(', ', $source_parts).')';
 
         // Extract columns used in target
         $columns = [];
@@ -67,7 +67,7 @@ 
         // Get the mapping
         $rows = DB::table('maj_geodata_ref')  //DB::table('maj_geodata_ref')
             ->select($columns)
-            ->whereRaw($this->sanitizeString($source) . " LIKE " . $concat_statement)
+            ->whereRaw($this->sanitizeString($source)." LIKE ".$concat_statement)
             ->get();
 
         // Format the output ID
@@ -75,13 +75,13 @@ 
             return null;
         }
 
-        $mapping = (array) $rows->first();
+        $mapping = (array)$rows->first();
         if (count($columns_select) === 0) {
             return $target_format;
         }
 
         return str_replace(
-            array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),
+            array_map(fn($tag) => '{'.$tag.'}', $columns_select[1]),
             array_map(fn($tag) => $mapping[$this->columnName($tag)] ?? '', $columns_select[1]),
             $target_format
         );

Indentation +79 added lines, -79 removed lines

@@ -21,91 +21,91 @@
  */
 class PlacesReferenceTableService
 {
-    /**
-     * Mapping format placeholder tags => table column names
-     * @var array<string, string>
-     */
-    private const COLUMN_MAPPING = [
-        'name'  =>  'majgr_place_name',
-        'id'    =>  'majgr_place_admin_id',
-        'zip'   =>  'majgr_place_zip',
-        'gov'   =>  'majgr_place_gov_id',
-        'mls'   =>  'majgr_place_mls_id'
-    ];
+	/**
+	 * Mapping format placeholder tags => table column names
+	 * @var array<string, string>
+	 */
+	private const COLUMN_MAPPING = [
+		'name'  =>  'majgr_place_name',
+		'id'    =>  'majgr_place_admin_id',
+		'zip'   =>  'majgr_place_zip',
+		'gov'   =>  'majgr_place_gov_id',
+		'mls'   =>  'majgr_place_mls_id'
+	];
 
-    /**
-     * Get the formatted target mapping value of a place defined by a source format.
-     *
-     * @param string $source
-     * @param string $source_format
-     * @param string $target_format
-     * @return string|NULL
-     */
-    public function targetId(string $source, string $source_format, string $target_format): ?string
-    {
-        // Extract parts for the WHERE clause
-        $source_format = str_replace(['{', '}'], ['{#', '#}'], $source_format);
-        $source_parts = preg_split('/[{}]/i', $source_format);
-        if ($source_parts === false) {
-            return null;
-        }
-        $source_parts = array_map(function (string $part): string {
-            if (preg_match('/^#([^#]+)#$/i', $part, $column_id) === 1) {
-                return $this->columnName($column_id[1]);
-            }
-            return $this->sanitizeString(str_replace(['?', '*'], ['_', '%'], $part));
-        }, array_filter($source_parts));
-        $source_parts[] = "'%'";
-        $concat_statement = 'CONCAT(' . implode(', ', $source_parts) . ')';
+	/**
+	 * Get the formatted target mapping value of a place defined by a source format.
+	 *
+	 * @param string $source
+	 * @param string $source_format
+	 * @param string $target_format
+	 * @return string|NULL
+	 */
+	public function targetId(string $source, string $source_format, string $target_format): ?string
+	{
+		// Extract parts for the WHERE clause
+		$source_format = str_replace(['{', '}'], ['{#', '#}'], $source_format);
+		$source_parts = preg_split('/[{}]/i', $source_format);
+		if ($source_parts === false) {
+			return null;
+		}
+		$source_parts = array_map(function (string $part): string {
+			if (preg_match('/^#([^#]+)#$/i', $part, $column_id) === 1) {
+				return $this->columnName($column_id[1]);
+			}
+			return $this->sanitizeString(str_replace(['?', '*'], ['_', '%'], $part));
+		}, array_filter($source_parts));
+		$source_parts[] = "'%'";
+		$concat_statement = 'CONCAT(' . implode(', ', $source_parts) . ')';
 
-        // Extract columns used in target
-        $columns = [];
-        if (preg_match_all('/{(.*?)}/i', $target_format, $columns_select) === 1) {
-            $columns = array_unique(array_filter(array_map(fn($id) => $this->columnName($id), $columns_select[1])));
-        }
+		// Extract columns used in target
+		$columns = [];
+		if (preg_match_all('/{(.*?)}/i', $target_format, $columns_select) === 1) {
+			$columns = array_unique(array_filter(array_map(fn($id) => $this->columnName($id), $columns_select[1])));
+		}
 
-        // Get the mapping
-        $rows = DB::table('maj_geodata_ref')  //DB::table('maj_geodata_ref')
-            ->select($columns)
-            ->whereRaw($this->sanitizeString($source) . " LIKE " . $concat_statement)
-            ->get();
+		// Get the mapping
+		$rows = DB::table('maj_geodata_ref')  //DB::table('maj_geodata_ref')
+			->select($columns)
+			->whereRaw($this->sanitizeString($source) . " LIKE " . $concat_statement)
+			->get();
 
-        // Format the output ID
-        if ($rows->count() === 0) {
-            return null;
-        }
+		// Format the output ID
+		if ($rows->count() === 0) {
+			return null;
+		}
 
-        $mapping = (array) $rows->first();
-        if (count($columns_select) === 0) {
-            return $target_format;
-        }
+		$mapping = (array) $rows->first();
+		if (count($columns_select) === 0) {
+			return $target_format;
+		}
 
-        return str_replace(
-            array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),
-            array_map(fn($tag) => $mapping[$this->columnName($tag)] ?? '', $columns_select[1]),
-            $target_format
-        );
-    }
+		return str_replace(
+			array_map(fn($tag) => '{' . $tag . '}', $columns_select[1]),
+			array_map(fn($tag) => $mapping[$this->columnName($tag)] ?? '', $columns_select[1]),
+			$target_format
+		);
+	}
 
-    /**
-     * Get the column name for a format placeholder tag
-     *
-     * @param string $placeholder
-     * @return string
-     */
-    private function columnName(string $placeholder): string
-    {
-        return self::COLUMN_MAPPING[$placeholder] ?? '';
-    }
+	/**
+	 * Get the column name for a format placeholder tag
+	 *
+	 * @param string $placeholder
+	 * @return string
+	 */
+	private function columnName(string $placeholder): string
+	{
+		return self::COLUMN_MAPPING[$placeholder] ?? '';
+	}
 
-    /**
-     * Sanitize string for use in a SQL query.
-     *
-     * @param string $string
-     * @return string
-     */
-    private function sanitizeString(string $string): string
-    {
-        return DB::connection()->getPdo()->quote($string);
-    }
+	/**
+	 * Sanitize string for use in a SQL query.
+	 *
+	 * @param string $string
+	 * @return string
+	 */
+	private function sanitizeString(string $string): string
+	{
+		return DB::connection()->getPdo()->quote($string);
+	}
 }

app/Module/GeoDispersion/Services/MapAdapterDataService.php

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))

Indentation +157 added lines, -157 removed lines

@@ -31,171 +31,171 @@
  */
 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
-     * @param bool $show_invalid
-     * @return Collection<GeoAnalysisMapAdapter|null>
-     */
-    public function allForView(GeoAnalysisMap $map_view, bool $show_invalid = false): Collection
-    {
-        $map_adapters = DB::table('maj_geodisp_mapviews')
-            ->select('maj_geodisp_mapviews.*')
-            ->where('majgm_majgv_id', '=', $map_view->id())
-            ->get()
-            ->map($this->mapAdapterMapper());
-        return $show_invalid ? $map_adapters : $map_adapters->filter();
-    }
+	/**
+	 * Get all GeoAnalysisMapAdapters linked to a Map View.
+	 *
+	 * @param GeoAnalysisMap $map_view
+	 * @param bool $show_invalid
+	 * @return Collection<GeoAnalysisMapAdapter|null>
+	 */
+	public function allForView(GeoAnalysisMap $map_view, bool $show_invalid = false): Collection
+	{
+		$map_adapters = DB::table('maj_geodisp_mapviews')
+			->select('maj_geodisp_mapviews.*')
+			->where('majgm_majgv_id', '=', $map_view->id())
+			->get()
+			->map($this->mapAdapterMapper());
+		return $show_invalid ? $map_adapters : $map_adapters->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();
+	}
 
-    /**
-     * Delete invalid GeoAnalysisMapAdapters from the database.
-     *
-     * @param AbstractGeoAnalysisView $view
-     * @param Collection<int> $valid_map_adapters
-     * @return int
-     */
-    public function deleteInvalid(AbstractGeoAnalysisView $view, Collection $valid_map_adapters): int
-    {
-        return DB::table('maj_geodisp_mapviews')
-            ->where('majgm_majgv_id', '=', $view->id())
-            ->whereNotIn('majgm_id', $valid_map_adapters)
-            ->delete();
-    }
+	/**
+	 * Delete invalid GeoAnalysisMapAdapters from the database.
+	 *
+	 * @param AbstractGeoAnalysisView $view
+	 * @param Collection<int> $valid_map_adapters
+	 * @return int
+	 */
+	public function deleteInvalid(AbstractGeoAnalysisView $view, Collection $valid_map_adapters): int
+	{
+		return DB::table('maj_geodisp_mapviews')
+			->where('majgm_majgv_id', '=', $view->id())
+			->whereNotIn('majgm_id', $valid_map_adapters)
+			->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;
+		}
+	}
 }

app/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;
+	}
 }

app/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;
+	}
 }