diff --git a/client/css/icons/style.css b/client/css/icons/style.css index 90f70bd022f65b24335883a7fcdd899db7d42c7a..995a6b2a6d7272a2ba770be7f7a77f7e31dae74b 100644 --- a/client/css/icons/style.css +++ b/client/css/icons/style.css @@ -596,6 +596,9 @@ .icon-language1:before { content: "\e2a8"; } +.icon-vm4vmp:before { + content: "\e2a8"; +} .icon-layers:before { content: "\e1d3"; } diff --git a/client/javascript/externs/mapJSON/MapJSON.js b/client/javascript/externs/mapJSON/MapJSON.js index 0d98c0487f4de44920d87be6070a95f0702f16da..1f631eb3536f9f76a3bd0b8a29c2a790df270b98 100755 --- a/client/javascript/externs/mapJSON/MapJSON.js +++ b/client/javascript/externs/mapJSON/MapJSON.js @@ -597,8 +597,11 @@ MapJSON.prototype.getLayerFromLayerDef_ = function (oMapDefinition, oLayerDef, o } if (goog.isDefAndNotNull(oLayerDef['is_filtered'])) { if (goog.isDefAndNotNull(oLayerDef['filter_form'])) { - if (goog.isString(oLayerDef['filter_form']) && oLayerDef['filter_form'].length !== 0) { - oLayerDef['filter_form'] = JSON.parse(oLayerDef['filter_form']); + if ((goog.isString(oLayerDef['filter_form']) && oLayerDef['filter_form'].length !== 0) || + goog.isObject(oLayerDef['filter_form'])) { + if (goog.isString(oLayerDef['filter_form'])) { + oLayerDef['filter_form'] = JSON.parse(oLayerDef['filter_form']); + } oLayerDef['filter_values'] = this.getFilterFormValues_(oLayerDef['filter_form']); layer.set('filter_form', oLayerDef['filter_form']); layer.set('filter_form_embedjs', oLayerDef['filter_form_embedjs']); diff --git a/vas/rest/class/vmlib/files/Files_manager.class.inc b/vas/rest/class/vmlib/files/Files_manager.class.inc index 107b1f237634127d2bfb2e7c82e2cd7e51b68d3f..598dfd49328471d439b778eb51b6c7883d74a1ca 100644 --- a/vas/rest/class/vmlib/files/Files_manager.class.inc +++ b/vas/rest/class/vmlib/files/Files_manager.class.inc @@ -363,7 +363,7 @@ class Files_manager{ $aThumbnailFileStruct = $aFileStruct; $aThumbnailFileStruct["width"] = 200; $aThumbnailFileStruct["height"] = 200; - + if (is_int($this->oProperties['filesystem_thumbnails_width'])) { $aThumbnailFileStruct["width"] = $this->oProperties['filesystem_thumbnails_width']; } diff --git a/vas/rest/conf/properties_server.inc b/vas/rest/conf/properties_server.inc index e14c4eb7f056ae9f6944dbc87089f7abcbba8155..7eb115606d8fc4415dbf29a17ba9864d9322bda7 100644 --- a/vas/rest/conf/properties_server.inc +++ b/vas/rest/conf/properties_server.inc @@ -50,7 +50,7 @@ $properties["notifierSecretKeyAccount"] = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX // utilisation de s3 pour remplacer le système de Fichier $properties['filesystem'] = 'fs'; // s3 $properties['filesystem_thumbnails_width'] = 350; // taille des images .min.jpg -$properties['filesystem_thumbnails_height'] = 350; // taille des images .min.jpg +$properties['filesystem_thumbnails_height'] = 350; // taille des images .min.jpg $properties['AWSCredentialsFilePath'] = ""; // .../.aws/credentials $properties["fileS3UploaderProfil"] = ""; $properties["fileS3UploaderBucket"] = "";