ol 10.2.2-dev.1727979328194 → 10.2.2-dev.1728458917595

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.2.2-dev.1727979328194",
+  "version": "10.2.2-dev.1728458917595",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/reproj/DataTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";yBAsBa,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,KAAI,OAAO,gBAAgB,EAAE,OAAO;;;;;UAK1E,QAAQ;;;;YACR,MAAM;;;;;;gBAKN,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;gBACzC,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;eACzC,OAAO,iBAAiB,EAAE,SAAS;;;;;;;;gBAEnC,MAAM;;;;YACN,MAAM;;;;qBACN,UAAU;;;;;;;;;;;;;;;;;;;;AApBxB;;GAEG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAgOjB;IAtNC;;;OAGG;IACH,qBACiE;IAEjE;;;OAGG;IACH,oBAAqC;IAErC;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAA4B;IAE5B;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,0BAAsE;IAEtE;;;OAGG;IACH,qBAAsB;IAEtB;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,iBAAiB;IAMjB;;;OAGG;IACH,oBAIwB;IAmDxB;;;OAGG;IACH,uBAOC;IAgGH;;OAEG;IACH,mBAsMC;IAqDD;;OAEG;IACH,yBAGC;CACF;qBAvjByD,gBAAgB"}
+{"version":3,"file":"DataTile.d.ts","sourceRoot":"","sources":["DataTile.js"],"names":[],"mappings":";yBAsBa,CAAS,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,EAAE,IAAM,EAAN,MAAM,KAAI,OAAO,gBAAgB,EAAE,OAAO;;;;;UAK1E,QAAQ;;;;YACR,MAAM;;;;;;gBAKN,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;gBACzC,OAAO,uBAAuB,EAAE,OAAO;;;;oBACvC,OAAO,yBAAyB,EAAE,OAAO;;;;eACzC,OAAO,iBAAiB,EAAE,SAAS;;;;;;;;gBAEnC,MAAM;;;;YACN,MAAM;;;;qBACN,UAAU;;;;;;;;;;;;;;;;;;;;AApBxB;;GAEG;AAEH;;;;GAIG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;GAKG;AACH;IACE;;OAEG;IACH,qBAFW,OAAO,EAgOjB;IAtNC;;;OAGG;IACH,qBACiE;IAEjE;;;OAGG;IACH,oBAAqC;IAErC;;;OAGG;IACH,gBAA6B;IAE7B;;;OAGG;IACH,oBAAuB;IAEvB;;;OAGG;IACH,qBAAwB;IAExB;;;OAGG;IACH,oBAA4B;IAE5B;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,0BAAsE;IAEtE;;;OAGG;IACH,qBAAsB;IAEtB;;;OAGG;IACH,6BAAgC;IAEhC;;;OAGG;IACH,iBAAiB;IAMjB;;;OAGG;IACH,oBAIwB;IAmDxB;;;OAGG;IACH,uBAOC;IAgGH;;OAEG;IACH,mBAuMC;IAqDD;;OAEG;IACH,yBAGC;CACF;qBAxjByD,gBAAgB"}

package/reproj/DataTile.js

