fix turf分析结果默认会自动添加到图层的问题

zhurc · zhurc · commit 47eda512ccfc · 2017-10-12T18:31:47.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
@@ -32080,7 +32080,7 @@ var TurfLayer = exports.TurfLayer = _leaflet2["default"].GeoJSON.extend({
      */
     process: function process(type, args, callback, addFeaturesToMap) {
         var result = _turf2["default"][type.split('.')[1]].apply(this, this.parse(type, args));
-        addFeaturesToMap = addFeaturesToMap || true;
+        addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;
         if (addFeaturesToMap) {
             this.addData([result]);
         }
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -28857,7 +28857,7 @@ var Turf = function (_ol$source$Vector) {
                 }
                 return;
             }
-            addFeaturesToMap = addFeaturesToMap || true;
+            addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;
             if (addFeaturesToMap) {
                 this.addFeatures(features);
             }
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/src/leaflet/overlay/TurfLayer.js b/src/leaflet/overlay/TurfLayer.js
@@ -160,7 +160,7 @@ export var TurfLayer = L.GeoJSON.extend({
      */
     process: function (type, args, callback, addFeaturesToMap) {
         var result = turf[type.split('.')[1]].apply(this, this.parse(type, args));
-        addFeaturesToMap = addFeaturesToMap || true;
+        addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;
         if (addFeaturesToMap) {
             this.addData([result]);
         }
diff --git a/src/openlayers/overlay/Turf.js b/src/openlayers/overlay/Turf.js
@@ -172,7 +172,7 @@ export default class Turf extends ol.source.Vector {
             }
             return;
         }
-        addFeaturesToMap = addFeaturesToMap || true;
+        addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;
         if (addFeaturesToMap) {
             this.addFeatures(features);
         }

Original file line number	Diff line number	Diff line change
`@@ -32080,7 +32080,7 @@ var TurfLayer = exports.TurfLayer = _leaflet2["default"].GeoJSON.extend({`
`32080`	`32080`	`*/`
`32081`	`32081`	`process: function process(type, args, callback, addFeaturesToMap) {`
`32082`	`32082`	`var result = _turf2["default"][type.split('.')[1]].apply(this, this.parse(type, args));`
`32083`		`- addFeaturesToMap = addFeaturesToMap \|\| true;`
	`32083`	`+ addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;`
`32084`	`32084`	`if (addFeaturesToMap) {`
`32085`	`32085`	`this.addData([result]);`
`32086`	`32086`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28857,7 +28857,7 @@ var Turf = function (_ol$source$Vector) {`
`28857`	`28857`	`}`
`28858`	`28858`	`return;`
`28859`	`28859`	`}`
`28860`		`- addFeaturesToMap = addFeaturesToMap \|\| true;`
	`28860`	`+ addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;`
`28861`	`28861`	`if (addFeaturesToMap) {`
`28862`	`28862`	`this.addFeatures(features);`
`28863`	`28863`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ export var TurfLayer = L.GeoJSON.extend({`
`160`	`160`	`*/`
`161`	`161`	`process: function (type, args, callback, addFeaturesToMap) {`
`162`	`162`	`var result = turf[type.split('.')[1]].apply(this, this.parse(type, args));`
`163`		`- addFeaturesToMap = addFeaturesToMap \|\| true;`
	`163`	`+ addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;`
`164`	`164`	`if (addFeaturesToMap) {`
`165`	`165`	`this.addData([result]);`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ export default class Turf extends ol.source.Vector {`
`172`	`172`	`}`
`173`	`173`	`return;`
`174`	`174`	`}`
`175`		`- addFeaturesToMap = addFeaturesToMap \|\| true;`
	`175`	`+ addFeaturesToMap = addFeaturesToMap == null ? true : addFeaturesToMap;`
`176`	`176`	`if (addFeaturesToMap) {`
`177`	`177`	`this.addFeatures(features);`
`178`	`178`	`}`