[BUGFIX] New function "attributeLayers" does not show columns/tables …

…aliases To do it, Lizmap adds an aliases property to GeoJSON FeatureCollections Fixes #94 Fixes #120
3liz · Feb 12, 2015 · 09752cd · 09752cd
1 parent 34cc6ae
commit 09752cd
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/lizmap/modules/lizmap/classes/qgisVectorLayer.class.php b/lizmap/modules/lizmap/classes/qgisVectorLayer.class.php
@@ -87,6 +87,20 @@ public function getFields() {
       return $fields;
   }
 
+  public function getAliasFields() {
+      $fields = $this->getFields();
+      $aliases = array();
+      foreach( $fields as $f ) {
+          $aliases[$f] = $f;
+          $alias = $this->xmlLayer->xpath("aliases/alias[@field='".$f."']");
+          if( count($alias) != 0 ) {
+            $alias = $alias[0];
+            $aliases[$f] = (string)$alias['name'];
+          }
+      }
+      return $aliases;
+  }
+
   public function getWfsFields() {
       $fields = $this->getFields();
       $excludeFields = $this->xmlLayer->xpath(".//excludeAttributesWFS/attribute");

diff --git a/lizmap/modules/lizmap/controllers/service.classic.php b/lizmap/modules/lizmap/controllers/service.classic.php
@@ -888,10 +888,24 @@ function GetFeature(){
 
     // Return response
     $rep = $this->getResponse('binary');
+    /*
     if(preg_match('#^GML#', $this->params['outputformat']))
       $rep->mimeType = 'text/xml';
     else
       $rep->mimeType = 'text/json';
+      * */
+    $rep->mimeType = $mime;
+    if ( $mime == 'text/plain' && strtolower( $this->params['outputformat'] ) == 'geojson' ) {
+        $rep->mimeType = 'text/json';
+        $layer = $this->project->findLayerByName( $this->params['typename'] );
+        if ( $layer != null ) {
+            $layer = $this->project->getLayer( $layer->id );
+            $aliases = $layer->getAliasFields();
+            $layer = json_decode( $data );
+            $layer->aliases = (object) $aliases;
+            $data = json_encode( $layer );
+        }
+    }
     $rep->content = $data;
     $rep->doDownload  =  false;
     $rep->outputFileName  =  'qgis_server_wfs';

diff --git a/lizmap/www/js/attributeTable.js b/lizmap/www/js/attributeTable.js
@@ -370,7 +370,10 @@ var lizAttributeTable = function() {
               config.attributeLayers[aName]['features'] = features;
               html+= '<tr>';
               for (var idx in features[0].properties){
-                html+='<th>' + idx + '</th>';
+                  if ( 'aliases' in data && idx in data.aliases )
+                    html+='<th>' + data.aliases[idx] + '</th>';
+                  else
+                    html+='<th>' + idx + '</th>';
               }
               html+='<th></th>';
               html+='</tr>';