diff --git a/src/ol/format/GPX.js b/src/ol/format/GPX.js index f5d06a8f58..ea15be4fe9 100644 --- a/src/ol/format/GPX.js +++ b/src/ol/format/GPX.js @@ -28,7 +28,7 @@ import {includes} from '../array.js'; import { readDateTime, readDecimal, - readNonNegativeInteger, + readPositiveInteger, readString, writeDateTimeTextNode, writeDecimalTextNode, @@ -262,7 +262,7 @@ const RTE_PARSERS = makeStructureNS(NAMESPACE_URIS, { 'desc': makeObjectPropertySetter(readString), 'src': makeObjectPropertySetter(readString), 'link': parseLink, - 'number': makeObjectPropertySetter(readNonNegativeInteger), + 'number': makeObjectPropertySetter(readPositiveInteger), 'extensions': parseExtensions, 'type': makeObjectPropertySetter(readString), 'rtept': parseRtePt, @@ -289,7 +289,7 @@ const TRK_PARSERS = makeStructureNS(NAMESPACE_URIS, { 'desc': makeObjectPropertySetter(readString), 'src': makeObjectPropertySetter(readString), 'link': parseLink, - 'number': makeObjectPropertySetter(readNonNegativeInteger), + 'number': makeObjectPropertySetter(readPositiveInteger), 'type': makeObjectPropertySetter(readString), 'extensions': parseExtensions, 'trkseg': parseTrkSeg, @@ -332,12 +332,12 @@ const WPT_PARSERS = makeStructureNS(NAMESPACE_URIS, { 'sym': makeObjectPropertySetter(readString), 'type': makeObjectPropertySetter(readString), 'fix': makeObjectPropertySetter(readString), - 'sat': makeObjectPropertySetter(readNonNegativeInteger), + 'sat': makeObjectPropertySetter(readPositiveInteger), 'hdop': makeObjectPropertySetter(readDecimal), 'vdop': makeObjectPropertySetter(readDecimal), 'pdop': makeObjectPropertySetter(readDecimal), 'ageofdgpsdata': makeObjectPropertySetter(readDecimal), - 'dgpsid': makeObjectPropertySetter(readNonNegativeInteger), + 'dgpsid': makeObjectPropertySetter(readPositiveInteger), 'extensions': parseExtensions, }); diff --git a/src/ol/format/WFS.js b/src/ol/format/WFS.js index b0d3554d68..dadf744a85 100644 --- a/src/ol/format/WFS.js +++ b/src/ol/format/WFS.js @@ -24,8 +24,8 @@ import {assert} from '../asserts.js'; import {assign} from '../obj.js'; import {get as getProjection} from '../proj.js'; import { - readNonNegativeInteger, readNonNegativeIntegerString, + readPositiveInteger, writeStringTextNode, } from './xsd.js'; @@ -51,14 +51,14 @@ const FEATURE_COLLECTION_PARSERS = { */ const TRANSACTION_SUMMARY_PARSERS = { 'http://www.opengis.net/wfs': { - 'totalInserted': makeObjectPropertySetter(readNonNegativeInteger), - 'totalUpdated': makeObjectPropertySetter(readNonNegativeInteger), - 'totalDeleted': makeObjectPropertySetter(readNonNegativeInteger), + 'totalInserted': makeObjectPropertySetter(readPositiveInteger), + 'totalUpdated': makeObjectPropertySetter(readPositiveInteger), + 'totalDeleted': makeObjectPropertySetter(readPositiveInteger), }, 'http://www.opengis.net/wfs/2.0': { - 'totalInserted': makeObjectPropertySetter(readNonNegativeInteger), - 'totalUpdated': makeObjectPropertySetter(readNonNegativeInteger), - 'totalDeleted': makeObjectPropertySetter(readNonNegativeInteger), + 'totalInserted': makeObjectPropertySetter(readPositiveInteger), + 'totalUpdated': makeObjectPropertySetter(readPositiveInteger), + 'totalDeleted': makeObjectPropertySetter(readPositiveInteger), }, }; diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js index 4396617bc7..08a044463f 100644 --- a/src/ol/format/WMSCapabilities.js +++ b/src/ol/format/WMSCapabilities.js @@ -13,8 +13,8 @@ import { readBooleanString, readDecimal, readDecimalString, - readNonNegativeInteger, readNonNegativeIntegerString, + readPositiveInteger, readString, } from './xsd.js'; import {readHref} from './xlink.js'; @@ -94,9 +94,9 @@ const SERVICE_PARSERS = makeStructureNS(NAMESPACE_URIS, { 'ContactInformation': makeObjectPropertySetter(readContactInformation), 'Fees': makeObjectPropertySetter(readString), 'AccessConstraints': makeObjectPropertySetter(readString), - 'LayerLimit': makeObjectPropertySetter(readNonNegativeInteger), - 'MaxWidth': makeObjectPropertySetter(readNonNegativeInteger), - 'MaxHeight': makeObjectPropertySetter(readNonNegativeInteger), + 'LayerLimit': makeObjectPropertySetter(readPositiveInteger), + 'MaxWidth': makeObjectPropertySetter(readPositiveInteger), + 'MaxHeight': makeObjectPropertySetter(readPositiveInteger), }); /** diff --git a/src/ol/format/WMTSCapabilities.js b/src/ol/format/WMTSCapabilities.js index 554c9a2337..cc70d49e50 100644 --- a/src/ol/format/WMTSCapabilities.js +++ b/src/ol/format/WMTSCapabilities.js @@ -11,7 +11,7 @@ import { makeStructureNS, pushParseAndPop, } from '../xml.js'; -import {readDecimal, readNonNegativeInteger, readString} from './xsd.js'; +import {readDecimal, readPositiveInteger, readString} from './xsd.js'; import {readHref} from './xlink.js'; /** @@ -150,10 +150,10 @@ const TMS_LIMITS_LIST_PARSERS = makeStructureNS(NAMESPACE_URIS, { // @ts-ignore const TMS_LIMITS_PARSERS = makeStructureNS(NAMESPACE_URIS, { 'TileMatrix': makeObjectPropertySetter(readString), - 'MinTileRow': makeObjectPropertySetter(readNonNegativeInteger), - 'MaxTileRow': makeObjectPropertySetter(readNonNegativeInteger), - 'MinTileCol': makeObjectPropertySetter(readNonNegativeInteger), - 'MaxTileCol': makeObjectPropertySetter(readNonNegativeInteger), + 'MinTileRow': makeObjectPropertySetter(readPositiveInteger), + 'MaxTileRow': makeObjectPropertySetter(readPositiveInteger), + 'MinTileCol': makeObjectPropertySetter(readPositiveInteger), + 'MaxTileCol': makeObjectPropertySetter(readPositiveInteger), }); /** @@ -210,10 +210,10 @@ const TM_PARSERS = makeStructureNS( { 'TopLeftCorner': makeObjectPropertySetter(readCoordinates), 'ScaleDenominator': makeObjectPropertySetter(readDecimal), - 'TileWidth': makeObjectPropertySetter(readNonNegativeInteger), - 'TileHeight': makeObjectPropertySetter(readNonNegativeInteger), - 'MatrixWidth': makeObjectPropertySetter(readNonNegativeInteger), - 'MatrixHeight': makeObjectPropertySetter(readNonNegativeInteger), + 'TileWidth': makeObjectPropertySetter(readPositiveInteger), + 'TileHeight': makeObjectPropertySetter(readPositiveInteger), + 'MatrixWidth': makeObjectPropertySetter(readPositiveInteger), + 'MatrixHeight': makeObjectPropertySetter(readPositiveInteger), }, makeStructureNS(OWS_NAMESPACE_URIS, { 'Identifier': makeObjectPropertySetter(readString), diff --git a/src/ol/format/xsd.js b/src/ol/format/xsd.js index a677379964..58762370f3 100644 --- a/src/ol/format/xsd.js +++ b/src/ol/format/xsd.js @@ -63,7 +63,7 @@ export function readDecimalString(string) { * @param {Node} node Node. * @return {number|undefined} Non negative integer. */ -export function readNonNegativeInteger(node) { +export function readPositiveInteger(node) { const s = getAllTextContent(node, false); return readNonNegativeIntegerString(s); }