From c9daebab291f96dace1ef44d317cec59e99b75e3 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 5 Feb 2019 17:27:11 +0100
Subject: [PATCH] Correction erreurs console
---
.../javascript/app/vmap/mapmanager/layerstree.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/module/javascript/app/vmap/mapmanager/layerstree.js b/module/javascript/app/vmap/mapmanager/layerstree.js
index 1ec2f59d..9d87c7d5 100644
--- a/module/javascript/app/vmap/mapmanager/layerstree.js
+++ b/module/javascript/app/vmap/mapmanager/layerstree.js
@@ -164,12 +164,14 @@ nsVmap.nsMapManager.LayersTree.prototype.LayertreeController = function ($scope,
if (goog.isDefAndNotNull(oUrlParams['extent'])){
oPositionOptions['extent'] = decodeURI(oUrlParams['extent']).split("|");
}
- if (goog.isDefAndNotNull(oUrlParams['lon']) &&
- goog.isDefAndNotNull(oUrlParams['lat']) &&
- goog.isDefAndNotNull(oUrlParams['zoom'])){
- oPositionOptions['lon'] = decodeURI(oUrlParams['lon']);
- oPositionOptions['lat'] = decodeURI(oUrlParams['lat']);
- oPositionOptions['zoom'] = decodeURI(oUrlParams['zoom']);
+ if (goog.isDefAndNotNull(oUrlParams)) {
+ if (goog.isDefAndNotNull(oUrlParams['lon']) &&
+ goog.isDefAndNotNull(oUrlParams['lat']) &&
+ goog.isDefAndNotNull(oUrlParams['zoom'])){
+ oPositionOptions['lon'] = decodeURI(oUrlParams['lon']);
+ oPositionOptions['lat'] = decodeURI(oUrlParams['lat']);
+ oPositionOptions['zoom'] = decodeURI(oUrlParams['zoom']);
+ }
}
this.loadTree(oPositionOptions);
@@ -464,7 +466,7 @@ nsVmap.nsMapManager.LayersTree.prototype.LayertreeController.prototype.loadTree
}
// Va à la position fournie
- if (goog.isDefAndNotNull(oPositionOptions)) {
+ if (goog.isDefAndNotNull(oPositionOptions)) {
if (goog.isDefAndNotNull(oPositionOptions['lon']) &&
goog.isDefAndNotNull(oPositionOptions['lat']) &&
goog.isDefAndNotNull(oPositionOptions['zoom'])){
--
GitLab