diff --git a/Makefile b/Makefile index 072abd9838..55db587693 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,7 @@ build/timestamps/gjslint-timestamp: $(SRC_JS) $(SPEC_JS) $(SPEC_RENDERING_JS) \ $(EXAMPLES_JS) @mkdir -p $(@D) @echo "Running gjslint..." - @gjslint --jslint_error=all --custom_jsdoc_tags=event,fires,function,classdesc,api,observable --strict $? + @gjslint --jslint_error=all --disable 0110 --custom_jsdoc_tags=event,fires,function,classdesc,api,observable --strict $? @touch $@ $(BUILD_HOSTED_EXAMPLES_JS): $(BUILD_HOSTED)/examples/%.js: build/examples/%.js diff --git a/package.json b/package.json index 0e2cd7c4ff..0c871644c2 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "install": "node tasks/install.js", "postinstall": "closure-util update", "start": "node tasks/serve.js", - "pretest": "eslint tasks test", + "pretest": "eslint tasks test src", "test": "node tasks/test.js", "debug-server": "node tasks/serve-lib.js" }, @@ -84,8 +84,7 @@ }, "rules": { "no-constant-condition": 0, - "no-multiple-empty-lines": [2, {"max": 3, "maxEOF": 1}], - "indent": 0 + "no-multiple-empty-lines": [2, {"max": 3, "maxEOF": 1}] } }, "ext": [ diff --git a/src/ol/attribution.js b/src/ol/attribution.js index 45c32d9dfe..1ee5379e81 100644 --- a/src/ol/attribution.js +++ b/src/ol/attribution.js @@ -59,8 +59,7 @@ ol.Attribution.prototype.getHTML = function() { * @param {!ol.proj.Projection} projection Projection. * @return {boolean} Intersects any tile range. */ -ol.Attribution.prototype.intersectsAnyTileRange = - function(tileRanges, tileGrid, projection) { +ol.Attribution.prototype.intersectsAnyTileRange = function(tileRanges, tileGrid, projection) { if (!this.tileRanges_) { return true; } diff --git a/src/ol/constraints.js b/src/ol/constraints.js index 84fc289b6f..4022801995 100644 --- a/src/ol/constraints.js +++ b/src/ol/constraints.js @@ -14,8 +14,7 @@ goog.require('ol.RotationConstraintType'); * @param {ol.RotationConstraintType} rotationConstraint * Rotation constraint. */ -ol.Constraints = - function(centerConstraint, resolutionConstraint, rotationConstraint) { +ol.Constraints = function(centerConstraint, resolutionConstraint, rotationConstraint) { /** * @type {ol.CenterConstraintType} diff --git a/src/ol/extent.js b/src/ol/extent.js index 086f7e433d..2ce48e6fff 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -301,8 +301,7 @@ ol.extent.createOrUpdateFromCoordinates = function(coordinates, opt_extent) { * @param {ol.Extent=} opt_extent Extent. * @return {ol.Extent} Extent. */ -ol.extent.createOrUpdateFromFlatCoordinates = - function(flatCoordinates, offset, end, stride, opt_extent) { +ol.extent.createOrUpdateFromFlatCoordinates = function(flatCoordinates, offset, end, stride, opt_extent) { var extent = ol.extent.createOrUpdateEmpty(opt_extent); return ol.extent.extendFlatCoordinates( extent, flatCoordinates, offset, end, stride); @@ -411,8 +410,7 @@ ol.extent.extendCoordinates = function(extent, coordinates) { * @param {number} stride Stride. * @return {ol.Extent} Extent. */ -ol.extent.extendFlatCoordinates = - function(extent, flatCoordinates, offset, end, stride) { +ol.extent.extendFlatCoordinates = function(extent, flatCoordinates, offset, end, stride) { for (; offset < end; offset += stride) { ol.extent.extendXY( extent, flatCoordinates[offset], flatCoordinates[offset + 1]); @@ -572,8 +570,7 @@ ol.extent.getEnlargedArea = function(extent1, extent2) { * @param {ol.Extent=} opt_extent Destination extent. * @return {ol.Extent} Extent. */ -ol.extent.getForViewAndSize = - function(center, resolution, rotation, size, opt_extent) { +ol.extent.getForViewAndSize = function(center, resolution, rotation, size, opt_extent) { var dx = resolution * size[0] / 2; var dy = resolution * size[1] / 2; var cosRotation = Math.cos(rotation); diff --git a/src/ol/format/esrijsonformat.js b/src/ol/format/esrijsonformat.js index 4465a30a82..cfe00c6b38 100644 --- a/src/ol/format/esrijsonformat.js +++ b/src/ol/format/esrijsonformat.js @@ -353,8 +353,7 @@ ol.format.EsriJSON.writePolygonGeometry_ = function(geometry, opt_options) { * @private * @return {EsriJSONPolyline} EsriJSON geometry. */ -ol.format.EsriJSON.writeMultiLineStringGeometry_ = - function(geometry, opt_options) { +ol.format.EsriJSON.writeMultiLineStringGeometry_ = function(geometry, opt_options) { goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString, 'geometry should be an ol.geom.MultiLineString'); var hasZM = ol.format.EsriJSON.getHasZM_(geometry); @@ -688,8 +687,7 @@ ol.format.EsriJSON.prototype.writeFeatures; * @return {Object} EsriJSON Object. * @api */ -ol.format.EsriJSON.prototype.writeFeaturesObject = - function(features, opt_options) { +ol.format.EsriJSON.prototype.writeFeaturesObject = function(features, opt_options) { opt_options = this.adaptOptions(opt_options); var objects = []; var i, ii; diff --git a/src/ol/format/geojsonformat.js b/src/ol/format/geojsonformat.js index c96a1d9ac6..ffda9f5ad2 100644 --- a/src/ol/format/geojsonformat.js +++ b/src/ol/format/geojsonformat.js @@ -243,8 +243,7 @@ ol.format.GeoJSON.writeLineStringGeometry_ = function(geometry, opt_options) { * @private * @return {GeoJSONGeometry} GeoJSON geometry. */ -ol.format.GeoJSON.writeMultiLineStringGeometry_ = - function(geometry, opt_options) { +ol.format.GeoJSON.writeMultiLineStringGeometry_ = function(geometry, opt_options) { goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString, 'geometry should be an ol.geom.MultiLineString'); return /** @type {GeoJSONGeometry} */ ({ @@ -572,8 +571,7 @@ ol.format.GeoJSON.prototype.writeFeatures; * @return {GeoJSONFeatureCollection} GeoJSON Object. * @api stable */ -ol.format.GeoJSON.prototype.writeFeaturesObject = - function(features, opt_options) { +ol.format.GeoJSON.prototype.writeFeaturesObject = function(features, opt_options) { opt_options = this.adaptOptions(opt_options); var objects = []; var i, ii; diff --git a/src/ol/format/gml/gml2format.js b/src/ol/format/gml/gml2format.js index 8255e28fa7..edbf4369f4 100644 --- a/src/ol/format/gml/gml2format.js +++ b/src/ol/format/gml/gml2format.js @@ -120,8 +120,7 @@ ol.format.GML2.prototype.readBox_ = function(node, objectStack) { * @param {Array.<*>} objectStack Object stack. * @private */ -ol.format.GML2.prototype.innerBoundaryIsParser_ = - function(node, objectStack) { +ol.format.GML2.prototype.innerBoundaryIsParser_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'innerBoundaryIs', @@ -146,8 +145,7 @@ ol.format.GML2.prototype.innerBoundaryIsParser_ = * @param {Array.<*>} objectStack Object stack. * @private */ -ol.format.GML2.prototype.outerBoundaryIsParser_ = - function(node, objectStack) { +ol.format.GML2.prototype.outerBoundaryIsParser_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'outerBoundaryIs', diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml/gml3format.js index 9b1792661b..cf8d6f32b5 100644 --- a/src/ol/format/gml/gml3format.js +++ b/src/ol/format/gml/gml3format.js @@ -224,8 +224,7 @@ ol.format.GML3.prototype.readPolygonPatch_ = function(node, objectStack) { * @private * @return {Array.|undefined} flat coordinates. */ -ol.format.GML3.prototype.readLineStringSegment_ = - function(node, objectStack) { +ol.format.GML3.prototype.readLineStringSegment_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'LineStringSegment', @@ -758,8 +757,7 @@ ol.format.GML3.prototype.writeEnvelope = function(node, extent, objectStack) { * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeLinearRing_ = - function(node, geometry, objectStack) { +ol.format.GML3.prototype.writeLinearRing_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var srsName = context['srsName']; @@ -779,8 +777,7 @@ ol.format.GML3.prototype.writeLinearRing_ = * @return {Node} Node. * @private */ -ol.format.GML3.prototype.RING_NODE_FACTORY_ = - function(value, objectStack, opt_nodeName) { +ol.format.GML3.prototype.RING_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { var context = objectStack[objectStack.length - 1]; var parentNode = context.node; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); @@ -799,8 +796,7 @@ ol.format.GML3.prototype.RING_NODE_FACTORY_ = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeSurfaceOrPolygon_ = - function(node, geometry, objectStack) { +ol.format.GML3.prototype.writeSurfaceOrPolygon_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var srsName = context['srsName']; @@ -829,8 +825,7 @@ ol.format.GML3.prototype.writeSurfaceOrPolygon_ = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeCurveOrLineString_ = - function(node, geometry, objectStack) { +ol.format.GML3.prototype.writeCurveOrLineString_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var srsName = context['srsName']; @@ -857,8 +852,7 @@ ol.format.GML3.prototype.writeCurveOrLineString_ = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeMultiSurfaceOrPolygon_ = - function(node, geometry, objectStack) { +ol.format.GML3.prototype.writeMultiSurfaceOrPolygon_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var srsName = context['srsName']; @@ -902,8 +896,7 @@ ol.format.GML3.prototype.writeMultiPoint_ = function(node, geometry, * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeMultiCurveOrLineString_ = - function(node, geometry, objectStack) { +ol.format.GML3.prototype.writeMultiCurveOrLineString_ = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var srsName = context['srsName']; @@ -938,8 +931,7 @@ ol.format.GML3.prototype.writeRing_ = function(node, ring, objectStack) { * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeSurfaceOrPolygonMember_ = - function(node, polygon, objectStack) { +ol.format.GML3.prototype.writeSurfaceOrPolygonMember_ = function(node, polygon, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var child = this.GEOMETRY_NODE_FACTORY_( @@ -957,8 +949,7 @@ ol.format.GML3.prototype.writeSurfaceOrPolygonMember_ = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writePointMember_ = - function(node, point, objectStack) { +ol.format.GML3.prototype.writePointMember_ = function(node, point, objectStack) { var child = ol.xml.createElementNS(node.namespaceURI, 'Point'); node.appendChild(child); this.writePoint_(child, point, objectStack); @@ -971,8 +962,7 @@ ol.format.GML3.prototype.writePointMember_ = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeLineStringOrCurveMember_ = - function(node, line, objectStack) { +ol.format.GML3.prototype.writeLineStringOrCurveMember_ = function(node, line, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var child = this.GEOMETRY_NODE_FACTORY_(line, objectStack); @@ -989,8 +979,7 @@ ol.format.GML3.prototype.writeLineStringOrCurveMember_ = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeSurfacePatches_ = - function(node, polygon, objectStack) { +ol.format.GML3.prototype.writeSurfacePatches_ = function(node, polygon, objectStack) { var child = ol.xml.createElementNS(node.namespaceURI, 'PolygonPatch'); node.appendChild(child); this.writeSurfaceOrPolygon_(child, polygon, objectStack); @@ -1003,8 +992,7 @@ ol.format.GML3.prototype.writeSurfacePatches_ = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeCurveSegments_ = - function(node, line, objectStack) { +ol.format.GML3.prototype.writeCurveSegments_ = function(node, line, objectStack) { var child = ol.xml.createElementNS(node.namespaceURI, 'LineStringSegment'); node.appendChild(child); @@ -1017,8 +1005,7 @@ ol.format.GML3.prototype.writeCurveSegments_ = * @param {ol.geom.Geometry|ol.Extent} geometry Geometry. * @param {Array.<*>} objectStack Node stack. */ -ol.format.GML3.prototype.writeGeometryElement = - function(node, geometry, objectStack) { +ol.format.GML3.prototype.writeGeometryElement = function(node, geometry, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var item = goog.object.clone(context); @@ -1049,8 +1036,7 @@ ol.format.GML3.prototype.writeGeometryElement = * @param {ol.Feature} feature Feature. * @param {Array.<*>} objectStack Node stack. */ -ol.format.GML3.prototype.writeFeatureElement = - function(node, feature, objectStack) { +ol.format.GML3.prototype.writeFeatureElement = function(node, feature, objectStack) { var fid = feature.getId(); if (fid) { node.setAttribute('fid', fid); @@ -1099,8 +1085,7 @@ ol.format.GML3.prototype.writeFeatureElement = * @param {Array.<*>} objectStack Node stack. * @private */ -ol.format.GML3.prototype.writeFeatureMembers_ = - function(node, features, objectStack) { +ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var featureType = context['featureType']; @@ -1225,8 +1210,7 @@ ol.format.GML3.MULTIGEOMETRY_TO_MEMBER_NODENAME_ = { * @return {Node|undefined} Node. * @private */ -ol.format.GML3.prototype.MULTIGEOMETRY_MEMBER_NODE_FACTORY_ = - function(value, objectStack, opt_nodeName) { +ol.format.GML3.prototype.MULTIGEOMETRY_MEMBER_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { var parentNode = objectStack[objectStack.length - 1].node; goog.asserts.assert(ol.xml.isNode(parentNode), 'parentNode should be a node'); @@ -1243,8 +1227,7 @@ ol.format.GML3.prototype.MULTIGEOMETRY_MEMBER_NODE_FACTORY_ = * @return {Node|undefined} Node. * @private */ -ol.format.GML3.prototype.GEOMETRY_NODE_FACTORY_ = - function(value, objectStack, opt_nodeName) { +ol.format.GML3.prototype.GEOMETRY_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); var multiSurface = context['multiSurface']; diff --git a/src/ol/format/gml/gmlbaseformat.js b/src/ol/format/gml/gmlbaseformat.js index e82c292160..aa5bdb13f0 100644 --- a/src/ol/format/gml/gmlbaseformat.js +++ b/src/ol/format/gml/gmlbaseformat.js @@ -340,8 +340,7 @@ ol.format.GMLBase.prototype.pointMemberParser_ = function(node, objectStack) { * @param {Array.<*>} objectStack Object stack. * @private */ -ol.format.GMLBase.prototype.lineStringMemberParser_ = - function(node, objectStack) { +ol.format.GMLBase.prototype.lineStringMemberParser_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'lineStringMember' || @@ -357,8 +356,7 @@ ol.format.GMLBase.prototype.lineStringMemberParser_ = * @param {Array.<*>} objectStack Object stack. * @private */ -ol.format.GMLBase.prototype.polygonMemberParser_ = - function(node, objectStack) { +ol.format.GMLBase.prototype.polygonMemberParser_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'polygonMember' || @@ -472,8 +470,7 @@ ol.format.GMLBase.prototype.readPolygon = function(node, objectStack) { * @private * @return {Array.} Flat coordinates. */ -ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_ = - function(node, objectStack) { +ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); return /** @type {Array.} */ (ol.xml.pushParseAndPop( @@ -583,8 +580,7 @@ ol.format.GMLBase.prototype.RING_PARSERS = Object({ /** * @inheritDoc */ -ol.format.GMLBase.prototype.readGeometryFromNode = - function(node, opt_options) { +ol.format.GMLBase.prototype.readGeometryFromNode = function(node, opt_options) { var geometry = this.readGeometryElement(node, [this.getReadOptions(node, opt_options ? opt_options : {})]); return geometry ? geometry : null; @@ -606,8 +602,7 @@ ol.format.GMLBase.prototype.readFeatures; /** * @inheritDoc */ -ol.format.GMLBase.prototype.readFeaturesFromNode = - function(node, opt_options) { +ol.format.GMLBase.prototype.readFeaturesFromNode = function(node, opt_options) { var options = { featureType: this.featureType, featureNS: this.featureNS diff --git a/src/ol/format/kmlformat.js b/src/ol/format/kmlformat.js index 8414635e7d..5cda7cdec3 100644 --- a/src/ol/format/kmlformat.js +++ b/src/ol/format/kmlformat.js @@ -2137,8 +2137,7 @@ ol.format.KML.writeColorTextNode_ = function(node, color) { * @param {Array.<*>} objectStack Object stack. * @private */ -ol.format.KML.writeCoordinatesTextNode_ = - function(node, coordinates, objectStack) { +ol.format.KML.writeCoordinatesTextNode_ = function(node, coordinates, objectStack) { var context = objectStack[objectStack.length - 1]; goog.asserts.assert(goog.isObject(context), 'context should be an Object'); @@ -2322,8 +2321,7 @@ ol.format.KML.writeLineStyle_ = function(node, style, objectStack) { * @param {Array.<*>} objectStack Object stack. * @private */ -ol.format.KML.writeMultiGeometry_ = - function(node, geometry, objectStack) { +ol.format.KML.writeMultiGeometry_ = function(node, geometry, objectStack) { goog.asserts.assert( (geometry instanceof ol.geom.MultiPoint) || (geometry instanceof ol.geom.MultiLineString) || @@ -2605,9 +2603,8 @@ ol.format.KML.ICON_SEQUENCE_ = ol.xml.makeStructureNS( ol.format.KML.NAMESPACE_URIS_, [ 'href' ], - ol.xml.makeStructureNS( - ol.format.KML.GX_NAMESPACE_URIS_, [ - 'x', 'y', 'w', 'h' + ol.xml.makeStructureNS(ol.format.KML.GX_NAMESPACE_URIS_, [ + 'x', 'y', 'w', 'h' ])); diff --git a/src/ol/format/polylineformat.js b/src/ol/format/polylineformat.js index 6ef878c57a..6472e5af19 100644 --- a/src/ol/format/polylineformat.js +++ b/src/ol/format/polylineformat.js @@ -301,8 +301,7 @@ ol.format.Polyline.prototype.readFeatures; /** * @inheritDoc */ -ol.format.Polyline.prototype.readFeaturesFromText = - function(text, opt_options) { +ol.format.Polyline.prototype.readFeaturesFromText = function(text, opt_options) { var feature = this.readFeatureFromText(text, opt_options); return [feature]; }; @@ -323,8 +322,7 @@ ol.format.Polyline.prototype.readGeometry; /** * @inheritDoc */ -ol.format.Polyline.prototype.readGeometryFromText = - function(text, opt_options) { +ol.format.Polyline.prototype.readGeometryFromText = function(text, opt_options) { var stride = ol.geom.SimpleGeometry.getStrideForLayout(this.geometryLayout_); var flatCoordinates = ol.format.Polyline.decodeDeltas( text, stride, this.factor_); @@ -368,8 +366,7 @@ ol.format.Polyline.prototype.writeFeatureText = function(feature, opt_options) { /** * @inheritDoc */ -ol.format.Polyline.prototype.writeFeaturesText = - function(features, opt_options) { +ol.format.Polyline.prototype.writeFeaturesText = function(features, opt_options) { goog.asserts.assert(features.length == 1, 'features array should have 1 item'); return this.writeFeatureText(features[0], opt_options); @@ -391,8 +388,7 @@ ol.format.Polyline.prototype.writeGeometry; /** * @inheritDoc */ -ol.format.Polyline.prototype.writeGeometryText = - function(geometry, opt_options) { +ol.format.Polyline.prototype.writeGeometryText = function(geometry, opt_options) { goog.asserts.assertInstanceof(geometry, ol.geom.LineString, 'geometry should be an ol.geom.LineString'); geometry = /** @type {ol.geom.LineString} */ diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfsformat.js index 10b463b828..d41006c0ab 100644 --- a/src/ol/format/wfsformat.js +++ b/src/ol/format/wfsformat.js @@ -192,8 +192,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadata = function(source) { * @return {ol.format.WFS.FeatureCollectionMetadata|undefined} * FeatureCollection metadata. */ -ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = - function(doc) { +ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = function(doc) { goog.asserts.assert(doc.nodeType == goog.dom.NodeType.DOCUMENT, 'doc.nodeType should be DOCUMENT'); for (var n = doc.firstChild; n; n = n.nextSibling) { diff --git a/src/ol/format/wmscapabilitiesformat.js b/src/ol/format/wmscapabilitiesformat.js index d5804203a7..71161b5514 100644 --- a/src/ol/format/wmscapabilitiesformat.js +++ b/src/ol/format/wmscapabilitiesformat.js @@ -131,8 +131,7 @@ ol.format.WMSCapabilities.readBoundingBox_ = function(node, objectStack) { * @param {Array.<*>} objectStack Object stack. * @return {ol.Extent|undefined} Bounding box object. */ -ol.format.WMSCapabilities.readEXGeographicBoundingBox_ = - function(node, objectStack) { +ol.format.WMSCapabilities.readEXGeographicBoundingBox_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'EX_GeographicBoundingBox', @@ -201,8 +200,7 @@ ol.format.WMSCapabilities.readService_ = function(node, objectStack) { * @private * @return {Object|undefined} Contact information object. */ -ol.format.WMSCapabilities.readContactInformation_ = - function(node, objectStack) { +ol.format.WMSCapabilities.readContactInformation_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType shpuld be ELEMENT'); goog.asserts.assert(node.localName == 'ContactInformation', @@ -219,8 +217,7 @@ ol.format.WMSCapabilities.readContactInformation_ = * @private * @return {Object|undefined} Contact person object. */ -ol.format.WMSCapabilities.readContactPersonPrimary_ = - function(node, objectStack) { +ol.format.WMSCapabilities.readContactPersonPrimary_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'ContactPersonPrimary', @@ -237,8 +234,7 @@ ol.format.WMSCapabilities.readContactPersonPrimary_ = * @private * @return {Object|undefined} Contact address object. */ -ol.format.WMSCapabilities.readContactAddress_ = - function(node, objectStack) { +ol.format.WMSCapabilities.readContactAddress_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); goog.asserts.assert(node.localName == 'ContactAddress', @@ -396,8 +392,7 @@ ol.format.WMSCapabilities.readDimension_ = function(node, objectStack) { * @param {Array.<*>} objectStack Object stack. * @return {Object|undefined} Online resource object. */ -ol.format.WMSCapabilities.readFormatOnlineresource_ = - function(node, objectStack) { +ol.format.WMSCapabilities.readFormatOnlineresource_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); return ol.xml.pushParseAndPop( @@ -473,8 +468,7 @@ ol.format.WMSCapabilities.readOperationType_ = function(node, objectStack) { * @param {Array.<*>} objectStack Object stack. * @return {Object|undefined} Online resource object. */ -ol.format.WMSCapabilities.readSizedFormatOnlineresource_ = - function(node, objectStack) { +ol.format.WMSCapabilities.readSizedFormatOnlineresource_ = function(node, objectStack) { goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, 'node.nodeType should be ELEMENT'); var formatOnlineresource = diff --git a/src/ol/format/wmsgetfeatureinfoformat.js b/src/ol/format/wmsgetfeatureinfoformat.js index c38b508090..382d7a3079 100644 --- a/src/ol/format/wmsgetfeatureinfoformat.js +++ b/src/ol/format/wmsgetfeatureinfoformat.js @@ -61,8 +61,7 @@ ol.format.WMSGetFeatureInfo.layerIdentifier_ = '_layer'; * @return {Array.} Features. * @private */ -ol.format.WMSGetFeatureInfo.prototype.readFeatures_ = - function(node, objectStack) { +ol.format.WMSGetFeatureInfo.prototype.readFeatures_ = function(node, objectStack) { node.namespaceURI = this.featureNS_; goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT, @@ -134,8 +133,7 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures; /** * @inheritDoc */ -ol.format.WMSGetFeatureInfo.prototype.readFeaturesFromNode = - function(node, opt_options) { +ol.format.WMSGetFeatureInfo.prototype.readFeaturesFromNode = function(node, opt_options) { var options = { 'featureType': this.featureType, 'featureNS': this.featureNS diff --git a/src/ol/format/xsdformat.js b/src/ol/format/xsdformat.js index 3257e59ac9..4caa23d029 100644 --- a/src/ol/format/xsdformat.js +++ b/src/ol/format/xsdformat.js @@ -165,8 +165,7 @@ ol.format.XSD.writeDecimalTextNode = function(node, decimal) { * @param {Node} node Node to append a TextNode with the decimal to. * @param {number} nonNegativeInteger Non negative integer. */ -ol.format.XSD.writeNonNegativeIntegerTextNode = - function(node, nonNegativeInteger) { +ol.format.XSD.writeNonNegativeIntegerTextNode = function(node, nonNegativeInteger) { goog.asserts.assert(nonNegativeInteger >= 0, 'value should be more than 0'); goog.asserts.assert(nonNegativeInteger == (nonNegativeInteger | 0), 'value should be an integer value'); diff --git a/src/ol/geom/circle.js b/src/ol/geom/circle.js index fd07b16a3a..85fc52b255 100644 --- a/src/ol/geom/circle.js +++ b/src/ol/geom/circle.js @@ -44,8 +44,7 @@ ol.geom.Circle.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.Circle.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.Circle.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { var flatCoordinates = this.flatCoordinates; var dx = x - flatCoordinates[0]; var dy = y - flatCoordinates[1]; @@ -187,8 +186,7 @@ ol.geom.Circle.prototype.setCenter = function(center) { * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api */ -ol.geom.Circle.prototype.setCenterAndRadius = - function(center, radius, opt_layout) { +ol.geom.Circle.prototype.setCenterAndRadius = function(center, radius, opt_layout) { if (!center) { this.setFlatCoordinates(ol.geom.GeometryLayout.XY, null); } else { @@ -215,8 +213,7 @@ ol.geom.Circle.prototype.setCenterAndRadius = * @param {ol.geom.GeometryLayout} layout Layout. * @param {Array.} flatCoordinates Flat coordinates. */ -ol.geom.Circle.prototype.setFlatCoordinates = - function(layout, flatCoordinates) { +ol.geom.Circle.prototype.setFlatCoordinates = function(layout, flatCoordinates) { this.setFlatCoordinatesInternal(layout, flatCoordinates); this.changed(); }; diff --git a/src/ol/geom/flat/areaflatgeom.js b/src/ol/geom/flat/areaflatgeom.js index eb0b1e4275..074f50c25d 100644 --- a/src/ol/geom/flat/areaflatgeom.js +++ b/src/ol/geom/flat/areaflatgeom.js @@ -30,8 +30,7 @@ ol.geom.flat.area.linearRing = function(flatCoordinates, offset, end, stride) { * @param {number} stride Stride. * @return {number} Area. */ -ol.geom.flat.area.linearRings = - function(flatCoordinates, offset, ends, stride) { +ol.geom.flat.area.linearRings = function(flatCoordinates, offset, ends, stride) { var area = 0; var i, ii; for (i = 0, ii = ends.length; i < ii; ++i) { @@ -50,8 +49,7 @@ ol.geom.flat.area.linearRings = * @param {number} stride Stride. * @return {number} Area. */ -ol.geom.flat.area.linearRingss = - function(flatCoordinates, offset, endss, stride) { +ol.geom.flat.area.linearRingss = function(flatCoordinates, offset, endss, stride) { var area = 0; var i, ii; for (i = 0, ii = endss.length; i < ii; ++i) { diff --git a/src/ol/geom/flat/centerflatgeom.js b/src/ol/geom/flat/centerflatgeom.js index 81f24369ff..a308c7e043 100644 --- a/src/ol/geom/flat/centerflatgeom.js +++ b/src/ol/geom/flat/centerflatgeom.js @@ -10,8 +10,7 @@ goog.require('ol.extent'); * @param {number} stride Stride. * @return {Array.} Flat centers. */ -ol.geom.flat.center.linearRingss = - function(flatCoordinates, offset, endss, stride) { +ol.geom.flat.center.linearRingss = function(flatCoordinates, offset, endss, stride) { var flatCenters = []; var i, ii; var extent = ol.extent.createEmpty(); diff --git a/src/ol/geom/flat/closestflatgeom.js b/src/ol/geom/flat/closestflatgeom.js index efe7470629..2acdfdac8e 100644 --- a/src/ol/geom/flat/closestflatgeom.js +++ b/src/ol/geom/flat/closestflatgeom.js @@ -17,8 +17,7 @@ goog.require('ol.math'); * @param {number} y Y. * @param {Array.} closestPoint Closest point. */ -ol.geom.flat.closest.point = - function(flatCoordinates, offset1, offset2, stride, x, y, closestPoint) { +ol.geom.flat.closest.point = function(flatCoordinates, offset1, offset2, stride, x, y, closestPoint) { var x1 = flatCoordinates[offset1]; var y1 = flatCoordinates[offset1 + 1]; var dx = flatCoordinates[offset2] - x1; @@ -58,8 +57,7 @@ ol.geom.flat.closest.point = * @param {number} maxSquaredDelta Max squared delta. * @return {number} Max squared delta. */ -ol.geom.flat.closest.getMaxSquaredDelta = - function(flatCoordinates, offset, end, stride, maxSquaredDelta) { +ol.geom.flat.closest.getMaxSquaredDelta = function(flatCoordinates, offset, end, stride, maxSquaredDelta) { var x1 = flatCoordinates[offset]; var y1 = flatCoordinates[offset + 1]; for (offset += stride; offset < end; offset += stride) { @@ -84,8 +82,7 @@ ol.geom.flat.closest.getMaxSquaredDelta = * @param {number} maxSquaredDelta Max squared delta. * @return {number} Max squared delta. */ -ol.geom.flat.closest.getsMaxSquaredDelta = - function(flatCoordinates, offset, ends, stride, maxSquaredDelta) { +ol.geom.flat.closest.getsMaxSquaredDelta = function(flatCoordinates, offset, ends, stride, maxSquaredDelta) { var i, ii; for (i = 0, ii = ends.length; i < ii; ++i) { var end = ends[i]; @@ -105,8 +102,7 @@ ol.geom.flat.closest.getsMaxSquaredDelta = * @param {number} maxSquaredDelta Max squared delta. * @return {number} Max squared delta. */ -ol.geom.flat.closest.getssMaxSquaredDelta = - function(flatCoordinates, offset, endss, stride, maxSquaredDelta) { +ol.geom.flat.closest.getssMaxSquaredDelta = function(flatCoordinates, offset, endss, stride, maxSquaredDelta) { var i, ii; for (i = 0, ii = endss.length; i < ii; ++i) { var ends = endss[i]; diff --git a/src/ol/geom/flat/containsflatgeom.js b/src/ol/geom/flat/containsflatgeom.js index 01759ff169..cb1f4401f0 100644 --- a/src/ol/geom/flat/containsflatgeom.js +++ b/src/ol/geom/flat/containsflatgeom.js @@ -12,8 +12,7 @@ goog.require('ol.extent'); * @param {ol.Extent} extent Extent. * @return {boolean} Contains extent. */ -ol.geom.flat.contains.linearRingContainsExtent = - function(flatCoordinates, offset, end, stride, extent) { +ol.geom.flat.contains.linearRingContainsExtent = function(flatCoordinates, offset, end, stride, extent) { var outside = ol.extent.forEachCorner(extent, /** * @param {ol.Coordinate} coordinate Coordinate. @@ -35,8 +34,7 @@ ol.geom.flat.contains.linearRingContainsExtent = * @param {number} y Y. * @return {boolean} Contains (x, y). */ -ol.geom.flat.contains.linearRingContainsXY = - function(flatCoordinates, offset, end, stride, x, y) { +ol.geom.flat.contains.linearRingContainsXY = function(flatCoordinates, offset, end, stride, x, y) { // http://www.ecse.rpi.edu/Homepages/wrf/Research/Short_Notes/pnpoly.html var contains = false; var x1 = flatCoordinates[end - stride]; @@ -65,8 +63,7 @@ ol.geom.flat.contains.linearRingContainsXY = * @param {number} y Y. * @return {boolean} Contains (x, y). */ -ol.geom.flat.contains.linearRingsContainsXY = - function(flatCoordinates, offset, ends, stride, x, y) { +ol.geom.flat.contains.linearRingsContainsXY = function(flatCoordinates, offset, ends, stride, x, y) { goog.asserts.assert(ends.length > 0, 'ends should not be an empty array'); if (ends.length === 0) { return false; @@ -95,8 +92,7 @@ ol.geom.flat.contains.linearRingsContainsXY = * @param {number} y Y. * @return {boolean} Contains (x, y). */ -ol.geom.flat.contains.linearRingssContainsXY = - function(flatCoordinates, offset, endss, stride, x, y) { +ol.geom.flat.contains.linearRingssContainsXY = function(flatCoordinates, offset, endss, stride, x, y) { goog.asserts.assert(endss.length > 0, 'endss should not be an empty array'); if (endss.length === 0) { return false; diff --git a/src/ol/geom/flat/deflateflatgeom.js b/src/ol/geom/flat/deflateflatgeom.js index 08c7fe7b02..afc532de89 100644 --- a/src/ol/geom/flat/deflateflatgeom.js +++ b/src/ol/geom/flat/deflateflatgeom.js @@ -10,8 +10,7 @@ goog.require('goog.asserts'); * @param {number} stride Stride. * @return {number} offset Offset. */ -ol.geom.flat.deflate.coordinate = - function(flatCoordinates, offset, coordinate, stride) { +ol.geom.flat.deflate.coordinate = function(flatCoordinates, offset, coordinate, stride) { goog.asserts.assert(coordinate.length == stride, 'length of the coordinate array should match stride'); var i, ii; @@ -29,8 +28,7 @@ ol.geom.flat.deflate.coordinate = * @param {number} stride Stride. * @return {number} offset Offset. */ -ol.geom.flat.deflate.coordinates = - function(flatCoordinates, offset, coordinates, stride) { +ol.geom.flat.deflate.coordinates = function(flatCoordinates, offset, coordinates, stride) { var i, ii; for (i = 0, ii = coordinates.length; i < ii; ++i) { var coordinate = coordinates[i]; @@ -53,8 +51,7 @@ ol.geom.flat.deflate.coordinates = * @param {Array.=} opt_ends Ends. * @return {Array.} Ends. */ -ol.geom.flat.deflate.coordinatess = - function(flatCoordinates, offset, coordinatess, stride, opt_ends) { +ol.geom.flat.deflate.coordinatess = function(flatCoordinates, offset, coordinatess, stride, opt_ends) { var ends = opt_ends ? opt_ends : []; var i = 0; var j, jj; @@ -77,8 +74,7 @@ ol.geom.flat.deflate.coordinatess = * @param {Array.>=} opt_endss Endss. * @return {Array.>} Endss. */ -ol.geom.flat.deflate.coordinatesss = - function(flatCoordinates, offset, coordinatesss, stride, opt_endss) { +ol.geom.flat.deflate.coordinatesss = function(flatCoordinates, offset, coordinatesss, stride, opt_endss) { var endss = opt_endss ? opt_endss : []; var i = 0; var j, jj; diff --git a/src/ol/geom/flat/flipflatgeom.js b/src/ol/geom/flat/flipflatgeom.js index 565ed49e77..62eb374c46 100644 --- a/src/ol/geom/flat/flipflatgeom.js +++ b/src/ol/geom/flat/flipflatgeom.js @@ -12,8 +12,7 @@ goog.require('goog.asserts'); * @param {number=} opt_destOffset Destination offset. * @return {Array.} Flat coordinates. */ -ol.geom.flat.flip.flipXY = - function(flatCoordinates, offset, end, stride, opt_dest, opt_destOffset) { +ol.geom.flat.flip.flipXY = function(flatCoordinates, offset, end, stride, opt_dest, opt_destOffset) { var dest, destOffset; if (opt_dest !== undefined) { dest = opt_dest; diff --git a/src/ol/geom/flat/geodesicflatgeom.js b/src/ol/geom/flat/geodesicflatgeom.js index 6ad3d62881..2f7e7d7d0d 100644 --- a/src/ol/geom/flat/geodesicflatgeom.js +++ b/src/ol/geom/flat/geodesicflatgeom.js @@ -14,8 +14,7 @@ goog.require('ol.proj'); * @param {number} squaredTolerance Squared tolerance. * @return {Array.} Flat coordinates. */ -ol.geom.flat.geodesic.line_ = - function(interpolate, transform, squaredTolerance) { +ol.geom.flat.geodesic.line_ = function(interpolate, transform, squaredTolerance) { // FIXME reduce garbage generation // FIXME optimize stack operations @@ -141,8 +140,7 @@ ol.geom.flat.geodesic.greatCircleArc = function( * @param {number} squaredTolerance Squared tolerance. * @return {Array.} Flat coordinates. */ -ol.geom.flat.geodesic.meridian = - function(lon, lat1, lat2, projection, squaredTolerance) { +ol.geom.flat.geodesic.meridian = function(lon, lat1, lat2, projection, squaredTolerance) { var epsg4326Projection = ol.proj.get('EPSG:4326'); return ol.geom.flat.geodesic.line_( /** @@ -165,8 +163,7 @@ ol.geom.flat.geodesic.meridian = * @param {number} squaredTolerance Squared tolerance. * @return {Array.} Flat coordinates. */ -ol.geom.flat.geodesic.parallel = - function(lat, lon1, lon2, projection, squaredTolerance) { +ol.geom.flat.geodesic.parallel = function(lat, lon1, lon2, projection, squaredTolerance) { var epsg4326Projection = ol.proj.get('EPSG:4326'); return ol.geom.flat.geodesic.line_( /** diff --git a/src/ol/geom/flat/inflateflatgeom.js b/src/ol/geom/flat/inflateflatgeom.js index e61c194f08..30cc11810c 100644 --- a/src/ol/geom/flat/inflateflatgeom.js +++ b/src/ol/geom/flat/inflateflatgeom.js @@ -9,8 +9,7 @@ goog.provide('ol.geom.flat.inflate'); * @param {Array.=} opt_coordinates Coordinates. * @return {Array.} Coordinates. */ -ol.geom.flat.inflate.coordinates = - function(flatCoordinates, offset, end, stride, opt_coordinates) { +ol.geom.flat.inflate.coordinates = function(flatCoordinates, offset, end, stride, opt_coordinates) { var coordinates = opt_coordinates !== undefined ? opt_coordinates : []; var i = 0; var j; @@ -30,8 +29,7 @@ ol.geom.flat.inflate.coordinates = * @param {Array.>=} opt_coordinatess Coordinatess. * @return {Array.>} Coordinatess. */ -ol.geom.flat.inflate.coordinatess = - function(flatCoordinates, offset, ends, stride, opt_coordinatess) { +ol.geom.flat.inflate.coordinatess = function(flatCoordinates, offset, ends, stride, opt_coordinatess) { var coordinatess = opt_coordinatess !== undefined ? opt_coordinatess : []; var i = 0; var j, jj; @@ -55,8 +53,7 @@ ol.geom.flat.inflate.coordinatess = * Coordinatesss. * @return {Array.>>} Coordinatesss. */ -ol.geom.flat.inflate.coordinatesss = - function(flatCoordinates, offset, endss, stride, opt_coordinatesss) { +ol.geom.flat.inflate.coordinatesss = function(flatCoordinates, offset, endss, stride, opt_coordinatesss) { var coordinatesss = opt_coordinatesss !== undefined ? opt_coordinatesss : []; var i = 0; var j, jj; diff --git a/src/ol/geom/flat/interiorpointflatgeom.js b/src/ol/geom/flat/interiorpointflatgeom.js index bffd186d20..15e9b7101f 100644 --- a/src/ol/geom/flat/interiorpointflatgeom.js +++ b/src/ol/geom/flat/interiorpointflatgeom.js @@ -78,8 +78,7 @@ ol.geom.flat.interiorpoint.linearRings = function(flatCoordinates, offset, * @param {Array.} flatCenters Flat centers. * @return {Array.} Interior points. */ -ol.geom.flat.interiorpoint.linearRingss = - function(flatCoordinates, offset, endss, stride, flatCenters) { +ol.geom.flat.interiorpoint.linearRingss = function(flatCoordinates, offset, endss, stride, flatCenters) { goog.asserts.assert(2 * endss.length == flatCenters.length, 'endss.length times 2 should be flatCenters.length'); var interiorPoints = []; diff --git a/src/ol/geom/flat/interpolateflatgeom.js b/src/ol/geom/flat/interpolateflatgeom.js index 3035d0b40e..896b1028bd 100644 --- a/src/ol/geom/flat/interpolateflatgeom.js +++ b/src/ol/geom/flat/interpolateflatgeom.js @@ -14,8 +14,7 @@ goog.require('goog.math'); * @param {Array.=} opt_dest Destination. * @return {Array.} Destination. */ -ol.geom.flat.interpolate.lineString = - function(flatCoordinates, offset, end, stride, fraction, opt_dest) { +ol.geom.flat.interpolate.lineString = function(flatCoordinates, offset, end, stride, fraction, opt_dest) { // FIXME interpolate extra dimensions goog.asserts.assert(0 <= fraction && fraction <= 1, 'fraction should be in between 0 and 1'); @@ -80,8 +79,7 @@ ol.geom.flat.interpolate.lineString = * @param {boolean} extrapolate Extrapolate. * @return {ol.Coordinate} Coordinate. */ -ol.geom.flat.lineStringCoordinateAtM = - function(flatCoordinates, offset, end, stride, m, extrapolate) { +ol.geom.flat.lineStringCoordinateAtM = function(flatCoordinates, offset, end, stride, m, extrapolate) { if (end == offset) { return null; } diff --git a/src/ol/geom/flat/intersectsextent.js b/src/ol/geom/flat/intersectsextent.js index 3cbd0770bd..c520464da3 100644 --- a/src/ol/geom/flat/intersectsextent.js +++ b/src/ol/geom/flat/intersectsextent.js @@ -14,8 +14,7 @@ goog.require('ol.geom.flat.segments'); * @param {ol.Extent} extent Extent. * @return {boolean} True if the geometry and the extent intersect. */ -ol.geom.flat.intersectsextent.lineString = - function(flatCoordinates, offset, end, stride, extent) { +ol.geom.flat.intersectsextent.lineString = function(flatCoordinates, offset, end, stride, extent) { var coordinatesExtent = ol.extent.extendFlatCoordinates( ol.extent.createEmpty(), flatCoordinates, offset, end, stride); if (!ol.extent.intersects(extent, coordinatesExtent)) { @@ -53,8 +52,7 @@ ol.geom.flat.intersectsextent.lineString = * @param {ol.Extent} extent Extent. * @return {boolean} True if the geometry and the extent intersect. */ -ol.geom.flat.intersectsextent.lineStrings = - function(flatCoordinates, offset, ends, stride, extent) { +ol.geom.flat.intersectsextent.lineStrings = function(flatCoordinates, offset, ends, stride, extent) { var i, ii; for (i = 0, ii = ends.length; i < ii; ++i) { if (ol.geom.flat.intersectsextent.lineString( @@ -75,8 +73,7 @@ ol.geom.flat.intersectsextent.lineStrings = * @param {ol.Extent} extent Extent. * @return {boolean} True if the geometry and the extent intersect. */ -ol.geom.flat.intersectsextent.linearRing = - function(flatCoordinates, offset, end, stride, extent) { +ol.geom.flat.intersectsextent.linearRing = function(flatCoordinates, offset, end, stride, extent) { if (ol.geom.flat.intersectsextent.lineString( flatCoordinates, offset, end, stride, extent)) { return true; @@ -109,8 +106,7 @@ ol.geom.flat.intersectsextent.linearRing = * @param {ol.Extent} extent Extent. * @return {boolean} True if the geometry and the extent intersect. */ -ol.geom.flat.intersectsextent.linearRings = - function(flatCoordinates, offset, ends, stride, extent) { +ol.geom.flat.intersectsextent.linearRings = function(flatCoordinates, offset, ends, stride, extent) { goog.asserts.assert(ends.length > 0, 'ends should not be an empty array'); if (!ol.geom.flat.intersectsextent.linearRing( flatCoordinates, offset, ends[0], stride, extent)) { @@ -138,8 +134,7 @@ ol.geom.flat.intersectsextent.linearRings = * @param {ol.Extent} extent Extent. * @return {boolean} True if the geometry and the extent intersect. */ -ol.geom.flat.intersectsextent.linearRingss = - function(flatCoordinates, offset, endss, stride, extent) { +ol.geom.flat.intersectsextent.linearRingss = function(flatCoordinates, offset, endss, stride, extent) { goog.asserts.assert(endss.length > 0, 'endss should not be an empty array'); var i, ii; for (i = 0, ii = endss.length; i < ii; ++i) { diff --git a/src/ol/geom/flat/lengthflatgeom.js b/src/ol/geom/flat/lengthflatgeom.js index ac1c685504..70b7a54d67 100644 --- a/src/ol/geom/flat/lengthflatgeom.js +++ b/src/ol/geom/flat/lengthflatgeom.js @@ -8,8 +8,7 @@ goog.provide('ol.geom.flat.length'); * @param {number} stride Stride. * @return {number} Length. */ -ol.geom.flat.length.lineString = - function(flatCoordinates, offset, end, stride) { +ol.geom.flat.length.lineString = function(flatCoordinates, offset, end, stride) { var x1 = flatCoordinates[offset]; var y1 = flatCoordinates[offset + 1]; var length = 0; @@ -32,8 +31,7 @@ ol.geom.flat.length.lineString = * @param {number} stride Stride. * @return {number} Perimeter. */ -ol.geom.flat.length.linearRing = - function(flatCoordinates, offset, end, stride) { +ol.geom.flat.length.linearRing = function(flatCoordinates, offset, end, stride) { var perimeter = ol.geom.flat.length.lineString(flatCoordinates, offset, end, stride); var dx = flatCoordinates[end - stride] - flatCoordinates[offset]; diff --git a/src/ol/geom/flat/orientflatgeom.js b/src/ol/geom/flat/orientflatgeom.js index 0e177e990d..f8fc0d481b 100644 --- a/src/ol/geom/flat/orientflatgeom.js +++ b/src/ol/geom/flat/orientflatgeom.js @@ -11,8 +11,7 @@ goog.require('ol.geom.flat.reverse'); * @param {number} stride Stride. * @return {boolean} Is clockwise. */ -ol.geom.flat.orient.linearRingIsClockwise = - function(flatCoordinates, offset, end, stride) { +ol.geom.flat.orient.linearRingIsClockwise = function(flatCoordinates, offset, end, stride) { // http://tinyurl.com/clockwise-method // https://github.com/OSGeo/gdal/blob/trunk/gdal/ogr/ogrlinearring.cpp var edge = 0; @@ -42,8 +41,7 @@ ol.geom.flat.orient.linearRingIsClockwise = * (counter-clockwise exterior ring and clockwise interior rings). * @return {boolean} Rings are correctly oriented. */ -ol.geom.flat.orient.linearRingsAreOriented = - function(flatCoordinates, offset, ends, stride, opt_right) { +ol.geom.flat.orient.linearRingsAreOriented = function(flatCoordinates, offset, ends, stride, opt_right) { var right = opt_right !== undefined ? opt_right : false; var i, ii; for (i = 0, ii = ends.length; i < ii; ++i) { @@ -78,8 +76,7 @@ ol.geom.flat.orient.linearRingsAreOriented = * (counter-clockwise exterior ring and clockwise interior rings). * @return {boolean} Rings are correctly oriented. */ -ol.geom.flat.orient.linearRingssAreOriented = - function(flatCoordinates, offset, endss, stride, opt_right) { +ol.geom.flat.orient.linearRingssAreOriented = function(flatCoordinates, offset, endss, stride, opt_right) { var i, ii; for (i = 0, ii = endss.length; i < ii; ++i) { if (!ol.geom.flat.orient.linearRingsAreOriented( @@ -104,8 +101,7 @@ ol.geom.flat.orient.linearRingssAreOriented = * @param {boolean=} opt_right Follow the right-hand rule for orientation. * @return {number} End. */ -ol.geom.flat.orient.orientLinearRings = - function(flatCoordinates, offset, ends, stride, opt_right) { +ol.geom.flat.orient.orientLinearRings = function(flatCoordinates, offset, ends, stride, opt_right) { var right = opt_right !== undefined ? opt_right : false; var i, ii; for (i = 0, ii = ends.length; i < ii; ++i) { @@ -137,8 +133,7 @@ ol.geom.flat.orient.orientLinearRings = * @param {boolean=} opt_right Follow the right-hand rule for orientation. * @return {number} End. */ -ol.geom.flat.orient.orientLinearRingss = - function(flatCoordinates, offset, endss, stride, opt_right) { +ol.geom.flat.orient.orientLinearRingss = function(flatCoordinates, offset, endss, stride, opt_right) { var i, ii; for (i = 0, ii = endss.length; i < ii; ++i) { offset = ol.geom.flat.orient.orientLinearRings( diff --git a/src/ol/geom/flat/reverseflatgeom.js b/src/ol/geom/flat/reverseflatgeom.js index 32ad1dbe01..5202ae1966 100644 --- a/src/ol/geom/flat/reverseflatgeom.js +++ b/src/ol/geom/flat/reverseflatgeom.js @@ -7,8 +7,7 @@ goog.provide('ol.geom.flat.reverse'); * @param {number} end End. * @param {number} stride Stride. */ -ol.geom.flat.reverse.coordinates = - function(flatCoordinates, offset, end, stride) { +ol.geom.flat.reverse.coordinates = function(flatCoordinates, offset, end, stride) { while (offset < end - stride) { var i; for (i = 0; i < stride; ++i) { diff --git a/src/ol/geom/flat/segmentsflatgeom.js b/src/ol/geom/flat/segmentsflatgeom.js index b834eecbdc..21403117ce 100644 --- a/src/ol/geom/flat/segmentsflatgeom.js +++ b/src/ol/geom/flat/segmentsflatgeom.js @@ -16,8 +16,7 @@ goog.provide('ol.geom.flat.segments'); * @return {T|boolean} Value. * @template T,S */ -ol.geom.flat.segments.forEach = - function(flatCoordinates, offset, end, stride, callback, opt_this) { +ol.geom.flat.segments.forEach = function(flatCoordinates, offset, end, stride, callback, opt_this) { var point1 = [flatCoordinates[offset], flatCoordinates[offset + 1]]; var point2 = []; var ret; diff --git a/src/ol/geom/flat/transformflatgeom.js b/src/ol/geom/flat/transformflatgeom.js index 81ecf4a53c..15eec7df0a 100644 --- a/src/ol/geom/flat/transformflatgeom.js +++ b/src/ol/geom/flat/transformflatgeom.js @@ -12,8 +12,7 @@ goog.require('goog.vec.Mat4'); * @param {Array.=} opt_dest Destination. * @return {Array.} Transformed coordinates. */ -ol.geom.flat.transform.transform2D = - function(flatCoordinates, offset, end, stride, transform, opt_dest) { +ol.geom.flat.transform.transform2D = function(flatCoordinates, offset, end, stride, transform, opt_dest) { var m00 = goog.vec.Mat4.getElement(transform, 0, 0); var m10 = goog.vec.Mat4.getElement(transform, 1, 0); var m01 = goog.vec.Mat4.getElement(transform, 0, 1); @@ -46,8 +45,7 @@ ol.geom.flat.transform.transform2D = * @param {Array.=} opt_dest Destination. * @return {Array.} Transformed coordinates. */ -ol.geom.flat.transform.translate = - function(flatCoordinates, offset, end, stride, deltaX, deltaY, opt_dest) { +ol.geom.flat.transform.translate = function(flatCoordinates, offset, end, stride, deltaX, deltaY, opt_dest) { var dest = opt_dest ? opt_dest : []; var i = 0; var j, k; diff --git a/src/ol/geom/geometrycollection.js b/src/ol/geom/geometrycollection.js index d81fd7a867..2d9e3fe3bf 100644 --- a/src/ol/geom/geometrycollection.js +++ b/src/ol/geom/geometrycollection.js @@ -95,8 +95,7 @@ ol.geom.GeometryCollection.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.GeometryCollection.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.GeometryCollection.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { if (minSquaredDistance < ol.extent.closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; @@ -160,8 +159,7 @@ ol.geom.GeometryCollection.prototype.getGeometriesArray = function() { /** * @inheritDoc */ -ol.geom.GeometryCollection.prototype.getSimplifiedGeometry = - function(squaredTolerance) { +ol.geom.GeometryCollection.prototype.getSimplifiedGeometry = function(squaredTolerance) { if (this.simplifiedGeometryRevision != this.getRevision()) { goog.object.clear(this.simplifiedGeometryCache); this.simplifiedGeometryMaxMinSquaredTolerance = 0; diff --git a/src/ol/geom/linearring.js b/src/ol/geom/linearring.js index a78ad6439b..10dba8f9e7 100644 --- a/src/ol/geom/linearring.js +++ b/src/ol/geom/linearring.js @@ -60,8 +60,7 @@ ol.geom.LinearRing.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.LinearRing.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.LinearRing.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { if (minSquaredDistance < ol.extent.closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; @@ -102,8 +101,7 @@ ol.geom.LinearRing.prototype.getCoordinates = function() { /** * @inheritDoc */ -ol.geom.LinearRing.prototype.getSimplifiedGeometryInternal = - function(squaredTolerance) { +ol.geom.LinearRing.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) { var simplifiedFlatCoordinates = []; simplifiedFlatCoordinates.length = ol.geom.flat.simplify.douglasPeucker( this.flatCoordinates, 0, this.flatCoordinates.length, this.stride, @@ -130,8 +128,7 @@ ol.geom.LinearRing.prototype.getType = function() { * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api stable */ -ol.geom.LinearRing.prototype.setCoordinates = - function(coordinates, opt_layout) { +ol.geom.LinearRing.prototype.setCoordinates = function(coordinates, opt_layout) { if (!coordinates) { this.setFlatCoordinates(ol.geom.GeometryLayout.XY, null); } else { @@ -150,8 +147,7 @@ ol.geom.LinearRing.prototype.setCoordinates = * @param {ol.geom.GeometryLayout} layout Layout. * @param {Array.} flatCoordinates Flat coordinates. */ -ol.geom.LinearRing.prototype.setFlatCoordinates = - function(layout, flatCoordinates) { +ol.geom.LinearRing.prototype.setFlatCoordinates = function(layout, flatCoordinates) { this.setFlatCoordinatesInternal(layout, flatCoordinates); this.changed(); }; diff --git a/src/ol/geom/linestring.js b/src/ol/geom/linestring.js index ad99d257bd..39445e32fc 100644 --- a/src/ol/geom/linestring.js +++ b/src/ol/geom/linestring.js @@ -94,8 +94,7 @@ ol.geom.LineString.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.LineString.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.LineString.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { if (minSquaredDistance < ol.extent.closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; @@ -209,8 +208,7 @@ ol.geom.LineString.prototype.getFlatMidpoint = function() { /** * @inheritDoc */ -ol.geom.LineString.prototype.getSimplifiedGeometryInternal = - function(squaredTolerance) { +ol.geom.LineString.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) { var simplifiedFlatCoordinates = []; simplifiedFlatCoordinates.length = ol.geom.flat.simplify.douglasPeucker( this.flatCoordinates, 0, this.flatCoordinates.length, this.stride, @@ -248,8 +246,7 @@ ol.geom.LineString.prototype.intersectsExtent = function(extent) { * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api stable */ -ol.geom.LineString.prototype.setCoordinates = - function(coordinates, opt_layout) { +ol.geom.LineString.prototype.setCoordinates = function(coordinates, opt_layout) { if (!coordinates) { this.setFlatCoordinates(ol.geom.GeometryLayout.XY, null); } else { @@ -268,8 +265,7 @@ ol.geom.LineString.prototype.setCoordinates = * @param {ol.geom.GeometryLayout} layout Layout. * @param {Array.} flatCoordinates Flat coordinates. */ -ol.geom.LineString.prototype.setFlatCoordinates = - function(layout, flatCoordinates) { +ol.geom.LineString.prototype.setFlatCoordinates = function(layout, flatCoordinates) { this.setFlatCoordinatesInternal(layout, flatCoordinates); this.changed(); }; diff --git a/src/ol/geom/multilinestring.js b/src/ol/geom/multilinestring.js index f227330286..00976094e1 100644 --- a/src/ol/geom/multilinestring.js +++ b/src/ol/geom/multilinestring.js @@ -90,8 +90,7 @@ ol.geom.MultiLineString.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.MultiLineString.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.MultiLineString.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { if (minSquaredDistance < ol.extent.closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; @@ -129,8 +128,7 @@ ol.geom.MultiLineString.prototype.closestPointXY = * @return {ol.Coordinate} Coordinate. * @api stable */ -ol.geom.MultiLineString.prototype.getCoordinateAtM = - function(m, opt_extrapolate, opt_interpolate) { +ol.geom.MultiLineString.prototype.getCoordinateAtM = function(m, opt_extrapolate, opt_interpolate) { if ((this.layout != ol.geom.GeometryLayout.XYM && this.layout != ol.geom.GeometryLayout.XYZM) || this.flatCoordinates.length === 0) { @@ -229,8 +227,7 @@ ol.geom.MultiLineString.prototype.getFlatMidpoints = function() { /** * @inheritDoc */ -ol.geom.MultiLineString.prototype.getSimplifiedGeometryInternal = - function(squaredTolerance) { +ol.geom.MultiLineString.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) { var simplifiedFlatCoordinates = []; var simplifiedEnds = []; simplifiedFlatCoordinates.length = ol.geom.flat.simplify.douglasPeuckers( @@ -268,8 +265,7 @@ ol.geom.MultiLineString.prototype.intersectsExtent = function(extent) { * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api stable */ -ol.geom.MultiLineString.prototype.setCoordinates = - function(coordinates, opt_layout) { +ol.geom.MultiLineString.prototype.setCoordinates = function(coordinates, opt_layout) { if (!coordinates) { this.setFlatCoordinates(ol.geom.GeometryLayout.XY, null, this.ends_); } else { @@ -290,8 +286,7 @@ ol.geom.MultiLineString.prototype.setCoordinates = * @param {Array.} flatCoordinates Flat coordinates. * @param {Array.} ends Ends. */ -ol.geom.MultiLineString.prototype.setFlatCoordinates = - function(layout, flatCoordinates, ends) { +ol.geom.MultiLineString.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) { if (!flatCoordinates) { goog.asserts.assert(ends && ends.length === 0, 'ends must be truthy and ends.length should be 0'); diff --git a/src/ol/geom/multipoint.js b/src/ol/geom/multipoint.js index d559c72b4d..64f50b2919 100644 --- a/src/ol/geom/multipoint.js +++ b/src/ol/geom/multipoint.js @@ -62,8 +62,7 @@ ol.geom.MultiPoint.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.MultiPoint.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.MultiPoint.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { if (minSquaredDistance < ol.extent.closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; @@ -173,8 +172,7 @@ ol.geom.MultiPoint.prototype.intersectsExtent = function(extent) { * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api stable */ -ol.geom.MultiPoint.prototype.setCoordinates = - function(coordinates, opt_layout) { +ol.geom.MultiPoint.prototype.setCoordinates = function(coordinates, opt_layout) { if (!coordinates) { this.setFlatCoordinates(ol.geom.GeometryLayout.XY, null); } else { @@ -193,8 +191,7 @@ ol.geom.MultiPoint.prototype.setCoordinates = * @param {ol.geom.GeometryLayout} layout Layout. * @param {Array.} flatCoordinates Flat coordinates. */ -ol.geom.MultiPoint.prototype.setFlatCoordinates = - function(layout, flatCoordinates) { +ol.geom.MultiPoint.prototype.setFlatCoordinates = function(layout, flatCoordinates) { this.setFlatCoordinatesInternal(layout, flatCoordinates); this.changed(); }; diff --git a/src/ol/geom/multipolygon.js b/src/ol/geom/multipolygon.js index d166402045..3fbbdceaf0 100644 --- a/src/ol/geom/multipolygon.js +++ b/src/ol/geom/multipolygon.js @@ -131,8 +131,7 @@ ol.geom.MultiPolygon.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.MultiPolygon.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.MultiPolygon.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { if (minSquaredDistance < ol.extent.closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; @@ -257,8 +256,7 @@ ol.geom.MultiPolygon.prototype.getOrientedFlatCoordinates = function() { /** * @inheritDoc */ -ol.geom.MultiPolygon.prototype.getSimplifiedGeometryInternal = - function(squaredTolerance) { +ol.geom.MultiPolygon.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) { var simplifiedFlatCoordinates = []; var simplifiedEndss = []; simplifiedFlatCoordinates.length = ol.geom.flat.simplify.quantizess( @@ -361,8 +359,7 @@ ol.geom.MultiPolygon.prototype.intersectsExtent = function(extent) { * @param {ol.geom.GeometryLayout=} opt_layout Layout. * @api stable */ -ol.geom.MultiPolygon.prototype.setCoordinates = - function(coordinates, opt_layout) { +ol.geom.MultiPolygon.prototype.setCoordinates = function(coordinates, opt_layout) { if (!coordinates) { this.setFlatCoordinates(ol.geom.GeometryLayout.XY, null, this.endss_); } else { @@ -389,8 +386,7 @@ ol.geom.MultiPolygon.prototype.setCoordinates = * @param {Array.} flatCoordinates Flat coordinates. * @param {Array.>} endss Endss. */ -ol.geom.MultiPolygon.prototype.setFlatCoordinates = - function(layout, flatCoordinates, endss) { +ol.geom.MultiPolygon.prototype.setFlatCoordinates = function(layout, flatCoordinates, endss) { goog.asserts.assert(endss, 'endss must be truthy'); if (!flatCoordinates || flatCoordinates.length === 0) { goog.asserts.assert(endss.length === 0, 'the length of endss should be 0'); diff --git a/src/ol/geom/point.js b/src/ol/geom/point.js index 862b5322df..5065b53640 100644 --- a/src/ol/geom/point.js +++ b/src/ol/geom/point.js @@ -41,8 +41,7 @@ ol.geom.Point.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.Point.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.Point.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { var flatCoordinates = this.flatCoordinates; var squaredDistance = ol.math.squaredDistance( x, y, flatCoordinates[0], flatCoordinates[1]); diff --git a/src/ol/geom/polygon.js b/src/ol/geom/polygon.js index 9e7d735465..ba738a6412 100644 --- a/src/ol/geom/polygon.js +++ b/src/ol/geom/polygon.js @@ -118,8 +118,7 @@ ol.geom.Polygon.prototype.clone = function() { /** * @inheritDoc */ -ol.geom.Polygon.prototype.closestPointXY = - function(x, y, closestPoint, minSquaredDistance) { +ol.geom.Polygon.prototype.closestPointXY = function(x, y, closestPoint, minSquaredDistance) { if (minSquaredDistance < ol.extent.closestSquaredDistanceXY(this.getExtent(), x, y)) { return minSquaredDistance; @@ -298,8 +297,7 @@ ol.geom.Polygon.prototype.getOrientedFlatCoordinates = function() { /** * @inheritDoc */ -ol.geom.Polygon.prototype.getSimplifiedGeometryInternal = - function(squaredTolerance) { +ol.geom.Polygon.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) { var simplifiedFlatCoordinates = []; var simplifiedEnds = []; simplifiedFlatCoordinates.length = ol.geom.flat.simplify.quantizes( @@ -359,8 +357,7 @@ ol.geom.Polygon.prototype.setCoordinates = function(coordinates, opt_layout) { * @param {Array.} flatCoordinates Flat coordinates. * @param {Array.} ends Ends. */ -ol.geom.Polygon.prototype.setFlatCoordinates = - function(layout, flatCoordinates, ends) { +ol.geom.Polygon.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) { if (!flatCoordinates) { goog.asserts.assert(ends && ends.length === 0, 'ends must be an empty array'); diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js index 1ddb4e3c12..4d35e33875 100644 --- a/src/ol/geom/simplegeometry.js +++ b/src/ol/geom/simplegeometry.js @@ -145,8 +145,7 @@ ol.geom.SimpleGeometry.prototype.getLayout = function() { /** * @inheritDoc */ -ol.geom.SimpleGeometry.prototype.getSimplifiedGeometry = - function(squaredTolerance) { +ol.geom.SimpleGeometry.prototype.getSimplifiedGeometry = function(squaredTolerance) { if (this.simplifiedGeometryRevision != this.getRevision()) { goog.object.clear(this.simplifiedGeometryCache); this.simplifiedGeometryMaxMinSquaredTolerance = 0; @@ -188,8 +187,7 @@ ol.geom.SimpleGeometry.prototype.getSimplifiedGeometry = * @return {ol.geom.SimpleGeometry} Simplified geometry. * @protected */ -ol.geom.SimpleGeometry.prototype.getSimplifiedGeometryInternal = - function(squaredTolerance) { +ol.geom.SimpleGeometry.prototype.getSimplifiedGeometryInternal = function(squaredTolerance) { return this; }; @@ -207,8 +205,7 @@ ol.geom.SimpleGeometry.prototype.getStride = function() { * @param {Array.} flatCoordinates Flat coordinates. * @protected */ -ol.geom.SimpleGeometry.prototype.setFlatCoordinatesInternal = - function(layout, flatCoordinates) { +ol.geom.SimpleGeometry.prototype.setFlatCoordinatesInternal = function(layout, flatCoordinates) { this.stride = ol.geom.SimpleGeometry.getStrideForLayout(layout); this.layout = layout; this.flatCoordinates = flatCoordinates; @@ -228,8 +225,7 @@ ol.geom.SimpleGeometry.prototype.setCoordinates = goog.abstractMethod; * @param {number} nesting Nesting. * @protected */ -ol.geom.SimpleGeometry.prototype.setLayout = - function(layout, coordinates, nesting) { +ol.geom.SimpleGeometry.prototype.setLayout = function(layout, coordinates, nesting) { /** @type {number} */ var stride; if (layout) { @@ -287,8 +283,7 @@ ol.geom.SimpleGeometry.prototype.translate = function(deltaX, deltaY) { * @param {Array.=} opt_dest Destination. * @return {Array.} Transformed flat coordinates. */ -ol.geom.transformSimpleGeometry2D = - function(simpleGeometry, transform, opt_dest) { +ol.geom.transformSimpleGeometry2D = function(simpleGeometry, transform, opt_dest) { var flatCoordinates = simpleGeometry.getFlatCoordinates(); if (!flatCoordinates) { return null; diff --git a/src/ol/graticule.js b/src/ol/graticule.js index 03ce26d3b2..a97d794ab4 100644 --- a/src/ol/graticule.js +++ b/src/ol/graticule.js @@ -167,8 +167,7 @@ ol.Graticule.intervals_ = [90, 45, 30, 20, 10, 5, 2, 1, 0.5, 0.2, 0.1, 0.05, * @return {number} Index. * @private */ -ol.Graticule.prototype.addMeridian_ = - function(lon, minLat, maxLat, squaredTolerance, extent, index) { +ol.Graticule.prototype.addMeridian_ = function(lon, minLat, maxLat, squaredTolerance, extent, index) { var lineString = this.getMeridian_(lon, minLat, maxLat, squaredTolerance, index); if (ol.extent.intersects(lineString.getExtent(), extent)) { @@ -188,8 +187,7 @@ ol.Graticule.prototype.addMeridian_ = * @return {number} Index. * @private */ -ol.Graticule.prototype.addParallel_ = - function(lat, minLon, maxLon, squaredTolerance, extent, index) { +ol.Graticule.prototype.addParallel_ = function(lat, minLon, maxLon, squaredTolerance, extent, index) { var lineString = this.getParallel_(lat, minLon, maxLon, squaredTolerance, index); if (ol.extent.intersects(lineString.getExtent(), extent)) { @@ -206,8 +204,7 @@ ol.Graticule.prototype.addParallel_ = * @param {number} squaredTolerance Squared tolerance. * @private */ -ol.Graticule.prototype.createGraticule_ = - function(extent, center, resolution, squaredTolerance) { +ol.Graticule.prototype.createGraticule_ = function(extent, center, resolution, squaredTolerance) { var interval = this.getInterval_(resolution); if (interval == -1) { diff --git a/src/ol/interaction/draganddropinteraction.js b/src/ol/interaction/draganddropinteraction.js index 105461a143..1cc4877531 100644 --- a/src/ol/interaction/draganddropinteraction.js +++ b/src/ol/interaction/draganddropinteraction.js @@ -213,8 +213,7 @@ ol.interaction.DragAndDropEventType = { * @param {Array.=} opt_features Features. * @param {ol.proj.Projection=} opt_projection Projection. */ -ol.interaction.DragAndDropEvent = - function(type, target, file, opt_features, opt_projection) { +ol.interaction.DragAndDropEvent = function(type, target, file, opt_features, opt_projection) { goog.base(this, type, target); diff --git a/src/ol/interaction/interaction.js b/src/ol/interaction/interaction.js index ee3cd56e2e..22945cd296 100644 --- a/src/ol/interaction/interaction.js +++ b/src/ol/interaction/interaction.js @@ -131,8 +131,7 @@ ol.interaction.Interaction.pan = function(map, view, delta, opt_duration) { * @param {ol.Coordinate=} opt_anchor Anchor coordinate. * @param {number=} opt_duration Duration. */ -ol.interaction.Interaction.rotate = - function(map, view, rotation, opt_anchor, opt_duration) { +ol.interaction.Interaction.rotate = function(map, view, rotation, opt_anchor, opt_duration) { rotation = view.constrainRotation(rotation, 0); ol.interaction.Interaction.rotateWithoutConstraints( map, view, rotation, opt_anchor, opt_duration); @@ -146,8 +145,7 @@ ol.interaction.Interaction.rotate = * @param {ol.Coordinate=} opt_anchor Anchor coordinate. * @param {number=} opt_duration Duration. */ -ol.interaction.Interaction.rotateWithoutConstraints = - function(map, view, rotation, opt_anchor, opt_duration) { +ol.interaction.Interaction.rotateWithoutConstraints = function(map, view, rotation, opt_anchor, opt_duration) { if (rotation !== undefined) { var currentRotation = view.getRotation(); var currentCenter = view.getCenter(); @@ -186,8 +184,7 @@ ol.interaction.Interaction.rotateWithoutConstraints = * will select the nearest resolution. If not defined 0 is * assumed. */ -ol.interaction.Interaction.zoom = - function(map, view, resolution, opt_anchor, opt_duration, opt_direction) { +ol.interaction.Interaction.zoom = function(map, view, resolution, opt_anchor, opt_duration, opt_direction) { resolution = view.constrainResolution(resolution, 0, opt_direction); ol.interaction.Interaction.zoomWithoutConstraints( map, view, resolution, opt_anchor, opt_duration); @@ -201,8 +198,7 @@ ol.interaction.Interaction.zoom = * @param {ol.Coordinate=} opt_anchor Anchor coordinate. * @param {number=} opt_duration Duration. */ -ol.interaction.Interaction.zoomByDelta = - function(map, view, delta, opt_anchor, opt_duration) { +ol.interaction.Interaction.zoomByDelta = function(map, view, delta, opt_anchor, opt_duration) { var currentResolution = view.getResolution(); var resolution = view.constrainResolution(currentResolution, delta, 0); ol.interaction.Interaction.zoomWithoutConstraints( @@ -217,8 +213,7 @@ ol.interaction.Interaction.zoomByDelta = * @param {ol.Coordinate=} opt_anchor Anchor coordinate. * @param {number=} opt_duration Duration. */ -ol.interaction.Interaction.zoomWithoutConstraints = - function(map, view, resolution, opt_anchor, opt_duration) { +ol.interaction.Interaction.zoomWithoutConstraints = function(map, view, resolution, opt_anchor, opt_duration) { if (resolution) { var currentResolution = view.getResolution(); var currentCenter = view.getCenter(); diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index bf5ae2f6a3..0d8b991ed0 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -359,8 +359,7 @@ ol.interaction.Modify.prototype.handleFeatureRemove_ = function(evt) { * @param {ol.geom.Point} geometry Geometry. * @private */ -ol.interaction.Modify.prototype.writePointGeometry_ = - function(feature, geometry) { +ol.interaction.Modify.prototype.writePointGeometry_ = function(feature, geometry) { var coordinates = geometry.getCoordinates(); var segmentData = /** @type {ol.interaction.SegmentDataType} */ ({ feature: feature, @@ -376,8 +375,7 @@ ol.interaction.Modify.prototype.writePointGeometry_ = * @param {ol.geom.MultiPoint} geometry Geometry. * @private */ -ol.interaction.Modify.prototype.writeMultiPointGeometry_ = - function(feature, geometry) { +ol.interaction.Modify.prototype.writeMultiPointGeometry_ = function(feature, geometry) { var points = geometry.getCoordinates(); var coordinates, i, ii, segmentData; for (i = 0, ii = points.length; i < ii; ++i) { @@ -399,8 +397,7 @@ ol.interaction.Modify.prototype.writeMultiPointGeometry_ = * @param {ol.geom.LineString} geometry Geometry. * @private */ -ol.interaction.Modify.prototype.writeLineStringGeometry_ = - function(feature, geometry) { +ol.interaction.Modify.prototype.writeLineStringGeometry_ = function(feature, geometry) { var coordinates = geometry.getCoordinates(); var i, ii, segment, segmentData; for (i = 0, ii = coordinates.length - 1; i < ii; ++i) { @@ -421,8 +418,7 @@ ol.interaction.Modify.prototype.writeLineStringGeometry_ = * @param {ol.geom.MultiLineString} geometry Geometry. * @private */ -ol.interaction.Modify.prototype.writeMultiLineStringGeometry_ = - function(feature, geometry) { +ol.interaction.Modify.prototype.writeMultiLineStringGeometry_ = function(feature, geometry) { var lines = geometry.getCoordinates(); var coordinates, i, ii, j, jj, segment, segmentData; for (j = 0, jj = lines.length; j < jj; ++j) { @@ -447,8 +443,7 @@ ol.interaction.Modify.prototype.writeMultiLineStringGeometry_ = * @param {ol.geom.Polygon} geometry Geometry. * @private */ -ol.interaction.Modify.prototype.writePolygonGeometry_ = - function(feature, geometry) { +ol.interaction.Modify.prototype.writePolygonGeometry_ = function(feature, geometry) { var rings = geometry.getCoordinates(); var coordinates, i, ii, j, jj, segment, segmentData; for (j = 0, jj = rings.length; j < jj; ++j) { @@ -473,8 +468,7 @@ ol.interaction.Modify.prototype.writePolygonGeometry_ = * @param {ol.geom.MultiPolygon} geometry Geometry. * @private */ -ol.interaction.Modify.prototype.writeMultiPolygonGeometry_ = - function(feature, geometry) { +ol.interaction.Modify.prototype.writeMultiPolygonGeometry_ = function(feature, geometry) { var polygons = geometry.getCoordinates(); var coordinates, i, ii, j, jj, k, kk, rings, segment, segmentData; for (k = 0, kk = polygons.length; k < kk; ++k) { @@ -502,8 +496,7 @@ ol.interaction.Modify.prototype.writeMultiPolygonGeometry_ = * @param {ol.geom.GeometryCollection} geometry Geometry. * @private */ -ol.interaction.Modify.prototype.writeGeometryCollectionGeometry_ = - function(feature, geometry) { +ol.interaction.Modify.prototype.writeGeometryCollectionGeometry_ = function(feature, geometry) { var i, geometries = geometry.getGeometriesArray(); for (i = 0; i < geometries.length; ++i) { this.SEGMENT_WRITERS_[geometries[i].getType()].call( @@ -517,8 +510,7 @@ ol.interaction.Modify.prototype.writeGeometryCollectionGeometry_ = * @return {ol.Feature} Vertex feature. * @private */ -ol.interaction.Modify.prototype.createOrUpdateVertexFeature_ = - function(coordinates) { +ol.interaction.Modify.prototype.createOrUpdateVertexFeature_ = function(coordinates) { var vertexFeature = this.vertexFeature_; if (!vertexFeature) { vertexFeature = new ol.Feature(new ol.geom.Point(coordinates)); @@ -990,8 +982,7 @@ ol.interaction.Modify.prototype.removeVertex_ = function() { * @param {Array} coordinates Coordinates. * @private */ -ol.interaction.Modify.prototype.setGeometryCoordinates_ = - function(geometry, coordinates) { +ol.interaction.Modify.prototype.setGeometryCoordinates_ = function(geometry, coordinates) { this.changingFeature_ = true; geometry.setCoordinates(coordinates); this.changingFeature_ = false; diff --git a/src/ol/interaction/pointerinteraction.js b/src/ol/interaction/pointerinteraction.js index ca45bb6d03..1fd2ba62a0 100644 --- a/src/ol/interaction/pointerinteraction.js +++ b/src/ol/interaction/pointerinteraction.js @@ -108,8 +108,7 @@ ol.interaction.Pointer.centroid = function(pointerEvents) { * or pointerup event. * @private */ -ol.interaction.Pointer.prototype.isPointerDraggingEvent_ = - function(mapBrowserEvent) { +ol.interaction.Pointer.prototype.isPointerDraggingEvent_ = function(mapBrowserEvent) { var type = mapBrowserEvent.type; return ( type === ol.MapBrowserEvent.EventType.POINTERDOWN || @@ -122,8 +121,7 @@ ol.interaction.Pointer.prototype.isPointerDraggingEvent_ = * @param {ol.MapBrowserPointerEvent} mapBrowserEvent Event. * @private */ -ol.interaction.Pointer.prototype.updateTrackedPointers_ = - function(mapBrowserEvent) { +ol.interaction.Pointer.prototype.updateTrackedPointers_ = function(mapBrowserEvent) { if (this.isPointerDraggingEvent_(mapBrowserEvent)) { var event = mapBrowserEvent.pointerEvent; diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index 872dc7f23b..34e1c69c59 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -58,8 +58,7 @@ ol.interaction.SelectFilterFunction; * @extends {goog.events.Event} * @constructor */ -ol.interaction.SelectEvent = - function(type, selected, deselected, mapBrowserEvent) { +ol.interaction.SelectEvent = function(type, selected, deselected, mapBrowserEvent) { goog.base(this, type); /** @@ -175,23 +174,21 @@ ol.interaction.Select = function(opt_options) { var layerFilter; if (options.layers) { if (goog.isFunction(options.layers)) { - layerFilter = - /** - * @param {ol.layer.Layer} layer Layer. - * @return {boolean} Include. - */ - function(layer) { + /** + * @param {ol.layer.Layer} layer Layer. + * @return {boolean} Include. + */ + layerFilter = function(layer) { goog.asserts.assertFunction(options.layers); return layer === featureOverlay || options.layers(layer); }; } else { var layers = options.layers; - layerFilter = - /** - * @param {ol.layer.Layer} layer Layer. - * @return {boolean} Include. - */ - function(layer) { + /** + * @param {ol.layer.Layer} layer Layer. + * @return {boolean} Include. + */ + layerFilter = function(layer) { return layer === featureOverlay || ol.array.includes(layers, layer); }; } @@ -228,8 +225,7 @@ goog.inherits(ol.interaction.Select, ol.interaction.Interaction); * @param {ol.layer.Layer} layer Layer. * @private */ -ol.interaction.Select.prototype.addFeatureLayerAssociation_ = - function(feature, layer) { +ol.interaction.Select.prototype.addFeatureLayerAssociation_ = function(feature, layer) { var key = goog.getUid(feature); this.featureLayerAssociation_[key] = layer; }; @@ -433,8 +429,7 @@ ol.interaction.Select.prototype.removeFeature_ = function(evt) { * @param {ol.Feature|ol.render.Feature} feature Feature. * @private */ -ol.interaction.Select.prototype.removeFeatureLayerAssociation_ = - function(feature) { +ol.interaction.Select.prototype.removeFeatureLayerAssociation_ = function(feature) { var key = goog.getUid(feature); delete this.featureLayerAssociation_[key]; }; diff --git a/src/ol/interaction/snapinteraction.js b/src/ol/interaction/snapinteraction.js index cce0c481a8..43e6c8c05f 100644 --- a/src/ol/interaction/snapinteraction.js +++ b/src/ol/interaction/snapinteraction.js @@ -416,8 +416,7 @@ ol.interaction.Snap.prototype.updateFeature_ = function(feature) { * @param {ol.geom.GeometryCollection} geometry Geometry. * @private */ -ol.interaction.Snap.prototype.writeGeometryCollectionGeometry_ = - function(feature, geometry) { +ol.interaction.Snap.prototype.writeGeometryCollectionGeometry_ = function(feature, geometry) { var i, geometries = geometry.getGeometriesArray(); for (i = 0; i < geometries.length; ++i) { this.SEGMENT_WRITERS_[geometries[i].getType()].call( @@ -431,8 +430,7 @@ ol.interaction.Snap.prototype.writeGeometryCollectionGeometry_ = * @param {ol.geom.LineString} geometry Geometry. * @private */ -ol.interaction.Snap.prototype.writeLineStringGeometry_ = - function(feature, geometry) { +ol.interaction.Snap.prototype.writeLineStringGeometry_ = function(feature, geometry) { var coordinates = geometry.getCoordinates(); var i, ii, segment, segmentData; for (i = 0, ii = coordinates.length - 1; i < ii; ++i) { @@ -451,8 +449,7 @@ ol.interaction.Snap.prototype.writeLineStringGeometry_ = * @param {ol.geom.MultiLineString} geometry Geometry. * @private */ -ol.interaction.Snap.prototype.writeMultiLineStringGeometry_ = - function(feature, geometry) { +ol.interaction.Snap.prototype.writeMultiLineStringGeometry_ = function(feature, geometry) { var lines = geometry.getCoordinates(); var coordinates, i, ii, j, jj, segment, segmentData; for (j = 0, jj = lines.length; j < jj; ++j) { @@ -474,8 +471,7 @@ ol.interaction.Snap.prototype.writeMultiLineStringGeometry_ = * @param {ol.geom.MultiPoint} geometry Geometry. * @private */ -ol.interaction.Snap.prototype.writeMultiPointGeometry_ = - function(feature, geometry) { +ol.interaction.Snap.prototype.writeMultiPointGeometry_ = function(feature, geometry) { var points = geometry.getCoordinates(); var coordinates, i, ii, segmentData; for (i = 0, ii = points.length; i < ii; ++i) { @@ -494,8 +490,7 @@ ol.interaction.Snap.prototype.writeMultiPointGeometry_ = * @param {ol.geom.MultiPolygon} geometry Geometry. * @private */ -ol.interaction.Snap.prototype.writeMultiPolygonGeometry_ = - function(feature, geometry) { +ol.interaction.Snap.prototype.writeMultiPolygonGeometry_ = function(feature, geometry) { var polygons = geometry.getCoordinates(); var coordinates, i, ii, j, jj, k, kk, rings, segment, segmentData; for (k = 0, kk = polygons.length; k < kk; ++k) { @@ -520,8 +515,7 @@ ol.interaction.Snap.prototype.writeMultiPolygonGeometry_ = * @param {ol.geom.Point} geometry Geometry. * @private */ -ol.interaction.Snap.prototype.writePointGeometry_ = - function(feature, geometry) { +ol.interaction.Snap.prototype.writePointGeometry_ = function(feature, geometry) { var coordinates = geometry.getCoordinates(); var segmentData = /** @type {ol.interaction.Snap.SegmentDataType} */ ({ feature: feature, @@ -536,8 +530,7 @@ ol.interaction.Snap.prototype.writePointGeometry_ = * @param {ol.geom.Polygon} geometry Geometry. * @private */ -ol.interaction.Snap.prototype.writePolygonGeometry_ = - function(feature, geometry) { +ol.interaction.Snap.prototype.writePolygonGeometry_ = function(feature, geometry) { var rings = geometry.getCoordinates(); var coordinates, i, ii, j, jj, segment, segmentData; for (j = 0, jj = rings.length; j < jj; ++j) { diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tilelayer.js index e1e0894423..50e556afdd 100644 --- a/src/ol/layer/tilelayer.js +++ b/src/ol/layer/tilelayer.js @@ -94,8 +94,7 @@ ol.layer.Tile.prototype.getUseInterimTilesOnError = function() { * @observable * @api */ -ol.layer.Tile.prototype.setUseInterimTilesOnError = - function(useInterimTilesOnError) { +ol.layer.Tile.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) { this.set( ol.layer.TileProperty.USE_INTERIM_TILES_ON_ERROR, useInterimTilesOnError); }; diff --git a/src/ol/layer/vectortilelayer.js b/src/ol/layer/vectortilelayer.js index fb158e6133..51da738caf 100644 --- a/src/ol/layer/vectortilelayer.js +++ b/src/ol/layer/vectortilelayer.js @@ -92,8 +92,7 @@ ol.layer.VectorTile.prototype.setPreload = function(preload) { * @observable * @api */ -ol.layer.VectorTile.prototype.setUseInterimTilesOnError = - function(useInterimTilesOnError) { +ol.layer.VectorTile.prototype.setUseInterimTilesOnError = function(useInterimTilesOnError) { this.set( ol.layer.TileProperty.USE_INTERIM_TILES_ON_ERROR, useInterimTilesOnError); }; diff --git a/src/ol/map.js b/src/ol/map.js index 5b5047c45d..c7d7c98f12 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -615,8 +615,7 @@ ol.Map.prototype.disposeInternal = function() { * @template S,T,U * @api stable */ -ol.Map.prototype.forEachFeatureAtPixel = - function(pixel, callback, opt_this, opt_layerFilter, opt_this2) { +ol.Map.prototype.forEachFeatureAtPixel = function(pixel, callback, opt_this, opt_layerFilter, opt_this2) { if (!this.frameState_) { return; } @@ -653,8 +652,7 @@ ol.Map.prototype.forEachFeatureAtPixel = * @template S,T,U * @api stable */ -ol.Map.prototype.forEachLayerAtPixel = - function(pixel, callback, opt_this, opt_layerFilter, opt_this2) { +ol.Map.prototype.forEachLayerAtPixel = function(pixel, callback, opt_this, opt_layerFilter, opt_this2) { if (!this.frameState_) { return; } @@ -683,8 +681,7 @@ ol.Map.prototype.forEachLayerAtPixel = * @template U * @api */ -ol.Map.prototype.hasFeatureAtPixel = - function(pixel, opt_layerFilter, opt_this) { +ol.Map.prototype.hasFeatureAtPixel = function(pixel, opt_layerFilter, opt_this) { if (!this.frameState_) { return false; } @@ -928,8 +925,7 @@ ol.Map.prototype.getOverlayContainerStopEvent = function() { * @param {number} tileResolution Tile resolution. * @return {number} Tile priority. */ -ol.Map.prototype.getTilePriority = - function(tile, tileSourceKey, tileCenter, tileResolution) { +ol.Map.prototype.getTilePriority = function(tile, tileSourceKey, tileCenter, tileResolution) { // Filter out tiles at higher zoom levels than the current zoom level, or that // are outside the visible extent. var frameState = this.frameState_; diff --git a/src/ol/mapbrowserevent.js b/src/ol/mapbrowserevent.js index 0a2db5f0e6..6d7b82dad3 100644 --- a/src/ol/mapbrowserevent.js +++ b/src/ol/mapbrowserevent.js @@ -255,8 +255,7 @@ ol.MapBrowserEventHandler.prototype.emulateClick_ = function(pointerEvent) { * @param {ol.pointer.PointerEvent} pointerEvent Pointer event. * @private */ -ol.MapBrowserEventHandler.prototype.updateActivePointers_ = - function(pointerEvent) { +ol.MapBrowserEventHandler.prototype.updateActivePointers_ = function(pointerEvent) { var event = pointerEvent; if (event.type == ol.MapBrowserEvent.EventType.POINTERUP || @@ -306,8 +305,7 @@ ol.MapBrowserEventHandler.prototype.handlePointerUp_ = function(pointerEvent) { * @return {boolean} If the left mouse button was pressed. * @private */ -ol.MapBrowserEventHandler.prototype.isMouseActionButton_ = - function(pointerEvent) { +ol.MapBrowserEventHandler.prototype.isMouseActionButton_ = function(pointerEvent) { return pointerEvent.button === 0; }; @@ -316,8 +314,7 @@ ol.MapBrowserEventHandler.prototype.isMouseActionButton_ = * @param {ol.pointer.PointerEvent} pointerEvent Pointer event. * @private */ -ol.MapBrowserEventHandler.prototype.handlePointerDown_ = - function(pointerEvent) { +ol.MapBrowserEventHandler.prototype.handlePointerDown_ = function(pointerEvent) { this.updateActivePointers_(pointerEvent); var newEvent = new ol.MapBrowserPointerEvent( ol.MapBrowserEvent.EventType.POINTERDOWN, this.map_, pointerEvent); @@ -365,8 +362,7 @@ ol.MapBrowserEventHandler.prototype.handlePointerDown_ = * @param {ol.pointer.PointerEvent} pointerEvent Pointer event. * @private */ -ol.MapBrowserEventHandler.prototype.handlePointerMove_ = - function(pointerEvent) { +ol.MapBrowserEventHandler.prototype.handlePointerMove_ = function(pointerEvent) { // Fix IE10 on windows Surface : When you tap the tablet, it triggers // multiple pointermove events between pointerdown and pointerup with // the exact same coordinates of the pointerdown event. To avoid a diff --git a/src/ol/pointer/mousesource.js b/src/ol/pointer/mousesource.js index d054a51f36..095dcc0403 100644 --- a/src/ol/pointer/mousesource.js +++ b/src/ol/pointer/mousesource.js @@ -111,8 +111,7 @@ ol.pointer.MouseSource.DEDUP_DIST = 25; * @param {goog.events.BrowserEvent} inEvent The in event. * @return {boolean} True, if the event was generated by a touch. */ -ol.pointer.MouseSource.prototype.isEventSimulatedFromTouch_ = - function(inEvent) { +ol.pointer.MouseSource.prototype.isEventSimulatedFromTouch_ = function(inEvent) { var lts = this.lastTouches; var x = inEvent.clientX, y = inEvent.clientY; for (var i = 0, l = lts.length, t; i < l && (t = lts[i]); i++) { diff --git a/src/ol/pointer/pointereventhandler.js b/src/ol/pointer/pointereventhandler.js index 17352aa823..f0a7f7deab 100644 --- a/src/ol/pointer/pointereventhandler.js +++ b/src/ol/pointer/pointereventhandler.js @@ -112,8 +112,7 @@ ol.pointer.PointerEventHandler.prototype.registerSources = function() { * @param {string} name A name for the event source * @param {ol.pointer.EventSource} source The source event. */ -ol.pointer.PointerEventHandler.prototype.registerSource = - function(name, source) { +ol.pointer.PointerEventHandler.prototype.registerSource = function(name, source) { var s = source; var newEvents = s.getEvents(); @@ -207,8 +206,7 @@ ol.pointer.PointerEventHandler.prototype.removeEvents_ = function(events) { * @return {Object} An object containing shallow copies of * `inEvent`'s properties. */ -ol.pointer.PointerEventHandler.prototype.cloneEvent = - function(browserEvent, inEvent) { +ol.pointer.PointerEventHandler.prototype.cloneEvent = function(browserEvent, inEvent) { var eventCopy = {}, p; for (var i = 0, ii = ol.pointer.CLONE_PROPS.length; i < ii; i++) { p = ol.pointer.CLONE_PROPS[i][0]; @@ -230,8 +228,7 @@ ol.pointer.PointerEventHandler.prototype.cloneEvent = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.down = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.down = function(pointerEventData, browserEvent) { this.fireEvent(ol.pointer.EventType.POINTERDOWN, pointerEventData, browserEvent); }; @@ -242,8 +239,7 @@ ol.pointer.PointerEventHandler.prototype.down = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.move = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.move = function(pointerEventData, browserEvent) { this.fireEvent(ol.pointer.EventType.POINTERMOVE, pointerEventData, browserEvent); }; @@ -254,8 +250,7 @@ ol.pointer.PointerEventHandler.prototype.move = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.up = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.up = function(pointerEventData, browserEvent) { this.fireEvent(ol.pointer.EventType.POINTERUP, pointerEventData, browserEvent); }; @@ -266,8 +261,7 @@ ol.pointer.PointerEventHandler.prototype.up = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.enter = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.enter = function(pointerEventData, browserEvent) { pointerEventData.bubbles = false; this.fireEvent(ol.pointer.EventType.POINTERENTER, pointerEventData, browserEvent); @@ -279,8 +273,7 @@ ol.pointer.PointerEventHandler.prototype.enter = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.leave = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.leave = function(pointerEventData, browserEvent) { pointerEventData.bubbles = false; this.fireEvent(ol.pointer.EventType.POINTERLEAVE, pointerEventData, browserEvent); @@ -292,8 +285,7 @@ ol.pointer.PointerEventHandler.prototype.leave = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.over = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.over = function(pointerEventData, browserEvent) { pointerEventData.bubbles = true; this.fireEvent(ol.pointer.EventType.POINTEROVER, pointerEventData, browserEvent); @@ -305,8 +297,7 @@ ol.pointer.PointerEventHandler.prototype.over = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.out = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.out = function(pointerEventData, browserEvent) { pointerEventData.bubbles = true; this.fireEvent(ol.pointer.EventType.POINTEROUT, pointerEventData, browserEvent); @@ -318,8 +309,7 @@ ol.pointer.PointerEventHandler.prototype.out = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.cancel = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.cancel = function(pointerEventData, browserEvent) { this.fireEvent(ol.pointer.EventType.POINTERCANCEL, pointerEventData, browserEvent); }; @@ -330,8 +320,7 @@ ol.pointer.PointerEventHandler.prototype.cancel = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.leaveOut = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.leaveOut = function(pointerEventData, browserEvent) { this.out(pointerEventData, browserEvent); if (!this.contains_( pointerEventData.target, @@ -346,8 +335,7 @@ ol.pointer.PointerEventHandler.prototype.leaveOut = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.enterOver = - function(pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.enterOver = function(pointerEventData, browserEvent) { this.over(pointerEventData, browserEvent); if (!this.contains_( pointerEventData.target, @@ -364,8 +352,7 @@ ol.pointer.PointerEventHandler.prototype.enterOver = * @return {boolean} Returns true if the container element * contains the other element. */ -ol.pointer.PointerEventHandler.prototype.contains_ = - function(container, contained) { +ol.pointer.PointerEventHandler.prototype.contains_ = function(container, contained) { if (!contained) { return false; } @@ -383,8 +370,7 @@ ol.pointer.PointerEventHandler.prototype.contains_ = * @param {goog.events.BrowserEvent} browserEvent The event. * @return {ol.pointer.PointerEvent} A PointerEvent of type `inType`. */ -ol.pointer.PointerEventHandler.prototype.makeEvent = - function(inType, pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.makeEvent = function(inType, pointerEventData, browserEvent) { return new ol.pointer.PointerEvent(inType, browserEvent, pointerEventData); }; @@ -395,8 +381,7 @@ ol.pointer.PointerEventHandler.prototype.makeEvent = * @param {Object} pointerEventData Pointer event data. * @param {goog.events.BrowserEvent} browserEvent The event. */ -ol.pointer.PointerEventHandler.prototype.fireEvent = - function(inType, pointerEventData, browserEvent) { +ol.pointer.PointerEventHandler.prototype.fireEvent = function(inType, pointerEventData, browserEvent) { var e = this.makeEvent(inType, pointerEventData, browserEvent); this.dispatchEvent(e); }; @@ -407,8 +392,7 @@ ol.pointer.PointerEventHandler.prototype.fireEvent = * and dispatches this event. * @param {goog.events.BrowserEvent} nativeEvent A platform event with a target. */ -ol.pointer.PointerEventHandler.prototype.fireNativeEvent = - function(nativeEvent) { +ol.pointer.PointerEventHandler.prototype.fireNativeEvent = function(nativeEvent) { var e = this.makeEvent(nativeEvent.type, nativeEvent.getBrowserEvent(), nativeEvent); this.dispatchEvent(e); @@ -422,8 +406,7 @@ ol.pointer.PointerEventHandler.prototype.fireNativeEvent = * @param {goog.events.BrowserEvent} browserEvent The event. * @return {ol.pointer.PointerEvent} The wrapped event. */ -ol.pointer.PointerEventHandler.prototype.wrapMouseEvent = - function(eventType, browserEvent) { +ol.pointer.PointerEventHandler.prototype.wrapMouseEvent = function(eventType, browserEvent) { var pointerEvent = this.makeEvent( eventType, ol.pointer.MouseSource.prepareEvent(browserEvent, this), diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js index cf787c45cb..7f0afc0674 100644 --- a/src/ol/pointer/touchsource.js +++ b/src/ol/pointer/touchsource.js @@ -181,8 +181,7 @@ ol.pointer.TouchSource.prototype.cancelResetClickCount_ = function() { * @param {Touch} inTouch Touch event * @return {Object} A pointer object. */ -ol.pointer.TouchSource.prototype.touchToPointer_ = - function(browserEvent, inTouch) { +ol.pointer.TouchSource.prototype.touchToPointer_ = function(browserEvent, inTouch) { var e = this.dispatcher.cloneEvent(browserEvent, inTouch); // Spec specifies that pointerId 1 is reserved for Mouse. // Touch identifiers can start at 0. @@ -217,8 +216,7 @@ ol.pointer.TouchSource.prototype.touchToPointer_ = * @param {goog.events.BrowserEvent} inEvent Touch event * @param {function(goog.events.BrowserEvent, Object)} inFunction In function. */ -ol.pointer.TouchSource.prototype.processTouches_ = - function(inEvent, inFunction) { +ol.pointer.TouchSource.prototype.processTouches_ = function(inEvent, inFunction) { var touches = Array.prototype.slice.call( inEvent.getBrowserEvent().changedTouches); var count = touches.length; @@ -340,8 +338,7 @@ ol.pointer.TouchSource.prototype.touchmove = function(inEvent) { * @param {goog.events.BrowserEvent} browserEvent The event. * @param {Object} inPointer The in pointer. */ -ol.pointer.TouchSource.prototype.moveOverOut_ = - function(browserEvent, inPointer) { +ol.pointer.TouchSource.prototype.moveOverOut_ = function(browserEvent, inPointer) { var event = inPointer; var pointer = this.pointerMap[event.pointerId]; // a finger drifted off the screen, ignore it @@ -412,8 +409,7 @@ ol.pointer.TouchSource.prototype.touchcancel = function(inEvent) { * @param {goog.events.BrowserEvent} browserEvent The event. * @param {Object} inPointer The in pointer. */ -ol.pointer.TouchSource.prototype.cancelOut_ = - function(browserEvent, inPointer) { +ol.pointer.TouchSource.prototype.cancelOut_ = function(browserEvent, inPointer) { this.dispatcher.cancel(inPointer, browserEvent); this.dispatcher.out(inPointer, browserEvent); this.dispatcher.leave(inPointer, browserEvent); diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js index 15bf89ee9f..152c885a6c 100644 --- a/src/ol/proj/proj.js +++ b/src/ol/proj/proj.js @@ -470,8 +470,7 @@ ol.proj.addEquivalentProjections = function(projections) { * @param {ol.TransformFunction} inverseTransform Transform from any projection * in projection2 to any projection in projection1.. */ -ol.proj.addEquivalentTransforms = - function(projections1, projections2, forwardTransform, inverseTransform) { +ol.proj.addEquivalentTransforms = function(projections1, projections2, forwardTransform, inverseTransform) { projections1.forEach(function(projection1) { projections2.forEach(function(projection2) { ol.proj.addTransform(projection1, projection2, forwardTransform); @@ -570,8 +569,7 @@ ol.proj.addTransform = function(source, destination, transformFn) { * the transformed {@link ol.Coordinate}. * @api stable */ -ol.proj.addCoordinateTransforms = - function(source, destination, forward, inverse) { +ol.proj.addCoordinateTransforms = function(source, destination, forward, inverse) { var sourceProj = ol.proj.get(source); var destProj = ol.proj.get(destination); ol.proj.addTransform(sourceProj, destProj, @@ -752,8 +750,7 @@ ol.proj.getTransform = function(source, destination) { * object. * @return {ol.TransformFunction} Transform function. */ -ol.proj.getTransformFromProjections = - function(sourceProjection, destinationProjection) { +ol.proj.getTransformFromProjections = function(sourceProjection, destinationProjection) { var transforms = ol.proj.transforms_; var sourceCode = sourceProjection.getCode(); var destinationCode = destinationProjection.getCode(); @@ -853,8 +850,7 @@ ol.proj.transformExtent = function(extent, source, destination) { * @param {ol.proj.Projection} destinationProjection Destination projection. * @return {ol.Coordinate} Point. */ -ol.proj.transformWithProjections = - function(point, sourceProjection, destinationProjection) { +ol.proj.transformWithProjections = function(point, sourceProjection, destinationProjection) { var transformFn = ol.proj.getTransformFromProjections( sourceProjection, destinationProjection); return transformFn(point); diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/canvasimmediate.js index b9b4346b31..11848903d5 100644 --- a/src/ol/render/canvas/canvasimmediate.js +++ b/src/ol/render/canvas/canvasimmediate.js @@ -36,8 +36,7 @@ goog.require('ol.vec.Mat4'); * @param {number} viewRotation View rotation. * @struct */ -ol.render.canvas.Immediate = - function(context, pixelRatio, extent, transform, viewRotation) { +ol.render.canvas.Immediate = function(context, pixelRatio, extent, transform, viewRotation) { /** * @private @@ -248,8 +247,7 @@ ol.render.canvas.Immediate = * @param {number} stride Stride. * @private */ -ol.render.canvas.Immediate.prototype.drawImages_ = - function(flatCoordinates, offset, end, stride) { +ol.render.canvas.Immediate.prototype.drawImages_ = function(flatCoordinates, offset, end, stride) { if (!this.image_) { return; } @@ -311,8 +309,7 @@ ol.render.canvas.Immediate.prototype.drawImages_ = * @param {number} stride Stride. * @private */ -ol.render.canvas.Immediate.prototype.drawText_ = - function(flatCoordinates, offset, end, stride) { +ol.render.canvas.Immediate.prototype.drawText_ = function(flatCoordinates, offset, end, stride) { if (!this.textState_ || this.text_ === '') { return; } @@ -366,8 +363,7 @@ ol.render.canvas.Immediate.prototype.drawText_ = * @private * @return {number} end End. */ -ol.render.canvas.Immediate.prototype.moveToLineTo_ = - function(flatCoordinates, offset, end, stride, close) { +ol.render.canvas.Immediate.prototype.moveToLineTo_ = function(flatCoordinates, offset, end, stride, close) { var context = this.context_; var pixelCoordinates = ol.geom.flat.transform.transform2D( flatCoordinates, offset, end, stride, this.transform_, @@ -392,8 +388,7 @@ ol.render.canvas.Immediate.prototype.moveToLineTo_ = * @private * @return {number} End. */ -ol.render.canvas.Immediate.prototype.drawRings_ = - function(flatCoordinates, offset, ends, stride) { +ol.render.canvas.Immediate.prototype.drawRings_ = function(flatCoordinates, offset, ends, stride) { var context = this.context_; var i, ii; for (i = 0, ii = ends.length; i < ii; ++i) { @@ -432,8 +427,7 @@ ol.render.canvas.Immediate.prototype.drawAsync = function(zIndex, callback) { * @param {ol.geom.Circle} circleGeometry Circle geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawCircleGeometry = - function(circleGeometry) { +ol.render.canvas.Immediate.prototype.drawCircleGeometry = function(circleGeometry) { if (!ol.extent.intersects(this.extent_, circleGeometry.getExtent())) { return; } @@ -508,8 +502,7 @@ ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) { * collection. * @param {ol.Feature} feature Feature. */ -ol.render.canvas.Immediate.prototype.drawGeometryCollectionGeometry = - function(geometryCollectionGeometry, feature) { +ol.render.canvas.Immediate.prototype.drawGeometryCollectionGeometry = function(geometryCollectionGeometry, feature) { var geometries = geometryCollectionGeometry.getGeometriesArray(); var i, ii; for (i = 0, ii = geometries.length; i < ii; ++i) { @@ -530,8 +523,7 @@ ol.render.canvas.Immediate.prototype.drawGeometryCollectionGeometry = * @param {ol.geom.Point|ol.render.Feature} pointGeometry Point geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawPointGeometry = - function(pointGeometry) { +ol.render.canvas.Immediate.prototype.drawPointGeometry = function(pointGeometry) { var flatCoordinates = pointGeometry.getFlatCoordinates(); var stride = pointGeometry.getStride(); if (this.image_) { @@ -551,8 +543,7 @@ ol.render.canvas.Immediate.prototype.drawPointGeometry = * geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawMultiPointGeometry = - function(multiPointGeometry) { +ol.render.canvas.Immediate.prototype.drawMultiPointGeometry = function(multiPointGeometry) { var flatCoordinates = multiPointGeometry.getFlatCoordinates(); var stride = multiPointGeometry.getStride(); if (this.image_) { @@ -572,8 +563,7 @@ ol.render.canvas.Immediate.prototype.drawMultiPointGeometry = * string geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawLineStringGeometry = - function(lineStringGeometry) { +ol.render.canvas.Immediate.prototype.drawLineStringGeometry = function(lineStringGeometry) { if (!ol.extent.intersects(this.extent_, lineStringGeometry.getExtent())) { return; } @@ -601,8 +591,7 @@ ol.render.canvas.Immediate.prototype.drawLineStringGeometry = * MultiLineString geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry = - function(multiLineStringGeometry) { +ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry = function(multiLineStringGeometry) { var geometryExtent = multiLineStringGeometry.getExtent(); if (!ol.extent.intersects(this.extent_, geometryExtent)) { return; @@ -637,8 +626,7 @@ ol.render.canvas.Immediate.prototype.drawMultiLineStringGeometry = * geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawPolygonGeometry = - function(polygonGeometry) { +ol.render.canvas.Immediate.prototype.drawPolygonGeometry = function(polygonGeometry) { if (!ol.extent.intersects(this.extent_, polygonGeometry.getExtent())) { return; } @@ -673,8 +661,7 @@ ol.render.canvas.Immediate.prototype.drawPolygonGeometry = * @param {ol.geom.MultiPolygon} multiPolygonGeometry MultiPolygon geometry. * @api */ -ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry = - function(multiPolygonGeometry) { +ol.render.canvas.Immediate.prototype.drawMultiPolygonGeometry = function(multiPolygonGeometry) { if (!ol.extent.intersects(this.extent_, multiPolygonGeometry.getExtent())) { return; } @@ -737,8 +724,7 @@ ol.render.canvas.Immediate.prototype.flush = function() { * @param {ol.render.canvas.FillState} fillState Fill state. * @private */ -ol.render.canvas.Immediate.prototype.setContextFillState_ = - function(fillState) { +ol.render.canvas.Immediate.prototype.setContextFillState_ = function(fillState) { var context = this.context_; var contextFillState = this.contextFillState_; if (!contextFillState) { @@ -758,8 +744,7 @@ ol.render.canvas.Immediate.prototype.setContextFillState_ = * @param {ol.render.canvas.StrokeState} strokeState Stroke state. * @private */ -ol.render.canvas.Immediate.prototype.setContextStrokeState_ = - function(strokeState) { +ol.render.canvas.Immediate.prototype.setContextStrokeState_ = function(strokeState) { var context = this.context_; var contextStrokeState = this.contextStrokeState_; if (!contextStrokeState) { @@ -811,8 +796,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ = * @param {ol.render.canvas.TextState} textState Text state. * @private */ -ol.render.canvas.Immediate.prototype.setContextTextState_ = - function(textState) { +ol.render.canvas.Immediate.prototype.setContextTextState_ = function(textState) { var context = this.context_; var contextTextState = this.contextTextState_; if (!contextTextState) { @@ -847,8 +831,7 @@ ol.render.canvas.Immediate.prototype.setContextTextState_ = * @param {ol.style.Stroke} strokeStyle Stroke style. * @api */ -ol.render.canvas.Immediate.prototype.setFillStrokeStyle = - function(fillStyle, strokeStyle) { +ol.render.canvas.Immediate.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) { if (!fillStyle) { this.fillState_ = null; } else { diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/canvasreplay.js index 3300326576..40b58e3059 100644 --- a/src/ol/render/canvas/canvasreplay.js +++ b/src/ol/render/canvas/canvasreplay.js @@ -158,8 +158,7 @@ goog.inherits(ol.render.canvas.Replay, ol.render.VectorContext); * @protected * @return {number} My end. */ -ol.render.canvas.Replay.prototype.appendFlatCoordinates = - function(flatCoordinates, offset, end, stride, close) { +ol.render.canvas.Replay.prototype.appendFlatCoordinates = function(flatCoordinates, offset, end, stride, close) { var myEnd = this.coordinates.length; var extent = this.getBufferedMaxExtent(); @@ -601,8 +600,7 @@ ol.render.canvas.Replay.prototype.replayHitDetection = function( /** * @private */ -ol.render.canvas.Replay.prototype.reverseHitDetectionInstructions_ = - function() { +ol.render.canvas.Replay.prototype.reverseHitDetectionInstructions_ = function() { var hitDetectionInstructions = this.hitDetectionInstructions; // step 1 - reverse array hitDetectionInstructions.reverse(); @@ -770,8 +768,7 @@ goog.inherits(ol.render.canvas.ImageReplay, ol.render.canvas.Replay); * @private * @return {number} My end. */ -ol.render.canvas.ImageReplay.prototype.drawCoordinates_ = - function(flatCoordinates, offset, end, stride) { +ol.render.canvas.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) { return this.appendFlatCoordinates( flatCoordinates, offset, end, stride, false); }; @@ -780,8 +777,7 @@ ol.render.canvas.ImageReplay.prototype.drawCoordinates_ = /** * @inheritDoc */ -ol.render.canvas.ImageReplay.prototype.drawPointGeometry = - function(pointGeometry, feature) { +ol.render.canvas.ImageReplay.prototype.drawPointGeometry = function(pointGeometry, feature) { if (!this.image_) { return; } @@ -833,8 +829,7 @@ ol.render.canvas.ImageReplay.prototype.drawPointGeometry = /** * @inheritDoc */ -ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry = - function(multiPointGeometry, feature) { +ol.render.canvas.ImageReplay.prototype.drawMultiPointGeometry = function(multiPointGeometry, feature) { if (!this.image_) { return; } @@ -995,8 +990,7 @@ goog.inherits(ol.render.canvas.LineStringReplay, ol.render.canvas.Replay); * @private * @return {number} end. */ -ol.render.canvas.LineStringReplay.prototype.drawFlatCoordinates_ = - function(flatCoordinates, offset, end, stride) { +ol.render.canvas.LineStringReplay.prototype.drawFlatCoordinates_ = function(flatCoordinates, offset, end, stride) { var myBegin = this.coordinates.length; var myEnd = this.appendFlatCoordinates( flatCoordinates, offset, end, stride, false); @@ -1069,8 +1063,7 @@ ol.render.canvas.LineStringReplay.prototype.setStrokeStyle_ = function() { /** * @inheritDoc */ -ol.render.canvas.LineStringReplay.prototype.drawLineStringGeometry = - function(lineStringGeometry, feature) { +ol.render.canvas.LineStringReplay.prototype.drawLineStringGeometry = function(lineStringGeometry, feature) { var state = this.state_; goog.asserts.assert(state, 'state should not be null'); var strokeStyle = state.strokeStyle; @@ -1097,8 +1090,7 @@ ol.render.canvas.LineStringReplay.prototype.drawLineStringGeometry = /** * @inheritDoc */ -ol.render.canvas.LineStringReplay.prototype.drawMultiLineStringGeometry = - function(multiLineStringGeometry, feature) { +ol.render.canvas.LineStringReplay.prototype.drawMultiLineStringGeometry = function(multiLineStringGeometry, feature) { var state = this.state_; goog.asserts.assert(state, 'state should not be null'); var strokeStyle = state.strokeStyle; @@ -1144,8 +1136,7 @@ ol.render.canvas.LineStringReplay.prototype.finish = function() { /** * @inheritDoc */ -ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle = - function(fillStyle, strokeStyle) { +ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) { goog.asserts.assert(this.state_, 'this.state_ should not be null'); goog.asserts.assert(!fillStyle, 'fillStyle should be null'); goog.asserts.assert(strokeStyle, 'strokeStyle should not be null'); @@ -1236,8 +1227,7 @@ goog.inherits(ol.render.canvas.PolygonReplay, ol.render.canvas.Replay); * @private * @return {number} End. */ -ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = - function(flatCoordinates, offset, ends, stride) { +ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = function(flatCoordinates, offset, ends, stride) { var state = this.state_; var beginPathInstruction = [ol.render.canvas.Instruction.BEGIN_PATH]; this.instructions.push(beginPathInstruction); @@ -1277,8 +1267,7 @@ ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = /** * @inheritDoc */ -ol.render.canvas.PolygonReplay.prototype.drawCircleGeometry = - function(circleGeometry, feature) { +ol.render.canvas.PolygonReplay.prototype.drawCircleGeometry = function(circleGeometry, feature) { var state = this.state_; goog.asserts.assert(state, 'state should not be null'); var fillStyle = state.fillStyle; @@ -1330,8 +1319,7 @@ ol.render.canvas.PolygonReplay.prototype.drawCircleGeometry = /** * @inheritDoc */ -ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry = - function(polygonGeometry, feature) { +ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry = function(polygonGeometry, feature) { var state = this.state_; goog.asserts.assert(state, 'state should not be null'); var fillStyle = state.fillStyle; @@ -1366,8 +1354,7 @@ ol.render.canvas.PolygonReplay.prototype.drawPolygonGeometry = /** * @inheritDoc */ -ol.render.canvas.PolygonReplay.prototype.drawMultiPolygonGeometry = - function(multiPolygonGeometry, feature) { +ol.render.canvas.PolygonReplay.prototype.drawMultiPolygonGeometry = function(multiPolygonGeometry, feature) { var state = this.state_; goog.asserts.assert(state, 'state should not be null'); var fillStyle = state.fillStyle; @@ -1444,8 +1431,7 @@ ol.render.canvas.PolygonReplay.prototype.getBufferedMaxExtent = function() { /** * @inheritDoc */ -ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle = - function(fillStyle, strokeStyle) { +ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) { goog.asserts.assert(this.state_, 'this.state_ should not be null'); goog.asserts.assert(fillStyle || strokeStyle, 'fillStyle or strokeStyle should not be null'); @@ -1624,8 +1610,7 @@ goog.inherits(ol.render.canvas.TextReplay, ol.render.canvas.Replay); /** * @inheritDoc */ -ol.render.canvas.TextReplay.prototype.drawText = - function(flatCoordinates, offset, end, stride, geometry, feature) { +ol.render.canvas.TextReplay.prototype.drawText = function(flatCoordinates, offset, end, stride, geometry, feature) { if (this.text_ === '' || !this.textState_ || (!this.textFillState_ && !this.textStrokeState_)) { return; @@ -1657,8 +1642,7 @@ ol.render.canvas.TextReplay.prototype.drawText = * @param {ol.render.canvas.FillState} fillState Fill state. * @private */ -ol.render.canvas.TextReplay.prototype.setReplayFillState_ = - function(fillState) { +ol.render.canvas.TextReplay.prototype.setReplayFillState_ = function(fillState) { var replayFillState = this.replayFillState_; if (replayFillState && replayFillState.fillStyle == fillState.fillStyle) { @@ -1682,8 +1666,7 @@ ol.render.canvas.TextReplay.prototype.setReplayFillState_ = * @param {ol.render.canvas.StrokeState} strokeState Stroke state. * @private */ -ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = - function(strokeState) { +ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = function(strokeState) { var replayStrokeState = this.replayStrokeState_; if (replayStrokeState && replayStrokeState.lineCap == strokeState.lineCap && @@ -1725,8 +1708,7 @@ ol.render.canvas.TextReplay.prototype.setReplayStrokeState_ = * @param {ol.render.canvas.TextState} textState Text state. * @private */ -ol.render.canvas.TextReplay.prototype.setReplayTextState_ = - function(textState) { +ol.render.canvas.TextReplay.prototype.setReplayTextState_ = function(textState) { var replayTextState = this.replayTextState_; if (replayTextState && replayTextState.font == textState.font && @@ -1979,8 +1961,7 @@ ol.render.canvas.ReplayGroup.prototype.forEachFeatureAtCoordinate = function( /** * @inheritDoc */ -ol.render.canvas.ReplayGroup.prototype.getReplay = - function(zIndex, replayType) { +ol.render.canvas.ReplayGroup.prototype.getReplay = function(zIndex, replayType) { var zIndexKey = zIndex !== undefined ? zIndex.toString() : '0'; var replays = this.replaysByZIndex_[zIndexKey]; if (replays === undefined) { diff --git a/src/ol/render/renderfeature.js b/src/ol/render/renderfeature.js index a05c7bcb44..484313e4dc 100644 --- a/src/ol/render/renderfeature.js +++ b/src/ol/render/renderfeature.js @@ -100,12 +100,18 @@ ol.render.Feature.prototype.getExtent = function() { /** * @return {Array.} Flat coordinates. */ -ol.render.Feature.prototype.getFlatCoordinates = - ol.render.Feature.prototype.getOrientedFlatCoordinates = function() { +ol.render.Feature.prototype.getOrientedFlatCoordinates = function() { return this.flatCoordinates_; }; +/** + * @return {Array.} Flat coordinates. + */ +ol.render.Feature.prototype.getFlatCoordinates = + ol.render.Feature.prototype.getOrientedFlatCoordinates; + + /** * Get the feature for working with its geometry. * @return {ol.render.Feature} Feature. diff --git a/src/ol/render/vector.js b/src/ol/render/vector.js index 504ed3d583..ea983b7023 100644 --- a/src/ol/render/vector.js +++ b/src/ol/render/vector.js @@ -45,8 +45,7 @@ ol.renderer.vector.getTolerance = function(resolution, pixelRatio) { * @param {ol.Feature} feature Feature. * @private */ -ol.renderer.vector.renderCircleGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderCircleGeometry_ = function(replayGroup, geometry, style, feature) { var fillStyle = style.getFill(); var strokeStyle = style.getStroke(); if (fillStyle || strokeStyle) { @@ -131,8 +130,7 @@ ol.renderer.vector.renderFeature_ = function( * @param {ol.Feature} feature Feature. * @private */ -ol.renderer.vector.renderGeometryCollectionGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderGeometryCollectionGeometry_ = function(replayGroup, geometry, style, feature) { var geometries = geometry.getGeometriesArray(); var i, ii; for (i = 0, ii = geometries.length; i < ii; ++i) { @@ -152,8 +150,7 @@ ol.renderer.vector.renderGeometryCollectionGeometry_ = * @param {ol.Feature|ol.render.Feature} feature Feature. * @private */ -ol.renderer.vector.renderLineStringGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderLineStringGeometry_ = function(replayGroup, geometry, style, feature) { var strokeStyle = style.getStroke(); if (strokeStyle) { var lineStringReplay = replayGroup.getReplay( @@ -178,8 +175,7 @@ ol.renderer.vector.renderLineStringGeometry_ = * @param {ol.Feature|ol.render.Feature} feature Feature. * @private */ -ol.renderer.vector.renderMultiLineStringGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderMultiLineStringGeometry_ = function(replayGroup, geometry, style, feature) { var strokeStyle = style.getStroke(); if (strokeStyle) { var lineStringReplay = replayGroup.getReplay( @@ -206,8 +202,7 @@ ol.renderer.vector.renderMultiLineStringGeometry_ = * @param {ol.Feature} feature Feature. * @private */ -ol.renderer.vector.renderMultiPolygonGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderMultiPolygonGeometry_ = function(replayGroup, geometry, style, feature) { var fillStyle = style.getFill(); var strokeStyle = style.getStroke(); if (strokeStyle || fillStyle) { @@ -235,8 +230,7 @@ ol.renderer.vector.renderMultiPolygonGeometry_ = * @param {ol.Feature|ol.render.Feature} feature Feature. * @private */ -ol.renderer.vector.renderPointGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderPointGeometry_ = function(replayGroup, geometry, style, feature) { var imageStyle = style.getImage(); if (imageStyle) { if (imageStyle.getImageState() != ol.style.ImageState.LOADED) { @@ -265,8 +259,7 @@ ol.renderer.vector.renderPointGeometry_ = * @param {ol.Feature|ol.render.Feature} feature Feature. * @private */ -ol.renderer.vector.renderMultiPointGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderMultiPointGeometry_ = function(replayGroup, geometry, style, feature) { var imageStyle = style.getImage(); if (imageStyle) { if (imageStyle.getImageState() != ol.style.ImageState.LOADED) { @@ -296,8 +289,7 @@ ol.renderer.vector.renderMultiPointGeometry_ = * @param {ol.Feature|ol.render.Feature} feature Feature. * @private */ -ol.renderer.vector.renderPolygonGeometry_ = - function(replayGroup, geometry, style, feature) { +ol.renderer.vector.renderPolygonGeometry_ = function(replayGroup, geometry, style, feature) { var fillStyle = style.getFill(); var strokeStyle = style.getStroke(); if (fillStyle || strokeStyle) { diff --git a/src/ol/render/webgl/webglimmediate.js b/src/ol/render/webgl/webglimmediate.js index d6590cea31..041c04c805 100644 --- a/src/ol/render/webgl/webglimmediate.js +++ b/src/ol/render/webgl/webglimmediate.js @@ -114,8 +114,7 @@ ol.render.webgl.Immediate.prototype.drawAsync = function(zIndex, callback) { * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawCircleGeometry = - function(circleGeometry, data) { +ol.render.webgl.Immediate.prototype.drawCircleGeometry = function(circleGeometry, data) { }; @@ -152,8 +151,7 @@ ol.render.webgl.Immediate.prototype.drawFeature = function(feature, style) { * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawGeometryCollectionGeometry = - function(geometryCollectionGeometry, data) { +ol.render.webgl.Immediate.prototype.drawGeometryCollectionGeometry = function(geometryCollectionGeometry, data) { var geometries = geometryCollectionGeometry.getGeometriesArray(); var renderers = ol.render.webgl.Immediate.GEOMETRY_RENDERERS_; var i, ii; @@ -174,8 +172,7 @@ ol.render.webgl.Immediate.prototype.drawGeometryCollectionGeometry = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawPointGeometry = - function(pointGeometry, data) { +ol.render.webgl.Immediate.prototype.drawPointGeometry = function(pointGeometry, data) { var context = this.context_; var replayGroup = new ol.render.webgl.ReplayGroup(1, this.extent_); var replay = /** @type {ol.render.webgl.ImageReplay} */ ( @@ -199,8 +196,7 @@ ol.render.webgl.Immediate.prototype.drawPointGeometry = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawLineStringGeometry = - function(lineStringGeometry, data) { +ol.render.webgl.Immediate.prototype.drawLineStringGeometry = function(lineStringGeometry, data) { }; @@ -208,8 +204,7 @@ ol.render.webgl.Immediate.prototype.drawLineStringGeometry = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawMultiLineStringGeometry = - function(multiLineStringGeometry, data) { +ol.render.webgl.Immediate.prototype.drawMultiLineStringGeometry = function(multiLineStringGeometry, data) { }; @@ -217,8 +212,7 @@ ol.render.webgl.Immediate.prototype.drawMultiLineStringGeometry = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawMultiPointGeometry = - function(multiPointGeometry, data) { +ol.render.webgl.Immediate.prototype.drawMultiPointGeometry = function(multiPointGeometry, data) { var context = this.context_; var replayGroup = new ol.render.webgl.ReplayGroup(1, this.extent_); var replay = /** @type {ol.render.webgl.ImageReplay} */ ( @@ -241,8 +235,7 @@ ol.render.webgl.Immediate.prototype.drawMultiPointGeometry = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawMultiPolygonGeometry = - function(multiPolygonGeometry, data) { +ol.render.webgl.Immediate.prototype.drawMultiPolygonGeometry = function(multiPolygonGeometry, data) { }; @@ -250,8 +243,7 @@ ol.render.webgl.Immediate.prototype.drawMultiPolygonGeometry = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawPolygonGeometry = - function(polygonGeometry, data) { +ol.render.webgl.Immediate.prototype.drawPolygonGeometry = function(polygonGeometry, data) { }; @@ -259,8 +251,7 @@ ol.render.webgl.Immediate.prototype.drawPolygonGeometry = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.drawText = - function(flatCoordinates, offset, end, stride, geometry, data) { +ol.render.webgl.Immediate.prototype.drawText = function(flatCoordinates, offset, end, stride, geometry, data) { }; @@ -268,8 +259,7 @@ ol.render.webgl.Immediate.prototype.drawText = * @inheritDoc * @api */ -ol.render.webgl.Immediate.prototype.setFillStrokeStyle = - function(fillStyle, strokeStyle) { +ol.render.webgl.Immediate.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) { }; diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/webglreplay.js index d20ca89279..a1e23e266a 100644 --- a/src/ol/render/webgl/webglreplay.js +++ b/src/ol/render/webgl/webglreplay.js @@ -216,8 +216,7 @@ goog.inherits(ol.render.webgl.ImageReplay, ol.render.VectorContext); * @param {ol.webgl.Context} context WebGL context. * @return {function()} Delete resources function. */ -ol.render.webgl.ImageReplay.prototype.getDeleteResourcesFunction = - function(context) { +ol.render.webgl.ImageReplay.prototype.getDeleteResourcesFunction = function(context) { // We only delete our stuff here. The shaders and the program may // be used by other ImageReplay instances (for other layers). And // they will be deleted when disposing of the ol.webgl.Context @@ -261,8 +260,7 @@ ol.render.webgl.ImageReplay.prototype.drawAsync = goog.abstractMethod; * @return {number} My end. * @private */ -ol.render.webgl.ImageReplay.prototype.drawCoordinates_ = - function(flatCoordinates, offset, end, stride) { +ol.render.webgl.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) { goog.asserts.assert(this.anchorX_ !== undefined, 'anchorX is defined'); goog.asserts.assert(this.anchorY_ !== undefined, 'anchorY is defined'); goog.asserts.assert(this.height_ !== undefined, 'height is defined'); @@ -373,8 +371,7 @@ ol.render.webgl.ImageReplay.prototype.drawCoordinates_ = /** * @inheritDoc */ -ol.render.webgl.ImageReplay.prototype.drawMultiPointGeometry = - function(multiPointGeometry, feature) { +ol.render.webgl.ImageReplay.prototype.drawMultiPointGeometry = function(multiPointGeometry, feature) { this.startIndices_.push(this.indices_.length); this.startIndicesFeature_.push(feature); var flatCoordinates = multiPointGeometry.getFlatCoordinates(); @@ -387,8 +384,7 @@ ol.render.webgl.ImageReplay.prototype.drawMultiPointGeometry = /** * @inheritDoc */ -ol.render.webgl.ImageReplay.prototype.drawPointGeometry = - function(pointGeometry, feature) { +ol.render.webgl.ImageReplay.prototype.drawPointGeometry = function(pointGeometry, feature) { this.startIndices_.push(this.indices_.length); this.startIndicesFeature_.push(feature); var flatCoordinates = pointGeometry.getFlatCoordinates(); @@ -467,8 +463,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) { * @param {Object.} texturePerImage Texture cache. * @param {WebGLRenderingContext} gl Gl. */ -ol.render.webgl.ImageReplay.prototype.createTextures_ = - function(textures, images, texturePerImage, gl) { +ol.render.webgl.ImageReplay.prototype.createTextures_ = function(textures, images, texturePerImage, gl) { goog.asserts.assert(textures.length === 0, 'upon creation, textures is empty'); @@ -619,8 +614,7 @@ ol.render.webgl.ImageReplay.prototype.replay = function(context, * @param {Array.} textures Textures. * @param {Array.} groupIndices Texture group indices. */ -ol.render.webgl.ImageReplay.prototype.drawReplay_ = - function(gl, context, skippedFeaturesHash, textures, groupIndices) { +ol.render.webgl.ImageReplay.prototype.drawReplay_ = function(gl, context, skippedFeaturesHash, textures, groupIndices) { goog.asserts.assert(textures.length === groupIndices.length, 'number of textures and groupIndeces match'); var elementType = context.hasOESElementIndexUint ? @@ -670,8 +664,7 @@ ol.render.webgl.ImageReplay.prototype.drawReplay_ = * @param {number} elementType Element type. * @param {number} elementSize Element Size. */ -ol.render.webgl.ImageReplay.prototype.drawReplaySkipping_ = - function(gl, skippedFeaturesHash, textures, groupIndices, +ol.render.webgl.ImageReplay.prototype.drawReplaySkipping_ = function(gl, skippedFeaturesHash, textures, groupIndices, elementType, elementSize) { var featureIndex = 0; @@ -744,8 +737,7 @@ ol.render.webgl.ImageReplay.prototype.drawElements_ = function( * @return {T|undefined} Callback result. * @template T */ -ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplay_ = - function(gl, context, skippedFeaturesHash, featureCallback, oneByOne, +ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplay_ = function(gl, context, skippedFeaturesHash, featureCallback, oneByOne, opt_hitExtent) { if (!oneByOne) { // draw all hit-detection features in "once" (by texture group) @@ -769,8 +761,7 @@ ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplay_ = * @return {T|undefined} Callback result. * @template T */ -ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayAll_ = - function(gl, context, skippedFeaturesHash, featureCallback) { +ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayAll_ = function(gl, context, skippedFeaturesHash, featureCallback) { gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); this.drawReplay_(gl, context, skippedFeaturesHash, this.hitDetectionTextures_, this.hitDetectionGroupIndices_); @@ -796,8 +787,7 @@ ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayAll_ = * @return {T|undefined} Callback result. * @template T */ -ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayOneByOne_ = - function(gl, context, skippedFeaturesHash, featureCallback, +ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayOneByOne_ = function(gl, context, skippedFeaturesHash, featureCallback, opt_hitExtent) { goog.asserts.assert(this.hitDetectionTextures_.length === this.hitDetectionGroupIndices_.length, @@ -965,8 +955,7 @@ ol.render.webgl.ReplayGroup = function( * @param {ol.webgl.Context} context WebGL context. * @return {function()} Delete resources function. */ -ol.render.webgl.ReplayGroup.prototype.getDeleteResourcesFunction = - function(context) { +ol.render.webgl.ReplayGroup.prototype.getDeleteResourcesFunction = function(context) { var functions = []; var replayKey; for (replayKey in this.replays_) { @@ -991,8 +980,7 @@ ol.render.webgl.ReplayGroup.prototype.finish = function(context) { /** * @inheritDoc */ -ol.render.webgl.ReplayGroup.prototype.getReplay = - function(zIndex, replayType) { +ol.render.webgl.ReplayGroup.prototype.getReplay = function(zIndex, replayType) { var replay = this.replays_[replayType]; if (replay === undefined) { var constructor = ol.render.webgl.BATCH_CONSTRUCTORS_[replayType]; diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/canvasimagelayerrenderer.js index 9346fbc8f2..29784ef05f 100644 --- a/src/ol/renderer/canvas/canvasimagelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasimagelayerrenderer.js @@ -55,8 +55,7 @@ goog.inherits(ol.renderer.canvas.ImageLayer, ol.renderer.canvas.Layer); /** * @inheritDoc */ -ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg) { +ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) { var layer = this.getLayer(); var source = layer.getSource(); var resolution = frameState.viewState.resolution; @@ -77,8 +76,7 @@ ol.renderer.canvas.ImageLayer.prototype.forEachFeatureAtCoordinate = /** * @inheritDoc */ -ol.renderer.canvas.ImageLayer.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg) { +ol.renderer.canvas.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) { if (!this.getImage()) { return undefined; } @@ -144,8 +142,7 @@ ol.renderer.canvas.ImageLayer.prototype.getImageTransform = function() { /** * @inheritDoc */ -ol.renderer.canvas.ImageLayer.prototype.prepareFrame = - function(frameState, layerState) { +ol.renderer.canvas.ImageLayer.prototype.prepareFrame = function(frameState, layerState) { var pixelRatio = frameState.pixelRatio; var viewState = frameState.viewState; diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/canvaslayerrenderer.js index a0da527720..2244d76187 100644 --- a/src/ol/renderer/canvas/canvaslayerrenderer.js +++ b/src/ol/renderer/canvas/canvaslayerrenderer.js @@ -38,8 +38,7 @@ goog.inherits(ol.renderer.canvas.Layer, ol.renderer.Layer); * @param {ol.layer.LayerState} layerState Layer state. * @param {CanvasRenderingContext2D} context Context. */ -ol.renderer.canvas.Layer.prototype.composeFrame = - function(frameState, layerState, context) { +ol.renderer.canvas.Layer.prototype.composeFrame = function(frameState, layerState, context) { this.dispatchPreComposeEvent(context, frameState); @@ -122,8 +121,7 @@ ol.renderer.canvas.Layer.prototype.composeFrame = * @param {goog.vec.Mat4.Number=} opt_transform Transform. * @private */ -ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ = - function(type, context, frameState, opt_transform) { +ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ = function(type, context, frameState, opt_transform) { var layer = this.getLayer(); if (layer.hasListener(type)) { var transform = opt_transform !== undefined ? @@ -145,8 +143,7 @@ ol.renderer.canvas.Layer.prototype.dispatchComposeEvent_ = * @param {goog.vec.Mat4.Number=} opt_transform Transform. * @protected */ -ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent = - function(context, frameState, opt_transform) { +ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent = function(context, frameState, opt_transform) { this.dispatchComposeEvent_(ol.render.EventType.POSTCOMPOSE, context, frameState, opt_transform); }; @@ -158,8 +155,7 @@ ol.renderer.canvas.Layer.prototype.dispatchPostComposeEvent = * @param {goog.vec.Mat4.Number=} opt_transform Transform. * @protected */ -ol.renderer.canvas.Layer.prototype.dispatchPreComposeEvent = - function(context, frameState, opt_transform) { +ol.renderer.canvas.Layer.prototype.dispatchPreComposeEvent = function(context, frameState, opt_transform) { this.dispatchComposeEvent_(ol.render.EventType.PRECOMPOSE, context, frameState, opt_transform); }; @@ -171,8 +167,7 @@ ol.renderer.canvas.Layer.prototype.dispatchPreComposeEvent = * @param {goog.vec.Mat4.Number=} opt_transform Transform. * @protected */ -ol.renderer.canvas.Layer.prototype.dispatchRenderEvent = - function(context, frameState, opt_transform) { +ol.renderer.canvas.Layer.prototype.dispatchRenderEvent = function(context, frameState, opt_transform) { this.dispatchComposeEvent_(ol.render.EventType.RENDER, context, frameState, opt_transform); }; @@ -196,8 +191,7 @@ ol.renderer.canvas.Layer.prototype.getImageTransform = goog.abstractMethod; * @protected * @return {!goog.vec.Mat4.Number} Transform. */ -ol.renderer.canvas.Layer.prototype.getTransform = - function(frameState, offsetX) { +ol.renderer.canvas.Layer.prototype.getTransform = function(frameState, offsetX) { var viewState = frameState.viewState; var pixelRatio = frameState.pixelRatio; return ol.vec.Mat4.makeTransform2D(this.transform_, @@ -226,8 +220,7 @@ ol.renderer.canvas.Layer.prototype.prepareFrame = goog.abstractMethod; * @return {ol.Pixel} The pixel. * @protected */ -ol.renderer.canvas.Layer.prototype.getPixelOnCanvas = - function(pixelOnMap, imageTransformInv) { +ol.renderer.canvas.Layer.prototype.getPixelOnCanvas = function(pixelOnMap, imageTransformInv) { var pixelOnCanvas = [0, 0]; ol.vec.Mat4.multVec2(imageTransformInv, pixelOnMap, pixelOnCanvas); return pixelOnCanvas; diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/canvasmaprenderer.js index 447bb44bd8..63715e24fb 100644 --- a/src/ol/renderer/canvas/canvasmaprenderer.js +++ b/src/ol/renderer/canvas/canvasmaprenderer.js @@ -97,8 +97,7 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) { * @param {olx.FrameState} frameState Frame state. * @private */ -ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ = - function(type, frameState) { +ol.renderer.canvas.Map.prototype.dispatchComposeEvent_ = function(type, frameState) { var map = this.getMap(); var context = this.context_; if (map.hasListener(type)) { diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/canvastilelayerrenderer.js index 9eea07979c..ea15e9d7a8 100644 --- a/src/ol/renderer/canvas/canvastilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvastilelayerrenderer.js @@ -122,8 +122,7 @@ ol.renderer.canvas.TileLayer.prototype.getImageTransform = function() { /** * @inheritDoc */ -ol.renderer.canvas.TileLayer.prototype.prepareFrame = - function(frameState, layerState) { +ol.renderer.canvas.TileLayer.prototype.prepareFrame = function(frameState, layerState) { // // Warning! You're entering a dangerous zone! @@ -458,8 +457,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = /** * @inheritDoc */ -ol.renderer.canvas.TileLayer.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg) { +ol.renderer.canvas.TileLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) { if (!this.context_) { return undefined; } diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index a6b1e4ab2e..a724cb7516 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -72,8 +72,7 @@ goog.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer); /** * @inheritDoc */ -ol.renderer.canvas.VectorLayer.prototype.composeFrame = - function(frameState, layerState, context) { +ol.renderer.canvas.VectorLayer.prototype.composeFrame = function(frameState, layerState, context) { var extent = frameState.extent; var pixelRatio = frameState.pixelRatio; @@ -153,8 +152,7 @@ ol.renderer.canvas.VectorLayer.prototype.composeFrame = /** * @inheritDoc */ -ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg) { +ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) { if (!this.replayGroup_) { return undefined; } else { @@ -187,8 +185,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtCoordinate = * @param {goog.events.Event} event Image style change event. * @private */ -ol.renderer.canvas.VectorLayer.prototype.handleStyleImageChange_ = - function(event) { +ol.renderer.canvas.VectorLayer.prototype.handleStyleImageChange_ = function(event) { this.renderIfReadyAndVisible(); }; @@ -196,8 +193,7 @@ ol.renderer.canvas.VectorLayer.prototype.handleStyleImageChange_ = /** * @inheritDoc */ -ol.renderer.canvas.VectorLayer.prototype.prepareFrame = - function(frameState, layerState) { +ol.renderer.canvas.VectorLayer.prototype.prepareFrame = function(frameState, layerState) { var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer()); goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector, @@ -267,12 +263,11 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = ol.renderer.vector.getTolerance(resolution, pixelRatio), extent, resolution, vectorLayer.getRenderBuffer()); vectorSource.loadFeatures(extent, resolution, projection); - var renderFeature = - /** - * @param {ol.Feature} feature Feature. - * @this {ol.renderer.canvas.VectorLayer} - */ - function(feature) { + /** + * @param {ol.Feature} feature Feature. + * @this {ol.renderer.canvas.VectorLayer} + */ + var renderFeature = function(feature) { var styles; var styleFunction = feature.getStyleFunction(); if (styleFunction) { @@ -325,8 +320,7 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = * @param {ol.render.canvas.ReplayGroup} replayGroup Replay group. * @return {boolean} `true` if an image is loading. */ -ol.renderer.canvas.VectorLayer.prototype.renderFeature = - function(feature, resolution, pixelRatio, styles, replayGroup) { +ol.renderer.canvas.VectorLayer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) { if (!styles) { return false; } diff --git a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js index 21ad759429..7aa1af39ab 100644 --- a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js @@ -76,8 +76,7 @@ goog.inherits(ol.renderer.canvas.VectorTileLayer, ol.renderer.canvas.Layer); /** * @inheritDoc */ -ol.renderer.canvas.VectorTileLayer.prototype.composeFrame = - function(frameState, layerState, context) { +ol.renderer.canvas.VectorTileLayer.prototype.composeFrame = function(frameState, layerState, context) { var pixelRatio = frameState.pixelRatio; var skippedFeatureUids = layerState.managed ? @@ -292,8 +291,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.createReplayGroup = function(tile, /** * @inheritDoc */ -ol.renderer.canvas.VectorTileLayer.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg) { +ol.renderer.canvas.VectorTileLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) { var pixelRatio = frameState.pixelRatio; var resolution = frameState.viewState.resolution; var rotation = frameState.viewState.rotation; @@ -356,8 +354,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.forEachFeatureAtCoordinate = * @param {goog.events.Event} event Image style change event. * @private */ -ol.renderer.canvas.VectorTileLayer.prototype.handleStyleImageChange_ = - function(event) { +ol.renderer.canvas.VectorTileLayer.prototype.handleStyleImageChange_ = function(event) { this.renderIfReadyAndVisible(); }; @@ -365,8 +362,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.handleStyleImageChange_ = /** * @inheritDoc */ -ol.renderer.canvas.VectorTileLayer.prototype.prepareFrame = - function(frameState, layerState) { +ol.renderer.canvas.VectorTileLayer.prototype.prepareFrame = function(frameState, layerState) { var layer = /** @type {ol.layer.Vector} */ (this.getLayer()); goog.asserts.assertInstanceof(layer, ol.layer.VectorTile, 'layer is an instance of ol.layer.VectorTile'); @@ -488,8 +484,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.prepareFrame = * @param {ol.render.canvas.ReplayGroup} replayGroup Replay group. * @return {boolean} `true` if an image is loading. */ -ol.renderer.canvas.VectorTileLayer.prototype.renderFeature = - function(feature, squaredTolerance, styles, replayGroup) { +ol.renderer.canvas.VectorTileLayer.prototype.renderFeature = function(feature, squaredTolerance, styles, replayGroup) { if (!styles) { return false; } diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/domimagelayerrenderer.js index e0e85fc0c0..e967c0998b 100644 --- a/src/ol/renderer/dom/domimagelayerrenderer.js +++ b/src/ol/renderer/dom/domimagelayerrenderer.js @@ -45,8 +45,7 @@ goog.inherits(ol.renderer.dom.ImageLayer, ol.renderer.dom.Layer); /** * @inheritDoc */ -ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg) { +ol.renderer.dom.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) { var layer = this.getLayer(); var source = layer.getSource(); var resolution = frameState.viewState.resolution; @@ -76,8 +75,7 @@ ol.renderer.dom.ImageLayer.prototype.clearFrame = function() { /** * @inheritDoc */ -ol.renderer.dom.ImageLayer.prototype.prepareFrame = - function(frameState, layerState) { +ol.renderer.dom.ImageLayer.prototype.prepareFrame = function(frameState, layerState) { var viewState = frameState.viewState; var viewCenter = viewState.center; diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/dommaprenderer.js index c36d876e1e..73eeec40b7 100644 --- a/src/ol/renderer/dom/dommaprenderer.js +++ b/src/ol/renderer/dom/dommaprenderer.js @@ -117,8 +117,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) { * @param {olx.FrameState} frameState Frame state. * @private */ -ol.renderer.dom.Map.prototype.dispatchComposeEvent_ = - function(type, frameState) { +ol.renderer.dom.Map.prototype.dispatchComposeEvent_ = function(type, frameState) { var map = this.getMap(); if (map.hasListener(type)) { var extent = frameState.extent; diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/domtilelayerrenderer.js index 1ed26c5bab..84dfe12444 100644 --- a/src/ol/renderer/dom/domtilelayerrenderer.js +++ b/src/ol/renderer/dom/domtilelayerrenderer.js @@ -76,8 +76,7 @@ ol.renderer.dom.TileLayer.prototype.clearFrame = function() { /** * @inheritDoc */ -ol.renderer.dom.TileLayer.prototype.prepareFrame = - function(frameState, layerState) { +ol.renderer.dom.TileLayer.prototype.prepareFrame = function(frameState, layerState) { if (!layerState.visible) { if (this.renderedVisible_) { @@ -420,8 +419,7 @@ ol.renderer.dom.TileLayerZ_.prototype.getResolution = function() { * @param {ol.Extent} extent Extent. * @param {ol.TileRange=} opt_tileRange Temporary ol.TileRange object. */ -ol.renderer.dom.TileLayerZ_.prototype.removeTilesOutsideExtent = - function(extent, opt_tileRange) { +ol.renderer.dom.TileLayerZ_.prototype.removeTilesOutsideExtent = function(extent, opt_tileRange) { var tileRange = this.tileGrid_.getTileRangeForExtentAndZ( extent, this.tileCoordOrigin_[0], opt_tileRange); /** @type {Array.} */ diff --git a/src/ol/renderer/dom/domvectorlayerrenderer.js b/src/ol/renderer/dom/domvectorlayerrenderer.js index 2352bcd516..c67ec99a8c 100644 --- a/src/ol/renderer/dom/domvectorlayerrenderer.js +++ b/src/ol/renderer/dom/domvectorlayerrenderer.js @@ -94,8 +94,7 @@ goog.inherits(ol.renderer.dom.VectorLayer, ol.renderer.dom.Layer); /** * @inheritDoc */ -ol.renderer.dom.VectorLayer.prototype.composeFrame = - function(frameState, layerState) { +ol.renderer.dom.VectorLayer.prototype.composeFrame = function(frameState, layerState) { var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer()); goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector, @@ -156,8 +155,7 @@ ol.renderer.dom.VectorLayer.prototype.composeFrame = * @param {goog.vec.Mat4.Number} transform Transform. * @private */ -ol.renderer.dom.VectorLayer.prototype.dispatchEvent_ = - function(type, frameState, transform) { +ol.renderer.dom.VectorLayer.prototype.dispatchEvent_ = function(type, frameState, transform) { var context = this.context_; var layer = this.getLayer(); if (layer.hasListener(type)) { @@ -175,8 +173,7 @@ ol.renderer.dom.VectorLayer.prototype.dispatchEvent_ = /** * @inheritDoc */ -ol.renderer.dom.VectorLayer.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg) { +ol.renderer.dom.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) { if (!this.replayGroup_) { return undefined; } else { @@ -209,8 +206,7 @@ ol.renderer.dom.VectorLayer.prototype.forEachFeatureAtCoordinate = * @param {goog.events.Event} event Image style change event. * @private */ -ol.renderer.dom.VectorLayer.prototype.handleStyleImageChange_ = - function(event) { +ol.renderer.dom.VectorLayer.prototype.handleStyleImageChange_ = function(event) { this.renderIfReadyAndVisible(); }; @@ -218,8 +214,7 @@ ol.renderer.dom.VectorLayer.prototype.handleStyleImageChange_ = /** * @inheritDoc */ -ol.renderer.dom.VectorLayer.prototype.prepareFrame = - function(frameState, layerState) { +ol.renderer.dom.VectorLayer.prototype.prepareFrame = function(frameState, layerState) { var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer()); goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector, @@ -275,12 +270,11 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame = ol.renderer.vector.getTolerance(resolution, pixelRatio), extent, resolution, vectorLayer.getRenderBuffer()); vectorSource.loadFeatures(extent, resolution, projection); - var renderFeature = - /** - * @param {ol.Feature} feature Feature. - * @this {ol.renderer.dom.VectorLayer} - */ - function(feature) { + /** + * @param {ol.Feature} feature Feature. + * @this {ol.renderer.dom.VectorLayer} + */ + var renderFeature = function(feature) { var styles; var styleFunction = feature.getStyleFunction(); if (styleFunction) { @@ -333,8 +327,7 @@ ol.renderer.dom.VectorLayer.prototype.prepareFrame = * @param {ol.render.canvas.ReplayGroup} replayGroup Replay group. * @return {boolean} `true` if an image is loading. */ -ol.renderer.dom.VectorLayer.prototype.renderFeature = - function(feature, resolution, pixelRatio, styles, replayGroup) { +ol.renderer.dom.VectorLayer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) { if (!styles) { return false; } diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layerrenderer.js index 6518480db4..397ff0bcf9 100644 --- a/src/ol/renderer/layerrenderer.js +++ b/src/ol/renderer/layerrenderer.js @@ -58,8 +58,7 @@ ol.renderer.Layer.prototype.forEachFeatureAtCoordinate = ol.nullFunction; * @return {T|undefined} Callback result. * @template S,T */ -ol.renderer.Layer.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg) { +ol.renderer.Layer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) { var coordinate = pixel.slice(); ol.vec.Mat4.multVec2( frameState.pixelToCoordinateMatrix, coordinate, coordinate); @@ -94,8 +93,7 @@ ol.renderer.Layer.prototype.hasFeatureAtCoordinate = goog.functions.FALSE; * lookup. * @protected */ -ol.renderer.Layer.prototype.createLoadedTileFinder = - function(source, projection, tiles) { +ol.renderer.Layer.prototype.createLoadedTileFinder = function(source, projection, tiles) { return ( /** * @param {number} zoom Zoom level. @@ -103,13 +101,13 @@ ol.renderer.Layer.prototype.createLoadedTileFinder = * @return {boolean} The tile range is fully loaded. */ function(zoom, tileRange) { - return source.forEachLoadedTile(projection, zoom, - tileRange, function(tile) { - if (!tiles[zoom]) { - tiles[zoom] = {}; - } - tiles[zoom][tile.tileCoord.toString()] = tile; - }); + function callback(tile) { + if (!tiles[zoom]) { + tiles[zoom] = {}; + } + tiles[zoom][tile.tileCoord.toString()] = tile; + } + return source.forEachLoadedTile(projection, zoom, tileRange, callback); }); }; @@ -182,8 +180,7 @@ ol.renderer.Layer.prototype.renderIfReadyAndVisible = function() { * @param {ol.source.Tile} tileSource Tile source. * @protected */ -ol.renderer.Layer.prototype.scheduleExpireCache = - function(frameState, tileSource) { +ol.renderer.Layer.prototype.scheduleExpireCache = function(frameState, tileSource) { if (tileSource.canExpireCache()) { frameState.postRenderFunctions.push( goog.partial( @@ -207,8 +204,7 @@ ol.renderer.Layer.prototype.scheduleExpireCache = * @param {Array.} attributions Attributions (source). * @protected */ -ol.renderer.Layer.prototype.updateAttributions = - function(attributionsSet, attributions) { +ol.renderer.Layer.prototype.updateAttributions = function(attributionsSet, attributions) { if (attributions) { var attribution, i, ii; for (i = 0, ii = attributions.length; i < ii; ++i) { @@ -245,8 +241,7 @@ ol.renderer.Layer.prototype.updateLogos = function(frameState, source) { * @param {ol.TileRange} tileRange Tile range. * @protected */ -ol.renderer.Layer.prototype.updateUsedTiles = - function(usedTiles, tileSource, z, tileRange) { +ol.renderer.Layer.prototype.updateUsedTiles = function(usedTiles, tileSource, z, tileRange) { // FIXME should we use tilesToDrawByZ instead? var tileSourceKey = goog.getUid(tileSource).toString(); var zKey = z.toString(); @@ -270,8 +265,7 @@ ol.renderer.Layer.prototype.updateUsedTiles = * @protected * @return {ol.Coordinate} Snapped center. */ -ol.renderer.Layer.prototype.snapCenterToPixel = - function(center, resolution, size) { +ol.renderer.Layer.prototype.snapCenterToPixel = function(center, resolution, size) { return [ resolution * (Math.round(center[0] / resolution) + (size[0] % 2) / 2), resolution * (Math.round(center[1] / resolution) + (size[1] % 2) / 2) diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/maprenderer.js index 2ab6e1d422..b4a220ac01 100644 --- a/src/ol/renderer/maprenderer.js +++ b/src/ol/renderer/maprenderer.js @@ -125,8 +125,7 @@ ol.renderer.Map.expireIconCache_ = function(map, frameState) { * @return {T|undefined} Callback result. * @template S,T,U */ -ol.renderer.Map.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg, +ol.renderer.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg, layerFilter, thisArg2) { var result; var viewState = frameState.viewState; @@ -200,8 +199,7 @@ ol.renderer.Map.prototype.forEachFeatureAtCoordinate = * @return {T|undefined} Callback result. * @template S,T,U */ -ol.renderer.Map.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg, +ol.renderer.Map.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg, layerFilter, thisArg2) { var result; var viewState = frameState.viewState; @@ -238,8 +236,7 @@ ol.renderer.Map.prototype.forEachLayerAtPixel = * @return {boolean} Is there a feature at the given coordinate? * @template U */ -ol.renderer.Map.prototype.hasFeatureAtCoordinate = - function(coordinate, frameState, layerFilter, thisArg) { +ol.renderer.Map.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, layerFilter, thisArg) { var hasFeature = this.forEachFeatureAtCoordinate( coordinate, frameState, goog.functions.TRUE, this, layerFilter, thisArg); @@ -344,8 +341,7 @@ ol.renderer.Map.prototype.renderFrame = ol.nullFunction; * @param {olx.FrameState} frameState Frame state. * @private */ -ol.renderer.Map.prototype.removeUnusedLayerRenderers_ = - function(map, frameState) { +ol.renderer.Map.prototype.removeUnusedLayerRenderers_ = function(map, frameState) { var layerKey; for (layerKey in this.layerRenderers_) { if (!frameState || !(layerKey in frameState.layerStates)) { @@ -368,8 +364,7 @@ ol.renderer.Map.prototype.scheduleExpireIconCache = function(frameState) { * @param {!olx.FrameState} frameState Frame state. * @protected */ -ol.renderer.Map.prototype.scheduleRemoveUnusedLayerRenderers = - function(frameState) { +ol.renderer.Map.prototype.scheduleRemoveUnusedLayerRenderers = function(frameState) { var layerKey; for (layerKey in this.layerRenderers_) { if (!(layerKey in frameState.layerStates)) { diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/webglimagelayerrenderer.js index 0aca1abc2b..3336745d1c 100644 --- a/src/ol/renderer/webgl/webglimagelayerrenderer.js +++ b/src/ol/renderer/webgl/webglimagelayerrenderer.js @@ -74,8 +74,7 @@ ol.renderer.webgl.ImageLayer.prototype.createTexture_ = function(image) { /** * @inheritDoc */ -ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg) { +ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) { var layer = this.getLayer(); var source = layer.getSource(); var resolution = frameState.viewState.resolution; @@ -97,8 +96,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachFeatureAtCoordinate = /** * @inheritDoc */ -ol.renderer.webgl.ImageLayer.prototype.prepareFrame = - function(frameState, layerState, context) { +ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layerState, context) { var gl = this.mapRenderer.getGL(); @@ -194,8 +192,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = * @param {ol.Extent} imageExtent Image extent. * @private */ -ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = - function(canvasWidth, canvasHeight, pixelRatio, +ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = function(canvasWidth, canvasHeight, pixelRatio, viewCenter, viewResolution, viewRotation, imageExtent) { var canvasExtentWidth = canvasWidth * viewResolution; @@ -223,8 +220,7 @@ ol.renderer.webgl.ImageLayer.prototype.updateProjectionMatrix_ = /** * @inheritDoc */ -ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = - function(coordinate, frameState) { +ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) { var hasFeature = this.forEachFeatureAtCoordinate( coordinate, frameState, goog.functions.TRUE, this); return hasFeature !== undefined; @@ -234,8 +230,7 @@ ol.renderer.webgl.ImageLayer.prototype.hasFeatureAtCoordinate = /** * @inheritDoc */ -ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg) { +ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) { if (!this.image_ || !this.image_.getImage()) { return undefined; } @@ -299,8 +294,7 @@ ol.renderer.webgl.ImageLayer.prototype.forEachLayerAtPixel = * @return {goog.vec.Mat4.Number} The transformation matrix. * @private */ -ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ = - function(mapSize, imageSize) { +ol.renderer.webgl.ImageLayer.prototype.getHitTransformationMatrix_ = function(mapSize, imageSize) { // the first matrix takes a map pixel, flips the y-axis and scales to // a range between -1 ... 1 var mapCoordMatrix = goog.vec.Mat4.createNumber(); diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/webgllayerrenderer.js index d03e23edfe..05441dd922 100644 --- a/src/ol/renderer/webgl/webgllayerrenderer.js +++ b/src/ol/renderer/webgl/webgllayerrenderer.js @@ -88,8 +88,7 @@ goog.inherits(ol.renderer.webgl.Layer, ol.renderer.Layer); * @param {number} framebufferDimension Framebuffer dimension. * @protected */ -ol.renderer.webgl.Layer.prototype.bindFramebuffer = - function(frameState, framebufferDimension) { +ol.renderer.webgl.Layer.prototype.bindFramebuffer = function(frameState, framebufferDimension) { var gl = this.mapRenderer.getGL(); @@ -134,8 +133,7 @@ ol.renderer.webgl.Layer.prototype.bindFramebuffer = * @param {ol.layer.LayerState} layerState Layer state. * @param {ol.webgl.Context} context Context. */ -ol.renderer.webgl.Layer.prototype.composeFrame = - function(frameState, layerState, context) { +ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState, context) { this.dispatchComposeEvent_( ol.render.EventType.PRECOMPOSE, context, frameState); @@ -189,8 +187,7 @@ ol.renderer.webgl.Layer.prototype.composeFrame = * @param {olx.FrameState} frameState Frame state. * @private */ -ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = - function(type, context, frameState) { +ol.renderer.webgl.Layer.prototype.dispatchComposeEvent_ = function(type, context, frameState) { var layer = this.getLayer(); if (layer.hasListener(type)) { var viewState = frameState.viewState; diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js index 3d884fd6d2..ddf0025002 100644 --- a/src/ol/renderer/webgl/webglmaprenderer.js +++ b/src/ol/renderer/webgl/webglmaprenderer.js @@ -187,8 +187,7 @@ goog.inherits(ol.renderer.webgl.Map, ol.renderer.Map); * @param {number} magFilter Mag filter. * @param {number} minFilter Min filter. */ -ol.renderer.webgl.Map.prototype.bindTileTexture = - function(tile, tileSize, tileGutter, magFilter, minFilter) { +ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileGutter, magFilter, minFilter) { var gl = this.getGL(); var tileKey = tile.getKey(); if (this.textureCache_.containsKey(tileKey)) { @@ -270,8 +269,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) { * @param {olx.FrameState} frameState Frame state. * @private */ -ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = - function(type, frameState) { +ol.renderer.webgl.Map.prototype.dispatchComposeEvent_ = function(type, frameState) { var map = this.getMap(); if (map.hasListener(type)) { var context = this.context_; @@ -536,8 +534,7 @@ ol.renderer.webgl.Map.prototype.renderFrame = function(frameState) { /** * @inheritDoc */ -ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg, +ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg, layerFilter, thisArg2) { var result; @@ -570,8 +567,7 @@ ol.renderer.webgl.Map.prototype.forEachFeatureAtCoordinate = /** * @inheritDoc */ -ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = - function(coordinate, frameState, layerFilter, thisArg) { +ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = function(coordinate, frameState, layerFilter, thisArg) { var hasFeature = false; if (this.getGL().isContextLost()) { @@ -603,8 +599,7 @@ ol.renderer.webgl.Map.prototype.hasFeatureAtCoordinate = /** * @inheritDoc */ -ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg, +ol.renderer.webgl.Map.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg, layerFilter, thisArg2) { if (this.getGL().isContextLost()) { return false; diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/webgltilelayerrenderer.js index 0eb9a11b48..3cebf9d055 100644 --- a/src/ol/renderer/webgl/webgltilelayerrenderer.js +++ b/src/ol/renderer/webgl/webgltilelayerrenderer.js @@ -112,8 +112,7 @@ ol.renderer.webgl.TileLayer.prototype.disposeInternal = function() { * lookup. * @protected */ -ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = - function(source, projection, tiles) { +ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = function(source, projection, tiles) { var mapRenderer = this.mapRenderer; return ( @@ -123,17 +122,17 @@ ol.renderer.webgl.TileLayer.prototype.createLoadedTileFinder = * @return {boolean} The tile range is fully loaded. */ function(zoom, tileRange) { - return source.forEachLoadedTile(projection, zoom, - tileRange, function(tile) { - var loaded = mapRenderer.isTileTextureLoaded(tile); - if (loaded) { - if (!tiles[zoom]) { - tiles[zoom] = {}; - } - tiles[zoom][tile.tileCoord.toString()] = tile; - } - return loaded; - }); + function callback(tile) { + var loaded = mapRenderer.isTileTextureLoaded(tile); + if (loaded) { + if (!tiles[zoom]) { + tiles[zoom] = {}; + } + tiles[zoom][tile.tileCoord.toString()] = tile; + } + return loaded; + } + return source.forEachLoadedTile(projection, zoom, tileRange, callback); }); }; @@ -150,8 +149,7 @@ ol.renderer.webgl.TileLayer.prototype.handleWebGLContextLost = function() { /** * @inheritDoc */ -ol.renderer.webgl.TileLayer.prototype.prepareFrame = - function(frameState, layerState, context) { +ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerState, context) { var mapRenderer = this.mapRenderer; var gl = context.getGL(); @@ -385,8 +383,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = /** * @inheritDoc */ -ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg) { +ol.renderer.webgl.TileLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) { if (!this.framebuffer) { return undefined; } diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/webglvectorlayerrenderer.js index e09a283472..e73eeaa067 100644 --- a/src/ol/renderer/webgl/webglvectorlayerrenderer.js +++ b/src/ol/renderer/webgl/webglvectorlayerrenderer.js @@ -72,8 +72,7 @@ goog.inherits(ol.renderer.webgl.VectorLayer, ol.renderer.webgl.Layer); /** * @inheritDoc */ -ol.renderer.webgl.VectorLayer.prototype.composeFrame = - function(frameState, layerState, context) { +ol.renderer.webgl.VectorLayer.prototype.composeFrame = function(frameState, layerState, context) { this.layerState_ = layerState; var viewState = frameState.viewState; var replayGroup = this.replayGroup_; @@ -104,8 +103,7 @@ ol.renderer.webgl.VectorLayer.prototype.disposeInternal = function() { /** * @inheritDoc */ -ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = - function(coordinate, frameState, callback, thisArg) { +ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coordinate, frameState, callback, thisArg) { if (!this.replayGroup_ || !this.layerState_) { return undefined; } else { @@ -138,8 +136,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = /** * @inheritDoc */ -ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = - function(coordinate, frameState) { +ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = function(coordinate, frameState) { if (!this.replayGroup_ || !this.layerState_) { return false; } else { @@ -157,8 +154,7 @@ ol.renderer.webgl.VectorLayer.prototype.hasFeatureAtCoordinate = /** * @inheritDoc */ -ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = - function(pixel, frameState, callback, thisArg) { +ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = function(pixel, frameState, callback, thisArg) { var coordinate = pixel.slice(); ol.vec.Mat4.multVec2( frameState.pixelToCoordinateMatrix, coordinate, coordinate); @@ -177,8 +173,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachLayerAtPixel = * @param {goog.events.Event} event Image style change event. * @private */ -ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = - function(event) { +ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = function(event) { this.renderIfReadyAndVisible(); }; @@ -186,8 +181,7 @@ ol.renderer.webgl.VectorLayer.prototype.handleStyleImageChange_ = /** * @inheritDoc */ -ol.renderer.webgl.VectorLayer.prototype.prepareFrame = - function(frameState, layerState, context) { +ol.renderer.webgl.VectorLayer.prototype.prepareFrame = function(frameState, layerState, context) { var vectorLayer = /** @type {ol.layer.Vector} */ (this.getLayer()); goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector, @@ -243,12 +237,11 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = ol.renderer.vector.getTolerance(resolution, pixelRatio), extent, vectorLayer.getRenderBuffer()); vectorSource.loadFeatures(extent, resolution, projection); - var renderFeature = - /** - * @param {ol.Feature} feature Feature. - * @this {ol.renderer.webgl.VectorLayer} - */ - function(feature) { + /** + * @param {ol.Feature} feature Feature. + * @this {ol.renderer.webgl.VectorLayer} + */ + var renderFeature = function(feature) { var styles; var styleFunction = feature.getStyleFunction(); if (styleFunction) { @@ -301,8 +294,7 @@ ol.renderer.webgl.VectorLayer.prototype.prepareFrame = * @param {ol.render.webgl.ReplayGroup} replayGroup Replay group. * @return {boolean} `true` if an image is loading. */ -ol.renderer.webgl.VectorLayer.prototype.renderFeature = - function(feature, resolution, pixelRatio, styles, replayGroup) { +ol.renderer.webgl.VectorLayer.prototype.renderFeature = function(feature, resolution, pixelRatio, styles, replayGroup) { if (!styles) { return false; } diff --git a/src/ol/resolutionconstraint.js b/src/ol/resolutionconstraint.js index 9c128ff2e7..df385090cf 100644 --- a/src/ol/resolutionconstraint.js +++ b/src/ol/resolutionconstraint.js @@ -15,8 +15,7 @@ ol.ResolutionConstraintType; * @param {Array.} resolutions Resolutions. * @return {ol.ResolutionConstraintType} Zoom function. */ -ol.ResolutionConstraint.createSnapToResolutions = - function(resolutions) { +ol.ResolutionConstraint.createSnapToResolutions = function(resolutions) { return ( /** * @param {number|undefined} resolution Resolution. @@ -43,8 +42,7 @@ ol.ResolutionConstraint.createSnapToResolutions = * @param {number=} opt_maxLevel Maximum level. * @return {ol.ResolutionConstraintType} Zoom function. */ -ol.ResolutionConstraint.createSnapToPower = - function(power, maxResolution, opt_maxLevel) { +ol.ResolutionConstraint.createSnapToPower = function(power, maxResolution, opt_maxLevel) { return ( /** * @param {number|undefined} resolution Resolution. diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 8c42d1b152..046c12d841 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -79,8 +79,7 @@ ol.source.BingMaps.TOS_ATTRIBUTION = new ol.Attribution({ /** * @param {BingMapsImageryMetadataResponse} response Response. */ -ol.source.BingMaps.prototype.handleImageryMetadataResponse = - function(response) { +ol.source.BingMaps.prototype.handleImageryMetadataResponse = function(response) { if (response.statusCode != 200 || response.statusDescription != 'OK' || diff --git a/src/ol/source/imagecanvassource.js b/src/ol/source/imagecanvassource.js index 39ddeef86d..1208a78b19 100644 --- a/src/ol/source/imagecanvassource.js +++ b/src/ol/source/imagecanvassource.js @@ -59,8 +59,7 @@ goog.inherits(ol.source.ImageCanvas, ol.source.Image); /** * @inheritDoc */ -ol.source.ImageCanvas.prototype.getImageInternal = - function(extent, resolution, pixelRatio, projection) { +ol.source.ImageCanvas.prototype.getImageInternal = function(extent, resolution, pixelRatio, projection) { resolution = this.findNearestResolution(resolution); var canvas = this.canvas_; diff --git a/src/ol/source/imagemapguidesource.js b/src/ol/source/imagemapguidesource.js index 0aca8cca20..4529dfa5df 100644 --- a/src/ol/source/imagemapguidesource.js +++ b/src/ol/source/imagemapguidesource.js @@ -117,8 +117,7 @@ ol.source.ImageMapGuide.prototype.getParams = function() { /** * @inheritDoc */ -ol.source.ImageMapGuide.prototype.getImageInternal = - function(extent, resolution, pixelRatio, projection) { +ol.source.ImageMapGuide.prototype.getImageInternal = function(extent, resolution, pixelRatio, projection) { resolution = this.findNearestResolution(resolution); pixelRatio = this.hidpi_ ? pixelRatio : 1; @@ -207,8 +206,7 @@ ol.source.ImageMapGuide.prototype.updateParams = function(params) { * @param {ol.proj.Projection} projection Projection. * @return {string} The mapagent map image request URL. */ -ol.source.ImageMapGuide.prototype.getUrl = - function(baseUrl, params, extent, size, projection) { +ol.source.ImageMapGuide.prototype.getUrl = function(baseUrl, params, extent, size, projection) { var scale = ol.source.ImageMapGuide.getScale(extent, size, this.metersPerUnit_, this.displayDpi_); var center = ol.extent.getCenter(extent); diff --git a/src/ol/source/imagesource.js b/src/ol/source/imagesource.js index e4b23e9918..47e817714b 100644 --- a/src/ol/source/imagesource.js +++ b/src/ol/source/imagesource.js @@ -89,8 +89,7 @@ ol.source.Image.prototype.getResolutions = function() { * @param {number} resolution Resolution. * @return {number} Resolution. */ -ol.source.Image.prototype.findNearestResolution = - function(resolution) { +ol.source.Image.prototype.findNearestResolution = function(resolution) { if (this.resolutions_) { var idx = ol.array.linearFindNearest(this.resolutions_, resolution, 0); resolution = this.resolutions_[idx]; @@ -106,8 +105,7 @@ ol.source.Image.prototype.findNearestResolution = * @param {ol.proj.Projection} projection Projection. * @return {ol.ImageBase} Single image. */ -ol.source.Image.prototype.getImage = - function(extent, resolution, pixelRatio, projection) { +ol.source.Image.prototype.getImage = function(extent, resolution, pixelRatio, projection) { var sourceProjection = this.getProjection(); if (!ol.ENABLE_RASTER_REPROJECTION || !sourceProjection || diff --git a/src/ol/source/imagestaticsource.js b/src/ol/source/imagestaticsource.js index fc6e75d9ab..7bf575ef03 100644 --- a/src/ol/source/imagestaticsource.js +++ b/src/ol/source/imagestaticsource.js @@ -63,8 +63,7 @@ goog.inherits(ol.source.ImageStatic, ol.source.Image); /** * @inheritDoc */ -ol.source.ImageStatic.prototype.getImageInternal = - function(extent, resolution, pixelRatio, projection) { +ol.source.ImageStatic.prototype.getImageInternal = function(extent, resolution, pixelRatio, projection) { if (ol.extent.intersects(extent, this.image_.getExtent())) { return this.image_; } diff --git a/src/ol/source/imagevectorsource.js b/src/ol/source/imagevectorsource.js index ccfddf1ffd..08f0f200f3 100644 --- a/src/ol/source/imagevectorsource.js +++ b/src/ol/source/imagevectorsource.js @@ -106,8 +106,7 @@ goog.inherits(ol.source.ImageVector, ol.source.ImageCanvas); * @return {HTMLCanvasElement} Canvas element. * @private */ -ol.source.ImageVector.prototype.canvasFunctionInternal_ = - function(extent, resolution, pixelRatio, size, projection) { +ol.source.ImageVector.prototype.canvasFunctionInternal_ = function(extent, resolution, pixelRatio, size, projection) { var replayGroup = new ol.render.canvas.ReplayGroup( ol.renderer.vector.getTolerance(resolution, pixelRatio), extent, @@ -217,8 +216,7 @@ ol.source.ImageVector.prototype.getStyleFunction = function() { * @return {!goog.vec.Mat4.Number} Transform. * @private */ -ol.source.ImageVector.prototype.getTransform_ = - function(center, resolution, pixelRatio, size) { +ol.source.ImageVector.prototype.getTransform_ = function(center, resolution, pixelRatio, size) { return ol.vec.Mat4.makeTransform2D(this.transform_, size[0] / 2, size[1] / 2, pixelRatio / resolution, -pixelRatio / resolution, @@ -232,8 +230,7 @@ ol.source.ImageVector.prototype.getTransform_ = * @param {goog.events.Event} event Image style change event. * @private */ -ol.source.ImageVector.prototype.handleImageChange_ = - function(event) { +ol.source.ImageVector.prototype.handleImageChange_ = function(event) { this.changed(); }; @@ -256,8 +253,7 @@ ol.source.ImageVector.prototype.handleSourceChange_ = function() { * @return {boolean} `true` if an image is loading. * @private */ -ol.source.ImageVector.prototype.renderFeature_ = - function(feature, resolution, pixelRatio, replayGroup) { +ol.source.ImageVector.prototype.renderFeature_ = function(feature, resolution, pixelRatio, replayGroup) { var styles; var styleFunction = feature.getStyleFunction(); if (styleFunction) { diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewmssource.js index 0dbe4695a9..94bb75b553 100644 --- a/src/ol/source/imagewmssource.js +++ b/src/ol/source/imagewmssource.js @@ -136,8 +136,7 @@ ol.source.ImageWMS.GETFEATUREINFO_IMAGE_SIZE_ = [101, 101]; * @return {string|undefined} GetFeatureInfo URL. * @api stable */ -ol.source.ImageWMS.prototype.getGetFeatureInfoUrl = - function(coordinate, resolution, projection, params) { +ol.source.ImageWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resolution, projection, params) { goog.asserts.assert(!('VERSION' in params), 'key VERSION is not allowed in params'); @@ -185,8 +184,7 @@ ol.source.ImageWMS.prototype.getParams = function() { /** * @inheritDoc */ -ol.source.ImageWMS.prototype.getImageInternal = - function(extent, resolution, pixelRatio, projection) { +ol.source.ImageWMS.prototype.getImageInternal = function(extent, resolution, pixelRatio, projection) { if (this.url_ === undefined) { return null; @@ -271,8 +269,7 @@ ol.source.ImageWMS.prototype.getImageLoadFunction = function() { * @return {string} Request URL. * @private */ -ol.source.ImageWMS.prototype.getRequestUrl_ = - function(extent, size, pixelRatio, projection, params) { +ol.source.ImageWMS.prototype.getRequestUrl_ = function(extent, size, pixelRatio, projection, params) { goog.asserts.assert(this.url_ !== undefined, 'url is defined'); diff --git a/src/ol/source/rastersource.js b/src/ol/source/rastersource.js index 6ee6e60ef7..7b3a317668 100644 --- a/src/ol/source/rastersource.js +++ b/src/ol/source/rastersource.js @@ -169,8 +169,7 @@ ol.source.Raster.prototype.setOperation = function(operation, opt_lib) { * @return {olx.FrameState} The updated frame state. * @private */ -ol.source.Raster.prototype.updateFrameState_ = - function(extent, resolution, projection) { +ol.source.Raster.prototype.updateFrameState_ = function(extent, resolution, projection) { var frameState = /** @type {olx.FrameState} */ ( goog.object.clone(this.frameState_)); @@ -214,8 +213,7 @@ ol.source.Raster.prototype.isDirty_ = function(extent, resolution) { /** * @inheritDoc */ -ol.source.Raster.prototype.getImage = - function(extent, resolution, pixelRatio, projection) { +ol.source.Raster.prototype.getImage = function(extent, resolution, pixelRatio, projection) { if (!this.allSourcesReady_()) { return null; @@ -315,8 +313,7 @@ ol.source.Raster.prototype.composeFrame_ = function(frameState, callback) { * @param {Object} data The user data. * @private */ -ol.source.Raster.prototype.onWorkerComplete_ = - function(frameState, callback, err, output, data) { +ol.source.Raster.prototype.onWorkerComplete_ = function(frameState, callback, err, output, data) { if (err) { callback(err); return; diff --git a/src/ol/source/tilearcgisrestsource.js b/src/ol/source/tilearcgisrestsource.js index 410ef2373f..bd71a5c27b 100644 --- a/src/ol/source/tilearcgisrestsource.js +++ b/src/ol/source/tilearcgisrestsource.js @@ -86,8 +86,7 @@ ol.source.TileArcGISRest.prototype.getParams = function() { * @return {string|undefined} Request URL. * @private */ -ol.source.TileArcGISRest.prototype.getRequestUrl_ = - function(tileCoord, tileSize, tileExtent, +ol.source.TileArcGISRest.prototype.getRequestUrl_ = function(tileCoord, tileSize, tileExtent, pixelRatio, projection, params) { var urls = this.urls; @@ -146,8 +145,7 @@ ol.source.TileArcGISRest.prototype.getTilePixelRatio = function(pixelRatio) { * @return {string|undefined} Tile URL. * @private */ -ol.source.TileArcGISRest.prototype.tileUrlFunction_ = - function(tileCoord, pixelRatio, projection) { +ol.source.TileArcGISRest.prototype.tileUrlFunction_ = function(tileCoord, pixelRatio, projection) { var tileGrid = this.getTileGrid(); if (!tileGrid) { diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimagesource.js index d6be2e131e..ba04c30283 100644 --- a/src/ol/source/tileimagesource.js +++ b/src/ol/source/tileimagesource.js @@ -172,8 +172,7 @@ ol.source.TileImage.prototype.getTileCacheForProjection = function(projection) { * @return {ol.Tile} Tile. * @private */ -ol.source.TileImage.prototype.createTile_ = - function(z, x, y, pixelRatio, projection, key) { +ol.source.TileImage.prototype.createTile_ = function(z, x, y, pixelRatio, projection, key) { var tileCoord = [z, x, y]; var urlTileCoord = this.getTileCoordForTileUrlFunction( tileCoord, projection); @@ -195,8 +194,7 @@ ol.source.TileImage.prototype.createTile_ = /** * @inheritDoc */ -ol.source.TileImage.prototype.getTile = - function(z, x, y, pixelRatio, projection) { +ol.source.TileImage.prototype.getTile = function(z, x, y, pixelRatio, projection) { if (!ol.ENABLE_RASTER_REPROJECTION || !this.getProjection() || !projection || @@ -239,8 +237,7 @@ ol.source.TileImage.prototype.getTile = * @return {!ol.Tile} Tile. * @protected */ -ol.source.TileImage.prototype.getTileInternal = - function(z, x, y, pixelRatio, projection) { +ol.source.TileImage.prototype.getTileInternal = function(z, x, y, pixelRatio, projection) { var /** @type {ol.Tile} */ tile = null; var tileCoordKey = this.getKeyZXY(z, x, y); var paramsKey = this.getKeyParams(); @@ -313,8 +310,7 @@ ol.source.TileImage.prototype.setRenderReprojectionEdges = function(render) { * @param {ol.tilegrid.TileGrid} tilegrid Tile grid to use for the projection. * @api */ -ol.source.TileImage.prototype.setTileGridForProjection = - function(projection, tilegrid) { +ol.source.TileImage.prototype.setTileGridForProjection = function(projection, tilegrid) { if (ol.ENABLE_RASTER_REPROJECTION) { var proj = ol.proj.get(projection); if (proj) { diff --git a/src/ol/source/tilesource.js b/src/ol/source/tilesource.js index 754004e5f5..956df7a9cd 100644 --- a/src/ol/source/tilesource.js +++ b/src/ol/source/tilesource.js @@ -119,8 +119,7 @@ ol.source.Tile.prototype.expireCache = function(projection, usedTiles) { * considered loaded. * @return {boolean} The tile range is fully covered with loaded tiles. */ -ol.source.Tile.prototype.forEachLoadedTile = - function(projection, z, tileRange, callback) { +ol.source.Tile.prototype.forEachLoadedTile = function(projection, z, tileRange, callback) { var tileCache = this.getTileCacheForProjection(projection); if (!tileCache) { return false; @@ -257,8 +256,7 @@ ol.source.Tile.prototype.getTilePixelRatio = function(pixelRatio) { * @param {ol.proj.Projection} projection Projection. * @return {ol.Size} Tile size. */ -ol.source.Tile.prototype.getTilePixelSize = - function(z, pixelRatio, projection) { +ol.source.Tile.prototype.getTilePixelSize = function(z, pixelRatio, projection) { var tileGrid = this.getTileGridForProjection(projection); var tilePixelRatio = this.getTilePixelRatio(pixelRatio); var tileSize = ol.size.toSize(tileGrid.getTileSize(z), this.tmpSize); @@ -279,8 +277,7 @@ ol.source.Tile.prototype.getTilePixelSize = * @return {ol.TileCoord} Tile coordinate to be passed to the tileUrlFunction or * null if no tile URL should be created for the passed `tileCoord`. */ -ol.source.Tile.prototype.getTileCoordForTileUrlFunction = - function(tileCoord, opt_projection) { +ol.source.Tile.prototype.getTileCoordForTileUrlFunction = function(tileCoord, opt_projection) { var projection = opt_projection !== undefined ? opt_projection : this.getProjection(); var tileGrid = this.getTileGridForProjection(projection); diff --git a/src/ol/source/tileutfgridsource.js b/src/ol/source/tileutfgridsource.js index a4afef2fce..e17f108c08 100644 --- a/src/ol/source/tileutfgridsource.js +++ b/src/ol/source/tileutfgridsource.js @@ -166,8 +166,7 @@ ol.source.TileUTFGrid.prototype.handleTileJSONResponse = function(tileJSON) { /** * @inheritDoc */ -ol.source.TileUTFGrid.prototype.getTile = - function(z, x, y, pixelRatio, projection) { +ol.source.TileUTFGrid.prototype.getTile = function(z, x, y, pixelRatio, projection) { var tileCoordKey = this.getKeyZXY(z, x, y); if (this.tileCache.containsKey(tileCoordKey)) { return /** @type {!ol.Tile} */ (this.tileCache.get(tileCoordKey)); @@ -211,8 +210,7 @@ ol.source.TileUTFGrid.prototype.useTile = function(z, x, y) { * @param {boolean} preemptive Load the tile when visible (before it's needed). * @private */ -ol.source.TileUTFGridTile_ = - function(tileCoord, state, src, extent, preemptive) { +ol.source.TileUTFGridTile_ = function(tileCoord, state, src, extent, preemptive) { goog.base(this, tileCoord, state); @@ -309,8 +307,7 @@ ol.source.TileUTFGridTile_.prototype.getData = function(coordinate) { * The tile data is requested if not yet loaded. * @template T */ -ol.source.TileUTFGridTile_.prototype.forDataAtCoordinate = - function(coordinate, callback, opt_this, opt_request) { +ol.source.TileUTFGridTile_.prototype.forDataAtCoordinate = function(coordinate, callback, opt_this, opt_request) { if (this.state == ol.TileState.IDLE && opt_request === true) { goog.events.listenOnce(this, goog.events.EventType.CHANGE, function(e) { callback.call(opt_this, this.getData(coordinate)); diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewmssource.js index ccec57afeb..e4044f541d 100644 --- a/src/ol/source/tilewmssource.js +++ b/src/ol/source/tilewmssource.js @@ -117,8 +117,7 @@ goog.inherits(ol.source.TileWMS, ol.source.TileImage); * @return {string|undefined} GetFeatureInfo URL. * @api stable */ -ol.source.TileWMS.prototype.getGetFeatureInfoUrl = - function(coordinate, resolution, projection, params) { +ol.source.TileWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resolution, projection, params) { goog.asserts.assert(!('VERSION' in params), 'key VERSION is not allowed in params'); @@ -207,8 +206,7 @@ ol.source.TileWMS.prototype.getParams = function() { * @return {string|undefined} Request URL. * @private */ -ol.source.TileWMS.prototype.getRequestUrl_ = - function(tileCoord, tileSize, tileExtent, +ol.source.TileWMS.prototype.getRequestUrl_ = function(tileCoord, tileSize, tileExtent, pixelRatio, projection, params) { var urls = this.urls; @@ -312,8 +310,7 @@ ol.source.TileWMS.prototype.resetCoordKeyPrefix_ = function() { * @return {string|undefined} Tile URL. * @private */ -ol.source.TileWMS.prototype.tileUrlFunction_ = - function(tileCoord, pixelRatio, projection) { +ol.source.TileWMS.prototype.tileUrlFunction_ = function(tileCoord, pixelRatio, projection) { var tileGrid = this.getTileGrid(); if (!tileGrid) { diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 9c51a3b875..fec4b6aa70 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -447,8 +447,7 @@ ol.source.Vector.prototype.forEachFeature = function(callback, opt_this) { * @return {S|undefined} The return value from the last call to the callback. * @template T,S */ -ol.source.Vector.prototype.forEachFeatureAtCoordinateDirect = - function(coordinate, callback, opt_this) { +ol.source.Vector.prototype.forEachFeatureAtCoordinateDirect = function(coordinate, callback, opt_this) { var extent = [coordinate[0], coordinate[1], coordinate[0], coordinate[1]]; return this.forEachFeatureInExtent(extent, function(feature) { var geometry = feature.getGeometry(); @@ -483,8 +482,7 @@ ol.source.Vector.prototype.forEachFeatureAtCoordinateDirect = * @template T,S * @api */ -ol.source.Vector.prototype.forEachFeatureInExtent = - function(extent, callback, opt_this) { +ol.source.Vector.prototype.forEachFeatureInExtent = function(extent, callback, opt_this) { if (this.featuresRtree_) { return this.featuresRtree_.forEachInExtent(extent, callback, opt_this); } else if (this.featuresCollection_) { @@ -510,8 +508,7 @@ ol.source.Vector.prototype.forEachFeatureInExtent = * @template T,S * @api */ -ol.source.Vector.prototype.forEachFeatureIntersectingExtent = - function(extent, callback, opt_this) { +ol.source.Vector.prototype.forEachFeatureIntersectingExtent = function(extent, callback, opt_this) { return this.forEachFeatureInExtent(extent, /** * @param {ol.Feature} feature Feature. @@ -608,8 +605,7 @@ ol.source.Vector.prototype.getFeaturesInExtent = function(extent) { * @return {ol.Feature} Closest feature. * @api stable */ -ol.source.Vector.prototype.getClosestFeatureToCoordinate = - function(coordinate) { +ol.source.Vector.prototype.getClosestFeatureToCoordinate = function(coordinate) { // Find the closest feature using branch and bound. We start searching an // infinite extent, and find the distance from the first feature found. This // becomes the closest feature. We then compute a smaller extent which any diff --git a/src/ol/source/vectortilesource.js b/src/ol/source/vectortilesource.js index f482e64ef7..557676053c 100644 --- a/src/ol/source/vectortilesource.js +++ b/src/ol/source/vectortilesource.js @@ -67,8 +67,7 @@ goog.inherits(ol.source.VectorTile, ol.source.UrlTile); /** * @inheritDoc */ -ol.source.VectorTile.prototype.getTile = - function(z, x, y, pixelRatio, projection) { +ol.source.VectorTile.prototype.getTile = function(z, x, y, pixelRatio, projection) { var tileCoordKey = this.getKeyZXY(z, x, y); if (this.tileCache.containsKey(tileCoordKey)) { return /** @type {!ol.Tile} */ (this.tileCache.get(tileCoordKey)); diff --git a/src/ol/structs/rbush.js b/src/ol/structs/rbush.js index 987a208428..7bc1c38458 100644 --- a/src/ol/structs/rbush.js +++ b/src/ol/structs/rbush.js @@ -197,8 +197,7 @@ ol.structs.RBush.prototype.forEach = function(callback, opt_this) { * @return {*} Callback return value. * @template S */ -ol.structs.RBush.prototype.forEachInExtent = - function(extent, callback, opt_this) { +ol.structs.RBush.prototype.forEachInExtent = function(extent, callback, opt_this) { if (goog.DEBUG) { ++this.readers_; try { diff --git a/src/ol/style/atlasmanager.js b/src/ol/style/atlasmanager.js index 9bae4cc629..ca4c11c027 100644 --- a/src/ol/style/atlasmanager.js +++ b/src/ol/style/atlasmanager.js @@ -170,8 +170,7 @@ ol.style.AtlasManager.prototype.mergeInfos_ = function(info, hitInfo) { * @return {?ol.style.AtlasManagerInfo} The position and atlas image for the * entry, or `null` if the image is too big. */ -ol.style.AtlasManager.prototype.add = - function(id, width, height, +ol.style.AtlasManager.prototype.add = function(id, width, height, renderCallback, opt_renderHitCallback, opt_this) { if (width + this.space_ > this.maxSize_ || height + this.space_ > this.maxSize_) { @@ -213,8 +212,7 @@ ol.style.AtlasManager.prototype.add = * @return {?ol.style.AtlasInfo} The position and atlas image for the entry, * or `null` if the image is too big. */ -ol.style.AtlasManager.prototype.add_ = - function(isHitAtlas, id, width, height, +ol.style.AtlasManager.prototype.add_ = function(isHitAtlas, id, width, height, renderCallback, opt_this) { var atlases = (isHitAtlas) ? this.hitAtlases_ : this.atlases_; var atlas, info, i, ii; @@ -329,8 +327,7 @@ ol.style.Atlas.prototype.get = function(id) { * `renderCallback`. * @return {?ol.style.AtlasInfo} The position and atlas image for the entry. */ -ol.style.Atlas.prototype.add = - function(id, width, height, renderCallback, opt_this) { +ol.style.Atlas.prototype.add = function(id, width, height, renderCallback, opt_this) { var block, i, ii; for (i = 0, ii = this.emptyBlocks_.length; i < ii; ++i) { block = this.emptyBlocks_[i]; @@ -367,8 +364,7 @@ ol.style.Atlas.prototype.add = * @param {number} width The width of the entry to insert. * @param {number} height The height of the entry to insert. */ -ol.style.Atlas.prototype.split_ = - function(index, block, width, height) { +ol.style.Atlas.prototype.split_ = function(index, block, width, height) { var deltaWidth = block.width - width; var deltaHeight = block.height - height; @@ -426,8 +422,7 @@ ol.style.Atlas.prototype.split_ = * @param {ol.style.Atlas.Block} newBlock1 The 1st block to add. * @param {ol.style.Atlas.Block} newBlock2 The 2nd block to add. */ -ol.style.Atlas.prototype.updateBlocks_ = - function(index, newBlock1, newBlock2) { +ol.style.Atlas.prototype.updateBlocks_ = function(index, newBlock1, newBlock2) { var args = [index, 1]; if (newBlock1.width > 0 && newBlock1.height > 0) { args.push(newBlock1); diff --git a/src/ol/style/circlestyle.js b/src/ol/style/circlestyle.js index e3819b602b..9a22e71569 100644 --- a/src/ol/style/circlestyle.js +++ b/src/ol/style/circlestyle.js @@ -389,8 +389,7 @@ ol.style.Circle.prototype.createHitDetectionCanvas_ = function(renderOptions) { * @param {number} x The origin for the symbol (x). * @param {number} y The origin for the symbol (y). */ -ol.style.Circle.prototype.drawHitDetectionCanvas_ = - function(renderOptions, context, x, y) { +ol.style.Circle.prototype.drawHitDetectionCanvas_ = function(renderOptions, context, x, y) { // reset transform context.setTransform(1, 0, 0, 1, 0, 0); diff --git a/src/ol/style/regularshapestyle.js b/src/ol/style/regularshapestyle.js index 1a89113fa3..f0b7c47a0e 100644 --- a/src/ol/style/regularshapestyle.js +++ b/src/ol/style/regularshapestyle.js @@ -450,8 +450,7 @@ ol.style.RegularShape.prototype.draw_ = function(renderOptions, context, x, y) { * @private * @param {ol.style.RegularShape.RenderOptions} renderOptions Render options. */ -ol.style.RegularShape.prototype.createHitDetectionCanvas_ = - function(renderOptions) { +ol.style.RegularShape.prototype.createHitDetectionCanvas_ = function(renderOptions) { this.hitDetectionImageSize_ = [renderOptions.size, renderOptions.size]; if (this.fill_) { this.hitDetectionCanvas_ = this.canvas_; @@ -480,8 +479,7 @@ ol.style.RegularShape.prototype.createHitDetectionCanvas_ = * @param {number} x The origin for the symbol (x). * @param {number} y The origin for the symbol (y). */ -ol.style.RegularShape.prototype.drawHitDetectionCanvas_ = - function(renderOptions, context, x, y) { +ol.style.RegularShape.prototype.drawHitDetectionCanvas_ = function(renderOptions, context, x, y) { // reset transform context.setTransform(1, 0, 0, 1, 0, 0); diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index e640b646c1..1cd060207f 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -163,8 +163,7 @@ ol.tilegrid.TileGrid.tmpTileCoord_ = [0, 0, 0]; * @return {boolean} Callback succeeded. * @template T */ -ol.tilegrid.TileGrid.prototype.forEachTileCoordParentTileRange = - function(tileCoord, callback, opt_this, opt_tileRange, opt_extent) { +ol.tilegrid.TileGrid.prototype.forEachTileCoordParentTileRange = function(tileCoord, callback, opt_this, opt_tileRange, opt_extent) { var tileCoordExtent = this.getTileCoordExtent(tileCoord, opt_extent); var z = tileCoord[0] - 1; while (z >= this.minZoom) { @@ -257,8 +256,7 @@ ol.tilegrid.TileGrid.prototype.getResolutions = function() { * @param {ol.Extent=} opt_extent Temporary ol.Extent object. * @return {ol.TileRange} Tile range. */ -ol.tilegrid.TileGrid.prototype.getTileCoordChildTileRange = - function(tileCoord, opt_tileRange, opt_extent) { +ol.tilegrid.TileGrid.prototype.getTileCoordChildTileRange = function(tileCoord, opt_tileRange, opt_extent) { if (tileCoord[0] < this.maxZoom) { var tileCoordExtent = this.getTileCoordExtent(tileCoord, opt_extent); return this.getTileRangeForExtentAndZ( @@ -275,8 +273,7 @@ ol.tilegrid.TileGrid.prototype.getTileCoordChildTileRange = * @param {ol.Extent=} opt_extent Temporary ol.Extent object. * @return {ol.Extent} Extent. */ -ol.tilegrid.TileGrid.prototype.getTileRangeExtent = - function(z, tileRange, opt_extent) { +ol.tilegrid.TileGrid.prototype.getTileRangeExtent = function(z, tileRange, opt_extent) { var origin = this.getOrigin(z); var resolution = this.getResolution(z); var tileSize = ol.size.toSize(this.getTileSize(z), this.tmpSize_); @@ -294,8 +291,7 @@ ol.tilegrid.TileGrid.prototype.getTileRangeExtent = * @param {ol.TileRange=} opt_tileRange Temporary tile range object. * @return {ol.TileRange} Tile range. */ -ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndResolution = - function(extent, resolution, opt_tileRange) { +ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndResolution = function(extent, resolution, opt_tileRange) { var tileCoord = ol.tilegrid.TileGrid.tmpTileCoord_; this.getTileCoordForXYAndResolution_( extent[0], extent[1], resolution, false, tileCoord); @@ -314,8 +310,7 @@ ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndResolution = * @param {ol.TileRange=} opt_tileRange Temporary tile range object. * @return {ol.TileRange} Tile range. */ -ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndZ = - function(extent, z, opt_tileRange) { +ol.tilegrid.TileGrid.prototype.getTileRangeForExtentAndZ = function(extent, z, opt_tileRange) { var resolution = this.getResolution(z); return this.getTileRangeForExtentAndResolution( extent, resolution, opt_tileRange); @@ -345,8 +340,7 @@ ol.tilegrid.TileGrid.prototype.getTileCoordCenter = function(tileCoord) { * @return {ol.Extent} Extent. * @api */ -ol.tilegrid.TileGrid.prototype.getTileCoordExtent = - function(tileCoord, opt_extent) { +ol.tilegrid.TileGrid.prototype.getTileCoordExtent = function(tileCoord, opt_extent) { var origin = this.getOrigin(tileCoord[0]); var resolution = this.getResolution(tileCoord[0]); var tileSize = ol.size.toSize(this.getTileSize(tileCoord[0]), this.tmpSize_); @@ -369,8 +363,7 @@ ol.tilegrid.TileGrid.prototype.getTileCoordExtent = * @return {ol.TileCoord} Tile coordinate. * @api */ -ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndResolution = - function(coordinate, resolution, opt_tileCoord) { +ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndResolution = function(coordinate, resolution, opt_tileCoord) { return this.getTileCoordForXYAndResolution_( coordinate[0], coordinate[1], resolution, false, opt_tileCoord); }; @@ -421,8 +414,7 @@ ol.tilegrid.TileGrid.prototype.getTileCoordForXYAndResolution_ = function( * @return {ol.TileCoord} Tile coordinate. * @api */ -ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndZ = - function(coordinate, z, opt_tileCoord) { +ol.tilegrid.TileGrid.prototype.getTileCoordForCoordAndZ = function(coordinate, z, opt_tileCoord) { var resolution = this.getResolution(z); return this.getTileCoordForXYAndResolution_( coordinate[0], coordinate[1], resolution, false, opt_tileCoord); @@ -528,8 +520,7 @@ ol.tilegrid.getForProjection = function(projection) { * ol.extent.Corner.TOP_LEFT). * @return {ol.tilegrid.TileGrid} TileGrid instance. */ -ol.tilegrid.createForExtent = - function(extent, opt_maxZoom, opt_tileSize, opt_corner) { +ol.tilegrid.createForExtent = function(extent, opt_maxZoom, opt_tileSize, opt_corner) { var corner = opt_corner !== undefined ? opt_corner : ol.extent.Corner.TOP_LEFT; @@ -575,8 +566,7 @@ ol.tilegrid.createXYZ = function(opt_options) { * ol.DEFAULT_TILE_SIZE). * @return {!Array.} Resolutions array. */ -ol.tilegrid.resolutionsFromExtent = - function(extent, opt_maxZoom, opt_tileSize) { +ol.tilegrid.resolutionsFromExtent = function(extent, opt_maxZoom, opt_tileSize) { var maxZoom = opt_maxZoom !== undefined ? opt_maxZoom : ol.DEFAULT_MAX_ZOOM; @@ -606,8 +596,7 @@ ol.tilegrid.resolutionsFromExtent = * ol.extent.Corner.BOTTOM_LEFT). * @return {ol.tilegrid.TileGrid} TileGrid instance. */ -ol.tilegrid.createForProjection = - function(projection, opt_maxZoom, opt_tileSize, opt_corner) { +ol.tilegrid.createForProjection = function(projection, opt_maxZoom, opt_tileSize, opt_corner) { var extent = ol.tilegrid.extentFromProjection(projection); return ol.tilegrid.createForExtent( extent, opt_maxZoom, opt_tileSize, opt_corner); diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmtstilegrid.js index e13060b9b6..9e9e8e4564 100644 --- a/src/ol/tilegrid/wmtstilegrid.js +++ b/src/ol/tilegrid/wmtstilegrid.js @@ -74,8 +74,7 @@ ol.tilegrid.WMTS.prototype.getMatrixIds = function() { * @return {ol.tilegrid.WMTS} WMTS tileGrid instance. * @api */ -ol.tilegrid.WMTS.createFromCapabilitiesMatrixSet = - function(matrixSet, opt_extent) { +ol.tilegrid.WMTS.createFromCapabilitiesMatrixSet = function(matrixSet, opt_extent) { /** @type {!Array.} */ var resolutions = []; diff --git a/src/ol/tileurlfunction.js b/src/ol/tileurlfunction.js index 2353f42454..49533af14a 100644 --- a/src/ol/tileurlfunction.js +++ b/src/ol/tileurlfunction.js @@ -122,8 +122,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) { * @param {ol.proj.Projection} projection Projection. * @return {string|undefined} Tile URL. */ -ol.TileUrlFunction.nullTileUrlFunction = - function(tileCoord, pixelRatio, projection) { +ol.TileUrlFunction.nullTileUrlFunction = function(tileCoord, pixelRatio, projection) { return undefined; }; diff --git a/src/ol/vectortile.js b/src/ol/vectortile.js index e9900ff24b..39aeff3f8b 100644 --- a/src/ol/vectortile.js +++ b/src/ol/vectortile.js @@ -29,8 +29,7 @@ ol.TileReplayState; * @param {ol.TileLoadFunctionType} tileLoadFunction Tile load function. * @param {ol.proj.Projection} projection Feature projection. */ -ol.VectorTile = - function(tileCoord, state, src, format, tileLoadFunction, projection) { +ol.VectorTile = function(tileCoord, state, src, format, tileLoadFunction, projection) { goog.base(this, tileCoord, state); diff --git a/src/ol/xml.js b/src/ol/xml.js index 203bd60428..3a681947e3 100644 --- a/src/ol/xml.js +++ b/src/ol/xml.js @@ -436,8 +436,7 @@ ol.xml.makeReplacer = function(valueReader, opt_this) { * @return {ol.xml.Parser} Parser. * @template T */ -ol.xml.makeObjectPropertyPusher = - function(valueReader, opt_property, opt_this) { +ol.xml.makeObjectPropertyPusher = function(valueReader, opt_property, opt_this) { goog.asserts.assert(valueReader !== undefined, 'undefined valueReader, expected function(this: T, Node, Array.<*>)'); return ( @@ -470,8 +469,7 @@ ol.xml.makeObjectPropertyPusher = * @return {ol.xml.Parser} Parser. * @template T */ -ol.xml.makeObjectPropertySetter = - function(valueReader, opt_property, opt_this) { +ol.xml.makeObjectPropertySetter = function(valueReader, opt_property, opt_this) { goog.asserts.assert(valueReader !== undefined, 'undefined valueReader, expected function(this: T, Node, Array.<*>)'); return (