ol 10.2.2-dev.1730915520848 → 10.2.2-dev.1730934210683

package/proj.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proj.d.ts","sourceRoot":"","sources":["proj.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"proj.d.ts","sourceRoot":"","sources":["proj.js"],"names":[],"mappings":"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"}

package/proj.js

@@ -75,6 +75,10 @@ import {applyTransform, getWidth} from './extent.js';
 import {clamp, modulo} from './math.js';
 import {equals, getWorldsAway} from './coordinate.js';
 import {getDistance} from './sphere.js';
+import {
+  makeProjection as makeUTMProjection,
+  makeTransforms as makeUTMTransforms,
+} from './proj/utm.js';
 import {warn} from './console.js';
 
 /**
@@ -84,6 +88,22 @@ import {warn} from './console.js';
  * @api
  */
 
+/**
+ * @typedef {Object} Transforms
+ * @property {TransformFunction} forward The forward transform (from geographic).
+ * @property {TransformFunction} inverse The inverse transform (to geographic).
+ */
+
+/**
+ * @type {Array<function(Projection): Transforms|null>}
+ */
+const transformFactories = [makeUTMTransforms];
+
+/**
+ * @type {Array<function(string): Projection|null>}
+ */
+const projectionFactories = [makeUTMProjection];
+
 /**
  * A transform function accepts an array of input coordinate values, an optional
  * output array, and an optional dimension (default should be 2).  The function
@@ -176,9 +196,20 @@ export function addProjections(projections) {
  * @api
  */
 export function get(projectionLike) {
-  return typeof projectionLike === 'string'
-    ? getProj(/** @type {string} */ (projectionLike))
-    : /** @type {Projection} */ (projectionLike) || null;
+  if (!(typeof projectionLike === 'string')) {
+    return projectionLike;
+  }
+  const projection = getProj(projectionLike);
+  if (projection) {
+    return projection;
+  }
+  for (const makeProjection of projectionFactories) {
+    const projection = makeProjection(projectionLike);
+    if (projection) {
+      return projection;
+    }
+  }
+  return null;
 }
 
 /**
@@ -226,7 +257,7 @@ export function getPointResolution(projection, resolution, point, units) {
         projection,
         get('EPSG:4326'),
       );
-      if (toEPSG4326 === identityTransform && projUnits !== 'degrees') {
+      if (!toEPSG4326 && projUnits !== 'degrees') {
         // no transform is available
         pointResolution = resolution * projection.getMetersPerUnit();
       } else {
@@ -460,24 +491,88 @@ export function equivalent(projection1, projection2) {
  * Searches in the list of transform functions for the function for converting
  * coordinates from the source projection to the destination projection.
  *
- * @param {Projection} sourceProjection Source Projection object.
- * @param {Projection} destinationProjection Destination Projection
+ * @param {Projection} source Source Projection object.
+ * @param {Projection} destination Destination Projection
  *     object.
- * @return {TransformFunction} Transform function.
+ * @return {TransformFunction|null} Transform function.
  */
-export function getTransformFromProjections(
-  sourceProjection,
-  destinationProjection,
-) {
-  const sourceCode = sourceProjection.getCode();
-  const destinationCode = destinationProjection.getCode();
+export function getTransformFromProjections(source, destination) {
+  const sourceCode = source.getCode();
+  const destinationCode = destination.getCode();
   let transformFunc = getTransformFunc(sourceCode, destinationCode);
-  if (!transformFunc) {
-    transformFunc = identityTransform;
+  if (transformFunc) {
+    return transformFunc;
+  }
+
+  /**
+   * @type {Transforms|null}
+   */
+  let sourceTransforms = null;
+
+  /**
+   * @type {Transforms|null}
+   */
+  let destinationTransforms = null;
+
+  // lazily add projections if we have supported transforms
+  for (const makeTransforms of transformFactories) {
+    if (!sourceTransforms) {
+      sourceTransforms = makeTransforms(source);
+    }
+    if (!destinationTransforms) {
+      destinationTransforms = makeTransforms(destination);
+    }
+  }
+
+  if (!sourceTransforms && !destinationTransforms) {
+    return null;
+  }
+
+  const intermediateCode = 'EPSG:4326';
+  if (!destinationTransforms) {
+    const toDestination = getTransformFunc(intermediateCode, destinationCode);
+    if (toDestination) {
+      transformFunc = composeTransformFuncs(
+        sourceTransforms.inverse,
+        toDestination,
+      );
+    }
+  } else if (!sourceTransforms) {
+    const fromSource = getTransformFunc(sourceCode, intermediateCode);
+    if (fromSource) {
+      transformFunc = composeTransformFuncs(
+        fromSource,
+        destinationTransforms.forward,
+      );
+    }
+  } else {
+    transformFunc = composeTransformFuncs(
+      sourceTransforms.inverse,
+      destinationTransforms.forward,
+    );
+  }
+
+  if (transformFunc) {
+    addProjection(source);
+    addProjection(destination);
+    addTransformFunc(source, destination, transformFunc);
   }
+
   return transformFunc;
 }
 
+/**
+ * @param {TransformFunction} t1 The first transform function.
+ * @param {TransformFunction} t2 The second transform function.
+ * @return {TransformFunction} The composed transform function.
+ */
+function composeTransformFuncs(t1, t2) {
+  return function (input, output, dimensions, stride) {
+    output = t1(input, output, dimensions, stride);
+    return t2(output, output, dimensions, stride);
+  };
+}
+
 /**
  * Given the projection-like objects, searches for a transformation
  * function to convert a coordinates array from the source projection to the
@@ -496,7 +591,9 @@ export function getTransform(source, destination) {
 
 /**
  * Transforms a coordinate from source projection to destination projection.
- * This returns a new coordinate (and does not modify the original).
+ * This returns a new coordinate (and does not modify the original). If there
+ * is no available transform between the two projection, the function will throw
+ * an error.
  *
  * See {@link module:ol/proj.transformExtent} for extent transformation.
  * See the transform method of {@link module:ol/geom/Geometry~Geometry} and its
@@ -510,6 +607,13 @@ export function getTransform(source, destination) {
  */
 export function transform(coordinate, source, destination) {
   const transformFunc = getTransform(source, destination);
+  if (!transformFunc) {
+    const sourceCode = get(source).getCode();
+    const destinationCode = get(destination).getCode();
+    throw new Error(
+      `No transform available between ${sourceCode} and ${destinationCode}`,
+    );
+  }
   return transformFunc(coordinate, undefined, coordinate.length);
 }
 

package/util.js

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