diff --git a/src/module_vmap/module/javascript/app/vmap/mapmanager/layerstree.js b/src/module_vmap/module/javascript/app/vmap/mapmanager/layerstree.js
index 673cb4e0f66ff2e60cc0b2faab5137030da12bb0..40f3664ccc42b98b6ecba740b0087d89e7d43539 100644
--- a/src/module_vmap/module/javascript/app/vmap/mapmanager/layerstree.js
+++ b/src/module_vmap/module/javascript/app/vmap/mapmanager/layerstree.js
@@ -117,6 +117,19 @@ nsVmap.nsMapManager.LayersTree.prototype.LayertreeController = function ($scope,
*/
$scope['tree'] = oVmap.getMapManager().getLayersTree();
+
+ /**
+ * The map compare layersTree
+ * @type {object}
+ */
+ $scope['compareTree'] = {};
+
+
+ /**
+ * The active map
+ */
+ $scope['activeMap'] = 1;
+
/**
* The current properties
*/
@@ -350,6 +363,13 @@ nsVmap.nsMapManager.LayersTree.prototype.LayertreeController.prototype.reloadTre
// relance le chargement des couches avec le nouvel arbre
this.loadTree();
+ // Arbre pour la comparaison
+ if(this.scope_["$root"]["compare_enabled"]){
+ var oCompareTree = jQuery.extend(true, {}, oVmap.getMapManager().getCompareLayersTree());
+
+ this.scope_['compareTree'] = oCompareTree;
+ }
+
oVmap.resizeLayerTools(false);
};
@@ -638,6 +658,20 @@ nsVmap.nsMapManager.LayersTree.prototype.LayertreeController.prototype.closeLaye
}
}
}
+
+ if (goog.isDefAndNotNull(this.scope_['compareTree'])) {
+ if (goog.isArray(this.scope_['compareTree']['children'])) {
+ for (var i = 0; i < this.scope_['compareTree']['children'].length; i++) {
+ if (goog.isDefAndNotNull(this.scope_['compareTree']['children'][i]['children'])) {
+ for (var ii = 0; ii < this.scope_['compareTree']['children'][i]['children'].length; ii++) {
+ if (goog.isDefAndNotNull(this.scope_['compareTree']['children'][i]['children'][ii]['olLayer'])) {
+ this.scope_['compareTree']['children'][i]['children'][ii]['displayedMenu'] = false;
+ }
+ }
+ }
+ }
+ }
+ }
};
/**
diff --git a/src/module_vmap/module/template/layers/layertree.html b/src/module_vmap/module/template/layers/layertree.html
index 0bf938a1d027cf5faaff66e511de19db0ab17240..22b649c8e9d9ed16ab807ba219345e5202b77060 100644
--- a/src/module_vmap/module/template/layers/layertree.html
+++ b/src/module_vmap/module/template/layers/layertree.html
@@ -13,15 +13,19 @@
<div id="layertree" class="layers-tool" collapse="{{ctrl.layerstree_collapsed === true ? 'out' : 'in'}}">
- <ul class="nav nav-tabs layerstree-nav left">
- <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 left" ng-show="$root.compare_enabled">
+ <li ng-class="{'active' : activeMap == 1}">
+ <a href="#" ng-click="activeMap=1">Carte 1</a>
+ </li>
+ <li ng-class="{'active' : activeMap == 2}">
+ <a href="#" ng-click="activeMap=2">Carte 2</a>
+ </li>
</ul>
<div class="indicators">
<span class="text-info icon-eye" style="font-size: 18px;line-height: 0" title="Définit si la couche est visible"></span>
</div>
- <ul class="tree">
+ <ul class="tree" ng-show="activeMap == 1 || !$root.compare_enabled">
<div ng-repeat="node in tree.children| orderBy : 'name'" ng-if="node.view === undefined">
<!-- Service -->
@@ -146,6 +150,108 @@
</ul>
</div>
</ul>
+
+ <ul class="tree" ng-show="activeMap == 2 && $root.compare_enabled">
+ <div ng-repeat="node in compareTree.children| orderBy : 'name'" ng-if="node.view === undefined">
+
+ <!-- Service -->
+ <div class="layerstree-phather">
+ <div class="tree-father-collapse-btn service-name left" data-toggle="collapse" data-target="#comparetree_element_{{$id}}" onclick="setTimeout(function () {
+ oVmap.resizeLayerTools(true)
+ }, 500)" title="{{node.name}}">
+ {{node.name}}
+ </div>
+ <div class="checkbox checkbox-info inline-checkbox right"
+ ng-class="{'checkbox_indeterminate': node.visible === null}">
+ <input id="compare_service_{{$id}}_visible"
+ ng-init="node.visible = ctrl.isGroupVisible(node)"
+ ng-model="node.visible"
+ ng-model-options="{getterSetter: true}"
+ ng-click="ctrl.setGroupVisible(node)"
+ type="checkbox"
+ style="cursor:pointer; position: absolute"
+ title="Definit si le groupe est visible">
+ <label for="compare_service_{{$id}}_visible"
+ style="cursor:pointer"
+ title="Definit si le groupe est visible"></label>
+ </div>
+ </div>
+
+ <!-- Calque -->
+ <ul id="comparetree_element_{{$id}}" class="collapse layers-tree-ul tree-element" ng-class="{'in': ctrl.layers_collapsed !== true}">
+ <div ng-repeat="layer in node.children">
+ <li>
+ <ul class="list-group-item layertree-item auto-height">
+
+ <!-- Nom du calque -->
+ <div class="layer-name layer-name-tree" title="{{layer.name}}">{{layer.name}}</div>
+ <div class="layer-checkboxes">
+ <button type="button"
+ class="btn btn-xs margin-sides-10 hidden"
+ ng-click="layer.olLayer.getSource().refreshWithTimestamp()">
+ <span class="glyphicon glyphicon-refresh"></span>
+ </button>
+ <div type="button" class="btn btn-xs layer-menu-button" ng-click="ctrl.toggleLayerMenu(layer, $event)">
+ <span ng-class="{'icon-filter': layer.olLayer.get('is_filtered'), 'icon-format_list_bulleted': !layer.olLayer.get('is_filtered')}"></span>
+ </div>
+ <!-- Checkbox visible -->
+ <div class="checkbox checkbox-info inline-checkbox" style="z-index: 10;">
+ <input id="{{layer.$$hashKey}}_compare_visible_order_checkbox"
+ type="checkbox"
+ style="cursor:pointer; position: absolute"
+ title="Definit si le calque est visible"
+ ng-checked="layer.olLayer.values.visible === true"
+ ng-click="ctrl.setVisible(layer.olLayer, !layer.olLayer.values.visible);node.visible = ctrl.isGroupVisible(node)">
+ <label for="{{layer.$$hashKey}}_compare_visible_order_checkbox" style="cursor:pointer" title="Definit si la couche est visible"></label>
+ </div>
+ </div>
+ </ul>
+ </li>
+ <div class="dropdown-menu layer-menu" ng-class="{'block': layer.displayedMenu === true}">
+ <div class="layer-menu-list">
+ <li ng-if="layer.olLayer.get('is_filtered')" ng-click="ctrl.displayFilterLayerModal(layer.olLayer)">
+ <a href="#">
+ <span class="icon-filter"></span>
+ Filtre
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ <div class="row">
+ <div class="col-xs-6">
+ <span class="icon-star-half"></span>
+ Transparence
+ </div>
+ <div class="col-xs-6">
+ <div class="layer-menu-list-slider">
+ <input data-app-layer-opacity-slider="" id="compare_slider_layer_form_{{layer.$$hashKey}}" type="text">
+ </div>
+ </div>
+ </div>
+ </a>
+ </li>
+ <li ng-if="layer.olLayer.get('type') === 'imagewms' || layer.olLayer.get('type') === 'tilewms'"
+ ng-repeat="sublayer in layer.olLayer.get('sublayers')">
+ <div class="sublayer-checkboxes">
+ <!-- Checkbox visible -->
+ <div class="checkbox checkbox-info sublayer-checkbox inline-checkbox">
+ <input id="{{layer.$$hashKey}}_compare_sublayer_{{sublayer}}_visible_checkbox"
+ type="checkbox"
+ style="cursor:pointer; position: absolute"
+ title="Definit si la couche est visible"
+ ng-checked="ctrl.isSublayerActive(layer.olLayer, sublayer)"
+ ng-disabled="layer.olLayer.values.visible !== true"
+ ng-click="ctrl.toggleSubLayer(layer.olLayer, sublayer, '#' + layer.$$hashKey + '_sublayer_' + sublayer + '_visible_checkbox')">
+ <label for="{{layer.$$hashKey}}_compare_sublayer_{{sublayer}}_visible_checkbox" style="cursor:pointer" title="Definit si la couche est visible">{{sublayer}}</label>
+ </div>
+ </div>
+ </li>
+ </div>
+ </div>
+ </div>
+ </ul>
+ </div>
+ </ul>
</div>
<!--Modale pour le filtrage-->