jon48 / webtrees-lib

app/Module/GeoDispersion/GeoAnalyses/AllEventsByTypeGeoAnalysis.php

Indentation +45 added lines, -45 removed lines

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

app/Module/GeoDispersion/GeoAnalyses/AllEventsByCenturyGeoAnalysis.php

Indentation +56 added lines, -56 removed lines

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

app/Module/GeoDispersion/PlaceMappers/SimplePlaceMapper.php

Indentation +17 added lines, -17 removed lines

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

app/Module/GeoDispersion/PlaceMappers/Config/FilteredTopPlaceMapperConfig.php

Indentation +102 added lines, -102 removed lines

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

app/Module/GeoDispersion/PlaceMappers/SimpleTopFilteredPlaceMapper.php

Indentation +43 added lines, -43 removed lines

@@ -28,51 +28,51 @@
  */
 class SimpleTopFilteredPlaceMapper extends SimplePlaceMapper implements PlaceMapperInterface
 {
-    use TopFilteredPlaceMapperTrait;
+	use TopFilteredPlaceMapperTrait;
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::title()
-     */
-    public function title(): string
-    {
-        return I18N::translate('Mapping on place name with filter');
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::title()
+	 */
+	public function title(): string
+	{
+		return I18N::translate('Mapping on place name with filter');
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
-     */
-    public function boot(): void
-    {
-        parent::boot();
-        $top_places = $this->config()->get('topPlaces');
-        if (is_array($top_places)) {
-            $this->setTopPlaces($top_places);
-        }
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::boot()
+	 */
+	public function boot(): void
+	{
+		parent::boot();
+		$top_places = $this->config()->get('topPlaces');
+		if (is_array($top_places)) {
+			$this->setTopPlaces($top_places);
+		}
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
-     */
-    public function config(): PlaceMapperConfigInterface
-    {
-        if (!(parent::config() instanceof FilteredTopPlaceMapperConfig)) {
-            $this->setConfig(app(FilteredTopPlaceMapperConfig::class));
-        }
-        return parent::config();
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\GeoDispersion\PlaceMapperInterface::config()
+	 */
+	public function config(): PlaceMapperConfigInterface
+	{
+		if (!(parent::config() instanceof FilteredTopPlaceMapperConfig)) {
+			$this->setConfig(app(FilteredTopPlaceMapperConfig::class));
+		}
+		return parent::config();
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::map()
-     */
-    public function map(Place $place, string $feature_property): ?string
-    {
-        if (!$this->belongsToTopLevels($place)) {
-            return null;
-        }
-        return parent::map($place, $feature_property);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\PlaceMappers\SimplePlaceMapper::map()
+	 */
+	public function map(Place $place, string $feature_property): ?string
+	{
+		if (!$this->belongsToTopLevels($place)) {
+			return null;
+		}
+		return parent::map($place, $feature_property);
+	}
 }

app/Module/GeoDispersion/Model/MapFeatureAnalysisData.php

Indentation +71 added lines, -71 removed lines

@@ -22,81 +22,81 @@
  */
 class MapFeatureAnalysisData
 {
-    private string $id;
-    private int $count;
-    private bool $in_map;
-    /**
-     * @var Collection<GeoAnalysisPlace> $places
-     */
-    private Collection $places;
+	private string $id;
+	private int $count;
+	private bool $in_map;
+	/**
+	 * @var Collection<GeoAnalysisPlace> $places
+	 */
+	private Collection $places;
 
-    /**
-     * Constructor for MapFeatureAnalysisData
-     *
-     * @param string $id
-     */
-    public function __construct(string $id)
-    {
-        $this->id = $id;
-        $this->count = 0;
-        $this->places = new Collection();
-        $this->in_map = false;
-    }
+	/**
+	 * Constructor for MapFeatureAnalysisData
+	 *
+	 * @param string $id
+	 */
+	public function __construct(string $id)
+	{
+		$this->id = $id;
+		$this->count = 0;
+		$this->places = new Collection();
+		$this->in_map = false;
+	}
 
-    /**
-     * Get the list of places mapped to the feature
-     *
-     * @return Collection<GeoAnalysisPlace>
-     */
-    public function places(): Collection
-    {
-        return $this->places;
-    }
+	/**
+	 * Get the list of places mapped to the feature
+	 *
+	 * @return Collection<GeoAnalysisPlace>
+	 */
+	public function places(): Collection
+	{
+		return $this->places;
+	}
 
-    /**
-     * Get the count of analysis items occurring in the feature
-     *
-     * @return int
-     */
-    public function count(): int
-    {
-        return $this->count;
-    }
+	/**
+	 * Get the count of analysis items occurring in the feature
+	 *
+	 * @return int
+	 */
+	public function count(): int
+	{
+		return $this->count;
+	}
 
-    /**
-     * Check whether the feature exist in the target map
-     *
-     * @return bool
-     */
-    public function existsInMap(): bool
-    {
-        return $this->in_map;
-    }
+	/**
+	 * Check whether the feature exist in the target map
+	 *
+	 * @return bool
+	 */
+	public function existsInMap(): bool
+	{
+		return $this->in_map;
+	}
 
-    /**
-     * Confirm that the feature exist in the target map
-     *
-     * @return $this
-     */
-    public function tagAsExisting(): self
-    {
-        $this->in_map = true;
-        return $this;
-    }
+	/**
+	 * Confirm that the feature exist in the target map
+	 *
+	 * @return $this
+	 */
+	public function tagAsExisting(): self
+	{
+		$this->in_map = true;
+		return $this;
+	}
 
-    /**
-     * Add a GeoAnalysisPlace to the feature
-     *
-     * @param GeoAnalysisPlace $place
-     * @param int $count
-     * @return $this
-     */
-    public function add(GeoAnalysisPlace $place, int $count): self
-    {
-        if (!$place->isExcluded()) {
-            $this->places->add($place);
-            $this->count += $count;
-        }
-        return $this;
-    }
+	/**
+	 * Add a GeoAnalysisPlace to the feature
+	 *
+	 * @param GeoAnalysisPlace $place
+	 * @param int $count
+	 * @return $this
+	 */
+	public function add(GeoAnalysisPlace $place, int $count): self
+	{
+		if (!$place->isExcluded()) {
+			$this->places->add($place);
+			$this->count += $count;
+		}
+		return $this;
+	}
 }

app/Module/GeoDispersion/Model/MapAdapterResult.php

Indentation +48 added lines, -48 removed lines

@@ -24,57 +24,57 @@
  */
 class MapAdapterResult
 {
-    private GeoAnalysisResult $result;
+	private GeoAnalysisResult $result;
 
-    /**
-     * @var \Brick\Geo\IO\GeoJSON\Feature[] $features
-     */
-    private array $features;
+	/**
+	 * @var \Brick\Geo\IO\GeoJSON\Feature[] $features
+	 */
+	private array $features;
 
-    /**
-     * Constructor for MapAdapterResult
-     *
-     * @param GeoAnalysisResult $result
-     * @param \Brick\Geo\IO\GeoJSON\Feature[] $features
-     */
-    final public function __construct(GeoAnalysisResult $result, array $features)
-    {
-        $this->result = $result;
-        $this->features = $features;
-    }
+	/**
+	 * Constructor for MapAdapterResult
+	 *
+	 * @param GeoAnalysisResult $result
+	 * @param \Brick\Geo\IO\GeoJSON\Feature[] $features
+	 */
+	final public function __construct(GeoAnalysisResult $result, array $features)
+	{
+		$this->result = $result;
+		$this->features = $features;
+	}
 
-    /**
-     * Get the GeoAnalysisResult after mapping of the places
-     *
-     * @return GeoAnalysisResult
-     */
-    public function geoAnalysisResult(): GeoAnalysisResult
-    {
-        return $this->result;
-    }
+	/**
+	 * Get the GeoAnalysisResult after mapping of the places
+	 *
+	 * @return GeoAnalysisResult
+	 */
+	public function geoAnalysisResult(): GeoAnalysisResult
+	{
+		return $this->result;
+	}
 
-    /**
-     * Get the list of features to display on the map
-     *
-     * @return \Brick\Geo\IO\GeoJSON\Feature[]
-     */
-    public function features(): array
-    {
-        return $this->features;
-    }
+	/**
+	 * Get the list of features to display on the map
+	 *
+	 * @return \Brick\Geo\IO\GeoJSON\Feature[]
+	 */
+	public function features(): array
+	{
+		return $this->features;
+	}
 
-    /**
-     * Merge the current MapAdapter with another.
-     * The current object is modified, not the second one.
-     *
-     * @param MapAdapterResult $other
-     * @return static
-     */
-    public function merge(MapAdapterResult $other): self
-    {
-        return new static(
-            $this->result->merge($other->result),
-            array_merge($this->features, $other->features)
-        );
-    }
+	/**
+	 * Merge the current MapAdapter with another.
+	 * The current object is modified, not the second one.
+	 *
+	 * @param MapAdapterResult $other
+	 * @return static
+	 */
+	public function merge(MapAdapterResult $other): self
+	{
+		return new static(
+			$this->result->merge($other->result),
+			array_merge($this->features, $other->features)
+		);
+	}
 }

app/Module/Certificates/Hooks/SourceCertificateIconHook.php

Indentation +49 added lines, -49 removed lines

@@ -27,57 +27,57 @@
  */
 class SourceCertificateIconHook implements FactSourceTextExtenderInterface
 {
-    private CertificatesModule $module;
-    private UrlObfuscatorService $url_obfuscator_service;
+	private CertificatesModule $module;
+	private UrlObfuscatorService $url_obfuscator_service;
 
-    /**
-     * Constructor for SourceCertificateIconHook
-     *
-     * @param CertificatesModule $module
-     * @param UrlObfuscatorService $url_obfuscator_service
-     */
-    public function __construct(CertificatesModule $module, UrlObfuscatorService $url_obfuscator_service)
-    {
-        $this->module = $module;
-        $this->url_obfuscator_service = $url_obfuscator_service;
-    }
+	/**
+	 * Constructor for SourceCertificateIconHook
+	 *
+	 * @param CertificatesModule $module
+	 * @param UrlObfuscatorService $url_obfuscator_service
+	 */
+	public function __construct(CertificatesModule $module, UrlObfuscatorService $url_obfuscator_service)
+	{
+		$this->module = $module;
+		$this->url_obfuscator_service = $url_obfuscator_service;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
-     */
-    public function module(): ModuleInterface
-    {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
+	 */
+	public function module(): ModuleInterface
+	{
+		return $this->module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourcePrepend()
-     */
-    public function factSourcePrepend(Tree $tree, string $source_record, int $level): string
-    {
-        $permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
-        if (
-            is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level &&
-            preg_match('/^' . $level . ' _ACT (.*)$/m', $source_record, $match) === 1
-        ) {
-            return view($this->module->name() . '::components/certificate-icon', [
-                'module_name'               =>  $this->module->name(),
-                'certificate'               =>  new Certificate($tree, $match[1]),
-                'url_obfuscator_service'    =>  $this->url_obfuscator_service,
-                'js_script_url'             =>  $this->module->assetUrl('js/certificates.min.js')
-            ]);
-        }
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourcePrepend()
+	 */
+	public function factSourcePrepend(Tree $tree, string $source_record, int $level): string
+	{
+		$permission_level = $tree->getPreference('MAJ_CERTIF_SHOW_CERT');
+		if (
+			is_numeric($permission_level) && Auth::accessLevel($tree) <= (int) $permission_level &&
+			preg_match('/^' . $level . ' _ACT (.*)$/m', $source_record, $match) === 1
+		) {
+			return view($this->module->name() . '::components/certificate-icon', [
+				'module_name'               =>  $this->module->name(),
+				'certificate'               =>  new Certificate($tree, $match[1]),
+				'url_obfuscator_service'    =>  $this->url_obfuscator_service,
+				'js_script_url'             =>  $this->module->assetUrl('js/certificates.min.js')
+			]);
+		}
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend()
-     */
-    public function factSourceAppend(Tree $tree, string $source_record, int $level): string
-    {
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\FactSourceTextExtenderInterface::factSourceAppend()
+	 */
+	public function factSourceAppend(Tree $tree, string $source_record, int $level): string
+	{
+		return '';
+	}
 }

app/Module/Certificates/Hooks/CertificateTagEditorHook.php

Indentation +51 added lines, -51 removed lines

@@ -24,60 +24,60 @@
  */
 class CertificateTagEditorHook implements CustomSimpleTagEditorInterface
 {
-    private ModuleInterface $module;
+	private ModuleInterface $module;
 
-    /**
-     * Constructor for CertificateTagEditorHook
-     *
-     * @param ModuleInterface $module
-     */
-    public function __construct(ModuleInterface $module)
-    {
-        $this->module = $module;
-    }
+	/**
+	 * Constructor for CertificateTagEditorHook
+	 *
+	 * @param ModuleInterface $module
+	 */
+	public function __construct(ModuleInterface $module)
+	{
+		$this->module = $module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
-     */
-    public function module(): ModuleInterface
-    {
-        return $this->module;
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\HookInterface::module()
+	 */
+	public function module(): ModuleInterface
+	{
+		return $this->module;
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\CustomSimpleTagEditorInterface::addExpectedTags()
-     */
-    public function addExpectedTags(array $expected_tags): array
-    {
-        return array_merge_recursive($expected_tags, [
-            'SOUR' => [ '_ACT' ]
-        ]);
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\CustomSimpleTagEditorInterface::addExpectedTags()
+	 */
+	public function addExpectedTags(array $expected_tags): array
+	{
+		return array_merge_recursive($expected_tags, [
+			'SOUR' => [ '_ACT' ]
+		]);
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\CustomSimpleTagEditorInterface::getLabel()
-     */
-    public function getLabel(string $tag): string
-    {
-        if (substr($tag, -4) === '_ACT') {
-            return Registry::elementFactory()->make(substr('INDI:SOUR:_ACT', 0, -strlen($tag)) . $tag)->label();
-        }
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\CustomSimpleTagEditorInterface::getLabel()
+	 */
+	public function getLabel(string $tag): string
+	{
+		if (substr($tag, -4) === '_ACT') {
+			return Registry::elementFactory()->make(substr('INDI:SOUR:_ACT', 0, -strlen($tag)) . $tag)->label();
+		}
+		return '';
+	}
 
-    /**
-     * {@inheritDoc}
-     * @see \MyArtJaub\Webtrees\Contracts\Hooks\CustomSimpleTagEditorInterface::editForm()
-     */
-    public function editForm(string $tag, string $id, string $name, string $value, Tree $tree): string
-    {
-        if (substr($tag, -4) === '_ACT') {
-            return Registry::elementFactory()->make(substr('INDI:SOUR:_ACT', 0, -strlen($tag)) . $tag)
-                ->edit($id, $name, $value, $tree);
-        }
-        return '';
-    }
+	/**
+	 * {@inheritDoc}
+	 * @see \MyArtJaub\Webtrees\Contracts\Hooks\CustomSimpleTagEditorInterface::editForm()
+	 */
+	public function editForm(string $tag, string $id, string $name, string $value, Tree $tree): string
+	{
+		if (substr($tag, -4) === '_ACT') {
+			return Registry::elementFactory()->make(substr('INDI:SOUR:_ACT', 0, -strlen($tag)) . $tag)
+				->edit($id, $name, $value, $tree);
+		}
+		return '';
+	}
 }