Merge pull request #67 from neo-garaix/update-adresseListener

Update compatibility for 3.8
3liz · Oct 8, 2024 · 1518089 · 1518089
2 parents 7a442eb + 08c7bf1
commit 1518089
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 28 deletions.
diff --git a/adresse/classes/adresse.listener.php b/adresse/classes/adresse.listener.php
@@ -47,37 +47,35 @@ public function ongetMapAdditions($event)
             $user_login = $juser->login;
         }
 
-        $adresseConfig = array();
-
-        $adresseConfig['user'] = $user_login;
-
         $player = $utils->getLayer($lizmap_project, 'v_point_adresse');
         $vlayer = $utils->getLayer($lizmap_project, 'voie');
 
-        $adresseConfig['point_adresse'] = array();
-        $adresseConfig['point_adresse']['id'] = $player->getId();
-        $adresseConfig['point_adresse']['name'] = $player->getName();
-
-        $adresseConfig['voie'] = array();
-        $adresseConfig['voie']['id'] = $vlayer->getId();
-        $adresseConfig['voie']['name'] = $vlayer->getName();
-
-        $adresseConfig['urls'] = array();
-        $adresseConfig['urls']['select'] = jUrl::get('adresse~service:select');
-        $adresseConfig['urls']['update'] = jUrl::get('adresse~service:update');
+        $jsvars = array(
+            'adresseConfig' => array(
+                'user' => $user_login,
+                'point_adresse' => array(
+                    'id' => $player->getId(),
+                    'name' => $player->getName()
+                ),
+                'voie' => array(
+                    'id' => $vlayer->getId(),
+                    'name' => $vlayer->getName()
+                ),
+                'urls' => array(
+                    'select' => jUrl::get('adresse~service:select'),
+                    'update' => jUrl::get('adresse~service:update')
+                )
+            )
+        );
 
         $js = array();
         $css = array();
         $js[] = jUrl::get('jelix~www:getfile', array('targetmodule' => 'adresse', 'file' => 'adresse.js'));
 
-        $jscode = array(
-            'var adresseConfig = ' . json_encode($adresseConfig),
-        );
-
         $event->add(
             array(
                 'js' => $js,
-                'jscode' => $jscode,
+                'jsvars' => $jsvars,
                 'css' => $css,
             )
         );

diff --git a/adresse/module.xml b/adresse/module.xml
@@ -5,13 +5,13 @@
         <label lang="en_US">adresse</label>
         <description lang="en_US" />
         <license URL="">Mozilla Public Licence (MPL)</license>
-        <copyright>2020-2023 3liz</copyright>
+        <copyright>2020-2024 3liz</copyright>
         <creator name="your name" email="[email protected]" />
         <!--<contributor name="hisname" email="[email protected]"  since="" role=""/>-->
         <homepageURL>http://3liz.com</homepageURL>
     </info>
     <dependencies>
-        <module name="lizmap" minversion="3.7.0" maxversion="3.7.*"/>
+        <module name="lizmap" minversion="3.8.0" maxversion="3.8.*"/>
     </dependencies>
     <autoload>
         <class name="adresseSearch" file="lib/adresseSearch.php"/>

diff --git a/tests/Makefile b/tests/Makefile
@@ -8,8 +8,8 @@ LIZMAP_DIR=$(shell pwd)/lizmap
 LIZMAP_USER_ID:=$(shell id -u)
 LIZMAP_USER_GID:=$(shell id -g)
 
-LIZMAP_VERSION_TAG:=3.5
-QGIS_VERSION_TAG:=3.22
+LIZMAP_VERSION_TAG:=3.8
+QGIS_VERSION_TAG:=3.34
 POSTGIS_VERSION_TAG:=13-3
 
 QGIS_MAP_WORKERS:=1
@@ -58,13 +58,13 @@ env: dirs
 		EOF
 
 run: stop env install-plugins
-	docker-compose up -d
+	docker compose up -d
 
 stop:
-	docker-compose down || true
+	docker compose down || true
 
 clean: stop
-	docker-compose down -v
+	docker compose down -v
 	rm -rf $(LIZMAP_DIR)/www/*
 	rm -rf $(LIZMAP_DIR)/var/*
 

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   pgsql:
     image: 3liz/postgis:${POSTGIS_VERSION_TAG}