jon48 / webtrees-lib

app/Module/GeoDispersion/Views/GeoAnalysisTable.php

Indentation +43 added lines, -43 removed lines

@@ -21,51 +21,51 @@
 
 class GeoAnalysisTable extends AbstractGeoAnalysisView
 {
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::type()
-     */
-    public function type(): string
-    {
-        return I18N::translateContext('GEODISPERSION', 'Table');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::type()
+	 */
+	public function type(): string
+	{
+		return I18N::translateContext('GEODISPERSION', 'Table');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
-     */
-    public function icon(ModuleInterface $module): string
-    {
-        return view($module->name() . '::icons/view-table', ['type' => $this->type()]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
+	 */
+	public function icon(ModuleInterface $module): string
+	{
+		return view($module->name() . '::icons/view-table', ['type' => $this->type()]);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
-     */
-    public function globalSettingsContent(ModuleInterface $module): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
+	 */
+	public function globalSettingsContent(ModuleInterface $module): string
+	{
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
-     * @return $this
-     */
-    public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
-    {
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
+	 * @return $this
+	 */
+	public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
+	{
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
-     */
-    public function globalTabContent(ModuleInterface $module, GeoAnalysisResult $result, array $params): string
-    {
-        return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
-            'result'    =>  $result
-        ]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
+	 */
+	public function globalTabContent(ModuleInterface $module, GeoAnalysisResult $result, array $params): string
+	{
+		return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
+			'result'    =>  $result
+		]);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-table', ['type' => $this->type()]);
+        return view($module->name().'::icons/view-table', ['type' => $this->type()]);
     }
 
     /**
@@ -63,7 +63,7 @@ 
      */
     public function globalTabContent(ModuleInterface $module, GeoAnalysisResult $result, array $params): string
     {
-        return view($module->name() . '::geoanalysisview-tab-glb-table', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-table', $params + [
             'result'    =>  $result
         ]);
     }

app/Module/GeoDispersion/Views/GeoAnalysisMap.php

Indentation +124 added lines, -124 removed lines

@@ -29,128 +29,128 @@
  */
 class GeoAnalysisMap extends AbstractGeoAnalysisView
 {
-    private ?MapColorsConfig $colors_config = null;
-
-    public function type(): string
-    {
-        return I18N::translateContext('GEODISPERSION', 'Map');
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
-     */
-    public function icon(ModuleInterface $module): string
-    {
-        return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
-     */
-    public function globalSettingsContent(ModuleInterface $module): string
-    {
-        return view($module->name() . '::admin/view-edit-map', [
-            'module_name'   =>  $module->name(),
-            'view'          =>  $this,
-            'colors'        =>  $this->colors(),
-            'map_adapters'  =>  app(MapAdapterDataService::class)->allForView($this, true)
-        ]);
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
-     * @return static
-     */
-    public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
-    {
-        $params = (array) $request->getParsedBody();
-
-        $default_color  = $params['view_map_color_default'] ?? '';
-        $stroke_color   = $params['view_map_color_stroke'] ?? '';
-        $maxvalue_color  = $params['view_map_color_maxvalue'] ?? '';
-        $hover_color  = $params['view_map_color_hover'] ?? '';
-
-        try {
-            return $this->withColors(new MapColorsConfig(
-                Hex::fromString($default_color),
-                Hex::fromString($stroke_color),
-                Hex::fromString($maxvalue_color),
-                Hex::fromString($hover_color)
-            ));
-        } catch (InvalidColorValue $ex) {
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
-     */
-    public function globalTabContent(ModuleInterface $module, GeoAnalysisResult $result, array $params): string
-    {
-        $map_adapters = app(MapAdapterDataService::class)->allForView($this);
-
-        $adapter_result = null;
-        foreach ($map_adapters as $map_adapter) {
-            $adapter_result_tmp = $map_adapter->convert($result);
-            $adapter_result = $adapter_result === null ?
-                $adapter_result_tmp :
-                $adapter_result->merge($adapter_result_tmp);
-        }
-
-        if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
-                'message'   =>  I18N::translate('The map could not be loaded.'),
-            ]);
-        }
-
-        //phpcs:disable Generic.Files.LineLength.TooLong
-        $basemap_provider = [
-            'url'    => 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-            'options' => [
-                'attribution' => '<a href="https://www.openstreetmap.org/copyright">&copy; OpenStreetMap</a> contributors',
-                'max_zoom'    => 19
-            ]
-        ];
-        //phpcs:enable
-
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
-            'result'            =>  $adapter_result->geoAnalysisResult(),
-            'features'          =>  $adapter_result->features(),
-            'colors'            =>  $this->colors(),
-            'basemap_provider'  =>  $basemap_provider
-        ]);
-    }
-
-    /**
-     * Get the color scheme configuration for the map view
-     *
-     * @return MapColorsConfig
-     */
-    public function colors(): MapColorsConfig
-    {
-        return $this->colors_config ?? new MapColorsConfig(
-            new Rgb(245, 245, 245),
-            new Rgb(213, 213, 213),
-            new Rgb(4, 147, 171),
-            new Rgb(255, 102, 0)
-        );
-    }
-
-    /**
-     * Returns a map view with a new color scheme configuration
-     *
-     * @param MapColorsConfig $config
-     * @return static
-     */
-    public function withColors(?MapColorsConfig $config): self
-    {
-        $new = clone $this;
-        $new->colors_config = $config;
-        return $new;
-    }
+	private ?MapColorsConfig $colors_config = null;
+
+	public function type(): string
+	{
+		return I18N::translateContext('GEODISPERSION', 'Map');
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::icon()
+	 */
+	public function icon(ModuleInterface $module): string
+	{
+		return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalSettingsContent()
+	 */
+	public function globalSettingsContent(ModuleInterface $module): string
+	{
+		return view($module->name() . '::admin/view-edit-map', [
+			'module_name'   =>  $module->name(),
+			'view'          =>  $this,
+			'colors'        =>  $this->colors(),
+			'map_adapters'  =>  app(MapAdapterDataService::class)->allForView($this, true)
+		]);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::withGlobalSettingsUpdate()
+	 * @return static
+	 */
+	public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
+	{
+		$params = (array) $request->getParsedBody();
+
+		$default_color  = $params['view_map_color_default'] ?? '';
+		$stroke_color   = $params['view_map_color_stroke'] ?? '';
+		$maxvalue_color  = $params['view_map_color_maxvalue'] ?? '';
+		$hover_color  = $params['view_map_color_hover'] ?? '';
+
+		try {
+			return $this->withColors(new MapColorsConfig(
+				Hex::fromString($default_color),
+				Hex::fromString($stroke_color),
+				Hex::fromString($maxvalue_color),
+				Hex::fromString($hover_color)
+			));
+		} catch (InvalidColorValue $ex) {
+		}
+
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisView::globalTabContent()
+	 */
+	public function globalTabContent(ModuleInterface $module, GeoAnalysisResult $result, array $params): string
+	{
+		$map_adapters = app(MapAdapterDataService::class)->allForView($this);
+
+		$adapter_result = null;
+		foreach ($map_adapters as $map_adapter) {
+			$adapter_result_tmp = $map_adapter->convert($result);
+			$adapter_result = $adapter_result === null ?
+				$adapter_result_tmp :
+				$adapter_result->merge($adapter_result_tmp);
+		}
+
+		if ($adapter_result === null) {
+			return view($module->name() . '::errors/tab-error', [
+				'message'   =>  I18N::translate('The map could not be loaded.'),
+			]);
+		}
+
+		//phpcs:disable Generic.Files.LineLength.TooLong
+		$basemap_provider = [
+			'url'    => 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+			'options' => [
+				'attribution' => '<a href="https://www.openstreetmap.org/copyright">&copy; OpenStreetMap</a> contributors',
+				'max_zoom'    => 19
+			]
+		];
+		//phpcs:enable
+
+		return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+			'result'            =>  $adapter_result->geoAnalysisResult(),
+			'features'          =>  $adapter_result->features(),
+			'colors'            =>  $this->colors(),
+			'basemap_provider'  =>  $basemap_provider
+		]);
+	}
+
+	/**
+	 * Get the color scheme configuration for the map view
+	 *
+	 * @return MapColorsConfig
+	 */
+	public function colors(): MapColorsConfig
+	{
+		return $this->colors_config ?? new MapColorsConfig(
+			new Rgb(245, 245, 245),
+			new Rgb(213, 213, 213),
+			new Rgb(4, 147, 171),
+			new Rgb(255, 102, 0)
+		);
+	}
+
+	/**
+	 * Returns a map view with a new color scheme configuration
+	 *
+	 * @param MapColorsConfig $config
+	 * @return static
+	 */
+	public function withColors(?MapColorsConfig $config): self
+	{
+		$new = clone $this;
+		$new->colors_config = $config;
+		return $new;
+	}
 }

Spacing +8 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function icon(ModuleInterface $module): string
     {
-        return view($module->name() . '::icons/view-map', ['type' => $this->type()]);
+        return view($module->name().'::icons/view-map', ['type' => $this->type()]);
     }
 
     /**
@@ -51,7 +51,7 @@ 
      */
     public function globalSettingsContent(ModuleInterface $module): string
     {
-        return view($module->name() . '::admin/view-edit-map', [
+        return view($module->name().'::admin/view-edit-map', [
             'module_name'   =>  $module->name(),
             'view'          =>  $this,
             'colors'        =>  $this->colors(),
@@ -65,12 +65,12 @@ 
      */
     public function withGlobalSettingsUpdate(ServerRequestInterface $request): self
     {
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $default_color  = $params['view_map_color_default'] ?? '';
         $stroke_color   = $params['view_map_color_stroke'] ?? '';
-        $maxvalue_color  = $params['view_map_color_maxvalue'] ?? '';
-        $hover_color  = $params['view_map_color_hover'] ?? '';
+        $maxvalue_color = $params['view_map_color_maxvalue'] ?? '';
+        $hover_color = $params['view_map_color_hover'] ?? '';
 
         try {
             return $this->withColors(new MapColorsConfig(
@@ -97,12 +97,11 @@ 
         foreach ($map_adapters as $map_adapter) {
             $adapter_result_tmp = $map_adapter->convert($result);
             $adapter_result = $adapter_result === null ?
-                $adapter_result_tmp :
-                $adapter_result->merge($adapter_result_tmp);
+                $adapter_result_tmp : $adapter_result->merge($adapter_result_tmp);
         }
 
         if ($adapter_result === null) {
-            return view($module->name() . '::errors/tab-error', [
+            return view($module->name().'::errors/tab-error', [
                 'message'   =>  I18N::translate('The map could not be loaded.'),
             ]);
         }
@@ -117,7 +116,7 @@ 
         ];
         //phpcs:enable
 
-        return view($module->name() . '::geoanalysisview-tab-glb-map', $params + [
+        return view($module->name().'::geoanalysisview-tab-glb-map', $params + [
             'result'            =>  $adapter_result->geoAnalysisResult(),
             'features'          =>  $adapter_result->features(),
             'colors'            =>  $this->colors(),

app/Module/GeoDispersion/Schema/Migration1.php

Indentation +31 added lines, -31 removed lines

@@ -24,35 +24,35 @@
 class Migration1 implements MigrationInterface
 {
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
-            $table->integer('majgv_id')->autoIncrement();
-            $table->integer('majgv_gedcom_id')->index();
-            $table->string('majgv_view_class', 255);
-            $table->enum('majgv_status', ['enabled', 'disabled'])->default('enabled');
-            $table->string('majgv_descr', 248);
-            $table->string('majgv_analysis', 255);
-            $table->tinyInteger('majgv_place_depth')->default(1);
-            $table->tinyInteger('majgv_top_places')->default(0);
-            $table->json('majgv_colors')->nullable();
-
-            $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
-        });
-
-        DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
-            $table->integer('majgm_id')->autoIncrement();
-            $table->integer('majgm_majgv_id')->index();
-            $table->string('majgm_map_id', 127);
-            $table->string('majgm_mapper', 255);
-            $table->string('majgm_feature_prop', 31);
-            $table->json('majgm_config')->nullable();
-
-            $table->foreign('majgm_majgv_id')->references('majgv_id')->on('maj_geodisp_views')->onDelete('cascade');
-        });
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
+			$table->integer('majgv_id')->autoIncrement();
+			$table->integer('majgv_gedcom_id')->index();
+			$table->string('majgv_view_class', 255);
+			$table->enum('majgv_status', ['enabled', 'disabled'])->default('enabled');
+			$table->string('majgv_descr', 248);
+			$table->string('majgv_analysis', 255);
+			$table->tinyInteger('majgv_place_depth')->default(1);
+			$table->tinyInteger('majgv_top_places')->default(0);
+			$table->json('majgv_colors')->nullable();
+
+			$table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
+		});
+
+		DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
+			$table->integer('majgm_id')->autoIncrement();
+			$table->integer('majgm_majgv_id')->index();
+			$table->string('majgm_map_id', 127);
+			$table->string('majgm_mapper', 255);
+			$table->string('majgm_feature_prop', 31);
+			$table->json('majgm_config')->nullable();
+
+			$table->foreign('majgm_majgv_id')->references('majgv_id')->on('maj_geodisp_views')->onDelete('cascade');
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function upgrade(): void
     {
-        DB::schema()->create('maj_geodisp_views', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_views', static function(Blueprint $table): void {
             $table->integer('majgv_id')->autoIncrement();
             $table->integer('majgv_gedcom_id')->index();
             $table->string('majgv_view_class', 255);
@@ -44,7 +44,7 @@ 
             $table->foreign('majgv_gedcom_id')->references('gedcom_id')->on('gedcom')->onDelete('cascade');
         });
 
-        DB::schema()->create('maj_geodisp_mapviews', static function (Blueprint $table): void {
+        DB::schema()->create('maj_geodisp_mapviews', static function(Blueprint $table): void {
             $table->integer('majgm_id')->autoIncrement();
             $table->integer('majgm_majgv_id')->index();
             $table->string('majgm_map_id', 127);

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 +209 added lines, -209 removed lines

@@ -39,213 +39,213 @@
  */
 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'
-    ];
-
-    /**
-     * {@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);
-
-        $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;
-            }
-
-            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();
-                }
-            }
-        }
-
-        DB::schema()->drop('maj_geodispersion');
-
-        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
-        );
-
-        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);
-
-        $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);
-
-        $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);
-
-            $mapadapter_data_service->insertGetId($map_adapter);
-        }
-
-        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 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');
-
-        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);
-        }
-    }
+	/**
+	 * 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;
+		}
+
+		/** @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();
+
+		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();
+				}
+			}
+		}
+
+		DB::schema()->drop('maj_geodispersion');
+
+		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
+		);
+
+		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);
+
+		$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);
+
+		$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);
+
+			$mapadapter_data_service->insertGetId($map_adapter);
+		}
+
+		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 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');
+
+		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/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
 class Migration0 implements MigrationInterface
 {
 
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        // This migration has been superseded by migration 1.
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		// This migration has been superseded by migration 1.
+	}
 }

app/Module/GeoDispersion/Services/MapDefinitionsService.php

Indentation +39 added lines, -39 removed lines

@@ -25,46 +25,46 @@
  */
 class MapDefinitionsService
 {
-    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;
+	}
 
-    /**
-     * Find a map definition by ID.
-     *
-     * @param string $id
-     * @return MapDefinitionInterface|NULL
-     */
-    public function find(string $id): ?MapDefinitionInterface
-    {
-        return $this->all()->get($id);
-    }
+	/**
+	 * Find a map definition by ID.
+	 *
+	 * @param string $id
+	 * @return MapDefinitionInterface|NULL
+	 */
+	public function find(string $id): ?MapDefinitionInterface
+	{
+		return $this->all()->get($id);
+	}
 
-    /**
-     * Get all map definitions available.
-     *
-     * {@internal The list is generated based on the modules exposing ModuleMapDefinitionProviderInterface,
-     * and the result is cached}
-     *
-     * @param bool $include_disabled
-     * @return Collection<string, MapDefinitionInterface>
-     */
-    public function all(bool $include_disabled = false): Collection
-    {
-        return Registry::cache()->array()->remember(
-            'maj-geodisp-maps-all',
-            fn() => $this->module_service
-                ->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
-                ->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
-                ->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ])
-        );
-    }
+	/**
+	 * Get all map definitions available.
+	 *
+	 * {@internal The list is generated based on the modules exposing ModuleMapDefinitionProviderInterface,
+	 * and the result is cached}
+	 *
+	 * @param bool $include_disabled
+	 * @return Collection<string, MapDefinitionInterface>
+	 */
+	public function all(bool $include_disabled = false): Collection
+	{
+		return Registry::cache()->array()->remember(
+			'maj-geodisp-maps-all',
+			fn() => $this->module_service
+				->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
+				->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
+				->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ])
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
             fn() => $this->module_service
                 ->findByInterface(ModuleMapDefinitionProviderInterface::class, $include_disabled)
                 ->flatMap(fn(ModuleMapDefinitionProviderInterface $module) => $module->listMapDefinition())
-                ->mapWithKeys(fn(MapDefinitionInterface $map) => [ $map->id() => $map ])
+                ->mapWithKeys(fn(MapDefinitionInterface $map) => [$map->id() => $map])
         );
     }
 }

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

Indentation +89 added lines, -89 removed lines

@@ -21,102 +21,102 @@
  */
 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] ?? '';
+	}
 
-    /**
-     * Get the placeholder tag for a column_name
-     *
-     * @param string $column_name
-     * @return string
-     */
-    private function tagName(string $column_name): string
-    {
-        return array_flip(self::COLUMN_MAPPING)[$column_name] ?? '';
-    }
+	/**
+	 * Get the placeholder tag for a column_name
+	 *
+	 * @param string $column_name
+	 * @return string
+	 */
+	private function tagName(string $column_name): string
+	{
+		return array_flip(self::COLUMN_MAPPING)[$column_name] ?? '';
+	}
 
-    /**
-     * 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);
+	}
 }

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

app/Module/GeoDispersion/Services/GeoAnalysisDataService.php

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

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<int, string[]>
-     */
-    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<int, string[]>
+	 */
+	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();
+	}
 }