From 4d7e35ed86d529363c15a7112945218537ffc1d1 Mon Sep 17 00:00:00 2001
From: "francois.grand" <francois.grand@irstea.fr>
Date: Wed, 28 Mar 2018 13:22:25 +0200
Subject: [PATCH] ParamValueIterator : correction de bugs

---
 src/param/param-values.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/param/param-values.ts b/src/param/param-values.ts
index f05578e8..d4e55170 100644
--- a/src/param/param-values.ts
+++ b/src/param/param-values.ts
@@ -78,7 +78,7 @@ export class ParamValueIterator implements IterableIterator<number> {
                 break;
 
             default:
-                throw new Error(`mode de génération de valeurs ${ParamValueMode[this._param.valueMode]}`);
+                throw new Error(`ParamValueIterator : mode de génération de valeurs ${ParamValueMode[this._param.valueMode]} incorrect`);
         }
     }
 
@@ -95,8 +95,7 @@ export class ParamValueIterator implements IterableIterator<number> {
 
             // liste
             case 2:
-                const i = this._index;
-                return this._index >= this._param.valueList.length;
+                return this._index < this._param.valueList.length;
 
             default:
                 throw new Error(`ParamValueIterator.hasNext() : erreur interne`);
@@ -107,11 +106,13 @@ export class ParamValueIterator implements IterableIterator<number> {
         switch (this._config) {
             // valeur fixée
             case 0:
-                if (this.hasNext)
+                if (this.hasNext) {
+                    this._index++;
                     return {
                         done: false,
                         value: this._param.singleValue
                     };
+                }
                 else
                     return {
                         done: true,
-- 
GitLab