jon48 / webtrees-mod-maj-geodata-france

app/PlaceMappers/SimpleFrancePlaceMapper.php

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
      *
      * @var array<string, string>
      */
-    private const MAPPINGS_REGIONS = [
+    private const MAPPINGS_REGIONS=[
         'Auvergne'              =>  'Auvergne-Rhône-Alpes',
         'Rhône-Alpes'           =>  'Auvergne-Rhône-Alpes',
         'Bourgogne'             =>  'Bourgogne-Franche-Comté',
@@ -61,7 +61,7 @@ 
      *
      * @var array<string, string>
      */
-    private const MAPPINGS_DEPARTEMENTS = [
+    private const MAPPINGS_DEPARTEMENTS=[
         'Basses-Alpes'          =>  'Alpes-de-Haute-Provence',
         'Basses-Pyrénées'       =>  'Pyrénées-Atlantiques',
         'Charente-Inférieure'   =>  'Charente-Maritime',
@@ -75,7 +75,7 @@ 
      *
      * @var array<string, string>
      */
-    private const MAPPINGS_KNOWN_COMMUNES_VARIATIONS = [
+    private const MAPPINGS_KNOWN_COMMUNES_VARIATIONS=[
         'Sarrus (Fridefont)'                            =>  'Fridefont',
         'Magnac (Fridefont)'                            =>  'Fridefont',
         'Mallet (Fridefont)'                            =>  'Fridefont',
@@ -88,7 +88,7 @@ 
     /**
      * @var array<string, mixed>
      */
-    private array $data = [];
+    private array $data=[];
 
     /**
      * {@inheritDoc}
@@ -114,7 +114,7 @@ 
      */
     public function setData(string $key, $data): void
     {
-        $this->data[$key] = $data;
+        $this->data[$key]=$data;
     }
 
     /**
@@ -148,16 +148,16 @@ 
      */
     public function map(Place $place, string $feature_property): ?string
     {
-        $map_def = $this->data('map');
+        $map_def=$this->data('map');
         if ($map_def === null || !($map_def instanceof MapDefinitionInterface)) {
             return null;
         }
-        $place_mappings = Registry::cache()->array()->remember(
-            SimpleFrancePlaceMapper::class . '-mapping-' . $map_def->id(),
+        $place_mappings=Registry::cache()->array()->remember(
+            SimpleFrancePlaceMapper::class.'-mapping-'.$map_def->id(),
             fn(): array => $this->mappingsForMap($map_def->id())
         );
 
-        $place_name = $place->firstParts(1)->first();
+        $place_name=$place->firstParts(1)->first();
         return $place_mappings[$place_name] ?? $place_name;
     }
 
@@ -183,7 +183,7 @@ 
      */
     private function mappingsForMap(string $map_id): array
     {
-        $mapping = [];
+        $mapping=[];
         if ($this->endsWith($map_id, '-departements')) {
             return self::MAPPINGS_DEPARTEMENTS;
         }
@@ -193,20 +193,20 @@ 
         }
 
         if (mb_strpos($map_id, '-communes') !== false) {
-            $mapping = self::MAPPINGS_KNOWN_COMMUNES_VARIATIONS;
+            $mapping=self::MAPPINGS_KNOWN_COMMUNES_VARIATIONS;
         }
 
         if ($this->endsWith($map_id, '-communes')) {
-            $module = app(ModuleService::class)->findByInterface(GeoDataFranceModule::class)->first();
+            $module=app(ModuleService::class)->findByInterface(GeoDataFranceModule::class)->first();
             if ($module === null) {
                 return $mapping;
             }
 
-            $file = $module->resourcesFolder() . '/mappings/new-communes.php';
+            $file=$module->resourcesFolder().'/mappings/new-communes.php';
             if (!is_file($file)) {
                 return $mapping;
             }
-            $mappings_new_communes = include $file;
+            $mappings_new_communes=include $file;
             if (!is_array($mappings_new_communes)) {
                 return $mapping;
             }

app/GeoDataFranceModule.php

Spacing +6 added lines, -6 removed lines

@@ -81,20 +81,20 @@ 
      */
     public function listMapDefinition(): array
     {
-        $filesystem = new Filesystem(new LocalFilesystemAdapter($this->resourcesFolder() . 'maps/'));
+        $filesystem=new Filesystem(new LocalFilesystemAdapter($this->resourcesFolder().'maps/'));
 
         //phpcs:disable Generic.Files.LineLength.TooLong
         return array_merge(
             [
                 new SimpleFilesystemMap(
                     'fr-metropole-regions-2016',
-                    I18N::translate('Metropolitan France by region') . ' (2016-)',
+                    I18N::translate('Metropolitan France by region').' (2016-)',
                     $filesystem,
                     'metropole-regions-2016.geojson'
                 ),
                 new SimpleFilesystemMap(
                     'fr-metropole-regions-1970',
-                    I18N::translate('Metropolitan France by region') . ' (1970-2015)',
+                    I18N::translate('Metropolitan France by region').' (1970-2015)',
                     $filesystem,
                     'metropole-regions-1970.geojson'
                 ),
@@ -106,19 +106,19 @@ 
                 ),
                 new SimpleFilesystemMap(
                     'fr-area-aubrac-lot-margeride-planeze-communes',
-                    I18N::translate('%s by municipality', 'Aubrac-Margeride-Planèze-Vallée du Lot') . ' - ' . I18N::translate('Latest'),
+                    I18N::translate('%s by municipality', 'Aubrac-Margeride-Planèze-Vallée du Lot').' - '.I18N::translate('Latest'),
                     $filesystem,
                     'areas/aubrac-lot-margeride-planeze/communes-latest.geojson'
                 ),
                 new SimpleFilesystemMap(
                     'fr-area-aubrac-lot-margeride-planeze-communes-2011',
-                    I18N::translate('%s by municipality', 'Aubrac-Margeride-Planèze-Vallée du Lot') . ' - 2011',
+                    I18N::translate('%s by municipality', 'Aubrac-Margeride-Planèze-Vallée du Lot').' - 2011',
                     $filesystem,
                     'areas/aubrac-lot-margeride-planeze/communes-2011.geojson'
                 ),
                 new SimpleFilesystemMap(
                     'fr-area-aubrac-lot-margeride-planeze-codespostaux',
-                    I18N::translate('%s by zip code', 'Aubrac-Margeride-Planèze-Vallée du Lot') . ' - ' . I18N::translate('Latest'),
+                    I18N::translate('%s by zip code', 'Aubrac-Margeride-Planèze-Vallée du Lot').' - '.I18N::translate('Latest'),
                     $filesystem,
                     'areas/aubrac-lot-margeride-planeze/codespostaux-latest.geojson'
                 )

resources/lang/fr/messages.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  * @license http://www.gnu.org/licenses/gpl.html GNU General Public License, version 3
  */
 
-return array (
+return array(
 
     'Geographical data - France'                =>  'Données géographiques - France',
     'Data to be used in geographical data analysis - France'