Skip to content
Snippets Groups Projects
Commit 08c51458 authored by Armand Bahi's avatar Armand Bahi
Browse files

Reset subtrees

Add 'src/vitis/' from commit '943bb3de'

git-subtree-dir: src/vitis
git-subtree-mainline: e5a8168befb90ae7be327bebb18173c37492bba0
git-subtree-split: 943bb3de

Add 'src/closure/' from commit 'd9f2f97e212dadeff0df8288b4f829e9b2a75845'

git-subtree-dir: src/closure
git-subtree-mainline: 7784e4ee6e110736d17c310a794e7d1ddca74fc4
git-subtree-split: d9f2f97e212dadeff0df8288b4f829e9b2a75845

Add 'src/module_vmap/' from commit '0fb7dbb7'

git-subtree-dir: src/module_vmap
git-subtree-mainline: 42b5722eb0d1c238c3ece2aa10829356b03234c7
git-subtree-split: 0fb7dbb7

Add 'src/module_vm4ms/' from commit '4dc05bee'

git-subtree-dir: src/module_vm4ms
git-subtree-mainline: 4b03db759f4316c0a6dd933daa844b921fc33543
git-subtree-split: 4dc05bee

Add 'src/module_anc/' from commit '0d85aba1'

git-subtree-dir: src/module_anc
git-subtree-mainline: f49d3613bf630edd0ae4149fb3a03f2e1944606c
git-subtree-split: 0d85aba1

Add 'src/module_cadastreV2/' from commit 'f20650be'

git-subtree-dir: src/module_cadastreV2
git-subtree-mainline: 6e6e9dd32386b8bf425d0db8c4b971df2c3fcb26
git-subtree-split: f20650be

Add 'src/module_cadastre/' from commit '6f475695'

git-subtree-dir: src/module_cadastre
git-subtree-mainline: f78917834f68ac08f48e06efb0b962c9b9cd9314
git-subtree-split: 6f475695
parent 32677aca
No related branches found
No related tags found
No related merge requests found
conf/depswriter/*.pyc
...@@ -592,11 +592,11 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.synchronizeMap = func ...@@ -592,11 +592,11 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.synchronizeMap = func
var this_ = this; var this_ = this;
// Synchro Échelle // Synchro Échelle
$(this_.map.getTargetElement()).on('mouseleave', function(){ this_.map.getTargetElement().addEventListener('mouseleave', function(){
oVmap.getMap().getOLMap().on("moveend", this_.updateCompareScaleMap, this_); oVmap.getMap().getOLMap().on("moveend", this_.updateCompareScaleMap, this_);
this_.map.un("moveend", this_.updateScaleMap, this_); this_.map.un("moveend", this_.updateScaleMap, this_);
}); });
$(this_.map.getTargetElement()).on('mouseenter', function(){ this_.map.getTargetElement().addEventListener('mouseenter', function(){
oVmap.getMap().getOLMap().un("moveend", this_.updateCompareScaleMap, this_); oVmap.getMap().getOLMap().un("moveend", this_.updateCompareScaleMap, this_);
this_.map.on("moveend", this_.updateScaleMap, this_); this_.map.on("moveend", this_.updateScaleMap, this_);
}); });
...@@ -664,20 +664,13 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.synchronizeMap = func ...@@ -664,20 +664,13 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.synchronizeMap = func
this_.targetOverlay_.setPosition(convertCoord); this_.targetOverlay_.setPosition(convertCoord);
}); });
// Si la souris n'est pas sur la carte comparée, déclenche un mouseleave
if (!$(this_.map.getTargetElement()).is(':hover')) {
$(this_.map.getTargetElement()).trigger('mouseleave');
}
}; };
/** /**
* Update the map extent with animation * Update the map extent with animation
* @returns {undefined} * @returns {undefined}
*/ */
nsVmap.MapCompare.prototype.mapCompareController.prototype.updateCompareScaleMap = function(e) { nsVmap.MapCompare.prototype.mapCompareController.prototype.updateCompareScaleMap = function(e) { console.log('updateCompareScaleMap');
oVmap.log('nsVmap.MapCompare.updateCompareScaleMap');
var this_ = this var this_ = this
this_.updateCenterCompareMap(); this_.updateCenterCompareMap();
oVmap.getMapCompare().setScale(oVmap.getMap().getScale()); oVmap.getMapCompare().setScale(oVmap.getMap().getScale());
...@@ -689,9 +682,7 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.updateCompareScaleMap ...@@ -689,9 +682,7 @@ nsVmap.MapCompare.prototype.mapCompareController.prototype.updateCompareScaleMap
* Update the map extent with animation * Update the map extent with animation
* @returns {undefined} * @returns {undefined}
*/ */
nsVmap.MapCompare.prototype.mapCompareController.prototype.updateScaleMap = function(e) { nsVmap.MapCompare.prototype.mapCompareController.prototype.updateScaleMap = function(e) { console.log('updateScaleMap');
oVmap.log('nsVmap.MapCompare.updateScaleMap');
var this_ = this var this_ = this
this_.updateCenterMap(); this_.updateCenterMap();
oVmap.getMap().setScale(oVmap.getMapCompare().getScale()); oVmap.getMap().setScale(oVmap.getMapCompare().getScale());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment