ol 6.9.1-dev.1637853899327 → 6.9.1-dev.1638198364241

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ol",
3
- "version": "6.9.1-dev.1637853899327",
3
+ "version": "6.9.1-dev.1638198364241",
4
4
  "description": "OpenLayers mapping library",
5
5
  "keywords": [
6
6
  "map",
package/proj/epsg4326.js CHANGED
@@ -75,7 +75,7 @@ export var PROJECTIONS = [
75
75
  new EPSG4326Projection('EPSG:4326', 'neu'),
76
76
  new EPSG4326Projection('urn:ogc:def:crs:OGC:1.3:CRS84'),
77
77
  new EPSG4326Projection('urn:ogc:def:crs:OGC:2:84'),
78
- new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84', 'neu'),
78
+ new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84'),
79
79
  new EPSG4326Projection('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'),
80
80
  new EPSG4326Projection('http://www.opengis.net/def/crs/EPSG/0/4326', 'neu'),
81
81
  ];
@@ -1 +1 @@
1
- {"version":3,"file":"epsg4326.js","sourceRoot":"","sources":["../src/proj/epsg4326.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B;;;;;GAKG;AACH,MAAM,CAAC,IAAM,MAAM,GAAG,OAAO,CAAC;AAE9B;;;;;GAKG;AACH,MAAM,CAAC,IAAM,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AAE3C;;;GAGG;AACH,MAAM,CAAC,IAAM,eAAe,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC;AAExD;;;;;;;GAOG;AACH;IAAiC,sCAAU;IACzC;;;OAGG;IACH,4BAAY,IAAI,EAAE,mBAAmB;eACnC,kBAAM;YACJ,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,MAAM,EAAE,MAAM;YACd,eAAe,EAAE,mBAAmB;YACpC,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,eAAe;YAC9B,WAAW,EAAE,MAAM;SACpB,CAAC;IACJ,CAAC;IACH,yBAAC;AAAD,CAAC,AAhBD,CAAiC,UAAU,GAgB1C;AAED;;;;;GAKG;AACH,MAAM,CAAC,IAAM,WAAW,GAAG;IACzB,IAAI,kBAAkB,CAAC,QAAQ,CAAC;IAChC,IAAI,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC;IAC1C,IAAI,kBAAkB,CAAC,+BAA+B,CAAC;IACvD,IAAI,kBAAkB,CAAC,0BAA0B,CAAC;IAClD,IAAI,kBAAkB,CAAC,8CAA8C,EAAE,KAAK,CAAC;IAC7E,IAAI,kBAAkB,CAAC,8CAA8C,EAAE,KAAK,CAAC;IAC7E,IAAI,kBAAkB,CAAC,4CAA4C,EAAE,KAAK,CAAC;CAC5E,CAAC"}
1
+ {"version":3,"file":"epsg4326.js","sourceRoot":"","sources":["../src/proj/epsg4326.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B;;;;;GAKG;AACH,MAAM,CAAC,IAAM,MAAM,GAAG,OAAO,CAAC;AAE9B;;;;;GAKG;AACH,MAAM,CAAC,IAAM,MAAM,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;AAE3C;;;GAGG;AACH,MAAM,CAAC,IAAM,eAAe,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,GAAG,CAAC;AAExD;;;;;;;GAOG;AACH;IAAiC,sCAAU;IACzC;;;OAGG;IACH,4BAAY,IAAI,EAAE,mBAAmB;eACnC,kBAAM;YACJ,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK,CAAC,OAAO;YACpB,MAAM,EAAE,MAAM;YACd,eAAe,EAAE,mBAAmB;YACpC,MAAM,EAAE,IAAI;YACZ,aAAa,EAAE,eAAe;YAC9B,WAAW,EAAE,MAAM;SACpB,CAAC;IACJ,CAAC;IACH,yBAAC;AAAD,CAAC,AAhBD,CAAiC,UAAU,GAgB1C;AAED;;;;;GAKG;AACH,MAAM,CAAC,IAAM,WAAW,GAAG;IACzB,IAAI,kBAAkB,CAAC,QAAQ,CAAC;IAChC,IAAI,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC;IAC1C,IAAI,kBAAkB,CAAC,+BAA+B,CAAC;IACvD,IAAI,kBAAkB,CAAC,0BAA0B,CAAC;IAClD,IAAI,kBAAkB,CAAC,8CAA8C,CAAC;IACtE,IAAI,kBAAkB,CAAC,8CAA8C,EAAE,KAAK,CAAC;IAC7E,IAAI,kBAAkB,CAAC,4CAA4C,EAAE,KAAK,CAAC;CAC5E,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"ogcTileUtil.d.ts","sourceRoot":"","sources":["../src/source/ogcTileUtil.js"],"names":[],"mappings":"AAoFA;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;GAIG;AACH,6FA2BC;AAED;;;;;GAKG;AACH,4IA+CC;AA2MD;;;GAGG;AACH,6EAIC"}
1
+ {"version":3,"file":"ogcTileUtil.d.ts","sourceRoot":"","sources":["../src/source/ogcTileUtil.js"],"names":[],"mappings":"AAoFA;;;;;GAKG;AAEH;;;;;;;GAOG;AAEH;;;;GAIG;AACH,6FA2BC;AAED;;;;;GAKG;AACH,4IA+CC;AAkND;;;GAGG;AACH,6EAIC"}
@@ -311,10 +311,14 @@ function parseTileSetMetadata(sourceInfo, tileSet) {
311
311
  if (tileSet.tileMatrixSet) {
312
312
  return parseTileMatrixSet(sourceInfo, tileSet.tileMatrixSet, tileUrlTemplate, tileMatrixSetLimits);
313
313
  }
314
- if (!tileSet.tileMatrixSetDefinition) {
315
- throw new Error('Expected tileMatrixSetDefinition or tileMatrixSet');
314
+ var tileMatrixSetLink = tileSet.links.find(function (link) {
315
+ return link.rel === 'http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme';
316
+ });
317
+ if (!tileMatrixSetLink) {
318
+ throw new Error('Expected http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme link or tileMatrixSet');
316
319
  }
317
- var url = resolveUrl(sourceInfo.url, tileSet.tileMatrixSetDefinition);
320
+ var tileMatrixSetDefinition = tileMatrixSetLink.href;
321
+ var url = resolveUrl(sourceInfo.url, tileMatrixSetDefinition);
318
322
  return getJSON(url).then(function (tileMatrixSet) {
319
323
  return parseTileMatrixSet(sourceInfo, tileMatrixSet, tileUrlTemplate, tileMatrixSetLimits);
320
324
  });
@@ -1 +1 @@
1
- {"version":3,"file":"ogcTileUtil.js","sourceRoot":"","sources":["../src/source/ogcTileUtil.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ogcTileUtil.js","sourceRoot":"","sources":["../src/source/ogcTileUtil.js"],"names":[],"mappings":"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"}
@@ -63,7 +63,7 @@ export const PROJECTIONS = [
63
63
  new EPSG4326Projection('EPSG:4326', 'neu'),
64
64
  new EPSG4326Projection('urn:ogc:def:crs:OGC:1.3:CRS84'),
65
65
  new EPSG4326Projection('urn:ogc:def:crs:OGC:2:84'),
66
- new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84', 'neu'),
66
+ new EPSG4326Projection('http://www.opengis.net/def/crs/OGC/1.3/CRS84'),
67
67
  new EPSG4326Projection('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'),
68
68
  new EPSG4326Projection('http://www.opengis.net/def/crs/EPSG/0/4326', 'neu'),
69
69
  ];
@@ -373,11 +373,18 @@ function parseTileSetMetadata(sourceInfo, tileSet) {
373
373
  );
374
374
  }
375
375
 
376
- if (!tileSet.tileMatrixSetDefinition) {
377
- throw new Error('Expected tileMatrixSetDefinition or tileMatrixSet');
376
+ const tileMatrixSetLink = tileSet.links.find(
377
+ (link) =>
378
+ link.rel === 'http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme'
379
+ );
380
+ if (!tileMatrixSetLink) {
381
+ throw new Error(
382
+ 'Expected http://www.opengis.net/def/rel/ogc/1.0/tiling-scheme link or tileMatrixSet'
383
+ );
378
384
  }
385
+ const tileMatrixSetDefinition = tileMatrixSetLink.href;
379
386
 
380
- const url = resolveUrl(sourceInfo.url, tileSet.tileMatrixSetDefinition);
387
+ const url = resolveUrl(sourceInfo.url, tileMatrixSetDefinition);
381
388
  return getJSON(url).then(function (tileMatrixSet) {
382
389
  return parseTileMatrixSet(
383
390
  sourceInfo,
package/util.js CHANGED
@@ -31,5 +31,5 @@ export function getUid(obj) {
31
31
  * OpenLayers version.
32
32
  * @type {string}
33
33
  */
34
- export var VERSION = '6.9.1-dev.1637853899327';
34
+ export var VERSION = '6.9.1-dev.1638198364241';
35
35
  //# sourceMappingURL=util.js.map