jon48 / webtrees-lib

app/Module/GeoDispersion/Schema/Migration0.php

Indentation +8 added lines, -8 removed lines

@@ -21,12 +21,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/Schema/Migration2.php

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/Schema/Migration1.php

Indentation +37 added lines, -37 removed lines

@@ -23,41 +23,41 @@
  */
 class Migration1 implements MigrationInterface
 {
-    /**
-     * {@inheritDoc}
-     * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
-     */
-    public function upgrade(): void
-    {
-        $in_transaction = DB::connection()->getPdo()->inTransaction();
-
-        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');
-        });
-
-        if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
-            DB::connection()->beginTransaction();
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \Fisharebest\Webtrees\Schema\MigrationInterface::upgrade()
+	 */
+	public function upgrade(): void
+	{
+		$in_transaction = DB::connection()->getPdo()->inTransaction();
+
+		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');
+		});
+
+		if ($in_transaction && !DB::connection()->getPdo()->inTransaction()) {
+			DB::connection()->beginTransaction();
+		}
+	}
 }

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

Indentation +39 added lines, -39 removed lines

@@ -32,48 +32,48 @@
  */
 class GeoAnalysisViewAddPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisService $geoanalysis_service;
-    private GeoAnalysisDataService $geoanalysis_data_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisService $geoanalysis_service;
+	private GeoAnalysisDataService $geoanalysis_data_service;
 
-    /**
-     * Constructor for GeoAnalysisViewAddPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisService $geoanalysis_service
-     * @param GeoAnalysisDataService $geoanalysis_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisService $geoanalysis_service,
-        GeoAnalysisDataService $geoanalysis_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoanalysis_service = $geoanalysis_service;
-        $this->geoanalysis_data_service = $geoanalysis_data_service;
-    }
+	/**
+	 * Constructor for GeoAnalysisViewAddPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisService $geoanalysis_service
+	 * @param GeoAnalysisDataService $geoanalysis_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisService $geoanalysis_service,
+		GeoAnalysisDataService $geoanalysis_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoanalysis_service = $geoanalysis_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';
+	/**
+	 * {@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.'));
-        }
-        $tree = Validator::attributes($request)->tree();
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+		$tree = Validator::attributes($request)->tree();
 
-        return $this->viewResponse($this->module->name() . '::admin/view-add', [
-            'module'        =>  $this->module,
-            'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
-            'tree'          =>  $tree,
-            'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
-            'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/view-add', [
+			'module'        =>  $this->module,
+			'title'         =>  I18N::translate('Add a geographical dispersion analysis view'),
+			'tree'          =>  $tree,
+			'geoanalysis_list'  =>  $this->geoanalysis_service->all(),
+			'place_example'     =>  $this->geoanalysis_data_service->placeHierarchyExample($tree)
+		]);
+	}
 }

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

Indentation +56 added lines, -56 removed lines

@@ -33,68 +33,68 @@
  */
 class MapAdapterEditPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private MapAdapterDataService $mapadapter_data_service;
-    private MapDefinitionsService $map_definition_service;
-    private PlaceMapperService $place_mapper_service;
+	private ?GeoDispersionModule $module;
+	private MapAdapterDataService $mapadapter_data_service;
+	private MapDefinitionsService $map_definition_service;
+	private PlaceMapperService $place_mapper_service;
 
-    /**
-     * Constructor for MapAdapterEditPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     * @param MapDefinitionsService $map_definition_service
-     * @param PlaceMapperService $place_mapper_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        MapAdapterDataService $mapadapter_data_service,
-        MapDefinitionsService $map_definition_service,
-        PlaceMapperService $place_mapper_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->mapadapter_data_service = $mapadapter_data_service;
-        $this->map_definition_service = $map_definition_service;
-        $this->place_mapper_service = $place_mapper_service;
-    }
+	/**
+	 * Constructor for MapAdapterEditPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 * @param MapDefinitionsService $map_definition_service
+	 * @param PlaceMapperService $place_mapper_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		MapAdapterDataService $mapadapter_data_service,
+		MapDefinitionsService $map_definition_service,
+		PlaceMapperService $place_mapper_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->mapadapter_data_service = $mapadapter_data_service;
+		$this->map_definition_service = $map_definition_service;
+		$this->place_mapper_service = $place_mapper_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@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.'));
-        }
+		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();
 
-        $adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
-        $map_adapter = $this->mapadapter_data_service->find($adapter_id);
+		$adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
+		$map_adapter = $this->mapadapter_data_service->find($adapter_id);
 
-        if ($map_adapter === null) {
-            throw new HttpNotFoundException(
-                I18N::translate('The map configuration could not be found.')
-            );
-        }
+		if ($map_adapter === null) {
+			throw new HttpNotFoundException(
+				I18N::translate('The map configuration could not be found.')
+			);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
-            'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Edit the map configuration'),
-            'tree'              =>  $tree,
-            'view_id'           =>  $map_adapter->geoAnalysisViewId(),
-            'map_adapter'       =>  $map_adapter,
-            'maps_list'         =>  $this->map_definition_service->all(),
-            'mappers_list'      =>  $this->place_mapper_service->all(),
-            'route_edit'        =>  route(MapAdapterEditAction::class, [
-                                        'tree' => $tree->name(),
-                                        'adapter_id' => $map_adapter->id()
-                                    ])
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+			'module'            =>  $this->module,
+			'title'             =>  I18N::translate('Edit the map configuration'),
+			'tree'              =>  $tree,
+			'view_id'           =>  $map_adapter->geoAnalysisViewId(),
+			'map_adapter'       =>  $map_adapter,
+			'maps_list'         =>  $this->map_definition_service->all(),
+			'mappers_list'      =>  $this->place_mapper_service->all(),
+			'route_edit'        =>  route(MapAdapterEditAction::class, [
+										'tree' => $tree->name(),
+										'adapter_id' => $map_adapter->id()
+									])
+		]);
+	}
 }

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

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/Http/RequestHandlers/MapAdapterMapperConfig.php

Indentation +54 added lines, -54 removed lines

@@ -33,67 +33,67 @@
  */
 class MapAdapterMapperConfig implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private MapAdapterDataService $mapadapter_data_service;
