correction usage double proxy

src/DEditMap/Model/EditionLayer/WFS.js

@@ -60,17 +60,22 @@ var Class = Utils.Class(Vector, {
         if (!_.isNil(layerDefinition.serverVersion)) {
             version = layerDefinition.serverVersion;
         }
-
+        var gmlFormat = new ol.format.GML3();
+        if (version === '1.0.0') {
+            gmlFormat = new ol.format.GML2();
+        }
         this.olFormat = new ol.format.WFS({
-            featureNS: layerDefinition.featureNameSpace
+            featureNS: layerDefinition.featureNameSpace,
+            gmlFormat: gmlFormat
         });
+        this.olFormat.wfsVersion = version;
 
         if (!_.isNil(layerDefinition.internalProjection)) {
             this.olFormat.defaultDataProjection = layerDefinition.internalProjection;
         }
 
-        this.url = this.getUrl(Utils.adaptationUrl(layerDefinition.serverUrl));
-
+        //this.url = this.getUrl(Utils.adaptationUrl(layerDefinition.serverUrl));
+        this.url = Utils.adaptationUrl(layerDefinition.serverUrl);
         var saveStrategy = EditionManager.initSaveStrategy(layerDefinition);
 
         var loader = null;
@@ -104,7 +109,8 @@ var Class = Utils.Class(Vector, {
                     labelTypeName = 'TYPENAMES=';
                 }
 
-                var finalUrl = Utils.adaptationUrl(this.url);
+                //var finalUrl = Utils.adaptationUrl(this.url);
+                var finalUrl = this.url;
                 finalUrl += 'SERVICE=WFS';
                 finalUrl += '&VERSION=' + version;
                 finalUrl += '&REQUEST=GetFeature';
@@ -115,9 +121,12 @@ var Class = Utils.Class(Vector, {
                 if (layerDefinition.displayMaxFeatures) {
                     finalUrl += '&MAXFEATURES=' + layerDefinition.displayMaxFeatures;
                 }
+                if (version === '2.0.0') {//force gml version cause ol 4 not support gml32
+                    finalUrl += '&OUTPUTFORMAT=gml3';
+                }
 
                 finalUrl = this.getUrl(finalUrl);
-                log.debug(finalUrl);
+
                 return finalUrl;
             }.bind(this);
             loader = this.getRequestGetLoader(url, this.olFormat, this.type, this._loaderWithRemoveFeatures);
@@ -135,6 +144,7 @@ var Class = Utils.Class(Vector, {
             if (!_.isNil(layerDefinition.displayMaxFeatures)) {
                 maxFeatures = layerDefinition.displayMaxFeatures;
             }
+            this.url = this.getUrl(this.url);
             loader = this.getRequestPostLoader(this.url, this.olFormat, layerDefinition.layerName, geometryName, prefix, maxFeatures, this._loaderWithRemoveFeatures);
         }