ol 10.7.1-dev.1763907276207 → 10.7.1-dev.1763923413317

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.7.1-dev.1763907276207",
+  "version": "10.7.1-dev.1763923413317",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/proj/proj4.d.ts

@@ -30,26 +30,61 @@ export function register(proj4: typeof import("proj4/dist/lib/core.js").default
     version: string;
 }): void;
 /**
- * Set the lookup function for getting proj4 definitions given an EPSG code.
+ * Set the lookup function for getting proj4 or WKT definitions given an
+ * projection code. By default, the {@link module:ol/proj/proj4.fromProjectionCode}
+ * function uses the spatialreference.org website for WKT definitions.
+ * This can be changed by providing a different lookup function.
+ *
+ * @param {function(string):Promise<string>} func The lookup function.
+ * @api
+ */
+export function setProjectionCodeLookup(func: (arg0: string) => Promise<string>): void;
+/**
+ * Get the current projection code lookup function.
+ *
+ * @return {function(string):Promise<string>} The projection lookup function.
+ */
+export function getProjectionCodeLookup(): (arg0: string) => Promise<string>;
+/**
+ * Get a projection from a projection code (i.e., authority:number).
+ * This function fetches the projection definition from the
+ * https://spatialreference.org website, registers this definition for use with
+ * proj4, and returns a configured projection.  You must call import proj4 and
+ * call {@link module:ol/proj/proj4.register} before using this function.
+ *
+ * If the projection definition is already registered with proj4, it will not
+ * be fetched again (so it is ok to call this function multiple times with the
+ * same code).
+ *
+ * @param {string} code The projection code (e.g., 'EPSG:4326' or 'OGC:CRS84').
+ * @return {Promise<Projection>} The projection.
+ * @api
+ */
+export function fromProjectionCode(code: string): Promise<Projection>;
+/**
+ * Set the lookup function for getting proj4 or WKT definitions given an EPSG code.
  * By default, the {@link module:ol/proj/proj4.fromEPSGCode} function uses the
- * epsg.io website for proj4 definitions.  This can be changed by providing a
- * different lookup function.
+ * spatialreference.org website for WKT definitions.
+ * This can be changed by providing a different lookup function.
  *
  * @param {function(number):Promise<string>} func The lookup function.
  * @api
+ * @deprecated Use {@link module:ol/proj/proj4.setProjectionCodeLookup} instead.
  */
 export function setEPSGLookup(func: (arg0: number) => Promise<string>): void;
 /**
  * Get the current EPSG lookup function.
  *
  * @return {function(number):Promise<string>} The EPSG lookup function.
+ * @deprecated Use {@link module:ol/proj/proj4.getProjectionCodeLookup} instead.
  */
 export function getEPSGLookup(): (arg0: number) => Promise<string>;
 /**
  * Get a projection from an EPSG code.  This function fetches the projection
- * definition from the epsg.io website, registers this definition for use with
- * proj4, and returns a configured projection.  You must call import proj4 and
- * call {@link module:ol/proj/proj4.register} before using this function.
+ * definition from the spatialreference.org website, registers this definition
+ * for use with proj4, and returns a configured projection.  You must call
+ * import proj4 and call {@link module:ol/proj/proj4.register} before using this
+ * function.
  *
  * If the projection definition is already registered with proj4, it will not
  * be fetched again (so it is ok to call this function multiple times with the
@@ -58,6 +93,7 @@ export function getEPSGLookup(): (arg0: number) => Promise<string>;
  * @param {number|string} code The EPSG code (e.g. 4326 or 'EPSG:4326').
  * @return {Promise<Projection>} The projection.
  * @api
+ * @deprecated Use {@link module:ol/proj/proj4.fromProjectionCode} instead.
  */
 export function fromEPSGCode(code: number | string): Promise<Projection>;
 /**
@@ -69,6 +105,7 @@ export function fromEPSGCode(code: number | string): Promise<Projection>;
  * @param {string} key MapTiler API key.  Get your own API key at https://www.maptiler.com/cloud/.
  * @return {function(number):Promise<string>} The EPSG lookup function.
  * @api
+ * @deprecated Not needed any more, the default lookup provides this functionality now.
  */
 export function epsgLookupMapTiler(key: string): (arg0: number) => Promise<string>;
 import Projection from './Projection.js';

