Merge branch 'master' of https://github.com/SuperMap/iClient9

Author: wuzhuorui5

build/deps.js

@@ -406,6 +406,16 @@ deps = {
                     "name": "L.supermap.mapVLayer",
                     "des": "百度MapV可视化效果"
                 }]
+            },
+            "Turf": {
+                "name": "Turf",
+                "src": [
+                    './src/leaflet/overlay/TurfLayer.js'
+                ],
+                "modules": [{
+                    "name": "L.supermap.turfLayer",
+                    "des": "客户端空间分析js库"
+                }]
             }
         },
 
@@ -605,7 +615,7 @@ deps = {
                     "des": "Online服务"
                 }]
             },
-             "iManager": {
+            "iManager": {
                 "name": "iManager服务",
                 "src": [
                     "./src/common/iManager/iManager.js"
@@ -710,6 +720,16 @@ deps = {
                     "name": "ol.source.Mapv",
                     "des": "百度MapV可视化效果"
                 }]
+            },
+            "Turf": {
+                "name": "Turf",
+                "src": [
+                    "./src/openlayers/overlay/turf.js",
+                ],
+                "modules": [{
+                    "name": "ol.source.Turf",
+                    "des": "客户端空间分析js库"
+                }]
             }
         },
         "Control": {

build/webpack.config.leaflet.js

@@ -26,7 +26,8 @@ module.exports = {
         'leaflet': 'L',
         'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
         'mapv':  "function(){try{return mapv}catch(e){return {}}}()",
-        'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()'
+        'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()',
+        'turf':  "function(){try{return turf}catch(e){return {}}}()"
     },
 
     module: {

build/webpack.config.openlayers.js

@@ -25,7 +25,8 @@ module.exports = {
         'openlayers/dist/ol-debug': 'ol',
         'echarts': 'function(){try{return echarts}catch(e){return {}}}()',
         'mapv':  "function(){try{return mapv}catch(e){return {}}}()",
-        'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()'
+        'elasticsearch': 'function(){try{return elasticsearch}catch(e){return {}}}()',
+        'turf':  "function(){try{return turf}catch(e){return {}}}()",
     },
 
     module: {