Merge branch 'release/2.2.1'

Author: trasher

.github/workflows/ci-linux.yml

@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: [ '8.1', '8.4' ]
+        php-versions: [ '8.2', '8.5' ]
         coverage: [none]
       fail-fast: false
 
@@ -83,13 +83,6 @@ jobs:
           cd galette-core/galette/plugins/plugin-maps
           ../../vendor/bin/twigcs templates/default --severity error --display blocking
 
-      - name: Check missing symbols
-        run: |
-          cd galette-core/galette/plugins/plugin-maps
-          composer require maglnet/composer-require-checker -W
-          vendor/bin/composer-require-checker check --config-file=.composer-require-checker.config.json ../../composer.json
-        if: matrix.php-versions == '8.4'
-
       - name: PHPStan checks
         run: |
           cd galette-core/galette/plugins/plugin-maps
@@ -118,19 +111,19 @@ jobs:
           #always tests higher stable php version with lower db version
           #enable coverage on higher stable php version with higher postrgesql version
           #lower php version
-          - { php-version: "8.1", db-image: "mysql:5.7", coverage: none, always: false }
-          - { php-version: "8.1", db-image: "mysql:8.1", coverage: none, always: false }
-          - { php-version: "8.1", db-image: "mariadb:10.4", coverage: none, always: false }
-          - { php-version: "8.1", db-image: "mariadb:11", coverage: none, always: false }
-          - { php-version: "8.1", db-image: "postgres:11", coverage: none, always: false }
-          - { php-version: "8.1", db-image: "postgres:16", coverage: none, always: false }
+          - { php-version: "8.2", db-image: "mysql:5.7", coverage: none, always: false }
+          - { php-version: "8.2", db-image: "mysql:8.1", coverage: none, always: false }
+          - { php-version: "8.2", db-image: "mariadb:10.4", coverage: none, always: false }
+          - { php-version: "8.2", db-image: "mariadb:11", coverage: none, always: false }
+          - { php-version: "8.2", db-image: "postgres:11", coverage: none, always: false }
+          - { php-version: "8.2", db-image: "postgres:16", coverage: none, always: false }
           #higher stable php version
-          - { php-version: "8.4", db-image: "mysql:5.7", coverage: none, always: true }
-          - { php-version: "8.4", db-image: "mysql:8.1", coverage: none, always: false }
-          - { php-version: "8.4", db-image: "mariadb:10.4", coverage: none, always: true }
-          - { php-version: "8.4", db-image: "mariadb:11", coverage: none, always: false }
-          - { php-version: "8.4", db-image: "postgres:11", coverage: none, always: true }
-          - { php-version: "8.4", db-image: "postgres:16", coverage: none, always: true }
+          - { php-version: "8.5", db-image: "mysql:5.7", coverage: none, always: true }
+          - { php-version: "8.5", db-image: "mysql:8.1", coverage: none, always: false }
+          - { php-version: "8.5", db-image: "mariadb:10.4", coverage: none, always: true }
+          - { php-version: "8.5", db-image: "mariadb:11", coverage: none, always: false }
+          - { php-version: "8.5", db-image: "postgres:11", coverage: none, always: true }
+          - { php-version: "8.5", db-image: "postgres:16", coverage: none, always: true }
       fail-fast: false
 
     env:

ChangeLog

@@ -1,3 +1,15 @@
+* 2025-12-08 - 2.2.1
+
+* 2025-10-09 - 2.2.0
+
+* 2024-10-20 - 2.1.2
+
+* 2024-10-20 - 2.1.1
+
+* 2024-06-07 - 2.1.0
+
+* 2023-12-07 - 2.0.0
+
 * 2021-11-29 - 1.7.0
 - Few bugfixes
 - Galette 0.9.6 compatible

_define.php

@@ -25,10 +25,10 @@
     'Galette Maps',     //Name
     'Maps features',    //Short description
     'Johan Cwiklinski', //Author
-    '2.2.0',            //Version
+    '2.2.1',            //Version
     '1.2.0',            //Galette compatible version
     'maps',             //routing name and translation domain