package/proj/proj4.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proj4.d.ts","sourceRoot":"","sources":["proj4.js"],"names":[],"mappings":"AAkBA;;GAEG;AACH,gCAFY,OAAO,CAIlB;AAED;;GAEG;AACH,mCAEC;AAED;;;;;;;;;;GAUG;AACH;;;;;;;;;;;SA6CC;AAcD;;;;;;;;GAQG;AACH,oCAHW,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,QAK1C;AAED;;;;GAIG;AACH,iCAFY,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,CAI3C;AAED;;;;;;;;;;;;;GAaG;AACH,mCAJW,MAAM,GAAC,MAAM,GACZ,OAAO,CAAC,UAAU,CAAC,CAsB9B;AAED;;;;;;;;;GASG;AACH,wCAJW,MAAM,GACL,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,CA0D3C;uBAvNsB,iBAAiB"}
+{"version":3,"file":"proj4.d.ts","sourceRoot":"","sources":["proj4.js"],"names":[],"mappings":"AAkBA;;GAEG;AACH,gCAFY,OAAO,CAIlB;AAED;;GAEG;AACH,mCAEC;AAED;;;;;;;;;;GAUG;AACH;;;;;;;;;;;SA6CC;AAsBD;;;;;;;;GAQG;AACH,8CAHW,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,QAK1C;AAED;;;;GAIG;AACH,2CAFY,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,CAI3C;AAED;;;;;;;;;;;;;;GAcG;AACH,yCAJW,MAAM,GACL,OAAO,CAAC,UAAU,CAAC,CAiB9B;AAWD;;;;;;;;;GASG;AACH,oCAJW,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,QAM1C;AAED;;;;;GAKG;AACH,iCAHY,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,CAK3C;AAED;;;;;;;;;;;;;;;GAeG;AACH,mCALW,MAAM,GAAC,MAAM,GACZ,OAAO,CAAC,UAAU,CAAC,CAS9B;AAED;;;;;;;;;;GAUG;AACH,wCALW,MAAM,GACL,CAAS,IAAM,EAAN,MAAM,KAAE,OAAO,CAAC,MAAM,CAAC,CA2D3C;uBApRsB,iBAAiB"}

package/proj/proj4.js

@@ -89,25 +89,96 @@ export function register(proj4) {
 }
 
 /**
- * @param {number} code The EPSG code.
- * @return {Promise<string>} The proj4 definition.
+ * @param {string} code The projection code.
+ * @return {Promise<string>} The WKT definition.
  */
