Merge branch 'v10.1.3' of https://github.com/SuperMap/iClient-JavaScript into v10.1.3

Author: xilanhuaweidapao

dist/leaflet/include-leaflet.js

@@ -138,13 +138,13 @@
             inputCSS('../../dist/leaflet/iclient-leaflet.min.css');
         }
         if (inArray(includes, 'iclient-plot-leaflet')) {
-            inputCSS('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.2/iclient-plot-leaflet.css');
+            inputCSS('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.3/iclient-plot-leaflet.css');
             if (supportES6()) {
                 inputScript(
-                    'https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.2/iclient-plot-leaflet-es6.min.js'
+                    'https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.3/iclient-plot-leaflet-es6.min.js'
                 );
             } else {
-                inputScript('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.2/iclient-plot-leaflet.min.js');
+                inputScript('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.3/iclient-plot-leaflet.min.js');
             }
         }
         if (inArray(includes, 'ant-design-vue')) {

examples-test/leaflet/04_bufferAnalystServiceIT.js

@@ -9,7 +9,7 @@ module.exports = {
         browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane svg', 10000);
         browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane svg g', 10000);
         browser.waitForElementPresent('.leaflet-pane.leaflet-overlay-pane svg g path', 10000);
-        browser.pause(2000);
+        browser.pause(10000);
         browser.elements('tag name', 'path', function (result) {
             this.assert.equal(result.value.length, 2, "expect Number of bufferAnalystServices path to be 2, actual is " + result.value.length);
         });

examples-test/leaflet/04_densityKernelAnalystServiceIT.js

@@ -11,7 +11,7 @@ module.exports = {
         browser.waitForElementPresent('.leaflet-pane.leaflet-map-pane', 10000);
         browser.waitForElementPresent('.leaflet-pane.leaflet-tile-pane', 10000);
         browser.waitForElementPresent('.leaflet-layer', 10000);
-        browser.pause(5000);
+        browser.pause(10000);
         browser.elements('css selector', '.leaflet-layer', function (result) {
             browser.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
         });
@@ -28,4 +28,4 @@ module.exports = {
         });
         browser.end();
     }
-};
+};

examples-test/leaflet/04_generateSpatialDataServiceIT.js

@@ -11,7 +11,7 @@ module.exports = {
         browser.waitForElementPresent('.leaflet-pane.leaflet-map-pane', 10000);
         browser.waitForElementPresent('.leaflet-pane.leaflet-tile-pane', 10000);
         browser.waitForElementPresent('.leaflet-layer', 10000);
-        browser.pause(5000);
+        browser.pause(10000);
         browser.elements('css selector', '.leaflet-layer', function (result) {
             this.assert.equal(result.value.length, 2, "expect Number of leaflet-layer to be 2, actual is " + result.value.length);
         });

src/openlayers/overlay/graphic/CanvasRenderer.js

@@ -47,11 +47,10 @@ export class GraphicCanvasRenderer extends olObject {
         CommonUtil.extend(this, opt);
         this.highLightStyle = this.layer.highLightStyle;
 
-        this.mapWidth = this.size[0];
-        this.mapHeight = this.size[1];
+        this.mapWidth = this.size[0] / this.pixelRatio;
+        this.mapHeight = this.size[1] / this.pixelRatio;
         this.width = this.map.getSize()[0];
         this.height = this.map.getSize()[1];
-
         this.context = Util.createCanvasContext2D(this.mapWidth, this.mapHeight);
         this.context.scale(this.pixelRatio, this.pixelRatio);
         this.canvas = this.context.canvas;
@@ -79,7 +78,6 @@ export class GraphicCanvasRenderer extends olObject {
         this.height = height;
         this.mapWidth = this.mapWidth * xRatio;
         this.mapHeight = this.mapHeight * yRatio;
-
         this.canvas.width = this.mapWidth;
         this.canvas.height = this.mapHeight;
         this.canvas.style.width = this.width + 'px';
@@ -114,18 +112,18 @@ export class GraphicCanvasRenderer extends olObject {
      */
     drawGraphics(graphics) {
         this.graphics_ = graphics || [];
-        let mapWidth = this.mapWidth / this.pixelRatio;
-        let mapHeight = this.mapHeight / this.pixelRatio;
+        let mapWidth = this.mapWidth;
+        let mapHeight = this.mapHeight;
 
         let vectorContext = olRender.toContext(this.context, {
             size: [mapWidth, mapHeight],
             pixelRatio: this.pixelRatio
         });
-        var defaultStyle = this.layer._getDefaultStyle();
+        let defaultStyle = this.layer._getDefaultStyle();
         let me = this,
             layer = me.layer,
             map = layer.map;
-        graphics.map(function(graphic) {
+        graphics.map(function (graphic) {
             let style = graphic.getStyle() || defaultStyle;
             if (me.selected === graphic) {
                 let defaultHighLightStyle = style;

test/openlayers/overlay/graphic/CanvasRendererSpec.js

@@ -0,0 +1,31 @@
+import { GraphicCanvasRenderer } from '../../../../src/openlayers/overlay/graphic/CanvasRenderer';
+import Map from 'ol/Map';
+import View from 'ol/View';
+
+var map = new Map({
+    target: 'map',
+    view: new View({
+        center: [116.85, 39.79],
+        zoom: 0,
+        projection: 'EPSG:4326'
+    })
+});
+describe('openlayers_render', () => {
+    var render;
+    it('constructor', () => {
+        spyOn(map, 'getSize').and.callFake(() => {
+            return [0, 0];
+        });
+        const size = [1920, 1080];
+        let pixelRatio = 1;
+        render = new GraphicCanvasRenderer('layer', { size, pixelRatio, map });
+        expect(render).not.toBeNull();
+        expect(render.mapWidth).toBe(1920);
+        expect(render.mapHeight).toBe(1080);
+        pixelRatio = 1.5;
+        render = new GraphicCanvasRenderer('layer', { size, pixelRatio, map });
+        expect(render).not.toBeNull();
+        expect(render.mapWidth).toBe(1280);
+        expect(render.mapHeight).toBe(720);
+    });
+});

test/test-main-openlayers.js

@@ -15,6 +15,7 @@ import './openlayers/mapping/WebMapSpec.js';
 import './openlayers/overlay/DataFlowSpec.js';
 import './openlayers/overlay/graphic/GraphicSpec.js';
 import './openlayers/overlay/GraphicSpec.js';
+import './openlayers/overlay/graphic/CanvasRendererSpec';
 
 import './openlayers/overlay/GraphSpec.js';
 import './openlayers/overlay/HeatMapSpec.js';