From ba1c14d9e439cb216e4518db1c13c696198459ea Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Thu, 22 Nov 2018 10:58:13 +0100
Subject: [PATCH] =?UTF-8?q?Comparaison=20sur=20la=20fen=C3=AAtre=20l=C3=A9?=
=?UTF-8?q?gende?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/vmap/mapmanager/maplegend.js | 36 ++++++++++++++++---
.../module/template/layers/maplegend.html | 31 +++++++++++++---
2 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/src/module_vmap/module/javascript/app/vmap/mapmanager/maplegend.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/maplegend.js
index 48d2e54e..91ff9d30 100644
--- a/src/module_vmap/module/javascript/app/vmap/mapmanager/maplegend.js
+++ b/src/module_vmap/module/javascript/app/vmap/mapmanager/maplegend.js
@@ -136,7 +136,17 @@ nsVmap.nsMapManager.MapLegend.prototype.maplegendController = function ($scope)
/**
* @private
*/
- this['aUrls'] = [];
+ this['oUrls'] = {};
+
+ /**
+ * @private
+ */
+ this['oCompareUrls'] = {};
+
+ /**
+ * The active map
+ */
+ $scope['activeMap'] = 1;
/**
* Contains the events stocked by listenLayers()
@@ -158,6 +168,18 @@ nsVmap.nsMapManager.MapLegend.prototype.maplegendController = function ($scope)
});
};
+
+/**
+ * Resize the layertools
+ */
+nsVmap.nsMapManager.MapLegend.prototype.maplegendController.prototype.resize = function () {
+ oVmap.log('nsVmap.nsMapManager.MapLegend.maplegendController.resize');
+
+ setTimeout(function () {
+ oVmap.resizeLayerTools();
+ });
+}
+
/**
* Loads the legend
* @export
@@ -165,18 +187,24 @@ nsVmap.nsMapManager.MapLegend.prototype.maplegendController = function ($scope)
nsVmap.nsMapManager.MapLegend.prototype.maplegendController.prototype.loadLegend = function () {
oVmap.log('nsVmap.nsMapManager.MapLegend.maplegendController.loadLegend');
- this['oUrls'] = this.getLegendUrls();
+ this['oUrls'] = this.getLegendUrls(oVmap.getMap().getOLMap());
this.downloadLegendImgs(this['oUrls']);
+
+ if(this.$scope_["$root"]["compare_enabled"]){
+ this['oCompareUrls'] = this.getLegendUrls(oVmap.getMapCompare().getOLMap());
+ this.downloadLegendImgs(this['oCompareUrls']);
+ }
};
/**
* Get the legend URLs
+ * @param {object} olMap
* @returns {object}
*/
-nsVmap.nsMapManager.MapLegend.prototype.maplegendController.prototype.getLegendUrls = function () {
+nsVmap.nsMapManager.MapLegend.prototype.maplegendController.prototype.getLegendUrls = function (olMap) {
oVmap.log('nsVmap.nsMapManager.MapLegend.maplegendController.getLegendUrls');
- var aLayers = oVmap.getMap().getOLMap().getLayers().getArray();
+ var aLayers = olMap.getLayers().getArray();
var oUrls = {};
// Récupération des URL WMS
diff --git a/src/module_vmap/module/template/layers/maplegend.html b/src/module_vmap/module/template/layers/maplegend.html
index 907476a5..4c34eb49 100755
--- a/src/module_vmap/module/template/layers/maplegend.html
+++ b/src/module_vmap/module/template/layers/maplegend.html
@@ -12,11 +12,15 @@
</div>
</div>
<div id="maplegendcontainer" class="layers-tool legend" collapse="{{ctrl.legend_collapsed === true ? 'out' : 'in'}}">
- <ul class="nav nav-tabs layerstree-nav">
- <li class="active"><a data-toggle="tab" href="#map1">Carte 1</a></li>
- <li><a data-toggle="tab" href="#map1">Carte 2</a></li>
+ <ul class="nav nav-tabs layerstree-nav" ng-show="$root.compare_enabled">
+ <li ng-class="{'active' : activeMap == 1}">
+ <a href="#" ng-click="activeMap=1;ctrl.resize()">Carte 1</a>
+ </li>
+ <li ng-class="{'active' : activeMap == 2}">
+ <a href="#" ng-click="activeMap=2;ctrl.resize()">Carte 2</a>
+ </li>
</ul>
- <div id="maplegend" class="tree legend">
+ <div id="maplegend" class="tree legend" ng-show="activeMap == 1 || !$root.compare_enabled">
<div ng-repeat="(sLayerName, layer) in ctrl.oUrls" class="layer-legend"
ng-show="ctrl.areLegendsLoaded(layer)">
<div id="legend_father{{$index}}" data-toggle="collapse" data-target="#legend_element_{{$index}}">
@@ -34,5 +38,24 @@
</div>
</div>
</div>
+
+ <div id="compare_maplegend" class="tree legend" ng-show="activeMap == 2 && $root.compare_enabled">
+ <div ng-repeat="(sLayerName, layer) in ctrl.oCompareUrls" class="layer-legend"
+ ng-show="ctrl.areLegendsLoaded(layer)">
+ <div id="compare_legend_father{{$index}}" data-toggle="collapse" data-target="#compere_legend_element_{{$index}}">
+ <div style="display: inline-block; width:98%">
+ <div class="legend_father_name" title="{{sLayerName}}">{{sLayerName}}</div>
+ </div>
+ </div>
+ <div id="compare_legend_element_{{$index}}" class="collapse in">
+ <ul class="list-group-item auto-height">
+ <div ng-repeat="node in layer"
+ ng-show="node.legendBlobURL">
+ <img ng-src="{{node.legendBlobURL}}" class="legend-img" legend-image-node>
+ </div>
+ </ul>
+ </div>
+ </div>
+ </div>
</div>
</div>
--
GitLab