Personnalsiation de la résolution

arno974 · Dec 2, 2021 · fd009b3 · fd009b3
1 parent de13286
commit fd009b3
Show file tree

Hide file tree

Showing 35 changed files with 21 additions and 6 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/README.md b/README.md
@@ -82,6 +82,7 @@ srid=3957
 profilUnit= PERCENT
 ; dock panel = dock or minidock or rightdock
 dock=dock
+altiresolution= résolution du MNT
 
 ;si cas IGN
 ;altiProfileProvider= ign

diff --git a/altiProfil.jpeg b/altiProfil.jpeg
diff --git a/altiProfil/classes/altiProfil.listener.php b/altiProfil/classes/altiProfil.listener.php
@@ -10,6 +10,7 @@ protected function getAltiProviderConfig($configItem) {
             'dock'=>'dock',
             'srid'=>'3857',
             'profilUnit'=>'PERCENT',
+            'altiresolution'=>25
         );
         if (empty($configItemValue) and array_key_exists($configItem, $defaultValues)) {
             $configItemValue = $defaultValues[$configItem];

diff --git a/altiProfil/classes/altiServicesFromDB.class.php b/altiProfil/classes/altiServicesFromDB.class.php
@@ -18,6 +18,7 @@ function __construct($repository, $project) {
         $this->AltiProfileTable = $localConfig->getValue('altiProfileTable', 'altiProfil');
         $this->Altisource = $localConfig->getValue('altisource', 'altiProfil');
         $this->profilUnit = $localConfig->getValue('profilUnit', 'altiProfil');
+        $this->AltiResolution = $localConfig->getValue('altiresolution', 'altiProfil');
 
         // Get project config: override table and source per project
         $this->repository = $repository;
@@ -110,14 +111,15 @@ protected function queryProfil($p1Lon, $p1Lat, $p2Lon, $p2Lat){
                         generate_series(
                             0,
                             ST_Length(line.geom)::int,
+                            --for very long line we reduce the steps
                             CASE
-                                WHEN ST_Length(line.geom)::int < 1000 THEN 5
-                                ELSE 20
+                                WHEN ST_Length(line.geom)::int < 1000 THEN %8$d
+                                ELSE %8$d*5
                             END
                         ) as i,
                         CASE
-                            WHEN ST_Length(line.geom)::int < 1000 THEN 5
-                            ELSE 20
+                            WHEN ST_Length(line.geom)::int < 1000 THEN %8$d
+                            ELSE %8$d*5
                         END as resolution
                     FROM line
                 ), 
@@ -154,7 +156,8 @@ protected function queryProfil($p1Lon, $p1Lat, $p2Lon, $p2Lat){
             $p1Lon, $p1Lat,
             $this->Srid,
             $p2Lon, $p2Lat,
-            $this->profilUnit
+            $this->profilUnit,
+            $this->AltiResolution,
         );
         $cnx = jDb::getConnection('altiProfil');
         $qResult = $cnx->query($sql);

diff --git a/altiProfil/classes/altiServicesFromIGN.class.php b/altiProfil/classes/altiServicesFromIGN.class.php
diff --git a/altiProfil/controllers/ajax.classic.php b/altiProfil/controllers/ajax.classic.php
diff --git a/altiProfil/install/config/altiProfil.ini.php.dist b/altiProfil/install/config/altiProfil.ini.php.dist
diff --git a/altiProfil/install/install.php b/altiProfil/install/install.php
diff --git a/altiProfil/locales/en_US/altiProfil.UTF-8.properties b/altiProfil/locales/en_US/altiProfil.UTF-8.properties
diff --git a/altiProfil/locales/fr_FR/altiProfil.UTF-8.properties b/altiProfil/locales/fr_FR/altiProfil.UTF-8.properties
diff --git a/altiProfil/module.xml b/altiProfil/module.xml
diff --git a/altiProfil/templates/altiProfil_Dock.tpl b/altiProfil/templates/altiProfil_Dock.tpl
@@ -9,6 +9,7 @@
     var LOCALES_ALTI_SLOPE = "{@altiProfil~altiProfil.alti.slope@}";
     
     var ALTI_PROVIDER = "{$altiProvider}";
+
     {if $altiProvider == "database"}      
       {if $profilUnit == "DEGREES"}
         var LOCALES_ALTI_UNIT = "{@altiProfil~altiProfil.alti.degrees@}";

diff --git a/altiProfil/themes/view/map.tpl b/altiProfil/themes/view/map.tpl
diff --git a/altiProfil/urls.xml b/altiProfil/urls.xml
diff --git a/altiProfil/www/css/altiProfil.css b/altiProfil/www/css/altiProfil.css
diff --git a/altiProfil/www/img/noun_altitude.png b/altiProfil/www/img/noun_altitude.png
diff --git a/altiProfil/www/img/noun_altitude.svg b/altiProfil/www/img/noun_altitude.svg
diff --git a/altiProfil/www/img/noun_altitude_click.png b/altiProfil/www/img/noun_altitude_click.png
diff --git a/altiProfil/www/img/noun_altitude_custom.svg b/altiProfil/www/img/noun_altitude_custom.svg
diff --git a/altiProfil/www/js/altiProfil.js b/altiProfil/www/js/altiProfil.js
@@ -86,7 +86,7 @@ function getProfil(p1,p2){
         'srs': lizMap.map.projection.projCode,
         'repository': lizUrls.params.repository,
         'project': lizUrls.params.project,
-        'sampling' : Math.round(p1.distanceTo(p2))/2 /* Seulement utilisé pour l'IGN => Nombre de points constituant le graphique */
+        'sampling' : Math.round(p1.distanceTo(p2))/2 /* Only use with french mapping Agency (IGN) web service  */
     }
 
     getProfilJsonResponse(qParams, function(data){
@@ -275,7 +275,10 @@ function initAltiProfil() {
                 altiProfilLayer.addFeatures(
                     [new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([p1Geom, p2Geom]))]
                 );
+
                 getProfil(p1Geom, p2Geom);
+                //setTimeout(() => { getProfil(p1Geom, p2Geom); }, 5000);
+
                 $('#altiProfil .menu-content #profil-chart').show();
             }
         }

diff --git a/altiProfilAdmin.png b/altiProfilAdmin.png
diff --git a/altiProfilAdmin/classes/altiProfilAdmin.listener.php b/altiProfilAdmin/classes/altiProfilAdmin.listener.php
diff --git a/altiProfilAdmin/events.xml b/altiProfilAdmin/events.xml
diff --git a/altiProfilAdmin/forms/config.form.xml b/altiProfilAdmin/forms/config.form.xml
@@ -14,6 +14,10 @@
    <label locale="altiProfilAdmin~admin.form.altisource.label" />
   </textarea>
 
+  <input ref="altiresolution" required="true" type="integer">
+   <label locale="altiProfilAdmin~admin.form.altiresolution.label" />
+  </input>
+
   <menulist ref="profilUnit" required="true">
     <label locale="altiProfilAdmin~admin.form.profilUnit.label" />
       <item value="PERCENT" selected="true" locale="altiProfilAdmin~admin.form.profilUnit.percent.label"/>

diff --git a/altiProfilAdmin/install/install.php b/altiProfilAdmin/install/install.php
diff --git a/altiProfilAdmin/locales/en_US/admin.UTF-8.properties b/altiProfilAdmin/locales/en_US/admin.UTF-8.properties
@@ -20,3 +20,4 @@ form.altiProfileTable.label=Database table
 form.srid.label=SRID
 form.ignServiceKey.label=IGN key
 form.ignServiceUrl.label=IGN service URL
+form.altiresolution.label=Resolution
diff --git a/altiProfilAdmin/locales/fr_FR/admin.UTF-8.properties b/altiProfilAdmin/locales/fr_FR/admin.UTF-8.properties
@@ -20,3 +20,4 @@ form.altiProfileTable.label=Table de la base
 form.srid.label=SRID
 form.ignServiceKey.label=Clé IGN
 form.ignServiceUrl.label=URL du service IGN
+form.altiresolution.label=Résolution
diff --git a/altiProfilAdmin/module.xml b/altiProfilAdmin/module.xml
diff --git a/altiProfilAdmin/templates/config_edit.tpl b/altiProfilAdmin/templates/config_edit.tpl
diff --git a/altiProfilAdmin/templates/config_view.tpl b/altiProfilAdmin/templates/config_view.tpl
diff --git a/altiProfilAdmin/urls.xml b/altiProfilAdmin/urls.xml
diff --git a/altiProfilAdmin/www/js/alti_profil_config.js b/altiProfilAdmin/www/js/alti_profil_config.js
diff --git a/composer.json b/composer.json