+	private ?GeoDispersionModule $module;
+	private MapAdapterDataService $mapadapter_data_service;
 
-    /**
-     * Constructor for MapAdapterMapperConfig Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param MapAdapterDataService $mapadapter_data_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        MapAdapterDataService $mapadapter_data_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->mapadapter_data_service = $mapadapter_data_service;
-    }
+	/**
+	 * Constructor for MapAdapterMapperConfig Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param MapAdapterDataService $mapadapter_data_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		MapAdapterDataService $mapadapter_data_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->mapadapter_data_service = $mapadapter_data_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/ajax';
+	/**
+	 * {@inheritDoc}
+	 * @see \Psr\Http\Server\RequestHandlerInterface::handle()
+	 */
+	public function handle(ServerRequestInterface $request): ResponseInterface
+	{
+		$this->layout = 'layouts/ajax';
 
-        if ($this->module === null) {
-            throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
-        }
-        $tree = Validator::attributes($request)->tree();
+		if ($this->module === null) {
+			throw new HttpNotFoundException(I18N::translate('The attached module could not be found.'));
+		}
+		$tree = Validator::attributes($request)->tree();
 
-        $adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
-        $map_adapter = $this->mapadapter_data_service->find($adapter_id);
+		$adapter_id = Validator::attributes($request)->integer('adapter_id', -1);
+		$map_adapter = $this->mapadapter_data_service->find($adapter_id);
 
-        $mapper_class = Validator::queryParams($request)->string('mapper', '');
-        $mapper = null;
-        if ($mapper_class === '' && $map_adapter !== null) {
-            $mapper = $map_adapter->placeMapper();
-        } else {
-            try {
-                $mapper = app($mapper_class);
-            } catch (BindingResolutionException $ex) {
-            }
+		$mapper_class = Validator::queryParams($request)->string('mapper', '');
+		$mapper = null;
+		if ($mapper_class === '' && $map_adapter !== null) {
+			$mapper = $map_adapter->placeMapper();
+		} else {
+			try {
+				$mapper = app($mapper_class);
+			} catch (BindingResolutionException $ex) {
+			}
 
-            if (
-                $mapper !== null && $map_adapter !== null &&
-                get_class($map_adapter->placeMapper()) === get_class($mapper)
-            ) {
-                $mapper = $map_adapter->placeMapper();
-            }
-        }
+			if (
+				$mapper !== null && $map_adapter !== null &&
+				get_class($map_adapter->placeMapper()) === get_class($mapper)
+			) {
+				$mapper = $map_adapter->placeMapper();
+			}
+		}
 
-        if ($mapper === null || !($mapper instanceof PlaceMapperInterface)) {
-            throw new HttpNotFoundException(
-                I18N::translate('The configuration for the place mapper could not be found.')
-            );
-        }
+		if ($mapper === null || !($mapper instanceof PlaceMapperInterface)) {
+			throw new HttpNotFoundException(
+				I18N::translate('The configuration for the place mapper could not be found.')
+			);
+		}
 
-        return $this->viewResponse('layouts/ajax', [
-            'content' => $mapper->config()->configContent($this->module, $tree)
-        ]);
-    }
+		return $this->viewResponse('layouts/ajax', [
+			'content' => $mapper->config()->configContent($this->module, $tree)
+		]);
+	}
 }

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

Indentation +56 added lines, -56 removed lines

@@ -33,68 +33,68 @@
  */
 class MapAdapterAddPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoview_data_service;
-    private MapDefinitionsService $map_definition_service;
-    private PlaceMapperService $place_mapper_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoview_data_service;
+	private MapDefinitionsService $map_definition_service;
+	private PlaceMapperService $place_mapper_service;
 
