ol 10.1.1-dev.1725805115669 → 10.1.1-dev.1725970564972

package/format/WMSCapabilities.d.ts

@@ -1,4 +1,19 @@
 export default WMSCapabilities;
+export type RootObject = {
+    /**
+     * Version
+     */
+    version: string;
+    /**
+     * Whether version is 1.3 or higher
+     */
+    v13: boolean;
+};
+/**
+ * @typedef {Object} RootObject
+ * @property {string} version Version
+ * @property {boolean} v13 Whether version is 1.3 or higher
+ */
 /**
  * @classdesc
  * Format for reading WMS capabilities data

package/format/WMSCapabilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WMSCapabilities.d.ts","sourceRoot":"","sources":["WMSCapabilities.js"],"names":[],"mappings":";AAgDA;;;;;GAKG;AACH;IAII;;OAEG;IACH,SAFU,MAAM,GAAC,SAAS,CAEF;CAoB3B;gBA9Ee,UAAU"}
+{"version":3,"file":"WMSCapabilities.d.ts","sourceRoot":"","sources":["WMSCapabilities.js"],"names":[],"mappings":";;;;;aAwEc,MAAM;;;;SACN,OAAO;;AAHrB;;;;GAIG;AAEH;;;;;GAKG;AACH;IAII;;OAEG;IACH,SAFU,MAAM,GAAC,SAAS,CAEF;CAoB3B;gBA1Ge,UAAU"}

package/format/WMSCapabilities.js

@@ -2,6 +2,7 @@
  * @module ol/format/WMSCapabilities
  */
 import XML from './XML.js';
