From 176ddd34033a51d1a12dbcd806669f43f4e354c2 Mon Sep 17 00:00:00 2001 From: Peter Robins Date: Fri, 13 May 2016 09:58:25 +0000 Subject: [PATCH] Rename non-api sub-namespace typedefs --- externs/olx.js | 4 +- src/ol/format/gml/gml2format.js | 8 +- src/ol/format/gml/gml3format.js | 44 ++--- src/ol/format/gml/gmlbaseformat.js | 14 +- src/ol/format/gpxformat.js | 38 ++-- src/ol/format/kmlformat.js | 112 +++++------ src/ol/format/osmxmlformat.js | 6 +- src/ol/format/owsformat.js | 28 +-- src/ol/format/wfsformat.js | 16 +- src/ol/format/wktformat.js | 4 +- src/ol/format/wmscapabilitiesformat.js | 34 ++-- src/ol/format/wmtscapabilitiesformat.js | 18 +- src/ol/layer/layer.js | 2 +- src/ol/layer/layerbase.js | 6 +- src/ol/render/canvas/canvasimmediate.js | 22 +-- src/ol/render/canvas/canvasreplay.js | 18 +- src/ol/renderer/canvas/canvaslayerrenderer.js | 4 +- .../canvas/canvastilelayerrenderer.js | 2 +- .../canvas/canvasvectortilelayerrenderer.js | 4 +- src/ol/renderer/dom/domlayerrenderer.js | 4 +- src/ol/renderer/maprenderer.js | 4 +- src/ol/renderer/webgl/webgllayerrenderer.js | 4 +- src/ol/renderer/webgl/webglmaprenderer.js | 6 +- .../webgl/webglvectorlayerrenderer.js | 2 +- src/ol/reproj/image.js | 2 +- src/ol/reproj/tile.js | 2 +- src/ol/reproj/triangulation.js | 4 +- src/ol/source/imagesource.js | 2 +- src/ol/source/rastersource.js | 6 +- src/ol/source/source.js | 2 +- src/ol/source/tilesource.js | 2 +- src/ol/source/urltilesource.js | 2 +- src/ol/structs/lrucache.js | 6 +- src/ol/typedefs.js | 181 +++++++++--------- src/ol/webgl/context.js | 2 +- src/ol/xml.js | 24 +-- 36 files changed, 315 insertions(+), 324 deletions(-) diff --git a/externs/olx.js b/externs/olx.js index 64615ed687..1be1423caf 100644 --- a/externs/olx.js +++ b/externs/olx.js @@ -7480,8 +7480,8 @@ olx.view.FitOptions.prototype.maxZoom; * extent: (null|ol.Extent), * focus: ol.Coordinate, * index: number, - * layerStates: Object., - * layerStatesArray: Array., + * layerStates: Object., + * layerStatesArray: Array., * logos: Object., * pixelRatio: number, * pixelToCoordinateMatrix: ol.vec.Mat4.Number, diff --git a/src/ol/format/gml/gml2format.js b/src/ol/format/gml/gml2format.js index 087253e740..22dc45bf06 100644 --- a/src/ol/format/gml/gml2format.js +++ b/src/ol/format/gml/gml2format.js @@ -166,7 +166,7 @@ ol.format.GML2.prototype.outerBoundaryIsParser_ = function(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { @@ -179,7 +179,7 @@ ol.format.GML2.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { @@ -192,7 +192,7 @@ ol.format.GML2.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML2.prototype.BOX_PARSERS_ = { @@ -205,7 +205,7 @@ ol.format.GML2.prototype.BOX_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML2.prototype.GEOMETRY_PARSERS_ = { diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml/gml3format.js index f8362433ff..db3b8b7b93 100644 --- a/src/ol/format/gml/gml3format.js +++ b/src/ol/format/gml/gml3format.js @@ -450,7 +450,7 @@ ol.format.GML3.prototype.readFlatPosList_ = function(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { @@ -463,7 +463,7 @@ ol.format.GML3.prototype.GEOMETRY_FLAT_COORDINATES_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { @@ -476,7 +476,7 @@ ol.format.GML3.prototype.FLAT_LINEAR_RINGS_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.GEOMETRY_PARSERS_ = { @@ -506,7 +506,7 @@ ol.format.GML3.prototype.GEOMETRY_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.MULTICURVE_PARSERS_ = { @@ -521,7 +521,7 @@ ol.format.GML3.prototype.MULTICURVE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = { @@ -536,7 +536,7 @@ ol.format.GML3.prototype.MULTISURFACE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = { @@ -550,7 +550,7 @@ ol.format.GML3.prototype.CURVEMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = { @@ -563,7 +563,7 @@ ol.format.GML3.prototype.SURFACEMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.SURFACE_PARSERS_ = { @@ -575,7 +575,7 @@ ol.format.GML3.prototype.SURFACE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.CURVE_PARSERS_ = { @@ -587,7 +587,7 @@ ol.format.GML3.prototype.CURVE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.ENVELOPE_PARSERS_ = { @@ -602,7 +602,7 @@ ol.format.GML3.prototype.ENVELOPE_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.PATCHES_PARSERS_ = { @@ -615,7 +615,7 @@ ol.format.GML3.prototype.PATCHES_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.prototype.SEGMENTS_PARSERS_ = { @@ -712,7 +712,7 @@ ol.format.GML3.prototype.writePoint_ = function(node, geometry, objectStack) { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.ENVELOPE_SERIALIZERS_ = { @@ -738,7 +738,7 @@ ol.format.GML3.prototype.writeEnvelope = function(node, extent, objectStack) { } var keys = ['lowerCorner', 'upperCorner']; var values = [extent[0] + ' ' + extent[1], extent[2] + ' ' + extent[3]]; - ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ + ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ ({node: node}), ol.format.GML3.ENVELOPE_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY, values, @@ -1019,7 +1019,7 @@ ol.format.GML3.prototype.writeGeometryElement = function(node, geometry, objectS value = ol.format.Feature.transformWithOptions(geometry, true, context); } - ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ + ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ (item), ol.format.GML3.GEOMETRY_SERIALIZERS_, this.GEOMETRY_NODE_FACTORY_, [value], objectStack, undefined, this); @@ -1066,7 +1066,7 @@ ol.format.GML3.prototype.writeFeatureElement = function(node, feature, objectSta } var item = ol.object.assign({}, context); item.node = node; - ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ + ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ (item), context.serializers, ol.xml.makeSimpleNodeFactory(undefined, featureNS), values, @@ -1091,7 +1091,7 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectS this.writeFeatureElement, this); var item = ol.object.assign({}, context); item.node = node; - ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ + ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ (item), serializers, ol.xml.makeSimpleNodeFactory(featureType, featureNS), features, @@ -1100,7 +1100,7 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectS /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { @@ -1114,7 +1114,7 @@ ol.format.GML3.SURFACEORPOLYGONMEMBER_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.POINTMEMBER_SERIALIZERS_ = { @@ -1126,7 +1126,7 @@ ol.format.GML3.POINTMEMBER_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { @@ -1140,7 +1140,7 @@ ol.format.GML3.LINESTRINGORCURVEMEMBER_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.RING_SERIALIZERS_ = { @@ -1152,7 +1152,7 @@ ol.format.GML3.RING_SERIALIZERS_ = { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GML3.GEOMETRY_SERIALIZERS_ = { diff --git a/src/ol/format/gml/gmlbaseformat.js b/src/ol/format/gml/gmlbaseformat.js index c09891056c..3a34fffe63 100644 --- a/src/ol/format/gml/gmlbaseformat.js +++ b/src/ol/format/gml/gmlbaseformat.js @@ -500,7 +500,7 @@ ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_ = function(node, object /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = { @@ -515,7 +515,7 @@ ol.format.GMLBase.prototype.MULTIPOINT_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = { @@ -530,7 +530,7 @@ ol.format.GMLBase.prototype.MULTILINESTRING_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = { @@ -545,7 +545,7 @@ ol.format.GMLBase.prototype.MULTIPOLYGON_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = { @@ -558,7 +558,7 @@ ol.format.GMLBase.prototype.POINTMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = { @@ -571,7 +571,7 @@ ol.format.GMLBase.prototype.LINESTRINGMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = { @@ -584,7 +584,7 @@ ol.format.GMLBase.prototype.POLYGONMEMBER_PARSERS_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @protected */ ol.format.GMLBase.prototype.RING_PARSERS = { diff --git a/src/ol/format/gpxformat.js b/src/ol/format/gpxformat.js index 477fc66e38..24fb384bf6 100644 --- a/src/ol/format/gpxformat.js +++ b/src/ol/format/gpxformat.js @@ -279,7 +279,7 @@ ol.format.GPX.FEATURE_READER_ = { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.GPX_PARSERS_ = ol.xml.makeStructureNS( @@ -292,7 +292,7 @@ ol.format.GPX.GPX_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.LINK_PARSERS_ = ol.xml.makeStructureNS( @@ -306,7 +306,7 @@ ol.format.GPX.LINK_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.RTE_PARSERS_ = ol.xml.makeStructureNS( @@ -326,7 +326,7 @@ ol.format.GPX.RTE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.RTEPT_PARSERS_ = ol.xml.makeStructureNS( @@ -338,7 +338,7 @@ ol.format.GPX.RTEPT_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.TRK_PARSERS_ = ol.xml.makeStructureNS( @@ -358,7 +358,7 @@ ol.format.GPX.TRK_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.TRKSEG_PARSERS_ = ol.xml.makeStructureNS( @@ -369,7 +369,7 @@ ol.format.GPX.TRKSEG_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.TRKPT_PARSERS_ = ol.xml.makeStructureNS( @@ -381,7 +381,7 @@ ol.format.GPX.TRKPT_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.WPT_PARSERS_ = ol.xml.makeStructureNS( @@ -526,7 +526,7 @@ ol.format.GPX.writeLink_ = function(node, value, objectStack) { properties['linkText'], properties['linkType'] ]; - ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ ({node: node}), + ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ ({node: node}), ol.format.GPX.LINK_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY, link, objectStack, ol.format.GPX.LINK_SEQUENCE_); }; @@ -571,7 +571,7 @@ ol.format.GPX.writeWptType_ = function(node, coordinate, objectStack) { } var orderedKeys = ol.format.GPX.WPT_TYPE_SEQUENCE_[namespaceURI]; var values = ol.xml.makeSequence(properties, orderedKeys); - ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ + ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ ({node: node, 'properties': properties}), ol.format.GPX.WPT_TYPE_SERIALIZERS_, ol.xml.OBJECT_PROPERTY_NODE_FACTORY, values, objectStack, orderedKeys); @@ -615,7 +615,7 @@ ol.format.GPX.writeRte_ = function(node, feature, objectStack) { ol.format.GPX.writeTrk_ = function(node, feature, objectStack) { var options = /** @type {olx.format.WriteOptions} */ (objectStack[0]); var properties = feature.getProperties(); - /** @type {ol.xml.NodeStackItem} */ + /** @type {ol.xmlNodeStackItem} */ var context = {node: node, 'properties': properties}; var geometry = feature.getGeometry(); if (geometry) { @@ -641,7 +641,7 @@ ol.format.GPX.writeTrk_ = function(node, feature, objectStack) { * @private */ ol.format.GPX.writeTrkSeg_ = function(node, lineString, objectStack) { - /** @type {ol.xml.NodeStackItem} */ + /** @type {ol.xmlNodeStackItem} */ var context = {node: node, 'geometryLayout': lineString.getLayout(), 'properties': {}}; ol.xml.pushSerializeAndPop(context, @@ -682,7 +682,7 @@ ol.format.GPX.LINK_SEQUENCE_ = ['text', 'type']; /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.LINK_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -705,7 +705,7 @@ ol.format.GPX.RTE_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.RTE_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -736,7 +736,7 @@ ol.format.GPX.TRK_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.TRK_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -764,7 +764,7 @@ ol.format.GPX.TRKSEG_NODE_FACTORY_ = ol.xml.makeSimpleNodeFactory('trkpt'); /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.TRKSEG_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -787,7 +787,7 @@ ol.format.GPX.WPT_TYPE_SEQUENCE_ = ol.xml.makeStructureNS( /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.WPT_TYPE_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -855,7 +855,7 @@ ol.format.GPX.GPX_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.GPX.GPX_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -895,7 +895,7 @@ ol.format.GPX.prototype.writeFeaturesNode = function(features, opt_options) { //FIXME Serialize metadata var gpx = ol.xml.createElementNS('http://www.topografix.com/GPX/1/1', 'gpx'); - ol.xml.pushSerializeAndPop(/** @type {ol.xml.NodeStackItem} */ + ol.xml.pushSerializeAndPop(/** @type {ol.xmlNodeStackItem} */ ({node: gpx}), ol.format.GPX.GPX_SERIALIZERS_, ol.format.GPX.GPX_NODE_FACTORY_, features, [opt_options]); return gpx; diff --git a/src/ol/format/kmlformat.js b/src/ol/format/kmlformat.js index 8919459b14..51ad6b600d 100644 --- a/src/ol/format/kmlformat.js +++ b/src/ol/format/kmlformat.js @@ -514,7 +514,7 @@ ol.format.KML.readURI_ = function(node) { /** * @param {Node} node Node. * @private - * @return {ol.format.KMLVec2_} Vec2. + * @return {ol.KMLVec2_} Vec2. */ ol.format.KML.readVec2_ = function(node) { var xunits = node.getAttribute('xunits'); @@ -589,7 +589,7 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) { src = ol.format.KML.DEFAULT_IMAGE_STYLE_SRC_; } var anchor, anchorXUnits, anchorYUnits; - var hotSpot = /** @type {ol.format.KMLVec2_|undefined} */ + var hotSpot = /** @type {ol.KMLVec2_|undefined} */ (object['hotSpot']); if (hotSpot) { anchor = [hotSpot.x, hotSpot.y]; @@ -783,7 +783,7 @@ ol.format.KML.gxCoordParser_ = function(node, objectStack) { ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI), 'namespaceURI of the node should be known to the KML parser'); goog.asserts.assert(node.localName == 'coord', 'localName should be coord'); - var gxTrackObject = /** @type {ol.format.KMLGxTrackObject_} */ + var gxTrackObject = /** @type {ol.KMLGxTrackObject_} */ (objectStack[objectStack.length - 1]); goog.asserts.assert(goog.isObject(gxTrackObject), 'gxTrackObject should be an Object'); @@ -842,7 +842,7 @@ ol.format.KML.readGxTrack_ = function(node, objectStack) { 'namespaceURI of the node should be known to the KML parser'); goog.asserts.assert(node.localName == 'Track', 'localName should be Track'); var gxTrackObject = ol.xml.pushParseAndPop( - /** @type {ol.format.KMLGxTrackObject_} */ ({ + /** @type {ol.KMLGxTrackObject_} */ ({ flatCoordinates: [], whens: [] }), ol.format.KML.GX_TRACK_PARSERS_, node, objectStack); @@ -1368,7 +1368,7 @@ ol.format.KML.whenParser_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'when', 'localName should be when'); - var gxTrackObject = /** @type {ol.format.KMLGxTrackObject_} */ + var gxTrackObject = /** @type {ol.KMLGxTrackObject_} */ (objectStack[objectStack.length - 1]); goog.asserts.assert(goog.isObject(gxTrackObject), 'gxTrackObject should be an Object'); @@ -1401,7 +1401,7 @@ ol.format.KML.whenParser_ = function(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.DATA_PARSERS_ = ol.xml.makeStructureNS( @@ -1412,7 +1412,7 @@ ol.format.KML.DATA_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.EXTENDED_DATA_PARSERS_ = ol.xml.makeStructureNS( @@ -1424,7 +1424,7 @@ ol.format.KML.EXTENDED_DATA_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_ = ol.xml.makeStructureNS( @@ -1436,7 +1436,7 @@ ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.FLAT_LINEAR_RING_PARSERS_ = ol.xml.makeStructureNS( @@ -1447,7 +1447,7 @@ ol.format.KML.FLAT_LINEAR_RING_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.FLAT_LINEAR_RINGS_PARSERS_ = ol.xml.makeStructureNS( @@ -1459,7 +1459,7 @@ ol.format.KML.FLAT_LINEAR_RINGS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.GX_TRACK_PARSERS_ = ol.xml.makeStructureNS( @@ -1473,7 +1473,7 @@ ol.format.KML.GX_TRACK_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.GEOMETRY_FLAT_COORDINATES_PARSERS_ = ol.xml.makeStructureNS( @@ -1484,7 +1484,7 @@ ol.format.KML.GEOMETRY_FLAT_COORDINATES_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.ICON_PARSERS_ = ol.xml.makeStructureNS( @@ -1501,7 +1501,7 @@ ol.format.KML.ICON_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.ICON_STYLE_PARSERS_ = ol.xml.makeStructureNS( @@ -1515,7 +1515,7 @@ ol.format.KML.ICON_STYLE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.INNER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS( @@ -1526,7 +1526,7 @@ ol.format.KML.INNER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.LABEL_STYLE_PARSERS_ = ol.xml.makeStructureNS( @@ -1538,7 +1538,7 @@ ol.format.KML.LABEL_STYLE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.LINE_STYLE_PARSERS_ = ol.xml.makeStructureNS( @@ -1550,7 +1550,7 @@ ol.format.KML.LINE_STYLE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.MULTI_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS( @@ -1565,7 +1565,7 @@ ol.format.KML.MULTI_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.GX_MULTITRACK_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS( @@ -1576,7 +1576,7 @@ ol.format.KML.GX_MULTITRACK_GEOMETRY_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.NETWORK_LINK_PARSERS_ = ol.xml.makeStructureNS( @@ -1594,7 +1594,7 @@ ol.format.KML.NETWORK_LINK_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.LINK_PARSERS_ = ol.xml.makeStructureNS( @@ -1605,7 +1605,7 @@ ol.format.KML.LINK_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.OUTER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS( @@ -1616,7 +1616,7 @@ ol.format.KML.OUTER_BOUNDARY_IS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.PAIR_PARSERS_ = ol.xml.makeStructureNS( @@ -1629,7 +1629,7 @@ ol.format.KML.PAIR_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeStructureNS( @@ -1666,7 +1666,7 @@ ol.format.KML.PLACEMARK_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeStructureNS( @@ -1679,7 +1679,7 @@ ol.format.KML.POLY_STYLE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.SCHEMA_DATA_PARSERS_ = ol.xml.makeStructureNS( @@ -1690,7 +1690,7 @@ ol.format.KML.SCHEMA_DATA_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.STYLE_PARSERS_ = ol.xml.makeStructureNS( @@ -1704,7 +1704,7 @@ ol.format.KML.STYLE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.STYLE_MAP_PARSERS_ = ol.xml.makeStructureNS( @@ -2161,7 +2161,7 @@ ol.format.KML.writeCoordinatesTextNode_ = function(node, coordinates, objectStac * @private */ ol.format.KML.writeDocument_ = function(node, features, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; ol.xml.pushSerializeAndPop(context, ol.format.KML.DOCUMENT_SERIALIZERS_, ol.format.KML.DOCUMENT_NODE_FACTORY_, features, objectStack, undefined, this); @@ -2175,7 +2175,7 @@ ol.format.KML.writeDocument_ = function(node, features, objectStack) { * @private */ ol.format.KML.writeIcon_ = function(node, icon, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; var parentNode = objectStack[objectStack.length - 1].node; var orderedKeys = ol.format.KML.ICON_SEQUENCE_[parentNode.namespaceURI]; var values = ol.xml.makeSequence(icon, orderedKeys); @@ -2197,7 +2197,7 @@ ol.format.KML.writeIcon_ = function(node, icon, objectStack) { * @private */ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; var properties = {}; var src = style.getSrc(); var size = style.getSize(); @@ -2218,7 +2218,7 @@ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) { } if (anchor && anchor[0] !== 0 && anchor[1] !== size[1]) { - var /** @type {ol.format.KMLVec2_} */ hotSpot = { + var /** @type {ol.KMLVec2_} */ hotSpot = { x: anchor[0], xunits: ol.style.IconAnchorUnits.PIXELS, y: size[1] - anchor[1], @@ -2255,7 +2255,7 @@ ol.format.KML.writeIconStyle_ = function(node, style, objectStack) { * @private */ ol.format.KML.writeLabelStyle_ = function(node, style, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; var properties = {}; var fill = style.getFill(); if (fill) { @@ -2281,7 +2281,7 @@ ol.format.KML.writeLabelStyle_ = function(node, style, objectStack) { * @private */ ol.format.KML.writeLineStyle_ = function(node, style, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; var properties = { 'color': style.getColor(), 'width': style.getWidth() @@ -2308,7 +2308,7 @@ ol.format.KML.writeMultiGeometry_ = function(node, geometry, objectStack) { (geometry instanceof ol.geom.MultiPolygon), 'geometry should be one of: ol.geom.GeometryCollection, ' + 'ol.geom.MultiPoint, ol.geom.MultiLineString or ol.geom.MultiPolygon'); - /** @type {ol.xml.NodeStackItem} */ + /** @type {ol.xmlNodeStackItem} */ var context = {node: node}; var type = geometry.getType(); /** @type {Array.} */ @@ -2346,7 +2346,7 @@ ol.format.KML.writeMultiGeometry_ = function(node, geometry, objectStack) { * @private */ ol.format.KML.writeBoundaryIs_ = function(node, linearRing, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; ol.xml.pushSerializeAndPop(context, ol.format.KML.BOUNDARY_IS_SERIALIZERS_, ol.format.KML.LINEAR_RING_NODE_FACTORY_, [linearRing], objectStack); @@ -2363,7 +2363,7 @@ ol.format.KML.writeBoundaryIs_ = function(node, linearRing, objectStack) { * @private */ ol.format.KML.writePlacemark_ = function(node, feature, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; // set id if (feature.getId()) { @@ -2421,7 +2421,7 @@ ol.format.KML.writePrimitiveGeometry_ = function(node, geometry, objectStack) { 'geometry should be one of ol.geom.Point, ol.geom.LineString ' + 'or ol.geom.LinearRing'); var flatCoordinates = geometry.getFlatCoordinates(); - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; context['layout'] = geometry.getLayout(); context['stride'] = geometry.getStride(); ol.xml.pushSerializeAndPop(context, @@ -2444,7 +2444,7 @@ ol.format.KML.writePolygon_ = function(node, polygon, objectStack) { goog.asserts.assert(linearRings.length > 0, 'linearRings should not be empty'); var outerRing = linearRings.shift(); - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; // inner rings ol.xml.pushSerializeAndPop(context, ol.format.KML.POLYGON_SERIALIZERS_, @@ -2465,7 +2465,7 @@ ol.format.KML.writePolygon_ = function(node, polygon, objectStack) { * @private */ ol.format.KML.writePolyStyle_ = function(node, style, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; ol.xml.pushSerializeAndPop(context, ol.format.KML.POLY_STYLE_SERIALIZERS_, ol.format.KML.COLOR_NODE_FACTORY_, [style.getColor()], objectStack); }; @@ -2490,7 +2490,7 @@ ol.format.KML.writeScaleTextNode_ = function(node, scale) { * @private */ ol.format.KML.writeStyle_ = function(node, style, objectStack) { - var /** @type {ol.xml.NodeStackItem} */ context = {node: node}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: node}; var properties = {}; var fillStyle = style.getFill(); var strokeStyle = style.getStroke(); @@ -2518,7 +2518,7 @@ ol.format.KML.writeStyle_ = function(node, style, objectStack) { /** * @param {Node} node Node to append a TextNode with the Vec2 to. - * @param {ol.format.KMLVec2_} vec2 Vec2. + * @param {ol.KMLVec2_} vec2 Vec2. * @private */ ol.format.KML.writeVec2_ = function(node, vec2) { @@ -2542,7 +2542,7 @@ ol.format.KML.KML_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.KML_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2554,7 +2554,7 @@ ol.format.KML.KML_SERIALIZERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.DOCUMENT_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2596,7 +2596,7 @@ ol.format.KML.ICON_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.ICON_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2624,7 +2624,7 @@ ol.format.KML.ICON_STYLE_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.ICON_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2649,7 +2649,7 @@ ol.format.KML.LABEL_STYLE_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.LABEL_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2672,7 +2672,7 @@ ol.format.KML.LINE_STYLE_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.LINE_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2684,7 +2684,7 @@ ol.format.KML.LINE_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.BOUNDARY_IS_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2696,7 +2696,7 @@ ol.format.KML.BOUNDARY_IS_SERIALIZERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.MULTI_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2725,7 +2725,7 @@ ol.format.KML.PLACEMARK_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.PLACEMARK_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2755,7 +2755,7 @@ ol.format.KML.PLACEMARK_SERIALIZERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2767,7 +2767,7 @@ ol.format.KML.PRIMITIVE_GEOMETRY_SERIALIZERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.POLYGON_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2781,7 +2781,7 @@ ol.format.KML.POLYGON_SERIALIZERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.POLY_STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2803,7 +2803,7 @@ ol.format.KML.STYLE_SEQUENCE_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.KML.STYLE_SERIALIZERS_ = ol.xml.makeStructureNS( @@ -2982,7 +2982,7 @@ ol.format.KML.prototype.writeFeaturesNode = function(features, opt_options) { ol.xml.setAttributeNS(kml, xmlSchemaInstanceUri, 'xsi:schemaLocation', ol.format.KML.SCHEMA_LOCATION_); - var /** @type {ol.xml.NodeStackItem} */ context = {node: kml}; + var /** @type {ol.xmlNodeStackItem} */ context = {node: kml}; var properties = {}; if (features.length > 1) { properties['Document'] = features; diff --git a/src/ol/format/osmxmlformat.js b/src/ol/format/osmxmlformat.js index b5c9a4c619..71a9ed8042 100644 --- a/src/ol/format/osmxmlformat.js +++ b/src/ol/format/osmxmlformat.js @@ -165,7 +165,7 @@ ol.format.OSMXML.NAMESPACE_URIS_ = [ /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OSMXML.WAY_PARSERS_ = ol.xml.makeStructureNS( @@ -177,7 +177,7 @@ ol.format.OSMXML.WAY_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OSMXML.PARSERS_ = ol.xml.makeStructureNS( @@ -189,7 +189,7 @@ ol.format.OSMXML.PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OSMXML.NODE_PARSERS_ = ol.xml.makeStructureNS( diff --git a/src/ol/format/owsformat.js b/src/ol/format/owsformat.js index 2c44fda4ce..ad28d423de 100644 --- a/src/ol/format/owsformat.js +++ b/src/ol/format/owsformat.js @@ -302,7 +302,7 @@ ol.format.OWS.NAMESPACE_URIS_ = [ /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.PARSERS_ = ol.xml.makeStructureNS( @@ -318,7 +318,7 @@ ol.format.OWS.PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.ADDRESS_PARSERS_ = ol.xml.makeStructureNS( @@ -337,7 +337,7 @@ ol.format.OWS.ADDRESS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.ALLOWED_VALUES_PARSERS_ = ol.xml.makeStructureNS( @@ -348,7 +348,7 @@ ol.format.OWS.ALLOWED_VALUES_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.CONSTRAINT_PARSERS_ = ol.xml.makeStructureNS( @@ -360,7 +360,7 @@ ol.format.OWS.CONSTRAINT_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.CONTACT_INFO_PARSERS_ = ol.xml.makeStructureNS( @@ -372,7 +372,7 @@ ol.format.OWS.CONTACT_INFO_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.DCP_PARSERS_ = ol.xml.makeStructureNS( @@ -383,7 +383,7 @@ ol.format.OWS.DCP_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.HTTP_PARSERS_ = ol.xml.makeStructureNS( @@ -395,7 +395,7 @@ ol.format.OWS.HTTP_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.OPERATION_PARSERS_ = ol.xml.makeStructureNS( @@ -406,7 +406,7 @@ ol.format.OWS.OPERATION_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.OPERATIONS_METADATA_PARSERS_ = ol.xml.makeStructureNS( @@ -417,7 +417,7 @@ ol.format.OWS.OPERATIONS_METADATA_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.PHONE_PARSERS_ = ol.xml.makeStructureNS( @@ -429,7 +429,7 @@ ol.format.OWS.PHONE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.REQUEST_METHOD_PARSERS_ = ol.xml.makeStructureNS( @@ -441,7 +441,7 @@ ol.format.OWS.REQUEST_METHOD_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.SERVICE_CONTACT_PARSERS_ = @@ -457,7 +457,7 @@ ol.format.OWS.SERVICE_CONTACT_PARSERS_ = /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.SERVICE_IDENTIFICATION_PARSERS_ = @@ -472,7 +472,7 @@ ol.format.OWS.SERVICE_IDENTIFICATION_PARSERS_ = /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.OWS.SERVICE_PROVIDER_PARSERS_ = diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index 25b2a441d5..a6b1af7a16 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -193,7 +193,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = function(doc /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.FEATURE_COLLECTION_PARSERS_ = { @@ -226,7 +226,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.TRANSACTION_SUMMARY_PARSERS_ = { @@ -255,7 +255,7 @@ ol.format.WFS.readTransactionSummary_ = function(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.OGC_FID_PARSERS_ = { @@ -279,7 +279,7 @@ ol.format.WFS.fidParser_ = function(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.INSERT_RESULTS_PARSERS_ = { @@ -303,7 +303,7 @@ ol.format.WFS.readInsertResults_ = function(node, objectStack) { /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.TRANSACTION_RESPONSE_PARSERS_ = { @@ -348,7 +348,7 @@ ol.format.WFS.prototype.readTransactionResponseFromNode = function(node) { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.QUERY_SERIALIZERS_ = { @@ -497,7 +497,7 @@ ol.format.WFS.writeNative_ = function(node, nativeElement, objectStack) { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.TRANSACTION_SERIALIZERS_ = { @@ -722,7 +722,7 @@ ol.format.WFS.writeOgcLiteral_ = function(node, value) { /** - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WFS.GETFEATURE_SERIALIZERS_ = { diff --git a/src/ol/format/wktformat.js b/src/ol/format/wktformat.js index 7532560d30..6239509327 100644 --- a/src/ol/format/wktformat.js +++ b/src/ol/format/wktformat.js @@ -445,7 +445,7 @@ ol.format.WKT.Lexer.prototype.nextChar_ = function() { /** * Fetch and return the next token. - * @return {!ol.format.WKTToken} Next string token. + * @return {!ol.WKTToken} Next string token. */ ol.format.WKT.Lexer.prototype.nextToken = function() { var c = this.nextChar_(); @@ -531,7 +531,7 @@ ol.format.WKT.Parser = function(lexer) { this.lexer_ = lexer; /** - * @type {ol.format.WKTToken} + * @type {ol.WKTToken} * @private */ this.token_; diff --git a/src/ol/format/wmscapabilitiesformat.js b/src/ol/format/wmscapabilitiesformat.js index 1ee65a4067..882644b093 100644 --- a/src/ol/format/wmscapabilitiesformat.js +++ b/src/ol/format/wmscapabilitiesformat.js @@ -568,7 +568,7 @@ ol.format.WMSCapabilities.NAMESPACE_URIS_ = [ /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.PARSERS_ = ol.xml.makeStructureNS( @@ -582,7 +582,7 @@ ol.format.WMSCapabilities.PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.CAPABILITY_PARSERS_ = ol.xml.makeStructureNS( @@ -598,7 +598,7 @@ ol.format.WMSCapabilities.CAPABILITY_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.SERVICE_PARSERS_ = ol.xml.makeStructureNS( @@ -626,7 +626,7 @@ ol.format.WMSCapabilities.SERVICE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.CONTACT_INFORMATION_PARSERS_ = ol.xml.makeStructureNS( @@ -648,7 +648,7 @@ ol.format.WMSCapabilities.CONTACT_INFORMATION_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.CONTACT_PERSON_PARSERS_ = ol.xml.makeStructureNS( @@ -662,7 +662,7 @@ ol.format.WMSCapabilities.CONTACT_PERSON_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.CONTACT_ADDRESS_PARSERS_ = ol.xml.makeStructureNS( @@ -679,7 +679,7 @@ ol.format.WMSCapabilities.CONTACT_ADDRESS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.EXCEPTION_PARSERS_ = ol.xml.makeStructureNS( @@ -690,7 +690,7 @@ ol.format.WMSCapabilities.EXCEPTION_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS( @@ -731,7 +731,7 @@ ol.format.WMSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.ATTRIBUTION_PARSERS_ = ol.xml.makeStructureNS( @@ -746,7 +746,7 @@ ol.format.WMSCapabilities.ATTRIBUTION_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ = @@ -764,7 +764,7 @@ ol.format.WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ = /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.REQUEST_PARSERS_ = ol.xml.makeStructureNS( @@ -780,7 +780,7 @@ ol.format.WMSCapabilities.REQUEST_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.OPERATIONTYPE_PARSERS_ = ol.xml.makeStructureNS( @@ -793,7 +793,7 @@ ol.format.WMSCapabilities.OPERATIONTYPE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.DCPTYPE_PARSERS_ = ol.xml.makeStructureNS( @@ -805,7 +805,7 @@ ol.format.WMSCapabilities.DCPTYPE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.HTTP_PARSERS_ = ol.xml.makeStructureNS( @@ -819,7 +819,7 @@ ol.format.WMSCapabilities.HTTP_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS( @@ -838,7 +838,7 @@ ol.format.WMSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ = @@ -851,7 +851,7 @@ ol.format.WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ = /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMSCapabilities.KEYWORDLIST_PARSERS_ = ol.xml.makeStructureNS( diff --git a/src/ol/format/wmtscapabilitiesformat.js b/src/ol/format/wmtscapabilitiesformat.js index d8d5d1d624..7e80450759 100644 --- a/src/ol/format/wmtscapabilitiesformat.js +++ b/src/ol/format/wmtscapabilitiesformat.js @@ -277,7 +277,7 @@ ol.format.WMTSCapabilities.OWS_NAMESPACE_URIS_ = [ /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.PARSERS_ = ol.xml.makeStructureNS( @@ -289,7 +289,7 @@ ol.format.WMTSCapabilities.PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.CONTENTS_PARSERS_ = ol.xml.makeStructureNS( @@ -303,7 +303,7 @@ ol.format.WMTSCapabilities.CONTENTS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS( @@ -332,7 +332,7 @@ ol.format.WMTSCapabilities.LAYER_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS( @@ -349,7 +349,7 @@ ol.format.WMTSCapabilities.STYLE_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.TMS_LINKS_PARSERS_ = ol.xml.makeStructureNS( @@ -361,7 +361,7 @@ ol.format.WMTSCapabilities.TMS_LINKS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.DIMENSION_PARSERS_ = ol.xml.makeStructureNS( @@ -378,7 +378,7 @@ ol.format.WMTSCapabilities.DIMENSION_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.WGS84_BBOX_READERS_ = ol.xml.makeStructureNS( @@ -392,7 +392,7 @@ ol.format.WMTSCapabilities.WGS84_BBOX_READERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.TMS_PARSERS_ = ol.xml.makeStructureNS( @@ -411,7 +411,7 @@ ol.format.WMTSCapabilities.TMS_PARSERS_ = ol.xml.makeStructureNS( /** * @const - * @type {Object.>} + * @type {Object.>} * @private */ ol.format.WMTSCapabilities.TM_PARSERS_ = ol.xml.makeStructureNS( diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index ab34d7eae7..4b5d3b2bc3 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -75,7 +75,7 @@ goog.inherits(ol.layer.Layer, ol.layer.Base); * Return `true` if the layer is visible, and if the passed resolution is * between the layer's minResolution and maxResolution. The comparison is * inclusive for `minResolution` and exclusive for `maxResolution`. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @param {number} resolution Resolution. * @return {boolean} The layer is visible at the given resolution. */ diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/layerbase.js index e594f6d54c..fa017de72f 100644 --- a/src/ol/layer/layerbase.js +++ b/src/ol/layer/layerbase.js @@ -60,7 +60,7 @@ goog.inherits(ol.layer.Base, ol.Object); /** - * @return {ol.layer.LayerState} Layer state. + * @return {ol.LayerState} Layer state. */ ol.layer.Base.prototype.getLayerState = function() { var opacity = this.getOpacity(); @@ -93,9 +93,9 @@ ol.layer.Base.prototype.getLayersArray = goog.abstractMethod; /** - * @param {Array.=} opt_states Optional list of layer + * @param {Array.=} opt_states Optional list of layer * states (to be modified in place). - * @return {Array.} List of layer states. + * @return {Array.} List of layer states. */ ol.layer.Base.prototype.getLayerStatesArray = goog.abstractMethod; diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index c2d8ba8899..aeba1f9074 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -71,31 +71,31 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, vi /** * @private - * @type {?ol.render.canvasFillState} + * @type {?ol.canvasFillState} */ this.contextFillState_ = null; /** * @private - * @type {?ol.render.canvasStrokeState} + * @type {?ol.canvasStrokeState} */ this.contextStrokeState_ = null; /** * @private - * @type {?ol.render.canvasTextState} + * @type {?ol.canvasTextState} */ this.contextTextState_ = null; /** * @private - * @type {?ol.render.canvasFillState} + * @type {?ol.canvasFillState} */ this.fillState_ = null; /** * @private - * @type {?ol.render.canvasStrokeState} + * @type {?ol.canvasStrokeState} */ this.strokeState_ = null; @@ -203,19 +203,19 @@ ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, vi /** * @private - * @type {?ol.render.canvasFillState} + * @type {?ol.canvasFillState} */ this.textFillState_ = null; /** * @private - * @type {?ol.render.canvasStrokeState} + * @type {?ol.canvasStrokeState} */ this.textStrokeState_ = null; /** * @private - * @type {?ol.render.canvasTextState} + * @type {?ol.canvasTextState} */ this.textState_ = null; @@ -700,7 +700,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPolygon = function(geometry) { /** - * @param {ol.render.canvasFillState} fillState Fill state. + * @param {ol.canvasFillState} fillState Fill state. * @private */ ol.render.canvas.Immediate.prototype.setContextFillState_ = function(fillState) { @@ -720,7 +720,7 @@ ol.render.canvas.Immediate.prototype.setContextFillState_ = function(fillState) /** - * @param {ol.render.canvasStrokeState} strokeState Stroke state. + * @param {ol.canvasStrokeState} strokeState Stroke state. * @private */ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeState) { @@ -772,7 +772,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeSta /** - * @param {ol.render.canvasTextState} textState Text state. + * @param {ol.canvasTextState} textState Text state. * @private */ ol.render.canvas.Immediate.prototype.setContextTextState_ = function(textState) { diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 4ad1e193b5..b31c526406 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -1538,19 +1538,19 @@ ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) { /** * @private - * @type {?ol.render.canvasFillState} + * @type {?ol.canvasFillState} */ this.replayFillState_ = null; /** * @private - * @type {?ol.render.canvasStrokeState} + * @type {?ol.canvasStrokeState} */ this.replayStrokeState_ = null; /** * @private - * @type {?ol.render.canvasTextState} + * @type {?ol.canvasTextState} */ this.replayTextState_ = null; @@ -1586,19 +1586,19 @@ ol.render.canvas.TextReplay = function(tolerance, maxExtent, resolution) { /** * @private - * @type {?ol.render.canvasFillState} + * @type {?ol.canvasFillState} */ this.textFillState_ = null; /** * @private - * @type {?ol.render.canvasStrokeState} + * @type {?ol.canvasStrokeState} */ this.textStrokeState_ = null; /** * @private - * @type {?ol.render.canvasTextState} + * @type {?ol.canvasTextState} */ this.textState_ = null; @@ -1638,7 +1638,7 @@ ol.render.canvas.TextReplay.prototype.drawText = function(flatCoordinates, offse /** - * @param {ol.render.canvasFillState} fillState Fill state. + * @param {ol.canvasFillState} fillState Fill state. * @private */ ol.render.canvas.TextReplay.prototype.setReplayFillState_ = function(fillState) { @@ -1662,7 +1662,7 @@ ol.render.canvas.TextReplay.prototype.setReplayFillState_ = function(fillState) /** - * @param {ol.render.canvasStrokeState} strokeState Stroke state. + * @param {ol.canvasStrokeState} strokeState Stroke state. * @private */ ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = function(strokeState) { @@ -1704,7 +1704,7 @@ ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = function(strokeSta /** - * @param {ol.render.canvasTextState} textState Text state. + * @param {ol.canvasTextState} textState Text state. * @private */ ol.render.canvas.TextReplay.prototype.setReplayTextState_ = function(textState) { diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js index 9e6a02a8ce..0cd55e088f 100644 --- a/src/ol/renderer/canvas/canvaslayerrenderer.js +++ b/src/ol/renderer/canvas/canvaslayerrenderer.js @@ -33,7 +33,7 @@ goog.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer); /** * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @param {CanvasRenderingContext2D} context Context. */ ol.renderer.canvas.Layer.prototype.composeFrame = function(frameState, layerState, context) { @@ -202,7 +202,7 @@ ol.renderer.canvas.Layer.prototype.getTransform = function(frameState, offsetX) /** * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @return {boolean} whether composeFrame should be called. */ ol.renderer.canvas.Layer.prototype.prepareFrame = goog.abstractMethod; diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 56b55d8354..5233f55180 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -216,7 +216,7 @@ ol.renderer.canvas.TileLayer.prototype.forEachLayerAtPixel = function( /** * @param {CanvasRenderingContext2D} context Context. * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @protected */ ol.renderer.canvas.TileLayer.prototype.renderTileImages = function(context, frameState, layerState) { diff --git a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js index 6fd97a5533..1197376b72 100644 --- a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js @@ -90,7 +90,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.composeFrame = function( /** * @param {CanvasRenderingContext2D} context Context. * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @private */ ol.renderer.canvas.VectorTileLayer.prototype.renderTileReplays_ = function( @@ -387,7 +387,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.renderFeature = function(feature, s /** * @param {ol.VectorTile} tile Tile. * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @param {Array.} skippedFeatures Skipped features. * @private */ diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/domlayerrenderer.js index 785a038bc2..6165667ca3 100644 --- a/src/ol/renderer/dom/domlayerrenderer.js +++ b/src/ol/renderer/dom/domlayerrenderer.js @@ -33,7 +33,7 @@ ol.renderer.dom.Layer.prototype.clearFrame = ol.nullFunction; /** * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. */ ol.renderer.dom.Layer.prototype.composeFrame = ol.nullFunction; @@ -48,7 +48,7 @@ ol.renderer.dom.Layer.prototype.getTarget = function() { /** * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @return {boolean} whether composeFrame should be called. */ ol.renderer.dom.Layer.prototype.prepareFrame = goog.abstractMethod; diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index dd8ce1f251..5b3085f2d0 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -373,8 +373,8 @@ ol.renderer.Map.prototype.scheduleRemoveUnusedLayerRenderers = function(frameSta /** - * @param {ol.layer.LayerState} state1 First layer state. - * @param {ol.layer.LayerState} state2 Second layer state. + * @param {ol.LayerState} state1 First layer state. + * @param {ol.LayerState} state2 Second layer state. * @return {number} The zIndex difference. */ ol.renderer.Map.sortByZIndex = function(state1, state2) { diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js index c8feb8d837..4cf9928928 100644 --- a/src/ol/renderer/webgl/webgllayerrenderer.js +++ b/src/ol/renderer/webgl/webgllayerrenderer.js @@ -130,7 +130,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebu /** * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @param {ol.webgl.Context} context Context. */ ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) { @@ -243,7 +243,7 @@ ol.renderer.webgl.Layer.prototype.handleWebGLContextLost = function() { /** * @param {olx.FrameState} frameState Frame state. - * @param {ol.layer.LayerState} layerState Layer state. + * @param {ol.LayerState} layerState Layer state. * @param {ol.webgl.Context} context Context. * @return {boolean} whether composeFrame should be called. */ diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 550b8fb491..4f8d23b708 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -104,7 +104,7 @@ ol.renderer.webgl.Map = function(container, map) { /** * @private - * @type {ol.structs.LRUCache.} + * @type {ol.structs.LRUCache.} */ this.textureCache_ = new ol.structs.LRUCache(); @@ -294,7 +294,7 @@ ol.renderer.webgl.Map.prototype.disposeInternal = function() { if (!gl.isContextLost()) { this.textureCache_.forEach( /** - * @param {?ol.renderer.webglTextureCacheEntry} textureCacheEntry + * @param {?ol.webglTextureCacheEntry} textureCacheEntry * Texture cache entry. */ function(textureCacheEntry) { @@ -443,7 +443,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) { this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, frameState); - /** @type {Array.} */ + /** @type {Array.} */ var layerStatesToDraw = []; var layerStatesArray = frameState.layerStatesArray; ol.array.stableSort(layerStatesArray, ol.renderer.Map.sortByZIndex); diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/webglvectorlayerrenderer.js index 4f4cf4deed..abdaffb10c 100644 --- a/src/ol/renderer/webgl/webglvectorlayerrenderer.js +++ b/src/ol/renderer/webgl/webglvectorlayerrenderer.js @@ -60,7 +60,7 @@ ol.renderer.webgl.VectorLayer = function(mapRenderer, vectorLayer) { /** * The last layer state. * @private - * @type {?ol.layer.LayerState} + * @type {?ol.LayerState} */ this.layerState_ = null; diff --git a/src/ol/reproj/image.js b/src/ol/reproj/image.js index 087ec42c95..ddbc3ff756 100644 --- a/src/ol/reproj/image.js +++ b/src/ol/reproj/image.js @@ -23,7 +23,7 @@ goog.require('ol.reproj.Triangulation'); * @param {ol.Extent} targetExtent Target extent. * @param {number} targetResolution Target resolution. * @param {number} pixelRatio Pixel ratio. - * @param {ol.reproj.ImageFunctionType} getImageFunction + * @param {ol.reprojImageFunctionType} getImageFunction * Function returning source images (extent, resolution, pixelRatio). */ ol.reproj.Image = function(sourceProj, targetProj, diff --git a/src/ol/reproj/tile.js b/src/ol/reproj/tile.js index 28a2d69688..99c0ed534f 100644 --- a/src/ol/reproj/tile.js +++ b/src/ol/reproj/tile.js @@ -28,7 +28,7 @@ goog.require('ol.reproj.Triangulation'); * @param {ol.TileCoord} wrappedTileCoord Coordinate of the tile wrapped in X. * @param {number} pixelRatio Pixel ratio. * @param {number} gutter Gutter of the source tiles. - * @param {ol.reproj.TileFunctionType} getTileFunction + * @param {ol.reprojTileFunctionType} getTileFunction * Function returning source tiles (z, x, y, pixelRatio). * @param {number=} opt_errorThreshold Acceptable reprojection error (in px). * @param {boolean=} opt_renderEdges Render reprojection edges. diff --git a/src/ol/reproj/triangulation.js b/src/ol/reproj/triangulation.js index c4e9051824..4d538b2ded 100644 --- a/src/ol/reproj/triangulation.js +++ b/src/ol/reproj/triangulation.js @@ -63,7 +63,7 @@ ol.reproj.Triangulation = function(sourceProj, targetProj, targetExtent, this.errorThresholdSquared_ = errorThreshold * errorThreshold; /** - * @type {Array.} + * @type {Array.} * @private */ this.triangles_ = []; @@ -324,7 +324,7 @@ ol.reproj.Triangulation.prototype.calculateSourceExtent = function() { /** - * @return {Array.} Array of the calculated triangles. + * @return {Array.} Array of the calculated triangles. */ ol.reproj.Triangulation.prototype.getTriangles = function() { return this.triangles_; diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js index 0d1c24f5f3..88c2e243db 100644 --- a/src/ol/source/imagesource.js +++ b/src/ol/source/imagesource.js @@ -19,7 +19,7 @@ goog.require('ol.source.Source'); * * @constructor * @extends {ol.source.Source} - * @param {ol.source.ImageOptions} options Single image source options. + * @param {ol.sourceImageOptions} options Single image source options. * @api */ ol.source.Image = function(options) { diff --git a/src/ol/source/rastersource.js b/src/ol/source/rastersource.js index 5c9f0ac993..bab233fe44 100644 --- a/src/ol/source/rastersource.js +++ b/src/ol/source/rastersource.js @@ -91,7 +91,7 @@ ol.source.Raster = function(options) { /** * The most recently rendered state. - * @type {?ol.source.RasterRenderedState} + * @type {?ol.sourceRasterRenderedState} * @private */ this.renderedState_ = null; @@ -340,7 +340,7 @@ ol.source.Raster.prototype.onWorkerComplete_ = function(frameState, callback, er * Get image data from a renderer. * @param {ol.renderer.canvas.Layer} renderer Layer renderer. * @param {olx.FrameState} frameState The frame state. - * @param {ol.layer.LayerState} layerState The layer state. + * @param {ol.LayerState} layerState The layer state. * @return {ImageData} The image data. * @private */ @@ -376,7 +376,7 @@ ol.source.Raster.context_ = null; /** * Get a list of layer states from a list of renderers. * @param {Array.} renderers Layer renderers. - * @return {Array.} The layer states. + * @return {Array.} The layer states. * @private */ ol.source.Raster.getLayerStatesArray_ = function(renderers) { diff --git a/src/ol/source/source.js b/src/ol/source/source.js index 4bb1e82ca7..a41cf4685c 100644 --- a/src/ol/source/source.js +++ b/src/ol/source/source.js @@ -30,7 +30,7 @@ ol.source.State = { * * @constructor * @extends {ol.Object} - * @param {ol.source.SourceOptions} options Source options. + * @param {ol.sourceSourceOptions} options Source options. * @api stable */ ol.source.Source = function(options) { diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index dbd41fa803..25bdec399c 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -22,7 +22,7 @@ goog.require('ol.tilegrid.TileGrid'); * * @constructor * @extends {ol.source.Source} - * @param {ol.source.TileOptions} options Tile source options. + * @param {ol.sourceTileOptions} options Tile source options. * @api */ ol.source.Tile = function(options) { diff --git a/src/ol/source/urltilesource.js b/src/ol/source/urltilesource.js index 6b87c687d5..5167c6abd0 100644 --- a/src/ol/source/urltilesource.js +++ b/src/ol/source/urltilesource.js @@ -14,7 +14,7 @@ goog.require('ol.source.TileEvent'); * @constructor * @fires ol.source.TileEvent * @extends {ol.source.Tile} - * @param {ol.source.UrlTileOptions} options Image tile options. + * @param {ol.sourceUrlTileOptions} options Image tile options. */ ol.source.UrlTile = function(options) { diff --git a/src/ol/structs/lrucache.js b/src/ol/structs/lrucache.js index 458ddd544e..4f1ee6cde1 100644 --- a/src/ol/structs/lrucache.js +++ b/src/ol/structs/lrucache.js @@ -22,19 +22,19 @@ ol.structs.LRUCache = function() { /** * @private - * @type {!Object.} + * @type {!Object.} */ this.entries_ = {}; /** * @private - * @type {?ol.structs.LRUCacheEntry} + * @type {?ol.LRUCacheEntry} */ this.oldest_ = null; /** * @private - * @type {?ol.structs.LRUCacheEntry} + * @type {?ol.LRUCacheEntry} */ this.newest_ = null; diff --git a/src/ol/typedefs.js b/src/ol/typedefs.js index 8a966e6891..2f08973965 100644 --- a/src/ol/typedefs.js +++ b/src/ol/typedefs.js @@ -27,19 +27,10 @@ goog.provide('ol.Extent'); goog.provide('ol.events.EventTargetLike'); -goog.provide('ol.format.KMLVec2_'); goog.provide('ol.interaction.DragBoxEndConditionType'); -goog.provide('ol.layer.LayerState'); goog.provide('ol.proj.ProjectionLike'); goog.provide('ol.raster.Operation'); -goog.provide('ol.render.canvas.FillState'); -goog.provide('ol.renderer.webgl.TextureCacheEntry'); -goog.provide('ol.reproj.ImageFunctionType'); -goog.provide('ol.source.ImageOptions'); -goog.provide('ol.structs.LRUCacheEntry'); goog.provide('ol.style.AtlasBlock'); -goog.provide('ol.webgl.BufferCacheEntry'); -goog.provide('ol.xml.NodeStackItem'); /** @@ -193,6 +184,34 @@ ol.ImageCanvasLoader; ol.ImageLoadFunctionType; +/** + * @typedef {{x: number, xunits: (ol.style.IconAnchorUnits|undefined), + * y: number, yunits: (ol.style.IconAnchorUnits|undefined)}} + */ +ol.KMLVec2_; + + +/** + * @typedef {{flatCoordinates: Array., + * whens: Array.}} + */ +ol.KMLGxTrackObject_; + + +/** + * @typedef {{layer: ol.layer.Layer, + * opacity: number, + * sourceState: ol.source.State, + * visible: boolean, + * managed: boolean, + * extent: (ol.Extent|undefined), + * zIndex: number, + * maxResolution: number, + * minResolution: number}} + */ +ol.LayerState; + + /** * One of `all`, `bbox`, `tile`. * @@ -202,6 +221,15 @@ ol.ImageLoadFunctionType; ol.LoadingStrategy; +/** + * @typedef {{key_: string, + * newer: ol.LRUCacheEntry, + * older: ol.LRUCacheEntry, + * value_: *}} + */ +ol.LRUCacheEntry; + + /** * @typedef {{controls: ol.Collection., * interactions: ol.Collection., @@ -327,6 +355,37 @@ ol.TileUrlFunctionType; ol.TransformFunction; +/** + * @typedef {{type: number, value: (number|string|undefined), position: number}} + */ +ol.WKTToken; + + +/** + * @typedef {{fillStyle: ol.ColorLike}} + */ +ol.canvasFillState; + + +/** + * @typedef {{lineCap: string, + * lineDash: Array., + * lineJoin: string, + * lineWidth: number, + * miterLimit: number, + * strokeStyle: string}} + */ +ol.canvasStrokeState; + + +/** + * @typedef {{font: string, + * textAlign: string, + * textBaseline: string}} + */ +ol.canvasTextState; + + /** * A function that takes an {@link ol.MapBrowserEvent} and returns a * `{boolean}`. If the condition is met, true should be returned. @@ -371,26 +430,6 @@ ol.events.Key; ol.events.ListenerFunctionType; -/** - * @typedef {{x: number, xunits: (ol.style.IconAnchorUnits|undefined), - * y: number, yunits: (ol.style.IconAnchorUnits|undefined)}} - */ -ol.format.KMLVec2_; - - -/** - * @typedef {{flatCoordinates: Array., - * whens: Array.}} - */ -ol.format.KMLGxTrackObject_; - - -/** - * @typedef {{type: number, value: (number|string|undefined), position: number}} - */ -ol.format.WKTToken; - - /** * A function that takes a {@link ol.MapBrowserEvent} and two * {@link ol.Pixel}s and returns a `{boolean}`. If the condition is met, @@ -454,20 +493,6 @@ ol.interaction.SnapResultType; ol.interaction.SnapSegmentDataType; -/** - * @typedef {{layer: ol.layer.Layer, - * opacity: number, - * sourceState: ol.source.State, - * visible: boolean, - * managed: boolean, - * extent: (ol.Extent|undefined), - * zIndex: number, - * maxResolution: number, - * minResolution: number}} - */ -ol.layer.LayerState; - - /** * A projection as {@link ol.proj.Projection}, SRS identifier string or * undefined. @@ -504,47 +529,16 @@ ol.raster.Operation; ol.raster.Pixel; -/** - * @typedef {{fillStyle: ol.ColorLike}} - */ -ol.render.canvasFillState; - - -/** - * @typedef {{lineCap: string, - * lineDash: Array., - * lineJoin: string, - * lineWidth: number, - * miterLimit: number, - * strokeStyle: string}} - */ -ol.render.canvasStrokeState; - - -/** - * @typedef {{font: string, - * textAlign: string, - * textBaseline: string}} - */ -ol.render.canvasTextState; - - -/** - * @typedef {{magFilter: number, minFilter: number, texture: WebGLTexture}} - */ -ol.renderer.webglTextureCacheEntry; - - /** * @typedef {function(ol.Extent, number, number) : ol.ImageBase} */ -ol.reproj.ImageFunctionType; +ol.reprojImageFunctionType; /** * @typedef {function(number, number, number, number) : ol.Tile} */ -ol.reproj.TileFunctionType; +ol.reprojTileFunctionType; /** @@ -553,7 +547,7 @@ ol.reproj.TileFunctionType; * @typedef {{source: Array., * target: Array.}} */ -ol.reproj.Triangle; +ol.reprojTriangle; /** @@ -564,7 +558,7 @@ ol.reproj.Triangle; * resolutions: (Array.|undefined), * state: (ol.source.State|undefined)}} */ -ol.source.ImageOptions; +ol.sourceImageOptions; /** @@ -572,7 +566,7 @@ ol.source.ImageOptions; * resolution: number, * extent: ol.Extent}} */ -ol.source.RasterRenderedState; +ol.sourceRasterRenderedState; /** @@ -582,7 +576,7 @@ ol.source.RasterRenderedState; * state: (ol.source.State|undefined), * wrapX: (boolean|undefined)}} */ -ol.source.SourceOptions; +ol.sourceSourceOptions; /** @@ -597,7 +591,7 @@ ol.source.SourceOptions; * tileGrid: (ol.tilegrid.TileGrid|undefined), * wrapX: (boolean|undefined)}} */ -ol.source.TileOptions; +ol.sourceTileOptions; /** @@ -616,16 +610,7 @@ ol.source.TileOptions; * urls: (Array.|undefined), * wrapX: (boolean|undefined)}} */ -ol.source.UrlTileOptions; - - -/** - * @typedef {{key_: string, - * newer: ol.structs.LRUCacheEntry, - * older: ol.structs.LRUCacheEntry, - * value_: *}} - */ -ol.structs.LRUCacheEntry; +ol.sourceUrlTileOptions; /** @@ -712,7 +697,13 @@ ol.style.StyleFunction; * @typedef {{buf: ol.webgl.Buffer, * buffer: WebGLBuffer}} */ -ol.webgl.BufferCacheEntry; +ol.webglBufferCacheEntry; + + +/** + * @typedef {{magFilter: number, minFilter: number, texture: WebGLTexture}} + */ +ol.webglTextureCacheEntry; /** @@ -721,16 +712,16 @@ ol.webgl.BufferCacheEntry; * have this structure. * @typedef {{node:Node}} */ -ol.xml.NodeStackItem; +ol.xmlNodeStackItem; /** * @typedef {function(Node, Array.<*>)} */ -ol.xml.Parser; +ol.xmlParser; /** * @typedef {function(Node, *, Array.<*>)} */ -ol.xml.Serializer; +ol.xmlSerializer; diff --git a/src/ol/webgl/context.js b/src/ol/webgl/context.js index 059175f3c1..28b4647acc 100644 --- a/src/ol/webgl/context.js +++ b/src/ol/webgl/context.js @@ -35,7 +35,7 @@ ol.webgl.Context = function(canvas, gl) { /** * @private - * @type {Object.} + * @type {Object.} */ this.bufferCache_ = {}; diff --git a/src/ol/xml.js b/src/ol/xml.js index 119ad799a5..8e3aeea6cf 100644 --- a/src/ol/xml.js +++ b/src/ol/xml.js @@ -123,7 +123,7 @@ ol.xml.parse = function(xml) { * @param {function(this: T, Node, Array.<*>): (Array.<*>|undefined)} * valueReader Value reader. * @param {T=} opt_this The object to use as `this` in `valueReader`. - * @return {ol.xml.Parser} Parser. + * @return {ol.xmlParser} Parser. * @template T */ ol.xml.makeArrayExtender = function(valueReader, opt_this) { @@ -152,7 +152,7 @@ ol.xml.makeArrayExtender = function(valueReader, opt_this) { * object stack. * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {T=} opt_this The object to use as `this` in `valueReader`. - * @return {ol.xml.Parser} Parser. + * @return {ol.xmlParser} Parser. * @template T */ ol.xml.makeArrayPusher = function(valueReader, opt_this) { @@ -179,7 +179,7 @@ ol.xml.makeArrayPusher = function(valueReader, opt_this) { * top of the stack. * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {T=} opt_this The object to use as `this` in `valueReader`. - * @return {ol.xml.Parser} Parser. + * @return {ol.xmlParser} Parser. * @template T */ ol.xml.makeReplacer = function(valueReader, opt_this) { @@ -204,7 +204,7 @@ ol.xml.makeReplacer = function(valueReader, opt_this) { * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {string=} opt_property Property. * @param {T=} opt_this The object to use as `this` in `valueReader`. - * @return {ol.xml.Parser} Parser. + * @return {ol.xmlParser} Parser. * @template T */ ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) { @@ -242,7 +242,7 @@ ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) * @param {function(this: T, Node, Array.<*>): *} valueReader Value reader. * @param {string=} opt_property Property. * @param {T=} opt_this The object to use as `this` in `valueReader`. - * @return {ol.xml.Parser} Parser. + * @return {ol.xmlParser} Parser. * @template T */ ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) { @@ -272,11 +272,11 @@ ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) /** * Create a serializer that appends nodes written by its `nodeWriter` to its * designated parent. The parent is the `node` of the - * {@link ol.xml.NodeStackItem} at the top of the `objectStack`. + * {@link ol.xmlNodeStackItem} at the top of the `objectStack`. * @param {function(this: T, Node, V, Array.<*>)} * nodeWriter Node writer. * @param {T=} opt_this The object to use as `this` in `nodeWriter`. - * @return {ol.xml.Serializer} Serializer. + * @return {ol.xmlSerializer} Serializer. * @template T, V */ ol.xml.makeChildAppender = function(nodeWriter, opt_this) { @@ -305,7 +305,7 @@ ol.xml.makeChildAppender = function(nodeWriter, opt_this) { * @param {function(this: T, Node, V, Array.<*>)} * nodeWriter Node writer. * @param {T=} opt_this The object to use as `this` in `nodeWriter`. - * @return {ol.xml.Serializer} Serializer. + * @return {ol.xmlSerializer} Serializer. * @template T, V */ ol.xml.makeArraySerializer = function(nodeWriter, opt_this) { @@ -422,7 +422,7 @@ ol.xml.makeStructureNS = function(namespaceURIs, structure, opt_structureNS) { /** * Parse a node using the parsers and object stack. - * @param {Object.>} parsersNS + * @param {Object.>} parsersNS * Parsers by namespace. * @param {Node} node Node. * @param {Array.<*>} objectStack Object stack. @@ -445,7 +445,7 @@ ol.xml.parseNode = function(parsersNS, node, objectStack, opt_this) { /** * Push an object on top of the stack, parse and return the popped object. * @param {T} object Object. - * @param {Object.>} parsersNS + * @param {Object.>} parsersNS * Parsers by namespace. * @param {Node} node Node. * @param {Array.<*>} objectStack Object stack. @@ -463,7 +463,7 @@ ol.xml.pushParseAndPop = function( /** * Walk through an array of `values` and call a serializer for each value. - * @param {Object.>} serializersNS + * @param {Object.>} serializersNS * Namespaced serializers. * @param {function(this: T, *, Array.<*>, (string|undefined)): (Node|undefined)} nodeFactory * Node factory. The `nodeFactory` creates the node whose namespace and name @@ -503,7 +503,7 @@ ol.xml.serialize = function( /** * @param {O} object Object. - * @param {Object.>} serializersNS + * @param {Object.>} serializersNS * Namespaced serializers. * @param {function(this: T, *, Array.<*>, (string|undefined)): (Node|undefined)} nodeFactory * Node factory. The `nodeFactory` creates the node whose namespace and name