-    /**
-     * Constructor for MapAdapterAddPage Request Handler
-     *
-     * @param ModuleService $module_service
-     * @param GeoAnalysisViewDataService $geoview_data_service
-     * @param MapDefinitionsService $map_definition_service
-     * @param PlaceMapperService $place_mapper_service
-     */
-    public function __construct(
-        ModuleService $module_service,
-        GeoAnalysisViewDataService $geoview_data_service,
-        MapDefinitionsService $map_definition_service,
-        PlaceMapperService $place_mapper_service
-    ) {
-        $this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
-        $this->geoview_data_service = $geoview_data_service;
-        $this->map_definition_service = $map_definition_service;
-        $this->place_mapper_service = $place_mapper_service;
-    }
+	/**
+	 * Constructor for MapAdapterAddPage Request Handler
+	 *
+	 * @param ModuleService $module_service
+	 * @param GeoAnalysisViewDataService $geoview_data_service
+	 * @param MapDefinitionsService $map_definition_service
+	 * @param PlaceMapperService $place_mapper_service
+	 */
+	public function __construct(
+		ModuleService $module_service,
+		GeoAnalysisViewDataService $geoview_data_service,
+		MapDefinitionsService $map_definition_service,
+		PlaceMapperService $place_mapper_service
+	) {
+		$this->module = $module_service->findByInterface(GeoDispersionModule::class)->first();
+		$this->geoview_data_service = $geoview_data_service;
+		$this->map_definition_service = $map_definition_service;
+		$this->place_mapper_service = $place_mapper_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \Psr\Http\Server\RequestHandlerInterface::handle()
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $this->layout = 'layouts/administration';
+	/**
+	 * {@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.'));
-        }
+		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();
 
-        $view_id = Validator::attributes($request)->integer('view_id', -1);
-        $view = $this->geoview_data_service->find($tree, $view_id, true);
+		$view_id = Validator::attributes($request)->integer('view_id', -1);
+		$view = $this->geoview_data_service->find($tree, $view_id, true);
 
-        if ($view === null) {
-            throw new HttpNotFoundException(
-                I18N::translate('The geographical dispersion analysis view could not be found.')
-            );
-        }
+		if ($view === null) {
+			throw new HttpNotFoundException(
+				I18N::translate('The geographical dispersion analysis view could not be found.')
+			);
+		}
 
-        return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
-            'module'            =>  $this->module,
-            'title'             =>  I18N::translate('Add a map configuration'),
-            'tree'              =>  $tree,
-            'view_id'           =>  $view_id,
-            'map_adapter'       =>  null,
-            'maps_list'         =>  $this->map_definition_service->all(),
-            'mappers_list'      =>  $this->place_mapper_service->all(),
-            'route_edit'        =>  route(MapAdapterAddAction::class, [
-                                        'tree'      => $tree->name(),
-                                        'view_id'   => $view_id
-                                    ])
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::admin/map-adapter-edit', [
+			'module'            =>  $this->module,
+			'title'             =>  I18N::translate('Add a map configuration'),
+			'tree'              =>  $tree,
+			'view_id'           =>  $view_id,
+			'map_adapter'       =>  null,
+			'maps_list'         =>  $this->map_definition_service->all(),
+			'mappers_list'      =>  $this->place_mapper_service->all(),
+			'route_edit'        =>  route(MapAdapterAddAction::class, [
+										'tree'      => $tree->name(),
+										'view_id'   => $view_id
+									])
+		]);
+	}
 }

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

Indentation +33 added lines, -33 removed lines

@@ -32,42 +32,42 @@
  */
 class GeoAnalysisViewPage implements RequestHandlerInterface
 {
-    use ViewResponseTrait;
+	use ViewResponseTrait;
 
-    private ?GeoDispersionModule $module;
-    private GeoAnalysisViewDataService $geoviewdata_service;
+	private ?GeoDispersionModule $module;
+	private GeoAnalysisViewDataService $geoviewdata_service;
 
-    /**
-     * Constructor for GeoAnalysisViewPage 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 GeoAnalysisViewPage 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();
-        $view_id = Validator::attributes($request)->integer('view_id', 0);
+		$tree = Validator::attributes($request)->tree();
+		$view_id = Validator::attributes($request)->integer('view_id', 0);
 
-        return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [
-            'module_name'           =>  $this->module->name(),
-            'title'                 =>  I18N::translate('Geographical dispersion'),
-            'tree'                  =>  $tree,
-            'view'                  =>  $this->geoviewdata_service->find($tree, $view_id)
-        ]);
-    }
+		return $this->viewResponse($this->module->name() . '::geoanalysisview-page', [
+			'module_name'           =>  $this->module->name(),
+			'title'                 =>  I18N::translate('Geographical dispersion'),
+			'tree'                  =>  $tree,
+			'view'                  =>  $this->geoviewdata_service->find($tree, $view_id)
+		]);
+	}
 }