echarts to 3.6.2；getFeatureByXXXService对接maxfeatures参数

songyumeng · songyumeng · commit 77b5d7fe499f · 2017-07-24T17:33:16.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
@@ -32744,6 +32744,9 @@ SuperMap.GetFeaturesByBoundsParameters.toJsonParameters = function (params) {
         parasByBounds.attributeFilter = params.attributeFilter;
         parasByBounds.getFeatureMode = SuperMap.GetFeaturesByBoundsParameters.getFeatureMode.BOUNDS_ATTRIBUTEFILTER;
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        parasByBounds.maxFeatures = params.maxFeatures;
+    }
 
     return SuperMap.Util.toJSON(parasByBounds);
 };
@@ -32930,7 +32933,6 @@ SuperMap.GetFeaturesByBufferParameters.toJsonParameters = function (params) {
     var filterParameter,
         paramsBySql,
         geometry;
-
     geometry = SuperMap.REST.ServerGeometry.fromGeometry(params.geometry);
     paramsBySql = {
         datasetNames: params.datasetNames,
@@ -32948,6 +32950,9 @@ SuperMap.GetFeaturesByBufferParameters.toJsonParameters = function (params) {
         paramsBySql.attributeFilter = params.attributeFilter;
         paramsBySql.getFeatureMode = "BUFFER_ATTRIBUTEFILTER";
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        paramsBySql.maxFeatures = params.maxFeatures;
+    }
     return SuperMap.Util.toJSON(paramsBySql);
 };
 module.exports = SuperMap.GetFeaturesByBufferParameters;
@@ -33158,6 +33163,9 @@ SuperMap.GetFeaturesByGeometryParameters.toJsonParameters = function (params) {
         parasByGeometry.attributeFilter = params.attributeFilter;
         parasByGeometry.getFeatureMode = "SPATIAL_ATTRIBUTEFILTER";
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        parasByGeometry.maxFeatures = params.maxFeatures;
+    }
 
     return SuperMap.Util.toJSON(parasByGeometry);
 };
@@ -33497,6 +33505,9 @@ SuperMap.GetFeaturesBySQLParameters.toJsonParameters = function (params) {
         getFeatureMode: "SQL",
         queryParameter: params.queryParameter
     };
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        paramsBySql.maxFeatures = params.maxFeatures;
+    }
     return SuperMap.Util.toJSON(paramsBySql);
 };
 module.exports = SuperMap.GetFeaturesBySQLParameters;
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
@@ -1539,11 +1539,11 @@ ol.supermap.ServiceBase = function (url, options) {
 ol.inherits(ol.supermap.ServiceBase, ol.Observable);
 
 ol.supermap.ResultEvent = function (type, opt_element) {
-    ol.events.Event.call(this, type);
+    ol.Observable.call(this, type);
     this.result = opt_element;
 
 };
-ol.inherits(ol.supermap.ResultEvent, ol.events.Event);
+ol.inherits(ol.supermap.ResultEvent, ol.Observable);
 
 module.exports = ol.supermap.ServiceBase;
 
@@ -23055,6 +23055,9 @@ SuperMap.GetFeaturesByBoundsParameters.toJsonParameters = function (params) {
         parasByBounds.attributeFilter = params.attributeFilter;
         parasByBounds.getFeatureMode = SuperMap.GetFeaturesByBoundsParameters.getFeatureMode.BOUNDS_ATTRIBUTEFILTER;
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        parasByBounds.maxFeatures = params.maxFeatures;
+    }
 
     return SuperMap.Util.toJSON(parasByBounds);
 };
@@ -23241,7 +23244,6 @@ SuperMap.GetFeaturesByBufferParameters.toJsonParameters = function (params) {
     var filterParameter,
         paramsBySql,
         geometry;
-
     geometry = SuperMap.REST.ServerGeometry.fromGeometry(params.geometry);
     paramsBySql = {
         datasetNames: params.datasetNames,
@@ -23259,6 +23261,9 @@ SuperMap.GetFeaturesByBufferParameters.toJsonParameters = function (params) {
         paramsBySql.attributeFilter = params.attributeFilter;
         paramsBySql.getFeatureMode = "BUFFER_ATTRIBUTEFILTER";
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        paramsBySql.maxFeatures = params.maxFeatures;
+    }
     return SuperMap.Util.toJSON(paramsBySql);
 };
 module.exports = SuperMap.GetFeaturesByBufferParameters;
@@ -23469,6 +23474,9 @@ SuperMap.GetFeaturesByGeometryParameters.toJsonParameters = function (params) {
         parasByGeometry.attributeFilter = params.attributeFilter;
         parasByGeometry.getFeatureMode = "SPATIAL_ATTRIBUTEFILTER";
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        parasByGeometry.maxFeatures = params.maxFeatures;
+    }
 
     return SuperMap.Util.toJSON(parasByGeometry);
 };
