ol 9.2.5-dev.1720190104389 → 9.2.5-dev.1720344310382

package/ol.css

@@ -348,3 +348,7 @@
 .ol-overviewmap .ol-overviewmap-box:hover {
   cursor: move;
 }
+
+.ol-overviewmap .ol-viewport:hover {
+  cursor: pointer;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "9.2.5-dev.1720190104389",
+  "version": "9.2.5-dev.1720344310382",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/source/ImageTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ImageTile.d.ts","sourceRoot":"","sources":["ImageTile.js"],"names":[],"mappings":";;;;;qBAUa,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAqC,EAArC,OAAO,eAAe,EAAE,aAAa,KAAE,CAAC,OAAO,gBAAgB,EAAE,SAAS,GAAC,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC,CAAC;wBAIxJ,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAqC,EAArC,OAAO,eAAe,EAAE,aAAa,KAAE,MAAM;sBAI9E,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAqBjC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;AAiGjD;;;;;;;GAOG;AACH;IACE;;OAEG;IACH,2CA2CC;IAED;;;OAGG;IACH,YAHW,OAAO,QAUjB;CACF;2BA1M0B,eAAe"}
+{"version":3,"file":"ImageTile.d.ts","sourceRoot":"","sources":["ImageTile.js"],"names":[],"mappings":";;;;;qBAUa,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAqC,EAArC,OAAO,eAAe,EAAE,aAAa,KAAE,CAAC,OAAO,gBAAgB,EAAE,SAAS,GAAC,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC,CAAC;wBAIxJ,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAqC,EAArC,OAAO,eAAe,EAAE,aAAa,KAAE,MAAM;sBAI9E,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAqBjC,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;AA+FjD;;;;;;;GAOG;AACH;IACE;;OAEG;IACH,2CA2CC;IAED;;;OAGG;IACH,YAHW,OAAO,QAUjB;CACF;2BAxM0B,eAAe"}

package/source/ImageTile.js

@@ -59,9 +59,7 @@ const loadError = new Error('Image failed to load');
 function loadImage(template, z, x, y, options) {
   return new Promise((resolve, reject) => {
     const image = new Image();
-    if (options.crossOrigin !== undefined) {
-      image.crossOrigin = options.crossOrigin;
-    }
+    image.crossOrigin = options.crossOrigin ?? null;
     image.addEventListener('load', () => resolve(image));
     image.addEventListener('error', () => reject(loadError));
     image.src = renderXYZTemplate(template, z, x, y, options.maxY);

package/source/arcgisRest.d.ts

@@ -26,7 +26,7 @@ export function getRequestUrl(baseUrl: string, extent: import("../extent.js").Ex
  * or the entire code must form a valid ArcGIS SpatialReference definition.
  * @property {number} [ratio=1.5] Ratio. `1` means image requests are the size of the map viewport,
  * `2` means twice the size of the map viewport, and so on.
- * @property {string} [url] ArcGIS Rest service URL for a Map Service or Image Service. The url
+ * @property {string} url ArcGIS Rest service URL for a Map Service or Image Service. The url
  * should include /MapServer or /ImageServer.
  * @property {function(HTMLImageElement, string): Promise<import('../DataTile.js').ImageLike>} [load] Function
  * to perform loading of the image. Receives the created `HTMLImageElement` and the desired `src` as argument and
@@ -77,7 +77,7 @@ export type LoaderOptions = {
      * ArcGIS Rest service URL for a Map Service or Image Service. The url
      * should include /MapServer or /ImageServer.
      */
-    url?: string | undefined;
+    url: string;
     /**
      * Function
      * to perform loading of the image. Receives the created `HTMLImageElement` and the desired `src` as argument and

package/source/arcgisRest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arcgisRest.d.ts","sourceRoot":"","sources":["arcgisRest.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH,uCARW,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,gBAEtC,MAAM,CAqCjB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;GAKG;AACH,sCAJW,aAAa,GACZ,OAAO,aAAa,EAAE,wBAAwB,CAwCzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAvDa,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;;mBAO1B,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}
+{"version":3,"file":"arcgisRest.d.ts","sourceRoot":"","sources":["arcgisRest.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH,uCARW,MAAM,UACN,OAAO,cAAc,EAAE,MAAM,cAC7B,MAAM,cACN,MAAM,cACN,OAAO,uBAAuB,EAAE,OAAO,gBAEtC,MAAM,CAqCjB;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH;;;;;GAKG;AACH,sCAJW,aAAa,GACZ,OAAO,aAAa,EAAE,wBAAwB,CAwCzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAvDa,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;SAKnC,MAAM;;;;;;mBAEG,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}

package/source/arcgisRest.js

@@ -74,7 +74,7 @@ export function getRequestUrl(
  * or the entire code must form a valid ArcGIS SpatialReference definition.
  * @property {number} [ratio=1.5] Ratio. `1` means image requests are the size of the map viewport,
  * `2` means twice the size of the map viewport, and so on.
- * @property {string} [url] ArcGIS Rest service URL for a Map Service or Image Service. The url
+ * @property {string} url ArcGIS Rest service URL for a Map Service or Image Service. The url
  * should include /MapServer or /ImageServer.
  * @property {function(HTMLImageElement, string): Promise<import('../DataTile.js').ImageLike>} [load] Function
  * to perform loading of the image. Receives the created `HTMLImageElement` and the desired `src` as argument and
@@ -90,6 +90,8 @@ export function getRequestUrl(
 export function createLoader(options) {
   const load = options.load ? options.load : decode;
   const projection = getProjection(options.projection || 'EPSG:3857');
+  const ratio = options.ratio ?? 1.5;
+  const crossOrigin = options.crossOrigin ?? null;
 
   /** @type {import('../Image.js').ImageObjectPromiseLoader} */
   return function (extent, resolution, pixelRatio) {
@@ -102,7 +104,7 @@ export function createLoader(options) {
     };
     Object.assign(params, options.params);
 
-    extent = getRequestExtent(extent, resolution, pixelRatio, options.ratio);
+    extent = getRequestExtent(extent, resolution, pixelRatio, ratio);
 
     const src = getRequestUrl(
       options.url,
@@ -114,9 +116,7 @@ export function createLoader(options) {
     );
 
     const image = new Image();
-    if (options.crossOrigin !== null) {
-      image.crossOrigin = options.crossOrigin;
-    }
+    image.crossOrigin = crossOrigin;
 
     return load(image, src).then((image) => {
       // Update resolution, because the server may return a smaller size than requested

package/source/mapguide.d.ts

@@ -9,7 +9,7 @@ export type LoaderOptions = {
     /**
      * The mapagent url.
      */
-    url?: string | undefined;
+    url: string;
     /**
      * The `crossOrigin` attribute for loaded images.  Note that
      * you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.

package/source/mapguide.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapguide.d.ts","sourceRoot":"","sources":["mapguide.js"],"names":[],"mappings":"AAqFA;;;;;GAKG;AACH,sCAJW,aAAa,GACZ,OAAO,aAAa,EAAE,wBAAwB,CA2BzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBA5FsB,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}
+{"version":3,"file":"mapguide.d.ts","sourceRoot":"","sources":["mapguide.js"],"names":[],"mappings":"AAqFA;;;;;GAKG;AACH,sCAJW,aAAa,GACZ,OAAO,aAAa,EAAE,wBAAwB,CA8BzD;;;;;SA3Ga,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAYG,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}

package/source/mapguide.js

@@ -9,7 +9,7 @@ import {getRequestExtent} from './Image.js';
 
 /**
  * @typedef {Object} LoaderOptions
- * @property {string} [url] The mapagent url.
+ * @property {string} url The mapagent url.
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
  * See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
@@ -91,14 +91,17 @@ function getUrl(
  */
 export function createLoader(options) {
   const load = options.load || decode;
+  const useOverlay = options.useOverlay ?? false;
+  const metersPerUnit = options.metersPerUnit || 1;
+  const displayDpi = options.displayDpi || 96;
+  const ratio = options.ratio ?? 1;
+  const crossOrigin = options.crossOrigin ?? null;
 
   /** @type {import('../Image.js').ImageObjectPromiseLoader} */
   return function (extent, resolution, pixelRatio) {
     const image = new Image();
-    if (options.crossOrigin !== null) {
-      image.crossOrigin = options.crossOrigin;
-    }
-    extent = getRequestExtent(extent, resolution, pixelRatio, options.ratio);
+    image.crossOrigin = crossOrigin;
+    extent = getRequestExtent(extent, resolution, pixelRatio, ratio);
     const width = getWidth(extent) / resolution;
     const height = getHeight(extent) / resolution;
     const size = [width * pixelRatio, height * pixelRatio];
@@ -107,9 +110,9 @@ export function createLoader(options) {
       options.params,
       extent,
       size,
-      options.useOverlay,
-      options.metersPerUnit || 1,
-      options.displayDpi || 96,
+      useOverlay,
+      metersPerUnit,
+      displayDpi,
     );
     return load(image, src).then((image) => ({image, extent, pixelRatio}));
   };

package/source/static.d.ts

@@ -3,7 +3,7 @@
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
  * See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
- * @property {import("../extent.js").Extent} [imageExtent] Extent of the image in map coordinates.
+ * @property {import("../extent.js").Extent} imageExtent Extent of the image in map coordinates.
  * This is the [left, bottom, right, top] map coordinates of your image. When using this loader with an
  * `ol/source/Image`, the same extent must be set as `extent` of the `ol/layer/Image`.
  * @property {string} url Image URL.
@@ -30,7 +30,7 @@ export type LoaderOptions = {
      * This is the [left, bottom, right, top] map coordinates of your image. When using this loader with an
      * `ol/source/Image`, the same extent must be set as `extent` of the `ol/layer/Image`.
      */
-    imageExtent?: import("../extent.js").Extent | undefined;
+    imageExtent: import("../extent.js").Extent;
     /**
      * Image URL.
      */

package/source/static.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["static.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;GAYG;AAEH;;;;;GAKG;AACH,sCAJW,aAAa,GACZ,OAAO,aAAa,EAAE,wBAAwB,CAmBzD;;;;;;;;;;;;;;;;;SA5Ba,MAAM;;;;;;mBACG,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}
+{"version":3,"file":"static.d.ts","sourceRoot":"","sources":["static.js"],"names":[],"mappings":"AAOA;;;;;;;;;;;;GAYG;AAEH;;;;;GAKG;AACH,sCAJW,aAAa,GACZ,OAAO,aAAa,EAAE,wBAAwB,CAmBzD;;;;;;;;;;;;;iBA/Ba,OAAO,cAAc,EAAE,MAAM;;;;SAG7B,MAAM;;;;;;mBACG,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}

package/source/static.js

@@ -10,7 +10,7 @@ import {getHeight, getWidth} from '../extent.js';
  * @property {null|string} [crossOrigin] The `crossOrigin` attribute for loaded images.  Note that
  * you must provide a `crossOrigin` value if you want to access pixel data with the Canvas renderer.
  * See https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image for more detail.
- * @property {import("../extent.js").Extent} [imageExtent] Extent of the image in map coordinates.
+ * @property {import("../extent.js").Extent} imageExtent Extent of the image in map coordinates.
  * This is the [left, bottom, right, top] map coordinates of your image. When using this loader with an
  * `ol/source/Image`, the same extent must be set as `extent` of the `ol/layer/Image`.
  * @property {string} url Image URL.
@@ -28,17 +28,17 @@ import {getHeight, getWidth} from '../extent.js';
 export function createLoader(options) {
   const load = options.load || decode;
   const extent = options.imageExtent;
-  const image = new Image();
-  if (options.crossOrigin !== null) {
-    image.crossOrigin = options.crossOrigin;
-  }
+  const crossOrigin = options.crossOrigin ?? null;
 
-  return () =>
-    load(image, options.url).then((image) => {
+  return () => {
+    const image = new Image();
+    image.crossOrigin = crossOrigin;
+    return load(image, options.url).then((image) => {
       const resolutionX = getWidth(extent) / image.width;
       const resolutionY = getHeight(extent) / image.height;
       const resolution =
         resolutionX !== resolutionY ? [resolutionX, resolutionY] : resolutionY;
       return {image, extent, resolution, pixelRatio: 1};
     });
+  };
 }

package/source/wms.d.ts.map

@@ -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,CAkBjB;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,CAgCzD;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;AAlRD;;;GAGG;AACH,8BAFU,MAAM,CAEuB;;;;;;;;yBAU1B,gBAAgB,GAAG,WAAW,GAAG,WAAW,GAAG,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;iBAsHpD,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;SAMnC,MAAM;;;;;;mBACG,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}
+{"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,CAkBjB;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;AAjRD;;;GAGG;AACH,8BAFU,MAAM,CAEuB;;;;;;;;yBAU1B,gBAAgB,GAAG,WAAW,GAAG,WAAW,GAAG,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;iBAsHpD,OAAO,YAAY,EAAE,cAAc;;;;;;;;;;;;;;;SAMnC,MAAM;;;;;;mBACG,gBAAgB,QAAE,MAAM,KAAG,OAAO,CAAC,OAAO,gBAAgB,EAAE,SAAS,CAAC"}

package/source/wms.js

@@ -166,6 +166,7 @@ export function createLoader(options) {
   const projection = getProjection(options.projection || 'EPSG:3857');
   const ratio = options.ratio || 1.5;
   const load = options.load || decode;
+  const crossOrigin = options.crossOrigin ?? null;
 
   /**
    * @type {import("../Image.js").Loader}
@@ -185,9 +186,7 @@ export function createLoader(options) {
       options.serverType,
     );
     const image = new Image();
-    if (options.crossOrigin !== null) {
-      image.crossOrigin = options.crossOrigin;
-    }
+    image.crossOrigin = crossOrigin;
     return load(image, src).then((image) => ({image, extent, pixelRatio}));
   };
 }
@@ -266,15 +265,6 @@ export function getLegendUrl(options, resolution) {
     'FORMAT': 'image/png',
   };
 
-  if (options.params === undefined || options.params['LAYER'] === undefined) {
-    const layers = options.params.LAYERS;
-    const isSingleLayer = !Array.isArray(layers) || layers.length === 1;
-    if (!isSingleLayer) {
-      return undefined;
-    }
-    baseParams['LAYER'] = layers;
-  }
-
   if (resolution !== undefined) {
     const mpu =
       getProjection(options.projection || 'EPSG:3857').getMetersPerUnit() || 1;
@@ -284,5 +274,14 @@ export function getLegendUrl(options, resolution) {
 
   Object.assign(baseParams, options.params);
 
+  if (options.params !== undefined && baseParams['LAYER'] === undefined) {
+    const layers = baseParams['LAYERS'];
+    const isSingleLayer = !Array.isArray(layers) || layers.length !== 1;
+    if (!isSingleLayer) {
+      return undefined;
+    }
+    baseParams['LAYER'] = layers;
+  }
+
   return appendParams(options.url, baseParams);
 }

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '9.2.5-dev.1720190104389';
+export const VERSION = '9.2.5-dev.1720344310382';