ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

simplify scale calculation

Browse Source 
update tests to reflect more accurate calculation
This commit is contained in:
mike-000
2020-08-03 22:19:56 +01:00
parent 425214eb4c
commit 95702648b2
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/ImageWMS.js
+2 -3
View File
@@ -247,9 +247,8 @@ class ImageWMS extends ImageSource {
const mpu = this.getProjection() const mpu = this.getProjection()
? this.getProjection().getMetersPerUnit() ? this.getProjection().getMetersPerUnit()
: 1; : 1;
const dpi = 25.4 / 0.28; const pixelSize = 0.00028;
const inchesPerMeter = 39.37; baseParams['SCALE'] = (resolution * mpu) / pixelSize;
baseParams['SCALE'] = resolution * mpu * inchesPerMeter * dpi;
} }
assign(baseParams, params); assign(baseParams, params);
src/ol/source/TileWMS.js
+2 -3
View File
@@ -263,9 +263,8 @@ class TileWMS extends TileImage {
const mpu = this.getProjection() const mpu = this.getProjection()
? this.getProjection().getMetersPerUnit() ? this.getProjection().getMetersPerUnit()
: 1; : 1;
const dpi = 25.4 / 0.28; const pixelSize = 0.00028;
const inchesPerMeter = 39.37; baseParams['SCALE'] = (resolution * mpu) / pixelSize;
baseParams['SCALE'] = resolution * mpu * inchesPerMeter * dpi;
} }
assign(baseParams, params); assign(baseParams, params);
test/spec/ol/source/imagewms.test.js
+2 -2
View File
@@ -369,7 +369,7 @@ describe('ol.source.ImageWMS', function () {
expect(queryData.get('REQUEST')).to.be('GetLegendGraphic'); expect(queryData.get('REQUEST')).to.be('GetLegendGraphic');
expect(queryData.get('SERVICE')).to.be('WMS'); expect(queryData.get('SERVICE')).to.be('WMS');
expect(queryData.get('VERSION')).to.be('1.3.0'); expect(queryData.get('VERSION')).to.be('1.3.0');
expect(queryData.get('SCALE')).to.be('357.14214285714274'); expect(queryData.get('SCALE')).to.be('357.14285714285717');
}); });
it('does not include SCALE if no resolution was provided', function () { it('does not include SCALE if no resolution was provided', function () {
@@ -405,7 +405,7 @@ describe('ol.source.ImageWMS', function () {
expect(queryData.get('REQUEST')).to.be('GetLegendGraphic'); expect(queryData.get('REQUEST')).to.be('GetLegendGraphic');
expect(queryData.get('SERVICE')).to.be('WMS'); expect(queryData.get('SERVICE')).to.be('WMS');
expect(queryData.get('VERSION')).to.be('1.3.0'); expect(queryData.get('VERSION')).to.be('1.3.0');
expect(queryData.get('SCALE')).to.be('357.14214285714274'); expect(queryData.get('SCALE')).to.be('357.14285714285717');
expect(queryData.get('STYLE')).to.be('STYLE_VALUE'); expect(queryData.get('STYLE')).to.be('STYLE_VALUE');
expect(queryData.get('FEATURETYPE')).to.be('FEATURETYPE_VALUE'); expect(queryData.get('FEATURETYPE')).to.be('FEATURETYPE_VALUE');
expect(queryData.get('RULE')).to.be('RULE_VALUE'); expect(queryData.get('RULE')).to.be('RULE_VALUE');
test/spec/ol/source/tilewms.test.js
+2 -2
View File
@@ -329,7 +329,7 @@ describe('ol.source.TileWMS', function () {
expect(queryData.get('REQUEST')).to.be('GetLegendGraphic'); expect(queryData.get('REQUEST')).to.be('GetLegendGraphic');
expect(queryData.get('SERVICE')).to.be('WMS'); expect(queryData.get('SERVICE')).to.be('WMS');
expect(queryData.get('VERSION')).to.be('1.3.0'); expect(queryData.get('VERSION')).to.be('1.3.0');
expect(queryData.get('SCALE')).to.be('357.14214285714274'); expect(queryData.get('SCALE')).to.be('357.14285714285717');
}); });
it('does not include SCALE if no resolution was provided', function () { it('does not include SCALE if no resolution was provided', function () {
@@ -365,7 +365,7 @@ describe('ol.source.TileWMS', function () {
expect(queryData.get('REQUEST')).to.be('GetLegendGraphic'); expect(queryData.get('REQUEST')).to.be('GetLegendGraphic');
expect(queryData.get('SERVICE')).to.be('WMS'); expect(queryData.get('SERVICE')).to.be('WMS');
expect(queryData.get('VERSION')).to.be('1.3.0'); expect(queryData.get('VERSION')).to.be('1.3.0');
expect(queryData.get('SCALE')).to.be('357.14214285714274'); expect(queryData.get('SCALE')).to.be('357.14285714285717');
expect(queryData.get('STYLE')).to.be('STYLE_VALUE'); expect(queryData.get('STYLE')).to.be('STYLE_VALUE');
expect(queryData.get('FEATURETYPE')).to.be('FEATURETYPE_VALUE'); expect(queryData.get('FEATURETYPE')).to.be('FEATURETYPE_VALUE');
expect(queryData.get('RULE')).to.be('RULE_VALUE'); expect(queryData.get('RULE')).to.be('RULE_VALUE');