@@ -23808,6 +23816,9 @@ SuperMap.GetFeaturesBySQLParameters.toJsonParameters = function (params) {
         getFeatureMode: "SQL",
         queryParameter: params.queryParameter
     };
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        paramsBySql.maxFeatures = params.maxFeatures;
+    }
     return SuperMap.Util.toJSON(paramsBySql);
 };
 module.exports = SuperMap.GetFeaturesBySQLParameters;
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/examples/leaflet/echartsBar.html b/examples/leaflet/echartsBar.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script type="text/javascript" src="http://cdn.bootcss.com/jquery/3.1.1/jquery.min.js"></script>
 <script>
diff --git a/examples/leaflet/echartsEffectScatter.html b/examples/leaflet/echartsEffectScatter.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 
 <script>
diff --git a/examples/leaflet/echartsGeoLines.html b/examples/leaflet/echartsGeoLines.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script>
     var map, url = "http://support.supermap.com:8090/iserver/services/map-world/rest/maps/%E4%B8%96%E7%95%8C%E5%9C%B0%E5%9B%BE_Gray";
diff --git a/examples/leaflet/echartsHeatmap.html b/examples/leaflet/echartsHeatmap.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript"  src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript"  src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript"  src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script type="text/javascript"  src="http://cdn.bootcss.com/jquery/3.1.1/jquery.min.js"></script>
 <script>
diff --git a/examples/leaflet/echartsLineMarker.html b/examples/leaflet/echartsLineMarker.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script>
     var map, resultLayer, url = "http://support.supermap.com.cn:8090/iserver/services/map-world/rest/maps/%E4%B8%96%E7%95%8C%E5%9C%B0%E5%9B%BE_Gray";
diff --git a/examples/leaflet/echartsLinesBus.html b/examples/leaflet/echartsLinesBus.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script type="text/javascript" src="http://cdn.bootcss.com/jquery/3.1.1/jquery.min.js"></script>
 <script>
diff --git a/examples/leaflet/echartsLinesEffect.html b/examples/leaflet/echartsLinesEffect.html
@@ -9,7 +9,7 @@
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script type="text/javascript" src="http://cdn.bootcss.com/jquery/3.1.1/jquery.min.js"></script>
 <script>
diff --git a/examples/leaflet/echartsPie.html b/examples/leaflet/echartsPie.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script type="text/javascript" src="http://cdn.bootcss.com/jquery/3.1.1/jquery.min.js"></script>
 <script>
diff --git a/examples/leaflet/echartsScatter.html b/examples/leaflet/echartsScatter.html
@@ -10,7 +10,7 @@
 <div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.min.js"></script>
 <script type="text/javascript" src="http://cdn.bootcss.com/jquery/3.1.1/jquery.min.js"></script>
 <script>
diff --git a/examples/mapboxgl/echarts_effectScatter.html b/examples/mapboxgl/echarts_effectScatter.html
@@ -6,7 +6,7 @@
     <meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no'/>
     <link href="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.css" rel="stylesheet">
     <script src="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.js"></script>
