ol 9.2.5-dev.1720352536811 → 9.2.5-dev.1720354561739
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ol.d.ts.map +1 -1
- package/dist/ol.js +2 -2
- package/dist/ol.js.map +1 -1
- package/format/GML2.d.ts.map +1 -1
- package/format/GML2.js +7 -9
- package/format/GML3.d.ts.map +1 -1
- package/format/GML3.js +21 -31
- package/package.json +1 -1
- package/source/Raster.d.ts +0 -7
- package/source/Raster.d.ts.map +1 -1
- package/source/Raster.js +2 -45
- package/source/WMTS.js +1 -1
- package/source/ogcTileUtil.js +7 -7
- package/source/wms.d.ts.map +1 -1
- package/source/wms.js +5 -7
- package/tilegrid/WMTS.js +1 -1
- package/util.js +1 -1
package/format/GML2.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GML2.d.ts","sourceRoot":"","sources":["GML2.js"],"names":[],"mappings":";AAyCA;;;;;;GAMG;AACH;IAqBE;;;;OAIG;IACH,0BAJW,IAAI,eACJ,KAAK,CAAC,GAAC,CAAC,GACP,KAAK,CAAC,MAAM,CAAC,GAAC,SAAS,CA6BlC;IAED;;;;OAIG;IACH,cAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,OAAO,cAAc,EAAE,MAAM,GAAC,SAAS,CAiBlD;IAED;;;OAGG;IACH,4BAHW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,QAiBlB;IAED;;;OAGG;IACH,4BAHW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,QAiBlB;IAED;;;;;;;OAOG;IACH,+BAoBC;IAED;;;;OAIG;IACH,0BAJW,OAAO,WACP,OAAO,eAAe,EAAE,OAAO,eAC/B,KAAK,CAAC,GAAC,CAAC,QAsDlB;IAED;;;;OAIG;IACH,6BAJW,OAAO,YACP,OAAO,uBAAuB,EAAE,OAAO,eACvC,KAAK,CAAC,GAAC,CAAC,QAoBlB;IAED;;;;OAIG;IACH,mCAJW,OAAO,QACP,OAAO,uBAAuB,EAAE,OAAO,eACvC,KAAK,CAAC,GAAC,CAAC,QAQlB;IAED;;;;OAIG;IACH,kCAJW,OAAO,YACP,OAAO,4BAA4B,EAAE,OAAO,eAC5C,KAAK,CAAC,GAAC,CAAC,QAoBlB;IAED;;;;OAIG;IACH,2BAJW,IAAI,YACJ,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,MAAM,eACnE,KAAK,CAAC,GAAC,CAAC,QA+BlB;IAED;;;;OAIG;IACH,+BAOC;IAED;;;;;OAKG;IACH,0BAaC;IAED;;;;;OAKG;IACH,4BAIC;IAED;;;;OAIG;IACH,4BAJW,OAAO,YACP,OAAO,oBAAoB,EAAE,OAAO,eACpC,KAAK,CAAC,GAAC,CAAC,QAyBlB;IAED;;;;;;OAMG;IACH,2BAWC;IAED;;;;;OAKG;IACH,6BAIC;IAED;;;;OAIG;IACH,gBAJW,OAAO,QACP,OAAO,uBAAuB,EAAE,OAAO,eACvC,KAAK,CAAC,GAAC,CAAC,QAMlB;IAED;;;;;;OAMG;IACH,
|
|
1
|
+
{"version":3,"file":"GML2.d.ts","sourceRoot":"","sources":["GML2.js"],"names":[],"mappings":"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"}
|
package/format/GML2.js
CHANGED
|
@@ -92,7 +92,7 @@ class GML2 extends GMLBase {
|
|
|
92
92
|
const x = parseFloat(coords[0]);
|
|
93
93
|
const y = parseFloat(coords[1]);
|
|
94
94
|
const z = coords.length === 3 ? parseFloat(coords[2]) : 0;
|
|
95
|
-
if (axisOrientation.
|
|
95
|
+
if (axisOrientation.startsWith('en')) {
|
|
96
96
|
flatCoordinates.push(x, y, z);
|
|
97
97
|
} else {
|
|
98
98
|
flatCoordinates.push(y, x, z);
|
|
@@ -481,14 +481,12 @@ class GML2 extends GMLBase {
|
|
|
481
481
|
* @private
|
|
482
482
|
*/
|
|
483
483
|
getCoords_(point, srsName, hasZ) {
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
? point[0] + ',' + point[1]
|
|
491
|
-
: point[1] + ',' + point[0];
|
|
484
|
+
const axisOrientation = srsName
|
|
485
|
+
? getProjection(srsName).getAxisOrientation()
|
|
486
|
+
: 'enu';
|
|
487
|
+
let coords = axisOrientation.startsWith('en')
|
|
488
|
+
? point[0] + ',' + point[1]
|
|
489
|
+
: point[1] + ',' + point[0];
|
|
492
490
|
if (hasZ) {
|
|
493
491
|
// For newly created points, Z can be undefined.
|
|
494
492
|
const z = point[2] || 0;
|
package/format/GML3.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GML3.d.ts","sourceRoot":"","sources":["GML3.js"],"names":[],"mappings":";AAqDA;;;;;;;GAOG;AACH;IASI;;;OAGG;IACH,iBAAuE;IAEvE;;;OAGG;IACH,eAAiE;IAEjE;;;OAGG;IACH,oBAC8D;IAE9D;;;OAGG;IACH,sBACkE;IASlE;;;OAGG;IACH,aAA6D;IAG/D;;;;OAIG;IACH,qBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,eAAe,GAAC,SAAS,CAgBpC;IAED;;;;OAIG;IACH,wBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,KAAK,CAAC,MAAM,CAAC,GAAC,SAAS,CAgBlC;IAED;;;;OAIG;IACH,uBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,YAAY,GAAC,SAAS,CAcjC;IAED;;;OAGG;IACH,wBAHW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,QAIlB;IAED;;;OAGG;IACH,0BAHW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,QAIlB;IAED;;;;OAIG;IACH,gBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAC,SAAS,CAU3C;IAED;;;;OAIG;IACH,kBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,KAAK,CAAC,MAAM,CAAC,GAAC,SAAS,CAIlC;IAED;;;;OAIG;IACH,uBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,KAAK,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,GAAC,SAAS,CAU3C;IAED;;;;OAIG;IACH,4BAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,KAAK,CAAC,MAAM,CAAC,GAAC,SAAS,CAUlC;IAED;;;OAGG;IACH,qBAHW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,QAiBlB;IAED;;;OAGG;IACH,qBAHW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,QAiBlB;IAED;;;;OAIG;IACH,kBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,OAAO,GAAC,SAAS,CAsB5B;IAED;;;;OAIG;IACH,gBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,UAAU,GAAC,SAAS,CAgB/B;IAED;;;;OAIG;IACH,mBAJW,OAAO,eACP,KAAK,CAAC,GAAC,CAAC,GACP,OAAO,cAAc,EAAE,MAAM,GAAC,SAAS,CAiBlD;IAED;;;;OAIG;IACH,kBAJW,IAAI,eACJ,KAAK,CAAC,GAAC,CAAC,GACP,KAAK,CAAC,MAAM,CAAC,GAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"GML3.d.ts","sourceRoot":"","sources":["GML3.js"],"names":[],"mappings":"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"}
|
package/format/GML3.js
CHANGED
|
@@ -371,14 +371,11 @@ class GML3 extends GMLBase {
|
|
|
371
371
|
}
|
|
372
372
|
const context = objectStack[0];
|
|
373
373
|
const containerSrs = context['srsName'];
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
axisOrientation = proj.getAxisOrientation();
|
|
378
|
-
}
|
|
374
|
+
const axisOrientation = containerSrs
|
|
375
|
+
? getProjection(containerSrs).getAxisOrientation()
|
|
376
|
+
: 'enu';
|
|
379
377
|
if (axisOrientation === 'neu') {
|
|
380
|
-
let i, ii;
|
|
381
|
-
for (i = 0, ii = flatCoordinates.length; i < ii; i += 3) {
|
|
378
|
+
for (let i = 0, ii = flatCoordinates.length; i < ii; i += 3) {
|
|
382
379
|
const y = flatCoordinates[i];
|
|
383
380
|
const x = flatCoordinates[i + 1];
|
|
384
381
|
flatCoordinates[i] = x;
|
|
@@ -405,11 +402,9 @@ class GML3 extends GMLBase {
|
|
|
405
402
|
const context = objectStack[0];
|
|
406
403
|
const containerSrs = context['srsName'];
|
|
407
404
|
const contextDimension = context['srsDimension'];
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
axisOrientation = proj.getAxisOrientation();
|
|
412
|
-
}
|
|
405
|
+
const axisOrientation = containerSrs
|
|
406
|
+
? getProjection(containerSrs).getAxisOrientation()
|
|
407
|
+
: 'enu';
|
|
413
408
|
const coords = s.split(/\s+/);
|
|
414
409
|
// The "dimension" attribute is from the GML 3.0.1 spec.
|
|
415
410
|
let dim = 2;
|
|
@@ -426,13 +421,14 @@ class GML3 extends GMLBase {
|
|
|
426
421
|
} else if (contextDimension) {
|
|
427
422
|
dim = readNonNegativeIntegerString(contextDimension);
|
|
428
423
|
}
|
|
424
|
+
const asXYZ = axisOrientation.startsWith('en');
|
|
429
425
|
let x, y, z;
|
|
430
426
|
const flatCoordinates = [];
|
|
431
427
|
for (let i = 0, ii = coords.length; i < ii; i += dim) {
|
|
432
428
|
x = parseFloat(coords[i]);
|
|
433
429
|
y = parseFloat(coords[i + 1]);
|
|
434
430
|
z = dim === 3 ? parseFloat(coords[i + 2]) : 0;
|
|
435
|
-
if (
|
|
431
|
+
if (asXYZ) {
|
|
436
432
|
flatCoordinates.push(x, y, z);
|
|
437
433
|
} else {
|
|
438
434
|
flatCoordinates.push(y, x, z);
|
|
@@ -453,18 +449,14 @@ class GML3 extends GMLBase {
|
|
|
453
449
|
const srsDimension = hasZ ? '3' : '2';
|
|
454
450
|
node.setAttribute('srsDimension', srsDimension);
|
|
455
451
|
const srsName = context['srsName'];
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
}
|
|
452
|
+
const axisOrientation = srsName
|
|
453
|
+
? getProjection(srsName).getAxisOrientation()
|
|
454
|
+
: 'enu';
|
|
460
455
|
const point = value.getCoordinates();
|
|
461
|
-
let coords;
|
|
462
456
|
// only 2d for simple features profile
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
coords = point[1] + ' ' + point[0];
|
|
467
|
-
}
|
|
457
|
+
let coords = axisOrientation.startsWith('en')
|
|
458
|
+
? point[0] + ' ' + point[1]
|
|
459
|
+
: point[1] + ' ' + point[0];
|
|
468
460
|
if (hasZ) {
|
|
469
461
|
// For newly created points, Z can be undefined.
|
|
470
462
|
const z = point[2] || 0;
|
|
@@ -481,14 +473,12 @@ class GML3 extends GMLBase {
|
|
|
481
473
|
* @private
|
|
482
474
|
*/
|
|
483
475
|
getCoords_(point, srsName, hasZ) {
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
? point[0] + ' ' + point[1]
|
|
491
|
-
: point[1] + ' ' + point[0];
|
|
476
|
+
const axisOrientation = srsName
|
|
477
|
+
? getProjection(srsName).getAxisOrientation()
|
|
478
|
+
: 'enu';
|
|
479
|
+
let coords = axisOrientation.startsWith('en')
|
|
480
|
+
? point[0] + ' ' + point[1]
|
|
481
|
+
: point[1] + ' ' + point[0];
|
|
492
482
|
if (hasZ) {
|
|
493
483
|
// For newly created points, Z can be undefined.
|
|
494
484
|
const z = point[2] || 0;
|
package/package.json
CHANGED
package/source/Raster.d.ts
CHANGED
|
@@ -1,10 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @param {Uint8ClampedArray} data Image data.
|
|
3
|
-
* @param {number} width Number of columns.
|
|
4
|
-
* @param {number} height Number of rows.
|
|
5
|
-
* @return {ImageData} Image data.
|
|
6
|
-
*/
|
|
7
|
-
export function newImageData(data: Uint8ClampedArray, width: number, height: number): ImageData;
|
|
8
1
|
/**
|
|
9
2
|
* @typedef {function(Error, ImageData, (Object|Array<Object>)): void} JobCallback
|
|
10
3
|
*/
|
package/source/Raster.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Raster.d.ts","sourceRoot":"","sources":["Raster.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Raster.d.ts","sourceRoot":"","sources":["Raster.js"],"names":[],"mappings":"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"}
|
package/source/Raster.js
CHANGED
|
@@ -16,35 +16,6 @@ import {create as createTransform} from '../transform.js';
|
|
|
16
16
|
import {equals, getCenter, getHeight, getWidth} from '../extent.js';
|
|
17
17
|
import {getUid} from '../util.js';
|
|
18
18
|
|
|
19
|
-
let hasImageData = true;
|
|
20
|
-
try {
|
|
21
|
-
new ImageData(10, 10);
|
|
22
|
-
} catch (_) {
|
|
23
|
-
hasImageData = false;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
/** @type {CanvasRenderingContext2D} */
|
|
27
|
-
let context;
|
|
28
|
-
|
|
29
|
-
/**
|
|
30
|
-
* @param {Uint8ClampedArray} data Image data.
|
|
31
|
-
* @param {number} width Number of columns.
|
|
32
|
-
* @param {number} height Number of rows.
|
|
33
|
-
* @return {ImageData} Image data.
|
|
34
|
-
*/
|
|
35
|
-
export function newImageData(data, width, height) {
|
|
36
|
-
if (hasImageData) {
|
|
37
|
-
return new ImageData(data, width, height);
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
if (!context) {
|
|
41
|
-
context = document.createElement('canvas').getContext('2d');
|
|
42
|
-
}
|
|
43
|
-
const imageData = context.createImageData(width, height);
|
|
44
|
-
imageData.data.set(data);
|
|
45
|
-
return imageData;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
19
|
/**
|
|
49
20
|
* @typedef {Object} MinionData
|
|
50
21
|
* @property {Array<ArrayBuffer>} buffers Array of buffers.
|
|
@@ -64,20 +35,6 @@ export function newImageData(data, width, height) {
|
|
|
64
35
|
* buffer.
|
|
65
36
|
*/
|
|
66
37
|
function createMinion(operation) {
|
|
67
|
-
let workerHasImageData = true;
|
|
68
|
-
try {
|
|
69
|
-
new ImageData(10, 10);
|
|
70
|
-
} catch (_) {
|
|
71
|
-
workerHasImageData = false;
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
function newWorkerImageData(data, width, height) {
|
|
75
|
-
if (workerHasImageData) {
|
|
76
|
-
return new ImageData(data, width, height);
|
|
77
|
-
}
|
|
78
|
-
return {data: data, width: width, height: height};
|
|
79
|
-
}
|
|
80
|
-
|
|
81
38
|
return function (data) {
|
|
82
39
|
// bracket notation for minification support
|
|
83
40
|
const buffers = data['buffers'];
|
|
@@ -92,7 +49,7 @@ function createMinion(operation) {
|
|
|
92
49
|
if (imageOps) {
|
|
93
50
|
const images = new Array(numBuffers);
|
|
94
51
|
for (let b = 0; b < numBuffers; ++b) {
|
|
95
|
-
images[b] =
|
|
52
|
+
images[b] = new ImageData(
|
|
96
53
|
new Uint8ClampedArray(buffers[b]),
|
|
97
54
|
width,
|
|
98
55
|
height,
|
|
@@ -406,7 +363,7 @@ export class Processor extends Disposable {
|
|
|
406
363
|
this.dataLookup_ = {};
|
|
407
364
|
job.callback(
|
|
408
365
|
null,
|
|
409
|
-
|
|
366
|
+
new ImageData(data, job.inputs[0].width, job.inputs[0].height),
|
|
410
367
|
meta,
|
|
411
368
|
);
|
|
412
369
|
this.dispatch_();
|
package/source/WMTS.js
CHANGED
|
@@ -448,7 +448,7 @@ export function optionsFromCapabilities(wmtsCap, config) {
|
|
|
448
448
|
}
|
|
449
449
|
|
|
450
450
|
let wrapX = false;
|
|
451
|
-
const switchXY = projection.getAxisOrientation().
|
|
451
|
+
const switchXY = projection.getAxisOrientation().startsWith('ne');
|
|
452
452
|
|
|
453
453
|
let matrix = matrixSetObj.TileMatrix[0];
|
|
454
454
|
|
package/source/ogcTileUtil.js
CHANGED
|
@@ -255,13 +255,13 @@ function parseTileMatrixSet(
|
|
|
255
255
|
}
|
|
256
256
|
}
|
|
257
257
|
const orderedAxes = tileMatrixSet.orderedAxes;
|
|
258
|
-
const
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
258
|
+
const axisOrientation = orderedAxes
|
|
259
|
+
? orderedAxes
|
|
260
|
+
.slice(0, 2)
|
|
261
|
+
.map((s) => s.replace(/E|X|Lon/i, 'e').replace(/N|Y|Lat/i, 'n'))
|
|
262
|
+
.join('')
|
|
263
|
+
: projection.getAxisOrientation();
|
|
264
|
+
const backwards = !axisOrientation.startsWith('en');
|
|
265
265
|
|
|
266
266
|
const matrices = tileMatrixSet.tileMatrices;
|
|
267
267
|
|
package/source/wms.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wms.d.ts","sourceRoot":"","sources":["wms.js"],"names":[],"mappings":"AAyBA;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,uCAPW,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,QAC7B,OAAO,YAAY,EAAE,IAAI,cACzB,OAAO,uBAAuB,EAAE,OAAO,gBAEtC,MAAM,
|
|
1
|
+
{"version":3,"file":"wms.d.ts","sourceRoot":"","sources":["wms.js"],"names":[],"mappings":"AAyBA;;;;;;;;GAQG;AAEH;;;;;;;GAOG;AACH,uCAPW,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,QAC7B,OAAO,YAAY,EAAE,IAAI,cACzB,OAAO,uBAAuB,EAAE,OAAO,gBAEtC,MAAM,CAgBjB;AAED;;;;;;;;;GASG;AACH,oCATW,OAAO,WAAW,EAAE,MAAM,cAC1B,MAAM,cACN,MAAM,cACN,OAAO,YAAY,EAAE,UAAU,OAC/B,MAAM,2BAEN,OAAO,UAAU,EAAE,UAAU,GAC5B,MAAM,CA4CjB;AAED;;;;GAIG;AACH,uDAHW,MAAM,OAehB;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH;;;;;GAKG;AACH,sCAJW,aAAa,GACZ,OAAO,aAAa,EAAE,wBAAwB,CA+BzD;AAED;;;;;;;;;;;GAWG;AACH,2CATW,aAAa,cAIb,OAAO,kBAAkB,EAAE,UAAU,cACrC,MAAM,GACL,MAAM,GAAC,SAAS,CAwC3B;AAED;;;;;;;;;;GAUG;AACH,sCANW,aAAa,oCAGZ,MAAM,GAAC,SAAS,CAkC3B;AA/QD;;;GAGG;AACH,8BAFU,MAAM,CAEuB;;;;;;;;yBAU1B,gBAAgB,GAAG,WAAW,GAAG,WAAW,GAAG,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;iBAoHpD,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;SAMnC,MAAM;;;;;;mBACG,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}
|
package/source/wms.js
CHANGED
|
@@ -46,17 +46,15 @@ export function getRequestUrl(baseUrl, extent, size, projection, params) {
|
|
|
46
46
|
params['HEIGHT'] = size[1];
|
|
47
47
|
|
|
48
48
|
const axisOrientation = projection.getAxisOrientation();
|
|
49
|
-
let bbox;
|
|
50
49
|
const v13 = compareVersions(params['VERSION'], '1.3') >= 0;
|
|
51
50
|
params[v13 ? 'CRS' : 'SRS'] = projection.getCode();
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
51
|
+
const bbox =
|
|
52
|
+
v13 && axisOrientation.startsWith('ne')
|
|
53
|
+
? [extent[1], extent[0], extent[3], extent[2]]
|
|
54
|
+
: extent;
|
|
57
55
|
params['BBOX'] = bbox.join(',');
|
|
58
56
|
|
|
59
|
-
return appendParams(
|
|
57
|
+
return appendParams(baseUrl, params);
|
|
60
58
|
}
|
|
61
59
|
|
|
62
60
|
/**
|
package/tilegrid/WMTS.js
CHANGED
|
@@ -126,7 +126,7 @@ export function createFromCapabilitiesMatrixSet(
|
|
|
126
126
|
const projection = getProjection(code);
|
|
127
127
|
const metersPerUnit = projection.getMetersPerUnit();
|
|
128
128
|
// swap origin x and y coordinates if axis orientation is lat/long
|
|
129
|
-
const switchOriginXY = projection.getAxisOrientation().
|
|
129
|
+
const switchOriginXY = projection.getAxisOrientation().startsWith('ne');
|
|
130
130
|
|
|
131
131
|
matrixSet[matrixIdsPropName].sort(function (a, b) {
|
|
132
132
|
return b[scaleDenominatorPropName] - a[scaleDenominatorPropName];
|
package/util.js
CHANGED