-let epsgLookup = async function (code) {
-  const response = await fetch(`https://epsg.io/${code}.proj4`);
+let projLookup = async function (code) {
+  if (typeof code !== 'string' || !code.includes(':')) {
+    throw new Error('Invalid code');
+  }
+  const [authority, num] = code.toLowerCase().split(':', 2);
+  const response = await fetch(
+    `https://spatialreference.org/ref/${authority}/${num}/ogcwkt/`,
+  );
   if (!response.ok) {
-    throw new Error(`Unexpected response from epsg.io: ${response.status}`);
+    throw new Error(
+      `Unexpected response from spatialreference.org: ${response.status}`,
+    );
   }
   return response.text();
 };
 
 /**
- * Set the lookup function for getting proj4 definitions given an EPSG code.
+ * Set the lookup function for getting proj4 or WKT definitions given an
+ * projection code. By default, the {@link module:ol/proj/proj4.fromProjectionCode}
+ * function uses the spatialreference.org website for WKT definitions.
+ * This can be changed by providing a different lookup function.
+ *
+ * @param {function(string):Promise<string>} func The lookup function.
+ * @api
+ */
+export function setProjectionCodeLookup(func) {
+  projLookup = func;
+}
+
+/**
+ * Get the current projection code lookup function.
+ *
+ * @return {function(string):Promise<string>} The projection lookup function.
+ */
+export function getProjectionCodeLookup() {
+  return projLookup;
+}
+
+/**
+ * Get a projection from a projection code (i.e., authority:number).
+ * This function fetches the projection definition from the
+ * https://spatialreference.org website, registers this definition for use with
+ * proj4, and returns a configured projection.  You must call import proj4 and
+ * call {@link module:ol/proj/proj4.register} before using this function.
+ *
+ * If the projection definition is already registered with proj4, it will not
+ * be fetched again (so it is ok to call this function multiple times with the
+ * same code).
+ *
+ * @param {string} code The projection code (e.g., 'EPSG:4326' or 'OGC:CRS84').
+ * @return {Promise<Projection>} The projection.
+ * @api
+ */
+export async function fromProjectionCode(code) {
+  const proj4 = registered;
+  if (!proj4) {
+    throw new Error('Proj4 must be registered first with register(proj4)');
+  }
+
+  if (proj4.defs(code)) {
+    return getCachedProjection(code);
+  }
+
+  proj4.defs(code, await projLookup(code));
+  register(proj4);
+
+  return getCachedProjection(code);
+}
+
+/**
+ * @param {number} code The EPSG code.
+ * @return {Promise<string>} The proj4 or WKT definition.
+ * @deprecated Use {@link module:ol/proj/proj4.projLookup} instead.
+ */
+let epsgLookup = async function (code) {
+  return await projLookup('EPSG:' + code);
+};
+
+/**
+ * Set the lookup function for getting proj4 or WKT definitions given an EPSG code.
  * By default, the {@link module:ol/proj/proj4.fromEPSGCode} function uses the
- * epsg.io website for proj4 definitions.  This can be changed by providing a
- * different lookup function.
+ * spatialreference.org website for WKT definitions.
+ * This can be changed by providing a different lookup function.
  *
  * @param {function(number):Promise<string>} func The lookup function.
  * @api
+ * @deprecated Use {@link module:ol/proj/proj4.setProjectionCodeLookup} instead.
  */
 export function setEPSGLookup(func) {
   epsgLookup = func;
@@ -117,6 +188,7 @@ export function setEPSGLookup(func) {
  * Get the current EPSG lookup function.
  *
  * @return {function(number):Promise<string>} The EPSG lookup function.
+ * @deprecated Use {@link module:ol/proj/proj4.getProjectionCodeLookup} instead.
  */
 export function getEPSGLookup() {
   return epsgLookup;
@@ -124,9 +196,10 @@ export function getEPSGLookup() {
 
 /**
  * Get a projection from an EPSG code.  This function fetches the projection
- * definition from the epsg.io website, registers this definition for use with
- * proj4, and returns a configured projection.  You must call import proj4 and
- * call {@link module:ol/proj/proj4.register} before using this function.
+ * definition from the spatialreference.org website, registers this definition
+ * for use with proj4, and returns a configured projection.  You must call
+ * import proj4 and call {@link module:ol/proj/proj4.register} before using this
+ * function.
  *
  * If the projection definition is already registered with proj4, it will not
  * be fetched again (so it is ok to call this function multiple times with the
@@ -135,26 +208,13 @@ export function getEPSGLookup() {
  * @param {number|string} code The EPSG code (e.g. 4326 or 'EPSG:4326').
  * @return {Promise<Projection>} The projection.
  * @api
+ * @deprecated Use {@link module:ol/proj/proj4.fromProjectionCode} instead.
  */
 export async function fromEPSGCode(code) {
-  if (typeof code === 'string') {
-    code = parseInt(code.split(':').pop(), 10);
+  if (typeof code === 'number') {
+    code = 'EPSG:' + code;
   }
-
-  const proj4 = registered;
-  if (!proj4) {
-    throw new Error('Proj4 must be registered first with register(proj4)');
-  }
-
-  const epsgCode = 'EPSG:' + code;
-  if (proj4.defs(epsgCode)) {
-    return getCachedProjection(epsgCode);
-  }
-
-  proj4.defs(epsgCode, await epsgLookup(code));
-  register(proj4);
-
-  return getCachedProjection(epsgCode);
+  return await fromProjectionCode(code);
 }
 
 /**
@@ -166,6 +226,7 @@ export async function fromEPSGCode(code) {
  * @param {string} key MapTiler API key.  Get your own API key at https://www.maptiler.com/cloud/.
  * @return {function(number):Promise<string>} The EPSG lookup function.
  * @api
+ * @deprecated Not needed any more, the default lookup provides this functionality now.
  */
 export function epsgLookupMapTiler(key) {
   return async function (code) {

package/proj.js

@@ -23,8 +23,8 @@
  * Proj4js, or create a custom build to support those projections you need; see
  * the Proj4js website for how to do this. You also need the Proj4js definitions
  * for the required projections. These definitions can be obtained from
- * https://epsg.io/, and are a JS function, so can be loaded in a script
- * tag (as in the examples) or pasted into your application.
+ * https://spatialreference.org/, and are a JS function, so can be loaded in a
+ * script tag (as in the examples) or pasted into your application.
  *
  * After all required projection definitions are added to proj4's registry (by
  * using `proj4.defs()`), simply call `register(proj4)` from the `ol/proj/proj4`

package/util.js

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