-    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
     <script type="text/javascript" src="http://iclient.supermapol.com/libs/echartsLayer/EchartsLayer.js"></script>
     <style>
         body {
diff --git a/examples/mapboxgl/echarts_geoline.html b/examples/mapboxgl/echarts_geoline.html
@@ -6,7 +6,7 @@
     <meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no'/>
     <link href="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.css" rel="stylesheet">
     <script src="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.js"></script>
-    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
     <script type="text/javascript" src="http://iclient.supermapol.com/libs/echartsLayer/EchartsLayer.js"></script>
     <style>
         body {
diff --git a/examples/mapboxgl/echarts_linesAirline.html b/examples/mapboxgl/echarts_linesAirline.html
@@ -6,7 +6,7 @@
     <link href="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.css" rel="stylesheet">
     <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
     <script src="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.js"></script>
-    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
     <script type="text/javascript" src="http://iclient.supermapol.com/libs/echartsLayer/EchartsLayer.js"></script>
     <style>
         body {
diff --git a/examples/mapboxgl/echarts_scatterWeibo.html b/examples/mapboxgl/echarts_scatterWeibo.html
@@ -7,7 +7,7 @@
     <link href="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.css" rel="stylesheet">
     <script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
     <script src="https://cdn.bootcss.com/mapbox-gl/0.38.0/mapbox-gl.js"></script>
-    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+    <script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
     <script type="text/javascript" src="http://iclient.supermapol.com/libs/echartsLayer/EchartsLayer.js"></script>
     <style>
         body {
diff --git a/examples/openlayers/echartsBar.html b/examples/openlayers/echartsBar.html
@@ -11,7 +11,7 @@
 <div id="popup"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/openlayers/4.2.0/ol-debug.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-openlayers.min.js"></script>
 <script type="text/javascript">
     var resultLayer;
diff --git a/examples/openlayers/echartsLineMarker.html b/examples/openlayers/echartsLineMarker.html
@@ -14,7 +14,7 @@
      style=" position: absolute;top: 10px;right: 5px;text-align: left;background: white;color: #333;box-shadow: 0 3px 14px rgba(0,0,0,0.4);"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/openlayers/4.2.0/ol-debug.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-openlayers.min.js"></script>
 <script type="text/javascript">
     var resultLayer;
diff --git a/examples/openlayers/echartsPie.html b/examples/openlayers/echartsPie.html
@@ -12,7 +12,7 @@
 <div id="popup"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/openlayers/4.2.0/ol-debug.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-openlayers.min.js"></script>
 <script type="text/javascript">
     var resultLayer;
diff --git a/examples/openlayers/echartsScatter.html b/examples/openlayers/echartsScatter.html
@@ -12,7 +12,7 @@
 <div id="infoControl" style=" position: absolute;top: 10px;right: 5px;text-align: left;"></div>
 
 <script type="text/javascript" src="http://cdn.bootcss.com/openlayers/4.2.0/ol-debug.js"></script>
-<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.4.0/echarts.min.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/echarts/3.6.2/echarts.min.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-openlayers.min.js"></script>
 <script type="text/javascript">
     var resultLayer;
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "browserify-istanbul": "^2.0.0",
     "commander": "^2.9.0",
     "css-loader": "^0.26.1",
-    "echarts": "3.5.4",
+    "echarts": "3.6.2",
     "mapv": "2.0.14",
     "mapbox-gl": "0.38.0",
     "extract-text-webpack-plugin": "^2.1.0",
diff --git a/src/common/iServer/GetFeaturesByBoundsParameters.js b/src/common/iServer/GetFeaturesByBoundsParameters.js
@@ -130,6 +130,9 @@ SuperMap.GetFeaturesByBoundsParameters.toJsonParameters = function (params) {
         parasByBounds.attributeFilter = params.attributeFilter;
         parasByBounds.getFeatureMode = SuperMap.GetFeaturesByBoundsParameters.getFeatureMode.BOUNDS_ATTRIBUTEFILTER;
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        parasByBounds.maxFeatures = params.maxFeatures;
+    }
 
     return SuperMap.Util.toJSON(parasByBounds);
 };
diff --git a/src/common/iServer/GetFeaturesByBufferParameters.js b/src/common/iServer/GetFeaturesByBufferParameters.js
@@ -95,7 +95,6 @@ SuperMap.GetFeaturesByBufferParameters.toJsonParameters = function (params) {
     var filterParameter,
         paramsBySql,
         geometry;
-
     geometry = SuperMap.REST.ServerGeometry.fromGeometry(params.geometry);
     paramsBySql = {
         datasetNames: params.datasetNames,
@@ -113,6 +112,9 @@ SuperMap.GetFeaturesByBufferParameters.toJsonParameters = function (params) {
         paramsBySql.attributeFilter = params.attributeFilter;
         paramsBySql.getFeatureMode = "BUFFER_ATTRIBUTEFILTER";
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        paramsBySql.maxFeatures = params.maxFeatures;
+    }
     return SuperMap.Util.toJSON(paramsBySql);
 };
 module.exports = SuperMap.GetFeaturesByBufferParameters;
diff --git a/src/common/iServer/GetFeaturesByGeometryParameters.js b/src/common/iServer/GetFeaturesByGeometryParameters.js
@@ -127,6 +127,9 @@ SuperMap.GetFeaturesByGeometryParameters.toJsonParameters = function (params) {
         parasByGeometry.attributeFilter = params.attributeFilter;
         parasByGeometry.getFeatureMode = "SPATIAL_ATTRIBUTEFILTER";
     }
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        parasByGeometry.maxFeatures = params.maxFeatures;
+    }
 
     return SuperMap.Util.toJSON(parasByGeometry);
 };
diff --git a/src/common/iServer/GetFeaturesBySQLParameters.js b/src/common/iServer/GetFeaturesBySQLParameters.js
@@ -74,6 +74,9 @@ SuperMap.GetFeaturesBySQLParameters.toJsonParameters = function (params) {
         getFeatureMode: "SQL",
         queryParameter: params.queryParameter
     };
+    if(params.maxFeatures&&!isNaN(params.maxFeatures)){
+        paramsBySql.maxFeatures = params.maxFeatures;
+    }
     return SuperMap.Util.toJSON(paramsBySql);
 };
 module.exports = SuperMap.GetFeaturesBySQLParameters;