+import {compareVersions} from '../string.js';
 import {
   makeArrayPusher,
   makeObjectPropertyPusher,
@@ -25,6 +26,10 @@ import {readHref} from './xlink.js';
  */
 const NAMESPACE_URIS = [null, 'http://www.opengis.net/wms'];
 
+function isV13(objectStack) {
+  return compareVersions(objectStack[0].version, '1.3') >= 0;
+}
+
 /**
  * @const
  * @type {Object<string, Object<string, import("../xml.js").Parser>>}
@@ -35,17 +40,40 @@ const PARSERS = makeStructureNS(NAMESPACE_URIS, {
   'Capability': makeObjectPropertySetter(readCapability),
 });
 
+const COMMON_CAPABILITY_PARSERS = {
+  'Request': makeObjectPropertySetter(readRequest),
+  'Exception': makeObjectPropertySetter(readException),
+  'Layer': makeObjectPropertySetter(readCapabilityLayer),
+};
+
 /**
  * @const
  * @type {Object<string, Object<string, import("../xml.js").Parser>>}
  */
 // @ts-ignore
 const CAPABILITY_PARSERS = makeStructureNS(NAMESPACE_URIS, {
-  'Request': makeObjectPropertySetter(readRequest),
-  'Exception': makeObjectPropertySetter(readException),
-  'Layer': makeObjectPropertySetter(readCapabilityLayer),
+  ...COMMON_CAPABILITY_PARSERS,
+  'UserDefinedSymbolization': makeObjectPropertySetter(
+    readUserDefinedSymbolization,
+  ),
 });
 
+/**
+ * @const
+ * @type {Object<string, Object<string, import("../xml.js").Parser>>}
+ */
+// @ts-ignore
+const CAPABILITY_PARSERS_V13 = makeStructureNS(
+  NAMESPACE_URIS,
+  COMMON_CAPABILITY_PARSERS,
+);
+
+/**
+ * @typedef {Object} RootObject
+ * @property {string} version Version
+ * @property {boolean} v13 Whether version is 1.3 or higher
+ */
+
 /**
  * @classdesc
  * Format for reading WMS capabilities data
@@ -81,12 +109,7 @@ class WMSCapabilities extends XML {
   }
 }
 
-/**
- * @const
- * @type {Object<string, Object<string, import("../xml.js").Parser>>}
- */
-// @ts-ignore
-const SERVICE_PARSERS = makeStructureNS(NAMESPACE_URIS, {
+const COMMON_SERVICE_PARSERS = {
   'Name': makeObjectPropertySetter(readString),
   'Title': makeObjectPropertySetter(readString),
   'Abstract': makeObjectPropertySetter(readString),
@@ -95,6 +118,22 @@ const SERVICE_PARSERS = makeStructureNS(NAMESPACE_URIS, {
   'ContactInformation': makeObjectPropertySetter(readContactInformation),
   'Fees': makeObjectPropertySetter(readString),
   'AccessConstraints': makeObjectPropertySetter(readString),
+};
+
+/**
+ * @const
+ * @type {Object<string, Object<string, import("../xml.js").Parser>>}
+ */
+// @ts-ignore
+const SERVICE_PARSERS = makeStructureNS(NAMESPACE_URIS, COMMON_SERVICE_PARSERS);
+
+/**
+ * @const
+ * @type {Object<string, Object<string, import("../xml.js").Parser>>}
+ */
+// @ts-ignore
+const SERVICE_PARSERS_V13 = makeStructureNS(NAMESPACE_URIS, {
+  ...COMMON_SERVICE_PARSERS,
   'LayerLimit': makeObjectPropertySetter(readPositiveInteger),
   'MaxWidth': makeObjectPropertySetter(readPositiveInteger),
   'MaxHeight': makeObjectPropertySetter(readPositiveInteger),
@@ -147,20 +186,11 @@ const EXCEPTION_PARSERS = makeStructureNS(NAMESPACE_URIS, {
   'Format': makeArrayPusher(readString),
 });
 
-/**
- * @const
- * @type {Object<string, Object<string, import("../xml.js").Parser>>}
- */
-// @ts-ignore
-const LAYER_PARSERS = makeStructureNS(NAMESPACE_URIS, {
+const COMMON_LAYER_PARSERS = {
   'Name': makeObjectPropertySetter(readString),
   'Title': makeObjectPropertySetter(readString),
   'Abstract': makeObjectPropertySetter(readString),
   'KeywordList': makeObjectPropertySetter(readKeywordList),
-  'CRS': makeObjectPropertyPusher(readString),
-  'EX_GeographicBoundingBox': makeObjectPropertySetter(
-    readEXGeographicBoundingBox,
-  ),
   'BoundingBox': makeObjectPropertyPusher(readBoundingBox),
   'Dimension': makeObjectPropertyPusher(readDimension),
   'Attribution': makeObjectPropertySetter(readAttribution),
@@ -170,6 +200,36 @@ const LAYER_PARSERS = makeStructureNS(NAMESPACE_URIS, {
   'DataURL': makeObjectPropertyPusher(readFormatOnlineresource),
   'FeatureListURL': makeObjectPropertyPusher(readFormatOnlineresource),
   'Style': makeObjectPropertyPusher(readStyle),
+  'Layer': makeObjectPropertyPusher(readLayer),
+};
+
+/**
+ * @const
+ * @type {Object<string, Object<string, import("../xml.js").Parser>>}
+ */
+// @ts-ignore
+const LAYER_PARSERS = makeStructureNS(NAMESPACE_URIS, {
+  ...COMMON_LAYER_PARSERS,
+  'SRS': makeObjectPropertyPusher(readString),
+  'Extent': makeObjectPropertySetter(readExtent),
+  'ScaleHint': makeObjectPropertyPusher(readScaleHint),
+  'LatLonBoundingBox': makeObjectPropertySetter((node, objectStack) =>
+    readBoundingBox(node, objectStack, false),
+  ),
+  'Layer': makeObjectPropertyPusher(readLayer),
+});
+
+/**
+ * @const
+ * @type {Object<string, Object<string, import("../xml.js").Parser>>}
+ */
+// @ts-ignore
+const LAYER_PARSERS_V13 = makeStructureNS(NAMESPACE_URIS, {
+  ...COMMON_LAYER_PARSERS,
+  'CRS': makeObjectPropertyPusher(readString),
+  'EX_GeographicBoundingBox': makeObjectPropertySetter(
+    readEXGeographicBoundingBox,
+  ),
   'MinScaleDenominator': makeObjectPropertySetter(readDecimal),
   'MaxScaleDenominator': makeObjectPropertySetter(readDecimal),
   'Layer': makeObjectPropertyPusher(readLayer),
@@ -280,12 +340,24 @@ function readAttribution(node, objectStack) {
   return pushParseAndPop({}, ATTRIBUTION_PARSERS, node, objectStack);
 }
 
+function readUserDefinedSymbolization(node, objectStack) {
+  return {
+    'SupportSLD': !!readBooleanString(
+      node.getAttribute('UserDefinedSymbolization'),
+    ),
+    'UserLayer': !!readBooleanString(node.getAttribute('UserLayer')),
+    'UserStyle': !!readBooleanString(node.getAttribute('UserStyle')),
+    'RemoteWFS': !!readBooleanString(node.getAttribute('RemoteWFS')),
+  };
+}
+
 /**
  * @param {Element} node Node.
  * @param {Array<*>} objectStack Object stack.
+ * @param {boolean} withCrs Whether to include the CRS attribute.
  * @return {Object} Bounding box object.
  */
-function readBoundingBox(node, objectStack) {
+function readBoundingBox(node, objectStack, withCrs = true) {
   const extent = [
     readDecimalString(node.getAttribute('minx')),
     readDecimalString(node.getAttribute('miny')),
@@ -298,11 +370,22 @@ function readBoundingBox(node, objectStack) {
     readDecimalString(node.getAttribute('resy')),
   ];
 
-  return {
-    'crs': node.getAttribute('CRS'),
-    'extent': extent,
-    'res': resolutions,
+  const result = {
+    extent,
+    res: resolutions,
   };
+  if (!withCrs) {
+    return result;
+  }
+
+  /** @type {RootObject} */
+  if (isV13(objectStack)) {
+    result.crs = node.getAttribute('CRS');
+  } else {
+    result.srs = node.getAttribute('SRS');
+  }
+
+  return result;
 }
 
 /**
@@ -354,7 +437,12 @@ function readEXGeographicBoundingBox(node, objectStack) {
  * @return {Object|undefined} Capability object.
  */
 function readCapability(node, objectStack) {
-  return pushParseAndPop({}, CAPABILITY_PARSERS, node, objectStack);
+  return pushParseAndPop(
+    {},
+    isV13(objectStack) ? CAPABILITY_PARSERS_V13 : CAPABILITY_PARSERS,
+    node,
+    objectStack,
+  );
 }
 
 /**
@@ -363,7 +451,12 @@ function readCapability(node, objectStack) {
  * @return {Object|undefined} Service object.
  */
 function readService(node, objectStack) {
-  return pushParseAndPop({}, SERVICE_PARSERS, node, objectStack);
+  return pushParseAndPop(
+    {},
+    isV13(objectStack) ? SERVICE_PARSERS_V13 : SERVICE_PARSERS,
+    node,
+    objectStack,
+  );
 }
 
 /**
@@ -408,7 +501,12 @@ function readException(node, objectStack) {
  * @return {Object|undefined} Layer object.
  */
 function readCapabilityLayer(node, objectStack) {
-  const layerObject = pushParseAndPop({}, LAYER_PARSERS, node, objectStack);
+  const layerObject = pushParseAndPop(
+    {},
+    isV13(objectStack) ? LAYER_PARSERS_V13 : LAYER_PARSERS,
+    node,
+    objectStack,
+  );
 
   if (layerObject['Layer'] === undefined) {
     return Object.assign(layerObject, readLayer(node, objectStack));
@@ -423,11 +521,18 @@ function readCapabilityLayer(node, objectStack) {
  * @return {Object|undefined} Layer object.
  */
 function readLayer(node, objectStack) {
+  const v13 = isV13(objectStack);
+
   const parentLayerObject = /**  @type {!Object<string,*>} */ (
     objectStack[objectStack.length - 1]
   );
 
-  const layerObject = pushParseAndPop({}, LAYER_PARSERS, node, objectStack);
+  const layerObject = pushParseAndPop(
+    {},
+    v13 ? LAYER_PARSERS_V13 : LAYER_PARSERS,
+    node,
+    objectStack,
+  );
 
   if (!layerObject) {
     return undefined;
@@ -469,7 +574,12 @@ function readLayer(node, objectStack) {
   layerObject['fixedHeight'] = fixedHeight;
 
   // See 7.2.4.8
-  const addKeys = ['Style', 'CRS', 'AuthorityURL'];
+  const addKeys = ['Style', 'AuthorityURL'];
+  if (v13) {
+    addKeys.push('CRS');
+  } else {
+    addKeys.push('SRS', 'Dimension');
+  }
   addKeys.forEach(function (key) {
     if (key in parentLayerObject) {
       const childValue = layerObject[key] || [];
@@ -477,14 +587,17 @@ function readLayer(node, objectStack) {
     }
   });
 
-  const replaceKeys = [
-    'EX_GeographicBoundingBox',
-    'BoundingBox',
-    'Dimension',
-    'Attribution',
-    'MinScaleDenominator',
-    'MaxScaleDenominator',
-  ];
+  const replaceKeys = ['BoundingBox', 'Attribution'];
+  if (v13) {
+    replaceKeys.push(
+      'Dimension',
+      'EX_GeographicBoundingBox',
+      'MinScaleDenominator',
+      'MaxScaleDenominator',
+    );
+  } else {
+    replaceKeys.push('LatLonBoundingBox', 'ScaleHint', 'Extent');
+  }
   replaceKeys.forEach(function (key) {
     if (!(key in layerObject)) {
       const parentValue = parentLayerObject[key];
@@ -505,13 +618,43 @@ function readDimension(node, objectStack) {
     'name': node.getAttribute('name'),
     'units': node.getAttribute('units'),
     'unitSymbol': node.getAttribute('unitSymbol'),
+  };
+
+  if (isV13(objectStack)) {
+    Object.assign(dimensionObject, {
+      'default': node.getAttribute('default'),
+      'multipleValues': readBooleanString(node.getAttribute('multipleValues')),
+      'nearestValue': readBooleanString(node.getAttribute('nearestValue')),
+      'current': readBooleanString(node.getAttribute('current')),
+      'values': readString(node),
+    });
+  }
+  return dimensionObject;
+}
+
+/**
+ * @param {Element} node Node.
+ * @param {Array<*>} objectStack Object stack.
+ * @return {Object} Extent object.
+ */
+function readExtent(node, objectStack) {
+  return {
+    'name': node.getAttribute('name'),
     'default': node.getAttribute('default'),
-    'multipleValues': readBooleanString(node.getAttribute('multipleValues')),
     'nearestValue': readBooleanString(node.getAttribute('nearestValue')),
-    'current': readBooleanString(node.getAttribute('current')),
-    'values': readString(node),
   };
-  return dimensionObject;
+}
+
+/**
+ * @param {Element} node Node.
+ * @param {Array<*>} objectStack Object stack.
+ * @return {Object} ScaleHint object.
+ */
+function readScaleHint(node, objectStack) {
+  return {
+    'min': readDecimalString(node.getAttribute('min')),
+    'max': readDecimalString(node.getAttribute('max')),
+  };
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.1.1-dev.1725805115669",
+  "version": "10.1.1-dev.1725970564972",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/util.js

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