@@ -455,6 +455,7 @@ class ReprojDataTile extends DataTile {
 
         sources.push({
           extent: dataSource.extent,
+          clipExtent: dataSource.clipExtent,
           texture: texture,
           width: width,
           height: height,

package/reproj/glreproj.d.ts

@@ -16,6 +16,7 @@ export function releaseGLCanvas(gl: WebGLRenderingContext): void;
 /**
  * @typedef {Object} ImageExtent
  * @property {import("../extent.js").Extent} extent Extent.
+ * @property {import("../extent.js").Extent} [clipExtent] Clip extent.
  * @property {WebGLTexture} texture Texture.
  * @property {number} width Width of texture.
  * @property {number} height Height of texture.
@@ -37,9 +38,10 @@ export function releaseGLCanvas(gl: WebGLRenderingContext): void;
  * TODO: Allow setting renderEdges value in the data as this is done in "data-space".
  * @param {boolean | Array<number>} [renderEdges] Render reprojection edges.
  * @param {boolean} [interpolate] Use linear interpolation when resampling.
+ * @param {boolean} [drawSingle] Draw single source images directly without stitchTexture.
  * @return {{framebuffer: WebGLFramebuffer, width: number, height: number, texture: WebGLTexture}} Canvas with reprojected data.
  */
-export function render(gl: WebGLRenderingContext, width_: number, height_: number, pixelRatio: number, sourceResolution: number, targetResolution: number, targetExtent: import("../extent.js").Extent, triangulation: import("../reproj/Triangulation.js").default, sources: Array<ImageExtent>, gutter: number, dataType: number, renderEdges?: boolean | number[] | undefined, interpolate?: boolean | undefined): {
+export function render(gl: WebGLRenderingContext, width_: number, height_: number, pixelRatio: number, sourceResolution: number, targetResolution: number, targetExtent: import("../extent.js").Extent, triangulation: import("../reproj/Triangulation.js").default, sources: Array<ImageExtent>, gutter: number, dataType: number, renderEdges?: boolean | number[] | undefined, interpolate?: boolean | undefined, drawSingle?: boolean | undefined): {
     framebuffer: WebGLFramebuffer;
     width: number;
     height: number;
@@ -54,6 +56,10 @@ export type ImageExtent = {
      * Extent.
      */
     extent: import("../extent.js").Extent;
+    /**
+     * Clip extent.
+     */
+    clipExtent?: import("../extent.js").Extent | undefined;
     /**
      * Texture.
      */

package/reproj/glreproj.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"glreproj.d.ts","sourceRoot":"","sources":["glreproj.js"],"names":[],"mappings":"AA4DA;;;;;;;GAOG;AACH,oNAFY,qBAAqB,CAsBhC;AAED;;;;GAIG;AACH,oCAFW,qBAAqB,QAO/B;AAOD;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;;;;GAkBG;AACH,2BAhBW,qBAAqB,UACrB,MAAM,WACN,MAAM,cACN,MAAM,oBACN,MAAM,oBACN,MAAM,gBACN,OAAO,cAAc,EAAE,MAAM,iBAC7B,OAAO,4BAA4B,EAAE,OAAO,WAC5C,KAAK,CAAC,WAAW,CAAC,UAClB,MAAM,YACN,MAAM,oFAIL;IAAC,WAAW,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAC,CAyThG;AAvVD;;GAEG;AACH,2BAFU,KAAK,CAAC,iBAAiB,GAAG,eAAe,CAAC,CAErB;;;;;YAIjB,OAAO,cAAc,EAAE,MAAM;;;;aAC7B,YAAY;;;;WACZ,MAAM;;;;YACN,MAAM"}
+{"version":3,"file":"glreproj.d.ts","sourceRoot":"","sources":["glreproj.js"],"names":[],"mappings":"AA4DA;;;;;;;GAOG;AACH,oNAFY,qBAAqB,CAsBhC;AAED;;;;GAIG;AACH,oCAFW,qBAAqB,QAO/B;AAOD;;;;;;;GAOG;AAEH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAjBW,qBAAqB,UACrB,MAAM,WACN,MAAM,cACN,MAAM,oBACN,MAAM,oBACN,MAAM,gBACN,OAAO,cAAc,EAAE,MAAM,iBAC7B,OAAO,4BAA4B,EAAE,OAAO,WAC5C,KAAK,CAAC,WAAW,CAAC,UAClB,MAAM,YACN,MAAM,sHAKL;IAAC,WAAW,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAC,CA8UhG;AA9WD;;GAEG;AACH,2BAFU,KAAK,CAAC,iBAAiB,GAAG,eAAe,CAAC,CAErB;;;;;YAIjB,OAAO,cAAc,EAAE,MAAM;;;;;;;;aAE7B,YAAY;;;;WACZ,MAAM;;;;YACN,MAAM"}

package/reproj/glreproj.js

@@ -108,6 +108,7 @@ export const canvasGLPool = [];
 /**
  * @typedef {Object} ImageExtent
  * @property {import("../extent.js").Extent} extent Extent.
+ * @property {import("../extent.js").Extent} [clipExtent] Clip extent.
  * @property {WebGLTexture} texture Texture.
  * @property {number} width Width of texture.
  * @property {number} height Height of texture.
@@ -130,6 +131,7 @@ export const canvasGLPool = [];
  * TODO: Allow setting renderEdges value in the data as this is done in "data-space".
  * @param {boolean | Array<number>} [renderEdges] Render reprojection edges.
  * @param {boolean} [interpolate] Use linear interpolation when resampling.
+ * @param {boolean} [drawSingle] Draw single source images directly without stitchTexture.
  * @return {{framebuffer: WebGLFramebuffer, width: number, height: number, texture: WebGLTexture}} Canvas with reprojected data.
  */
 export function render(
@@ -146,6 +148,7 @@ export function render(
   dataType,
   renderEdges,
   interpolate,
+  drawSingle,
 ) {
   const width = Math.round(pixelRatio * width_);
   const height = Math.round(pixelRatio * height_);
@@ -221,7 +224,7 @@ export function render(
   let stitchHeight;
   const stitchScale = 1 / sourceResolution;
 
-  if (sources.length !== 1 || gutter !== 0) {
+  if (!drawSingle || sources.length !== 1 || gutter !== 0) {
     stitchTexture = gl.createTexture();
     if (resultTexture === null) {
       throw new Error('Could not create texture');
@@ -281,6 +284,24 @@ export function render(
       gl.bindFramebuffer(gl.FRAMEBUFFER, fb);
       gl.viewport(0, 0, stitchWidthFixed, stitchHeightFixed);
 
+      if (src.clipExtent) {
+        const xPos =
+          (src.clipExtent[0] - sourceDataExtent[0]) * stitchScale * scaleFactor;
+        const yPos =
+          -(src.clipExtent[3] - sourceDataExtent[3]) *
+          stitchScale *
+          scaleFactor;
+        const width = getWidth(src.clipExtent) * stitchScale * scaleFactor;
+        const height = getHeight(src.clipExtent) * stitchScale * scaleFactor;
+        gl.enable(gl.SCISSOR_TEST);
+        gl.scissor(
+          interpolate ? xPos : Math.round(xPos),
+          interpolate ? yPos : Math.round(yPos),
+          interpolate ? width : Math.round(xPos + width) - Math.round(xPos),
+          interpolate ? height : Math.round(yPos + height) - Math.round(yPos),
+        );
+      }
+
       webGLCanvas.drawImage(
         src.texture,
         src.width,
@@ -298,6 +319,8 @@ export function render(
         stitchWidthFixed,
         stitchHeightFixed,
       );
+
+      gl.disable(gl.SCISSOR_TEST);
     });
     gl.deleteFramebuffer(fb);
   } else {

package/util.js

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