Merge pull request #32 from nworr/compatibility-37

Compatibility Lizmap 3.7
arno974 · Feb 7, 2024 · 1c3d9ac · 1c3d9ac
2 parents 0744374 + 3eed1dd
commit 1c3d9ac
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/altiProfil/install/www/altiprofil/js/altiProfil.js b/altiProfil/install/www/altiprofil/js/altiProfil.js
@@ -69,20 +69,20 @@ function resizePlot(id){
 }
 
 function getProfil(p1,p2){
+    var p1Point = new OpenLayers.LonLat(p1.x, p1.y);
+    var p2Point = new OpenLayers.LonLat(p2.x, p2.y);
     if(lizMap.map.projection.projCode != "EPSG:4326"){
         var fromProjection = new OpenLayers.Projection(lizMap.map.projection.projCode);
         var toProjection = new OpenLayers.Projection("EPSG:4326");
-        var p1ConvertedPoint = new OpenLayers.LonLat(p1.x, p1.y);
-        var p2ConvertedPoint = new OpenLayers.LonLat(p2.x, p2.y);
-        p1ConvertedPoint.transform(fromProjection, toProjection);
-        p2ConvertedPoint.transform(fromProjection, toProjection);
+        p1Point.transform(fromProjection, toProjection);
+        p2Point.transform(fromProjection, toProjection);
     }
 
     var qParams = {
-        'p1Lon': p1ConvertedPoint.lon,
-        'p1Lat': p1ConvertedPoint.lat,
-        'p2Lon': p2ConvertedPoint.lon,
-        'p2Lat': p2ConvertedPoint.lat,
+        'p1Lon': p1Point.lon,
+        'p1Lat': p1Point.lat,
+        'p2Lon': p2Point.lon,
+        'p2Lat': p2Point.lat,
         'srs': lizMap.map.projection.projCode,
         'repository': lizUrls.params.repository,
         'project': lizUrls.params.project,

diff --git a/altiProfil/lib/AltiConfig.php b/altiProfil/lib/AltiConfig.php
@@ -8,7 +8,12 @@ class AltiConfig
 
     function __construct()
     {
-        $altiProfilConfigFile = \jApp::configPath('altiProfil.ini.php');
+        if (method_exists('jApp', 'varConfigPath')) {
+            // LWC >= 3.6
+            $altiProfilConfigFile = \jApp::varConfigPath('altiProfil.ini.php');
+        } else {
+            $altiProfilConfigFile = \jApp::configPath('altiProfil.ini.php');
+        }
         $defaultValues =  array(
             'altisource' => '',
             'altiProfileTable' => '',
@@ -73,4 +78,4 @@ public function getIgnServiceUrl($path, $parameters)
         $url .= '?'. http_build_query($parameters, '', '&');
         return $url;
     }
-}
+}
diff --git a/altiProfilAdmin/controllers/config.classic.php b/altiProfilAdmin/controllers/config.classic.php
@@ -24,8 +24,14 @@ class configCtrl extends jController {
 
     function __construct( $request ) {
         parent::__construct( $request );
-        $monfichier = jApp::configPath('altiProfil.ini.php');
-        $this->ini = new jIniFileModifier ($monfichier);
+        if (method_exists('jApp', 'varConfigPath')) {
+	    // LWC >= 3.6
+	    $monfichier = \jApp::varConfigPath('altiProfil.ini.php');
+            $this->ini = new \Jelix\IniFile\IniModifier($monfichier);
+        } else {
+	    $monfichier = \jApp::configPath('altiProfil.ini.php');
+            $this->ini = new jIniFileModifier($monfichier);
+        }
     }
 
     /**

diff --git a/tests/Makefile b/tests/Makefile
@@ -8,7 +8,7 @@ LIZMAP_DIR=$(shell pwd)/lizmap
 LIZMAP_USER_ID:=$(shell id -u)
 LIZMAP_USER_GID:=$(shell id -g)
 
-LIZMAP_VERSION_TAG:=3.6
+LIZMAP_VERSION_TAG:=3.7
 QGIS_VERSION_TAG:=3.22
 POSTGIS_VERSION_TAG:=13-3