-    '2025-10-09',       //Release date
+    '2025-12-08',       //Release date
     [   //Permissions needed
         'maps_localize_member'  => 'member',
         'maps_mymap'            => 'member',

gulpfile.js

@@ -4,7 +4,7 @@ const { series, parallel } = require('gulp');
 const del = require('del');
 const concat = require('gulp-concat');
 const uglify = require('gulp-uglify');
-const merge = require('merge-stream');
+const merge = require('ordered-read-streams');
 const replace = require('gulp-replace');
 const cleancss = require('gulp-clean-css');
 
@@ -14,7 +14,7 @@ const plugin = {
 
 const main_styles = [
   './node_modules/leaflet/dist/leaflet.css',
-  './node_modules/leaflet.fullscreen/Control.FullScreen.css',
+  './node_modules/leaflet.fullscreen/dist/Control.FullScreen.css',
   './node_modules/leaflet-gesture-handling/dist/leaflet-gesture-handling.css',
   './node_modules/leaflet.markercluster/dist/MarkerCluster.css',
   './node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css',
@@ -24,7 +24,7 @@ const main_styles = [
 
 const main_scripts = [
   './node_modules/leaflet/dist/leaflet.js',
-  './node_modules/leaflet.fullscreen/Control.FullScreen.js',
+  './node_modules/leaflet.fullscreen/dist/Control.FullScreen.umd.js',
   './node_modules/leaflet-gesture-handling/dist/leaflet-gesture-handling.min.js',
   './node_modules/leaflet.markercluster/dist/leaflet.markercluster.js',
   './node_modules/leaflet-control-geocoder/dist/Control.Geocoder.js',
@@ -66,7 +66,7 @@ function styles() {
     .pipe(concat('maps-main.bundle.min.css'))
     .pipe(gulp.dest(plugin.public));
 
-  locate = gulp.src([
+    locate = gulp.src([
       './node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.css'
     ])
     .pipe(replace('../location-arrow-solid.svg', './images/location-arrow-solid.svg'))
@@ -84,7 +84,7 @@ function scripts() {
     .pipe(uglify())
     .pipe(gulp.dest(plugin.public));
 
-  locate = gulp.src([
+    locate = gulp.src([
       './node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.js'
     ])
     .pipe(concat('maps-locate.bundle.min.js'))
@@ -96,7 +96,7 @@ function scripts() {
 
 function assets() {
   main = main_assets.map(function (asset) {
-    return gulp.src(asset.src)
+    return gulp.src(asset.src, {encoding: false})
       .pipe(gulp.dest(plugin.public + asset.dest));
     }
   );

lang/br.utf8/LC_MESSAGES/maps.mo

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-08 22:15+0100\n"
+"POT-Creation-Date: 2025-12-07 10:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,162 +17,166 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../_routes.php:32
+#: ../_routes.php:34
 msgid "Javascript libraries has not been built!"
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:70
-#: ../lib/GaletteMaps/Controllers/MapsController.php:155
-#: ../lib/GaletteMaps/PluginGaletteMaps.php:72
+#: ../lib/GaletteMaps/PluginGaletteMaps.php:53
+#: ../lib/GaletteMaps/PluginGaletteMaps.php:99
+msgid "My localization"
+msgstr ""
+
+#: ../lib/GaletteMaps/PluginGaletteMaps.php:74
+#: ../lib/GaletteMaps/Controllers/MapsController.php:64
+#: ../lib/GaletteMaps/Controllers/MapsController.php:145
 msgid "Maps"
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:83
+#: ../lib/GaletteMaps/PluginGaletteMaps.php:130
+msgid "Geolocalize"
+msgstr ""
+
+#: ../lib/GaletteMaps/PluginGaletteMaps.php:134
+msgid "Geolocalize %membername"
+msgstr ""
+
+#: ../lib/GaletteMaps/Controllers/MapsController.php:73
 msgid ""
 "Coordinates has not been loaded. Maybe plugin tables does not exists in the "
 "database?"
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:158
+#: ../lib/GaletteMaps/Controllers/MapsController.php:148
 msgid "%member geographic position"
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:204
+#: ../lib/GaletteMaps/Controllers/MapsController.php:194
 msgid "Superadmin cannot be localized."
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:231
-#: ../lib/GaletteMaps/Controllers/MapsController.php:243
+#: ../lib/GaletteMaps/Controllers/MapsController.php:221
+#: ../lib/GaletteMaps/Controllers/MapsController.php:233
 msgid "Coordinates has not been removed :("
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:241
+#: ../lib/GaletteMaps/Controllers/MapsController.php:231
 msgid "Coordinates has been removed!"
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:256
+#: ../lib/GaletteMaps/Controllers/MapsController.php:246
 msgid "New coordinates has been stored!"
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:258
+#: ../lib/GaletteMaps/Controllers/MapsController.php:248
 msgid "Coordinates has not been stored :("
 msgstr ""
 
-#: ../lib/GaletteMaps/Controllers/MapsController.php:261
+#: ../lib/GaletteMaps/Controllers/MapsController.php:251
 msgid "Something went wrong :("
 msgstr ""
 
-#: ../lib/GaletteMaps/PluginGaletteMaps.php:51
-#: ../lib/GaletteMaps/PluginGaletteMaps.php:97
-msgid "My localization"
-msgstr ""
-
-#: ../lib/GaletteMaps/PluginGaletteMaps.php:118
-msgid "Geolocalize"
+#: ../tempcache/common_html.html.twig:66 ../tempcache/common_html.html.twig:72
+msgid "Member (company)"
 msgstr ""
 
-#: ../lib/GaletteMaps/PluginGaletteMaps.php:122
-msgid "Geolocalize %membername"
+#: ../tempcache/common_html.html.twig:82 ../tempcache/common_html.html.twig:88
+msgid "Search result"
 msgstr ""
 
-#: ../tempcache/maps.html.twig:102
+#: ../tempcache/maps.html.twig:114
 msgid "aka"
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:129
+#: ../tempcache/common_scripts.html.twig:134
 msgid "An error occured during 'I live here' process :("
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:163
+#: ../tempcache/common_scripts.html.twig:179
 msgid "Display map in full screen"
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:185
+#: ../tempcache/common_scripts.html.twig:183
+msgid "Exit full screen"
+msgstr ""
+
+#: ../tempcache/common_scripts.html.twig:195
 msgid "Search your town..."
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:191
+#: ../tempcache/common_scripts.html.twig:201
 msgid "Search a town..."
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:197
+#: ../tempcache/common_scripts.html.twig:207
 msgid "Sorry, that town could not be found."
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:201
+#: ../tempcache/common_scripts.html.twig:211
 msgid "Search"
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:225
+#: ../tempcache/common_scripts.html.twig:235
 msgid "Show me where I am"
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:230
+#: ../tempcache/common_scripts.html.twig:240
 msgid "You seem located outside the boundaries of the map"
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:242
+#: ../tempcache/common_scripts.html.twig:252
 msgid "Map data (c)"
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:244
+#: ../tempcache/common_scripts.html.twig:254
 msgid "OpenStreetMap contributors"
 msgstr ""
 
-#: ../tempcache/common_scripts.html.twig:246
+#: ../tempcache/common_scripts.html.twig:256
 msgid "Imagery (c)"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:64
+#: ../tempcache/mymap.html.twig:72
 msgid "Choose your location"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:70
+#: ../tempcache/mymap.html.twig:78
 msgid "Choose %member location"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:80
+#: ../tempcache/mymap.html.twig:88
 msgid "Select your town."
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:84
+#: ../tempcache/mymap.html.twig:92
 msgid "In the database, town is set to: '%town'"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:174
+#: ../tempcache/mymap.html.twig:186
 msgid "You clicked at %p"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:177 ../tempcache/mymap.html.twig:298
-#: ../tempcache/mymap.html.twig:327
+#: ../tempcache/mymap.html.twig:189 ../tempcache/mymap.html.twig:310
+#: ../tempcache/mymap.html.twig:339
 msgid "I live here!"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:179 ../tempcache/mymap.html.twig:300
-#: ../tempcache/mymap.html.twig:329
+#: ../tempcache/mymap.html.twig:191 ../tempcache/mymap.html.twig:312
+#: ../tempcache/mymap.html.twig:341
 msgid "Member lives here!"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:211
+#: ../tempcache/mymap.html.twig:223
 msgid "Remove my coordinates"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:213
+#: ../tempcache/mymap.html.twig:225
 msgid "Remove member coordinates"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:219
+#: ../tempcache/mymap.html.twig:231
 msgid "Are you sure you want to remove coordinates from the database?"
 msgstr ""
 
-#: ../tempcache/mymap.html.twig:272
+#: ../tempcache/mymap.html.twig:284
 msgid "An error occured removing coordinates :("
 msgstr ""
-
-#: ../tempcache/common_html.html.twig:61 ../tempcache/common_html.html.twig:67
-msgid "Member (company)"
-msgstr ""
-
-#: ../tempcache/common_html.html.twig:77 ../tempcache/common_html.html.twig:83
-msgid "Search result"
-msgstr ""