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

wuzhuorui5 · wuzhuorui5 · commit 91268d897ee0 · 2017-08-18T08:52:35.000+08:00
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -10428,8 +10428,8 @@ var StyleUtils = function () {
                     var symbolParameters = {
                         "transparent": true,
                         "resourceType": "SYMBOLMARKER",
-                        "picWidth": Math.ceil(shader.markerSize * _SuperMap2.default.DOTS_PER_INCH * _SuperMap2.default.INCHES_PER_UNIT["mm"]),
-                        "picHeight": Math.ceil(shader.markerSize * _SuperMap2.default.DOTS_PER_INCH * _SuperMap2.default.INCHES_PER_UNIT["mm"]),
+                        "picWidth": Math.ceil(shader.markerSize * _SuperMap2.default.DOTS_PER_INCH * _SuperMap2.default.INCHES_PER_UNIT["mm"]) || 13,
+                        "picHeight": Math.ceil(shader.markerSize * _SuperMap2.default.DOTS_PER_INCH * _SuperMap2.default.INCHES_PER_UNIT["mm"]) || 13,
                         "style": JSON.stringify(shader)
                     };
                     var imageUrl = _SuperMap2.default.Util.urlAppend(url + "/symbol.png", _SuperMap2.default.Util.getParameterString(symbolParameters));
@@ -50929,7 +50929,7 @@ var MapvCanvasLayer = function () {
 
         /**
          * @function ol.supermap.MapvCanvasLayer.prototype.resize
-         * @param mapWidth - {number} ��ͼ���
+         * @param mapWidth - {number} ��ͼ����
          * @param mapHeight - {number} ��ͼ�߶�
          * @description ������ͼ��С
          */
@@ -50950,7 +50950,7 @@ var MapvCanvasLayer = function () {
         /**
          * @function ol.supermap.MapvCanvasLayer.prototype.setZIndex
          * @param zIndex - {number} �㼶����
-         * @description ����ͼ��㼶
+         * @description ����ͼ���㼶
          */
 
     }, {
@@ -50960,7 +50960,7 @@ var MapvCanvasLayer = function () {
         }
         /**
          * @function ol.supermap.MapvCanvasLayer.prototype.getZIndex
-         * @description ��ȡͼ��㼶
+         * @description ��ȡͼ���㼶
          */
 
     }, {
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/examples/openlayers/04_bufferAnalystService_geometry.html b/examples/openlayers/04_bufferAnalystService_geometry.html
@@ -143,7 +143,7 @@
 
             //将组成缓冲区的边界点提出来，为了构造下面查询服务的geometry
             var bufferPoints = [];
-            var coordinate = serviceResult.result.geometry.coordinates[0][0];
+            var coordinate = serviceResult.result.resultGeometry.geometry.coordinates[0][0];
             for (var i = 0; i < coordinate.length; i++) {
                 bufferPoints.push([coordinate[i][0], coordinate[i][1]]);
             }
diff --git a/examples/openlayers/05_findMTSPPathsService.html b/examples/openlayers/05_findMTSPPathsService.html
@@ -40,7 +40,6 @@
         map.addLayer(layer);
         findMTSPPathsProcess();
     });
-    mapService.getMapStatus();
 
     function findMTSPPathsProcess() {
         //添加配送点
diff --git a/examples/openlayers/WMTSLayer.html b/examples/openlayers/WMTSLayer.html
@@ -26,6 +26,7 @@
         view: new ol.View({
             center: [0, 0],
             zoom: 0,
+
         }),
         layers: [new ol.layer.Tile({
             opacity: 0.7,
@@ -36,6 +37,7 @@
                 format: 'image/png',
                 tileGrid: new ol.tilegrid.WMTS({
                     origin: [-2.0037508342787E7, 2.0037508342787E7],
+                    extent:[-2.0037508342787E7, -2.0037508342787E7,2.0037508342787E7, 2.0037508342787E7],
                     resolutions: resolutions,
                     matrixIds: matrixIds
                 }),
diff --git a/src/openlayers/core/StyleUtils.js b/src/openlayers/core/StyleUtils.js
@@ -23,8 +23,8 @@ export default class StyleUtils {
                 var symbolParameters = {
                     "transparent": true,
                     "resourceType": "SYMBOLMARKER",
-                    "picWidth": Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"]),
-                    "picHeight": Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"]),
+                    "picWidth": Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"])||13,
+                    "picHeight": Math.ceil(shader.markerSize * SuperMap.DOTS_PER_INCH * SuperMap.INCHES_PER_UNIT["mm"])||13,
                     "style": JSON.stringify(shader)
                 };
                 var imageUrl = SuperMap.Util.urlAppend(url + "/symbol.png", SuperMap.Util.getParameterString(symbolParameters));

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@`
`143`	`143`
`144`	`144`	`//将组成缓冲区的边界点提出来，为了构造下面查询服务的geometry`
`145`	`145`	`var bufferPoints = [];`
`146`		`- var coordinate = serviceResult.result.geometry.coordinates[0][0];`
	`146`	`+ var coordinate = serviceResult.result.resultGeometry.geometry.coordinates[0][0];`
`147`	`147`	`for (var i = 0; i < coordinate.length; i++) {`
`148`	`148`	`bufferPoints.push([coordinate[i][0], coordinate[i][1]]);`
`149`	`149`	`}`