ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use goog.DEBUG instead of ol.DEBUG for now

Browse Source
This commit is contained in:
Andreas Hocevar
2016-08-04 09:37:42 +02:00
parent 55ab5704d4
commit e0015b3d4e
121 changed files with 712 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/upgrade-notes.md
View File

@@ -2,7 +2,7 @@
#### Changes in the way assertions are handled #### Changes in the way assertions are handled
Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on http://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks when in debug mode when the new `ol.DEBUG` compiler flag (previously `goog.DEBUG`) is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.' Previously, minified builds of the library did not have any assertions. This caused applications to fail silently or with cryptic stack traces. Starting with this release, developers get notified of many runtime errors through the new `ol.AssertionError`. This error has a `code` property. The meaning of the code can be found on http://openlayers.org/en/latest/doc/errors/. There are additional console assertion checks in debug mode when the `goog.DEBUG` compiler flag is `true`. As this is `true` by default, it is recommended that those creating custom builds set this to `false` so these assertions are stripped.'
#### Removal of `ol.ENABLE_NAMED_COLORS` #### Removal of `ol.ENABLE_NAMED_COLORS`

3
config/ol.json
View File

@@ -15,8 +15,7 @@
"externs/topojson.js" "externs/topojson.js"
], ],
"define": [ "define": [
"goog.DEBUG=false", "goog.DEBUG=false"
"ol.DEBUG=false"
], ],
"jscomp_error": [ "jscomp_error": [
"*" "*"

4
src/ol/array.js
View File

@@ -144,9 +144,9 @@ ol.array.linearFindNearest = function(arr, target, direction) {
* @param {number} end End index. * @param {number} end End index.
*/ */
ol.array.reverseSubArray = function(arr, begin, end) { ol.array.reverseSubArray = function(arr, begin, end) {
ol.DEBUG && console.assert(begin >= 0, goog.DEBUG && console.assert(begin >= 0,
'Array begin index should be equal to or greater than 0'); 'Array begin index should be equal to or greater than 0');
ol.DEBUG && console.assert(end < arr.length, goog.DEBUG && console.assert(end < arr.length,
'Array end index should be less than the array length'); 'Array end index should be less than the array length');
while (begin < end) { while (begin < end) {
var tmp = arr[begin]; var tmp = arr[begin];

2
src/ol/events/eventtarget.js
View File

@@ -143,7 +143,7 @@ ol.events.EventTarget.prototype.removeEventListener = function(type, listener) {
var listeners = this.listeners_[type]; var listeners = this.listeners_[type];
if (listeners) { if (listeners) {
var index = listeners.indexOf(listener); var index = listeners.indexOf(listener);
ol.DEBUG && console.assert(index != -1, 'listener not found'); goog.DEBUG && console.assert(index != -1, 'listener not found');
if (type in this.pendingRemovals_) { if (type in this.pendingRemovals_) {
// make listener a no-op, and remove later in #dispatchEvent() // make listener a no-op, and remove later in #dispatchEvent()
listeners[index] = ol.nullFunction; listeners[index] = ol.nullFunction;

4
src/ol/extent.js
View File

@@ -53,8 +53,8 @@ ol.extent.boundingExtent = function(coordinates) {
* @return {ol.Extent} Extent. * @return {ol.Extent} Extent.
*/ */
ol.extent.boundingExtentXYs_ = function(xs, ys, opt_extent) { ol.extent.boundingExtentXYs_ = function(xs, ys, opt_extent) {
ol.DEBUG && console.assert(xs.length > 0, 'xs length should be larger than 0'); goog.DEBUG && console.assert(xs.length > 0, 'xs length should be larger than 0');
ol.DEBUG && console.assert(ys.length > 0, 'ys length should be larger than 0'); goog.DEBUG && console.assert(ys.length > 0, 'ys length should be larger than 0');
var minX = Math.min.apply(null, xs); var minX = Math.min.apply(null, xs);
var minY = Math.min.apply(null, ys); var minY = Math.min.apply(null, ys);
var maxX = Math.max.apply(null, xs); var maxX = Math.max.apply(null, xs);

28
src/ol/format/esrijsonformat.js
View File

@@ -80,7 +80,7 @@ ol.format.EsriJSON.readGeometry_ = function(object, opt_options) {
} }
} }
var geometryReader = ol.format.EsriJSON.GEOMETRY_READERS_[type]; var geometryReader = ol.format.EsriJSON.GEOMETRY_READERS_[type];
ol.DEBUG && console.assert(geometryReader, goog.DEBUG && console.assert(geometryReader,
'geometryReader should be defined'); 'geometryReader should be defined');
return /** @type {ol.geom.Geometry} */ ( return /** @type {ol.geom.Geometry} */ (
ol.format.Feature.transformWithOptions( ol.format.Feature.transformWithOptions(
@@ -144,8 +144,8 @@ ol.format.EsriJSON.convertRings_ = function(rings, layout) {
* @return {ol.geom.Geometry} Point. * @return {ol.geom.Geometry} Point.
*/ */
ol.format.EsriJSON.readPointGeometry_ = function(object) { ol.format.EsriJSON.readPointGeometry_ = function(object) {
ol.DEBUG && console.assert(typeof object.x === 'number', 'object.x should be number'); goog.DEBUG && console.assert(typeof object.x === 'number', 'object.x should be number');
ol.DEBUG && console.assert(typeof object.y === 'number', 'object.y should be number'); goog.DEBUG && console.assert(typeof object.y === 'number', 'object.y should be number');
var point; var point;
if (object.m !== undefined && object.z !== undefined) { if (object.m !== undefined && object.z !== undefined) {
point = new ol.geom.Point([object.x, object.y, object.z, object.m], point = new ol.geom.Point([object.x, object.y, object.z, object.m],
@@ -169,9 +169,9 @@ ol.format.EsriJSON.readPointGeometry_ = function(object) {
* @return {ol.geom.Geometry} LineString. * @return {ol.geom.Geometry} LineString.
*/ */
ol.format.EsriJSON.readLineStringGeometry_ = function(object) { ol.format.EsriJSON.readLineStringGeometry_ = function(object) {
ol.DEBUG && console.assert(Array.isArray(object.paths), goog.DEBUG && console.assert(Array.isArray(object.paths),
'object.paths should be an array'); 'object.paths should be an array');
ol.DEBUG && console.assert(object.paths.length === 1, goog.DEBUG && console.assert(object.paths.length === 1,
'object.paths array length should be 1'); 'object.paths array length should be 1');
var layout = ol.format.EsriJSON.getGeometryLayout_(object); var layout = ol.format.EsriJSON.getGeometryLayout_(object);
return new ol.geom.LineString(object.paths[0], layout); return new ol.geom.LineString(object.paths[0], layout);
@@ -184,9 +184,9 @@ ol.format.EsriJSON.readLineStringGeometry_ = function(object) {
* @return {ol.geom.Geometry} MultiLineString. * @return {ol.geom.Geometry} MultiLineString.
*/ */
ol.format.EsriJSON.readMultiLineStringGeometry_ = function(object) { ol.format.EsriJSON.readMultiLineStringGeometry_ = function(object) {
ol.DEBUG && console.assert(Array.isArray(object.paths), goog.DEBUG && console.assert(Array.isArray(object.paths),
'object.paths should be an array'); 'object.paths should be an array');
ol.DEBUG && console.assert(object.paths.length > 1, goog.DEBUG && console.assert(object.paths.length > 1,
'object.paths array length should be more than 1'); 'object.paths array length should be more than 1');
var layout = ol.format.EsriJSON.getGeometryLayout_(object); var layout = ol.format.EsriJSON.getGeometryLayout_(object);
return new ol.geom.MultiLineString(object.paths, layout); return new ol.geom.MultiLineString(object.paths, layout);
@@ -217,7 +217,7 @@ ol.format.EsriJSON.getGeometryLayout_ = function(object) {
* @return {ol.geom.Geometry} MultiPoint. * @return {ol.geom.Geometry} MultiPoint.
*/ */
ol.format.EsriJSON.readMultiPointGeometry_ = function(object) { ol.format.EsriJSON.readMultiPointGeometry_ = function(object) {
ol.DEBUG && console.assert(object.points, 'object.points should be defined'); goog.DEBUG && console.assert(object.points, 'object.points should be defined');
var layout = ol.format.EsriJSON.getGeometryLayout_(object); var layout = ol.format.EsriJSON.getGeometryLayout_(object);
return new ol.geom.MultiPoint(object.points, layout); return new ol.geom.MultiPoint(object.points, layout);
}; };
@@ -229,8 +229,8 @@ ol.format.EsriJSON.readMultiPointGeometry_ = function(object) {
* @return {ol.geom.Geometry} MultiPolygon. * @return {ol.geom.Geometry} MultiPolygon.
*/ */
ol.format.EsriJSON.readMultiPolygonGeometry_ = function(object) { ol.format.EsriJSON.readMultiPolygonGeometry_ = function(object) {
ol.DEBUG && console.assert(object.rings); goog.DEBUG && console.assert(object.rings);
ol.DEBUG && console.assert(object.rings.length > 1, goog.DEBUG && console.assert(object.rings.length > 1,
'object.rings should have length larger than 1'); 'object.rings should have length larger than 1');
var layout = ol.format.EsriJSON.getGeometryLayout_(object); var layout = ol.format.EsriJSON.getGeometryLayout_(object);
return new ol.geom.MultiPolygon( return new ol.geom.MultiPolygon(
@@ -245,7 +245,7 @@ ol.format.EsriJSON.readMultiPolygonGeometry_ = function(object) {
* @return {ol.geom.Geometry} Polygon. * @return {ol.geom.Geometry} Polygon.
*/ */
ol.format.EsriJSON.readPolygonGeometry_ = function(object) { ol.format.EsriJSON.readPolygonGeometry_ = function(object) {
ol.DEBUG && console.assert(object.rings); goog.DEBUG && console.assert(object.rings);
var layout = ol.format.EsriJSON.getGeometryLayout_(object); var layout = ol.format.EsriJSON.getGeometryLayout_(object);
return new ol.geom.Polygon(object.rings, layout); return new ol.geom.Polygon(object.rings, layout);
}; };
@@ -469,7 +469,7 @@ ol.format.EsriJSON.prototype.readFeatures;
ol.format.EsriJSON.prototype.readFeatureFromObject = function( ol.format.EsriJSON.prototype.readFeatureFromObject = function(
object, opt_options) { object, opt_options) {
var esriJSONFeature = /** @type {EsriJSONFeature} */ (object); var esriJSONFeature = /** @type {EsriJSONFeature} */ (object);
ol.DEBUG && console.assert(esriJSONFeature.geometry || goog.DEBUG && console.assert(esriJSONFeature.geometry ||
esriJSONFeature.attributes, esriJSONFeature.attributes,
'geometry or attributes should be defined'); 'geometry or attributes should be defined');
var geometry = ol.format.EsriJSON.readGeometry_(esriJSONFeature.geometry, var geometry = ol.format.EsriJSON.readGeometry_(esriJSONFeature.geometry,
@@ -481,7 +481,7 @@ ol.format.EsriJSON.prototype.readFeatureFromObject = function(
feature.setGeometry(geometry); feature.setGeometry(geometry);
if (opt_options && opt_options.idField && if (opt_options && opt_options.idField &&
esriJSONFeature.attributes[opt_options.idField]) { esriJSONFeature.attributes[opt_options.idField]) {
ol.DEBUG && console.assert( goog.DEBUG && console.assert(
typeof esriJSONFeature.attributes[opt_options.idField] === 'number', typeof esriJSONFeature.attributes[opt_options.idField] === 'number',
'objectIdFieldName value should be a number'); 'objectIdFieldName value should be a number');
feature.setId(/** @type {number} */( feature.setId(/** @type {number} */(
@@ -575,7 +575,7 @@ ol.format.EsriJSON.prototype.readProjectionFromObject = function(object) {
*/ */
ol.format.EsriJSON.writeGeometry_ = function(geometry, opt_options) { ol.format.EsriJSON.writeGeometry_ = function(geometry, opt_options) {
var geometryWriter = ol.format.EsriJSON.GEOMETRY_WRITERS_[geometry.getType()]; var geometryWriter = ol.format.EsriJSON.GEOMETRY_WRITERS_[geometry.getType()];
ol.DEBUG && console.assert(geometryWriter, 'geometryWriter should be defined'); goog.DEBUG && console.assert(geometryWriter, 'geometryWriter should be defined');
return geometryWriter(/** @type {ol.geom.Geometry} */ ( return geometryWriter(/** @type {ol.geom.Geometry} */ (
ol.format.Feature.transformWithOptions(geometry, true, opt_options)), ol.format.Feature.transformWithOptions(geometry, true, opt_options)),
opt_options); opt_options);

20
src/ol/format/geojsonformat.js
View File

@@ -70,7 +70,7 @@ ol.format.GeoJSON.readGeometry_ = function(object, opt_options) {
return null; return null;
} }
var geometryReader = ol.format.GeoJSON.GEOMETRY_READERS_[object.type]; var geometryReader = ol.format.GeoJSON.GEOMETRY_READERS_[object.type];
ol.DEBUG && console.assert(geometryReader, 'geometryReader should be defined'); goog.DEBUG && console.assert(geometryReader, 'geometryReader should be defined');
return /** @type {ol.geom.Geometry} */ ( return /** @type {ol.geom.Geometry} */ (
ol.format.Feature.transformWithOptions( ol.format.Feature.transformWithOptions(
geometryReader(object), false, opt_options)); geometryReader(object), false, opt_options));
@@ -85,7 +85,7 @@ ol.format.GeoJSON.readGeometry_ = function(object, opt_options) {
*/ */
ol.format.GeoJSON.readGeometryCollectionGeometry_ = function( ol.format.GeoJSON.readGeometryCollectionGeometry_ = function(
object, opt_options) { object, opt_options) {
ol.DEBUG && console.assert(object.type == 'GeometryCollection', goog.DEBUG && console.assert(object.type == 'GeometryCollection',
'object.type should be GeometryCollection'); 'object.type should be GeometryCollection');
var geometries = object.geometries.map( var geometries = object.geometries.map(
/** /**
@@ -105,7 +105,7 @@ ol.format.GeoJSON.readGeometryCollectionGeometry_ = function(
* @return {ol.geom.Point} Point. * @return {ol.geom.Point} Point.
*/ */
ol.format.GeoJSON.readPointGeometry_ = function(object) { ol.format.GeoJSON.readPointGeometry_ = function(object) {
ol.DEBUG && console.assert(object.type == 'Point', goog.DEBUG && console.assert(object.type == 'Point',
'object.type should be Point'); 'object.type should be Point');
return new ol.geom.Point(object.coordinates); return new ol.geom.Point(object.coordinates);
}; };
@@ -117,7 +117,7 @@ ol.format.GeoJSON.readPointGeometry_ = function(object) {
* @return {ol.geom.LineString} LineString. * @return {ol.geom.LineString} LineString.
*/ */
ol.format.GeoJSON.readLineStringGeometry_ = function(object) { ol.format.GeoJSON.readLineStringGeometry_ = function(object) {
ol.DEBUG && console.assert(object.type == 'LineString', goog.DEBUG && console.assert(object.type == 'LineString',
'object.type should be LineString'); 'object.type should be LineString');
return new ol.geom.LineString(object.coordinates); return new ol.geom.LineString(object.coordinates);
}; };
@@ -129,7 +129,7 @@ ol.format.GeoJSON.readLineStringGeometry_ = function(object) {
* @return {ol.geom.MultiLineString} MultiLineString. * @return {ol.geom.MultiLineString} MultiLineString.
*/ */
ol.format.GeoJSON.readMultiLineStringGeometry_ = function(object) { ol.format.GeoJSON.readMultiLineStringGeometry_ = function(object) {
ol.DEBUG && console.assert(object.type == 'MultiLineString', goog.DEBUG && console.assert(object.type == 'MultiLineString',
'object.type should be MultiLineString'); 'object.type should be MultiLineString');
return new ol.geom.MultiLineString(object.coordinates); return new ol.geom.MultiLineString(object.coordinates);
}; };
@@ -141,7 +141,7 @@ ol.format.GeoJSON.readMultiLineStringGeometry_ = function(object) {
* @return {ol.geom.MultiPoint} MultiPoint. * @return {ol.geom.MultiPoint} MultiPoint.
*/ */
ol.format.GeoJSON.readMultiPointGeometry_ = function(object) { ol.format.GeoJSON.readMultiPointGeometry_ = function(object) {
ol.DEBUG && console.assert(object.type == 'MultiPoint', goog.DEBUG && console.assert(object.type == 'MultiPoint',
'object.type should be MultiPoint'); 'object.type should be MultiPoint');
return new ol.geom.MultiPoint(object.coordinates); return new ol.geom.MultiPoint(object.coordinates);
}; };
@@ -153,7 +153,7 @@ ol.format.GeoJSON.readMultiPointGeometry_ = function(object) {
* @return {ol.geom.MultiPolygon} MultiPolygon. * @return {ol.geom.MultiPolygon} MultiPolygon.
*/ */
ol.format.GeoJSON.readMultiPolygonGeometry_ = function(object) { ol.format.GeoJSON.readMultiPolygonGeometry_ = function(object) {
ol.DEBUG && console.assert(object.type == 'MultiPolygon', goog.DEBUG && console.assert(object.type == 'MultiPolygon',
'object.type should be MultiPolygon'); 'object.type should be MultiPolygon');
return new ol.geom.MultiPolygon(object.coordinates); return new ol.geom.MultiPolygon(object.coordinates);
}; };
@@ -165,7 +165,7 @@ ol.format.GeoJSON.readMultiPolygonGeometry_ = function(object) {
* @return {ol.geom.Polygon} Polygon. * @return {ol.geom.Polygon} Polygon.
*/ */
ol.format.GeoJSON.readPolygonGeometry_ = function(object) { ol.format.GeoJSON.readPolygonGeometry_ = function(object) {
ol.DEBUG && console.assert(object.type == 'Polygon', goog.DEBUG && console.assert(object.type == 'Polygon',
'object.type should be Polygon'); 'object.type should be Polygon');
return new ol.geom.Polygon(object.coordinates); return new ol.geom.Polygon(object.coordinates);
}; };
@@ -179,7 +179,7 @@ ol.format.GeoJSON.readPolygonGeometry_ = function(object) {
*/ */
ol.format.GeoJSON.writeGeometry_ = function(geometry, opt_options) { ol.format.GeoJSON.writeGeometry_ = function(geometry, opt_options) {
var geometryWriter = ol.format.GeoJSON.GEOMETRY_WRITERS_[geometry.getType()]; var geometryWriter = ol.format.GeoJSON.GEOMETRY_WRITERS_[geometry.getType()];
ol.DEBUG && console.assert(geometryWriter, 'geometryWriter should be defined'); goog.DEBUG && console.assert(geometryWriter, 'geometryWriter should be defined');
return geometryWriter(/** @type {ol.geom.Geometry} */ ( return geometryWriter(/** @type {ol.geom.Geometry} */ (
ol.format.Feature.transformWithOptions(geometry, true, opt_options)), ol.format.Feature.transformWithOptions(geometry, true, opt_options)),
opt_options); opt_options);
@@ -384,7 +384,7 @@ ol.format.GeoJSON.prototype.readFeatures;
ol.format.GeoJSON.prototype.readFeatureFromObject = function( ol.format.GeoJSON.prototype.readFeatureFromObject = function(
object, opt_options) { object, opt_options) {
var geoJSONFeature = /** @type {GeoJSONFeature} */ (object); var geoJSONFeature = /** @type {GeoJSONFeature} */ (object);
ol.DEBUG && console.assert(geoJSONFeature.type == 'Feature', goog.DEBUG && console.assert(geoJSONFeature.type == 'Feature',
'geoJSONFeature.type should be Feature'); 'geoJSONFeature.type should be Feature');
var geometry = ol.format.GeoJSON.readGeometry_(geoJSONFeature.geometry, var geometry = ol.format.GeoJSON.readGeometry_(geoJSONFeature.geometry,
opt_options); opt_options);

20
src/ol/format/gml/gml2format.js
View File

@@ -99,9 +99,9 @@ ol.format.GML2.prototype.readFlatCoordinates_ = function(node, objectStack) {
* @return {ol.Extent|undefined} Envelope. * @return {ol.Extent|undefined} Envelope.
*/ */
ol.format.GML2.prototype.readBox_ = function(node, objectStack) { ol.format.GML2.prototype.readBox_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Box', 'localName should be Box'); goog.DEBUG && console.assert(node.localName == 'Box', 'localName should be Box');
/** @type {Array.<number>} */ /** @type {Array.<number>} */
var flatCoordinates = ol.xml.pushParseAndPop([null], var flatCoordinates = ol.xml.pushParseAndPop([null],
this.BOX_PARSERS_, node, objectStack, this); this.BOX_PARSERS_, node, objectStack, this);
@@ -117,9 +117,9 @@ ol.format.GML2.prototype.readBox_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GML2.prototype.innerBoundaryIsParser_ = function(node, objectStack) { ol.format.GML2.prototype.innerBoundaryIsParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'innerBoundaryIs', goog.DEBUG && console.assert(node.localName == 'innerBoundaryIs',
'localName should be innerBoundaryIs'); 'localName should be innerBoundaryIs');
/** @type {Array.<number>|undefined} */ /** @type {Array.<number>|undefined} */
var flatLinearRing = ol.xml.pushParseAndPop(undefined, var flatLinearRing = ol.xml.pushParseAndPop(undefined,
@@ -127,9 +127,9 @@ ol.format.GML2.prototype.innerBoundaryIsParser_ = function(node, objectStack) {
if (flatLinearRing) { if (flatLinearRing) {
var flatLinearRings = /** @type {Array.<Array.<number>>} */ var flatLinearRings = /** @type {Array.<Array.<number>>} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
ol.DEBUG && console.assert(Array.isArray(flatLinearRings), goog.DEBUG && console.assert(Array.isArray(flatLinearRings),
'flatLinearRings should be an array'); 'flatLinearRings should be an array');
ol.DEBUG && console.assert(flatLinearRings.length > 0, goog.DEBUG && console.assert(flatLinearRings.length > 0,
'flatLinearRings should have an array length larger than 0'); 'flatLinearRings should have an array length larger than 0');
flatLinearRings.push(flatLinearRing); flatLinearRings.push(flatLinearRing);
} }
@@ -142,9 +142,9 @@ ol.format.GML2.prototype.innerBoundaryIsParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GML2.prototype.outerBoundaryIsParser_ = function(node, objectStack) { ol.format.GML2.prototype.outerBoundaryIsParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'outerBoundaryIs', goog.DEBUG && console.assert(node.localName == 'outerBoundaryIs',
'localName should be outerBoundaryIs'); 'localName should be outerBoundaryIs');
/** @type {Array.<number>|undefined} */ /** @type {Array.<number>|undefined} */
var flatLinearRing = ol.xml.pushParseAndPop(undefined, var flatLinearRing = ol.xml.pushParseAndPop(undefined,
@@ -152,9 +152,9 @@ ol.format.GML2.prototype.outerBoundaryIsParser_ = function(node, objectStack) {
if (flatLinearRing) { if (flatLinearRing) {
var flatLinearRings = /** @type {Array.<Array.<number>>} */ var flatLinearRings = /** @type {Array.<Array.<number>>} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
ol.DEBUG && console.assert(Array.isArray(flatLinearRings), goog.DEBUG && console.assert(Array.isArray(flatLinearRings),
'flatLinearRings should be an array'); 'flatLinearRings should be an array');
ol.DEBUG && console.assert(flatLinearRings.length > 0, goog.DEBUG && console.assert(flatLinearRings.length > 0,
'flatLinearRings should have an array length larger than 0'); 'flatLinearRings should have an array length larger than 0');
flatLinearRings[0] = flatLinearRing; flatLinearRings[0] = flatLinearRing;
} }

66
src/ol/format/gml/gml3format.js
View File

@@ -92,9 +92,9 @@ ol.format.GML3.schemaLocation_ = ol.format.GMLBase.GMLNS +
* @return {ol.geom.MultiLineString|undefined} MultiLineString. * @return {ol.geom.MultiLineString|undefined} MultiLineString.
*/ */
ol.format.GML3.prototype.readMultiCurve_ = function(node, objectStack) { ol.format.GML3.prototype.readMultiCurve_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'MultiCurve', goog.DEBUG && console.assert(node.localName == 'MultiCurve',
'localName should be MultiCurve'); 'localName should be MultiCurve');
/** @type {Array.<ol.geom.LineString>} */ /** @type {Array.<ol.geom.LineString>} */
var lineStrings = ol.xml.pushParseAndPop([], var lineStrings = ol.xml.pushParseAndPop([],
@@ -116,9 +116,9 @@ ol.format.GML3.prototype.readMultiCurve_ = function(node, objectStack) {
* @return {ol.geom.MultiPolygon|undefined} MultiPolygon. * @return {ol.geom.MultiPolygon|undefined} MultiPolygon.
*/ */
ol.format.GML3.prototype.readMultiSurface_ = function(node, objectStack) { ol.format.GML3.prototype.readMultiSurface_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'MultiSurface', goog.DEBUG && console.assert(node.localName == 'MultiSurface',
'localName should be MultiSurface'); 'localName should be MultiSurface');
/** @type {Array.<ol.geom.Polygon>} */ /** @type {Array.<ol.geom.Polygon>} */
var polygons = ol.xml.pushParseAndPop([], var polygons = ol.xml.pushParseAndPop([],
@@ -139,9 +139,9 @@ ol.format.GML3.prototype.readMultiSurface_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GML3.prototype.curveMemberParser_ = function(node, objectStack) { ol.format.GML3.prototype.curveMemberParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'curveMember' || goog.DEBUG && console.assert(node.localName == 'curveMember' ||
node.localName == 'curveMembers', node.localName == 'curveMembers',
'localName should be curveMember or curveMembers'); 'localName should be curveMember or curveMembers');
ol.xml.parseNode(this.CURVEMEMBER_PARSERS_, node, objectStack, this); ol.xml.parseNode(this.CURVEMEMBER_PARSERS_, node, objectStack, this);
@@ -154,9 +154,9 @@ ol.format.GML3.prototype.curveMemberParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GML3.prototype.surfaceMemberParser_ = function(node, objectStack) { ol.format.GML3.prototype.surfaceMemberParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'surfaceMember' || goog.DEBUG && console.assert(node.localName == 'surfaceMember' ||
node.localName == 'surfaceMembers', node.localName == 'surfaceMembers',
'localName should be surfaceMember or surfaceMembers'); 'localName should be surfaceMember or surfaceMembers');
ol.xml.parseNode(this.SURFACEMEMBER_PARSERS_, ol.xml.parseNode(this.SURFACEMEMBER_PARSERS_,
@@ -171,9 +171,9 @@ ol.format.GML3.prototype.surfaceMemberParser_ = function(node, objectStack) {
* @return {Array.<(Array.<number>)>|undefined} flat coordinates. * @return {Array.<(Array.<number>)>|undefined} flat coordinates.
*/ */
ol.format.GML3.prototype.readPatch_ = function(node, objectStack) { ol.format.GML3.prototype.readPatch_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'patches', goog.DEBUG && console.assert(node.localName == 'patches',
'localName should be patches'); 'localName should be patches');
return ol.xml.pushParseAndPop([null], return ol.xml.pushParseAndPop([null],
this.PATCHES_PARSERS_, node, objectStack, this); this.PATCHES_PARSERS_, node, objectStack, this);
@@ -187,9 +187,9 @@ ol.format.GML3.prototype.readPatch_ = function(node, objectStack) {
* @return {Array.<number>|undefined} flat coordinates. * @return {Array.<number>|undefined} flat coordinates.
*/ */
ol.format.GML3.prototype.readSegment_ = function(node, objectStack) { ol.format.GML3.prototype.readSegment_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'segments', goog.DEBUG && console.assert(node.localName == 'segments',
'localName should be segments'); 'localName should be segments');
return ol.xml.pushParseAndPop([null], return ol.xml.pushParseAndPop([null],
this.SEGMENTS_PARSERS_, node, objectStack, this); this.SEGMENTS_PARSERS_, node, objectStack, this);
@@ -203,9 +203,9 @@ ol.format.GML3.prototype.readSegment_ = function(node, objectStack) {
* @return {Array.<(Array.<number>)>|undefined} flat coordinates. * @return {Array.<(Array.<number>)>|undefined} flat coordinates.
*/ */
ol.format.GML3.prototype.readPolygonPatch_ = function(node, objectStack) { ol.format.GML3.prototype.readPolygonPatch_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'npde.nodeType should be ELEMENT'); 'npde.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'PolygonPatch', goog.DEBUG && console.assert(node.localName == 'PolygonPatch',
'localName should be PolygonPatch'); 'localName should be PolygonPatch');
return ol.xml.pushParseAndPop([null], return ol.xml.pushParseAndPop([null],
this.FLAT_LINEAR_RINGS_PARSERS_, node, objectStack, this); this.FLAT_LINEAR_RINGS_PARSERS_, node, objectStack, this);
@@ -219,9 +219,9 @@ ol.format.GML3.prototype.readPolygonPatch_ = function(node, objectStack) {
* @return {Array.<number>|undefined} flat coordinates. * @return {Array.<number>|undefined} flat coordinates.
*/ */
ol.format.GML3.prototype.readLineStringSegment_ = function(node, objectStack) { ol.format.GML3.prototype.readLineStringSegment_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LineStringSegment', goog.DEBUG && console.assert(node.localName == 'LineStringSegment',
'localName should be LineStringSegment'); 'localName should be LineStringSegment');
return ol.xml.pushParseAndPop([null], return ol.xml.pushParseAndPop([null],
this.GEOMETRY_FLAT_COORDINATES_PARSERS_, this.GEOMETRY_FLAT_COORDINATES_PARSERS_,
@@ -235,9 +235,9 @@ ol.format.GML3.prototype.readLineStringSegment_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GML3.prototype.interiorParser_ = function(node, objectStack) { ol.format.GML3.prototype.interiorParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'interior', goog.DEBUG && console.assert(node.localName == 'interior',
'localName should be interior'); 'localName should be interior');
/** @type {Array.<number>|undefined} */ /** @type {Array.<number>|undefined} */
var flatLinearRing = ol.xml.pushParseAndPop(undefined, var flatLinearRing = ol.xml.pushParseAndPop(undefined,
@@ -245,9 +245,9 @@ ol.format.GML3.prototype.interiorParser_ = function(node, objectStack) {
if (flatLinearRing) { if (flatLinearRing) {
var flatLinearRings = /** @type {Array.<Array.<number>>} */ var flatLinearRings = /** @type {Array.<Array.<number>>} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
ol.DEBUG && console.assert(Array.isArray(flatLinearRings), goog.DEBUG && console.assert(Array.isArray(flatLinearRings),
'flatLinearRings should be an array'); 'flatLinearRings should be an array');
ol.DEBUG && console.assert(flatLinearRings.length > 0, goog.DEBUG && console.assert(flatLinearRings.length > 0,
'flatLinearRings should have an array length of 1 or more'); 'flatLinearRings should have an array length of 1 or more');
flatLinearRings.push(flatLinearRing); flatLinearRings.push(flatLinearRing);
} }
@@ -260,9 +260,9 @@ ol.format.GML3.prototype.interiorParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GML3.prototype.exteriorParser_ = function(node, objectStack) { ol.format.GML3.prototype.exteriorParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'exterior', goog.DEBUG && console.assert(node.localName == 'exterior',
'localName should be exterior'); 'localName should be exterior');
/** @type {Array.<number>|undefined} */ /** @type {Array.<number>|undefined} */
var flatLinearRing = ol.xml.pushParseAndPop(undefined, var flatLinearRing = ol.xml.pushParseAndPop(undefined,
@@ -270,9 +270,9 @@ ol.format.GML3.prototype.exteriorParser_ = function(node, objectStack) {
if (flatLinearRing) { if (flatLinearRing) {
var flatLinearRings = /** @type {Array.<Array.<number>>} */ var flatLinearRings = /** @type {Array.<Array.<number>>} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
ol.DEBUG && console.assert(Array.isArray(flatLinearRings), goog.DEBUG && console.assert(Array.isArray(flatLinearRings),
'flatLinearRings should be an array'); 'flatLinearRings should be an array');
ol.DEBUG && console.assert(flatLinearRings.length > 0, goog.DEBUG && console.assert(flatLinearRings.length > 0,
'flatLinearRings should have an array length of 1 or more'); 'flatLinearRings should have an array length of 1 or more');
flatLinearRings[0] = flatLinearRing; flatLinearRings[0] = flatLinearRing;
} }
@@ -286,9 +286,9 @@ ol.format.GML3.prototype.exteriorParser_ = function(node, objectStack) {
* @return {ol.geom.Polygon|undefined} Polygon. * @return {ol.geom.Polygon|undefined} Polygon.
*/ */
ol.format.GML3.prototype.readSurface_ = function(node, objectStack) { ol.format.GML3.prototype.readSurface_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Surface', goog.DEBUG && console.assert(node.localName == 'Surface',
'localName should be Surface'); 'localName should be Surface');
/** @type {Array.<Array.<number>>} */ /** @type {Array.<Array.<number>>} */
var flatLinearRings = ol.xml.pushParseAndPop([null], var flatLinearRings = ol.xml.pushParseAndPop([null],
@@ -318,9 +318,9 @@ ol.format.GML3.prototype.readSurface_ = function(node, objectStack) {
* @return {ol.geom.LineString|undefined} LineString. * @return {ol.geom.LineString|undefined} LineString.
*/ */
ol.format.GML3.prototype.readCurve_ = function(node, objectStack) { ol.format.GML3.prototype.readCurve_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Curve', 'localName should be Curve'); goog.DEBUG && console.assert(node.localName == 'Curve', 'localName should be Curve');
/** @type {Array.<number>} */ /** @type {Array.<number>} */
var flatCoordinates = ol.xml.pushParseAndPop([null], var flatCoordinates = ol.xml.pushParseAndPop([null],
this.CURVE_PARSERS_, node, objectStack, this); this.CURVE_PARSERS_, node, objectStack, this);
@@ -341,9 +341,9 @@ ol.format.GML3.prototype.readCurve_ = function(node, objectStack) {
* @return {ol.Extent|undefined} Envelope. * @return {ol.Extent|undefined} Envelope.
*/ */
ol.format.GML3.prototype.readEnvelope_ = function(node, objectStack) { ol.format.GML3.prototype.readEnvelope_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Envelope', goog.DEBUG && console.assert(node.localName == 'Envelope',
'localName should be Envelope'); 'localName should be Envelope');
/** @type {Array.<number>} */ /** @type {Array.<number>} */
var flatCoordinates = ol.xml.pushParseAndPop([null], var flatCoordinates = ol.xml.pushParseAndPop([null],
@@ -722,7 +722,7 @@ ol.format.GML3.ENVELOPE_SERIALIZERS_ = {
* @param {Array.<*>} objectStack Node stack. * @param {Array.<*>} objectStack Node stack.
*/ */
ol.format.GML3.prototype.writeEnvelope = function(node, extent, objectStack) { ol.format.GML3.prototype.writeEnvelope = function(node, extent, objectStack) {
ol.DEBUG && console.assert(extent.length == 4, 'extent should have 4 items'); goog.DEBUG && console.assert(extent.length == 4, 'extent should have 4 items');
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
var srsName = context['srsName']; var srsName = context['srsName'];
if (srsName) { if (srsName) {
@@ -1185,7 +1185,7 @@ ol.format.GML3.MULTIGEOMETRY_TO_MEMBER_NODENAME_ = {
*/ */
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; var parentNode = objectStack[objectStack.length - 1].node;
ol.DEBUG && console.assert(ol.xml.isNode(parentNode), goog.DEBUG && console.assert(ol.xml.isNode(parentNode),
'parentNode should be a node'); 'parentNode should be a node');
return ol.xml.createElementNS('http://www.opengis.net/gml', return ol.xml.createElementNS('http://www.opengis.net/gml',
ol.format.GML3.MULTIGEOMETRY_TO_MEMBER_NODENAME_[parentNode.nodeName]); ol.format.GML3.MULTIGEOMETRY_TO_MEMBER_NODENAME_[parentNode.nodeName]);
@@ -1207,7 +1207,7 @@ ol.format.GML3.prototype.GEOMETRY_NODE_FACTORY_ = function(value, objectStack, o
var curve = context['curve']; var curve = context['curve'];
var multiCurve = context['multiCurve']; var multiCurve = context['multiCurve'];
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
ol.DEBUG && console.assert(ol.xml.isNode(parentNode), goog.DEBUG && console.assert(ol.xml.isNode(parentNode),
'parentNode should be a node'); 'parentNode should be a node');
var nodeName; var nodeName;
if (!Array.isArray(value)) { if (!Array.isArray(value)) {

50
src/ol/format/gml/gmlbaseformat.js
View File

@@ -107,7 +107,7 @@ ol.format.GMLBase.ONLY_WHITESPACE_RE_ = /^[\s\xa0]*$/;
* @return {Array.<ol.Feature> | undefined} Features. * @return {Array.<ol.Feature> | undefined} Features.
*/ */
ol.format.GMLBase.prototype.readFeaturesInternal = function(node, objectStack) { ol.format.GMLBase.prototype.readFeaturesInternal = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
var localName = node.localName; var localName = node.localName;
var features = null; var features = null;
@@ -259,14 +259,14 @@ ol.format.GMLBase.prototype.readFeatureElement = function(node, objectStack) {
* @return {ol.geom.Point|undefined} Point. * @return {ol.geom.Point|undefined} Point.
*/ */
ol.format.GMLBase.prototype.readPoint = function(node, objectStack) { ol.format.GMLBase.prototype.readPoint = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Point', 'localName should be Point'); goog.DEBUG && console.assert(node.localName == 'Point', 'localName should be Point');
var flatCoordinates = var flatCoordinates =
this.readFlatCoordinatesFromNode_(node, objectStack); this.readFlatCoordinatesFromNode_(node, objectStack);
if (flatCoordinates) { if (flatCoordinates) {
var point = new ol.geom.Point(null); var point = new ol.geom.Point(null);
ol.DEBUG && console.assert(flatCoordinates.length == 3, goog.DEBUG && console.assert(flatCoordinates.length == 3,
'flatCoordinates should have a length of 3'); 'flatCoordinates should have a length of 3');
point.setFlatCoordinates(ol.geom.GeometryLayout.XYZ, flatCoordinates); point.setFlatCoordinates(ol.geom.GeometryLayout.XYZ, flatCoordinates);
return point; return point;
@@ -280,9 +280,9 @@ ol.format.GMLBase.prototype.readPoint = function(node, objectStack) {
* @return {ol.geom.MultiPoint|undefined} MultiPoint. * @return {ol.geom.MultiPoint|undefined} MultiPoint.
*/ */
ol.format.GMLBase.prototype.readMultiPoint = function(node, objectStack) { ol.format.GMLBase.prototype.readMultiPoint = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'MultiPoint', goog.DEBUG && console.assert(node.localName == 'MultiPoint',
'localName should be MultiPoint'); 'localName should be MultiPoint');
/** @type {Array.<Array.<number>>} */ /** @type {Array.<Array.<number>>} */
var coordinates = ol.xml.pushParseAndPop([], var coordinates = ol.xml.pushParseAndPop([],
@@ -301,9 +301,9 @@ ol.format.GMLBase.prototype.readMultiPoint = function(node, objectStack) {
* @return {ol.geom.MultiLineString|undefined} MultiLineString. * @return {ol.geom.MultiLineString|undefined} MultiLineString.
*/ */
ol.format.GMLBase.prototype.readMultiLineString = function(node, objectStack) { ol.format.GMLBase.prototype.readMultiLineString = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'MultiLineString', goog.DEBUG && console.assert(node.localName == 'MultiLineString',
'localName should be MultiLineString'); 'localName should be MultiLineString');
/** @type {Array.<ol.geom.LineString>} */ /** @type {Array.<ol.geom.LineString>} */
var lineStrings = ol.xml.pushParseAndPop([], var lineStrings = ol.xml.pushParseAndPop([],
@@ -324,9 +324,9 @@ ol.format.GMLBase.prototype.readMultiLineString = function(node, objectStack) {
* @return {ol.geom.MultiPolygon|undefined} MultiPolygon. * @return {ol.geom.MultiPolygon|undefined} MultiPolygon.
*/ */
ol.format.GMLBase.prototype.readMultiPolygon = function(node, objectStack) { ol.format.GMLBase.prototype.readMultiPolygon = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'MultiPolygon', goog.DEBUG && console.assert(node.localName == 'MultiPolygon',
'localName should be MultiPolygon'); 'localName should be MultiPolygon');
/** @type {Array.<ol.geom.Polygon>} */ /** @type {Array.<ol.geom.Polygon>} */
var polygons = ol.xml.pushParseAndPop([], var polygons = ol.xml.pushParseAndPop([],
@@ -347,9 +347,9 @@ ol.format.GMLBase.prototype.readMultiPolygon = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GMLBase.prototype.pointMemberParser_ = function(node, objectStack) { ol.format.GMLBase.prototype.pointMemberParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'pointMember' || goog.DEBUG && console.assert(node.localName == 'pointMember' ||
node.localName == 'pointMembers', node.localName == 'pointMembers',
'localName should be pointMember or pointMembers'); 'localName should be pointMember or pointMembers');
ol.xml.parseNode(this.POINTMEMBER_PARSERS_, ol.xml.parseNode(this.POINTMEMBER_PARSERS_,
@@ -363,9 +363,9 @@ ol.format.GMLBase.prototype.pointMemberParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GMLBase.prototype.lineStringMemberParser_ = function(node, objectStack) { ol.format.GMLBase.prototype.lineStringMemberParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'lineStringMember' || goog.DEBUG && console.assert(node.localName == 'lineStringMember' ||
node.localName == 'lineStringMembers', node.localName == 'lineStringMembers',
'localName should be LineStringMember or LineStringMembers'); 'localName should be LineStringMember or LineStringMembers');
ol.xml.parseNode(this.LINESTRINGMEMBER_PARSERS_, ol.xml.parseNode(this.LINESTRINGMEMBER_PARSERS_,
@@ -379,9 +379,9 @@ ol.format.GMLBase.prototype.lineStringMemberParser_ = function(node, objectStack
* @private * @private
*/ */
ol.format.GMLBase.prototype.polygonMemberParser_ = function(node, objectStack) { ol.format.GMLBase.prototype.polygonMemberParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'polygonMember' || goog.DEBUG && console.assert(node.localName == 'polygonMember' ||
node.localName == 'polygonMembers', node.localName == 'polygonMembers',
'localName should be polygonMember or polygonMembers'); 'localName should be polygonMember or polygonMembers');
ol.xml.parseNode(this.POLYGONMEMBER_PARSERS_, node, ol.xml.parseNode(this.POLYGONMEMBER_PARSERS_, node,
@@ -395,9 +395,9 @@ ol.format.GMLBase.prototype.polygonMemberParser_ = function(node, objectStack) {
* @return {ol.geom.LineString|undefined} LineString. * @return {ol.geom.LineString|undefined} LineString.
*/ */
ol.format.GMLBase.prototype.readLineString = function(node, objectStack) { ol.format.GMLBase.prototype.readLineString = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LineString', goog.DEBUG && console.assert(node.localName == 'LineString',
'localName should be LineString'); 'localName should be LineString');
var flatCoordinates = var flatCoordinates =
this.readFlatCoordinatesFromNode_(node, objectStack); this.readFlatCoordinatesFromNode_(node, objectStack);
@@ -418,9 +418,9 @@ ol.format.GMLBase.prototype.readLineString = function(node, objectStack) {
* @return {Array.<number>|undefined} LinearRing flat coordinates. * @return {Array.<number>|undefined} LinearRing flat coordinates.
*/ */
ol.format.GMLBase.prototype.readFlatLinearRing_ = function(node, objectStack) { ol.format.GMLBase.prototype.readFlatLinearRing_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LinearRing', goog.DEBUG && console.assert(node.localName == 'LinearRing',
'localName should be LinearRing'); 'localName should be LinearRing');
var ring = ol.xml.pushParseAndPop(null, var ring = ol.xml.pushParseAndPop(null,
this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node,
@@ -439,9 +439,9 @@ ol.format.GMLBase.prototype.readFlatLinearRing_ = function(node, objectStack) {
* @return {ol.geom.LinearRing|undefined} LinearRing. * @return {ol.geom.LinearRing|undefined} LinearRing.
*/ */
ol.format.GMLBase.prototype.readLinearRing = function(node, objectStack) { ol.format.GMLBase.prototype.readLinearRing = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LinearRing', goog.DEBUG && console.assert(node.localName == 'LinearRing',
'localName should be LinearRing'); 'localName should be LinearRing');
var flatCoordinates = var flatCoordinates =
this.readFlatCoordinatesFromNode_(node, objectStack); this.readFlatCoordinatesFromNode_(node, objectStack);
@@ -461,9 +461,9 @@ ol.format.GMLBase.prototype.readLinearRing = function(node, objectStack) {
* @return {ol.geom.Polygon|undefined} Polygon. * @return {ol.geom.Polygon|undefined} Polygon.
*/ */
ol.format.GMLBase.prototype.readPolygon = function(node, objectStack) { ol.format.GMLBase.prototype.readPolygon = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Polygon', goog.DEBUG && console.assert(node.localName == 'Polygon',
'localName should be Polygon'); 'localName should be Polygon');
/** @type {Array.<Array.<number>>} */ /** @type {Array.<Array.<number>>} */
var flatLinearRings = ol.xml.pushParseAndPop([null], var flatLinearRings = ol.xml.pushParseAndPop([null],
@@ -493,7 +493,7 @@ ol.format.GMLBase.prototype.readPolygon = function(node, objectStack) {
* @return {Array.<number>} Flat coordinates. * @return {Array.<number>} Flat coordinates.
*/ */
ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_ = function(node, objectStack) { ol.format.GMLBase.prototype.readFlatCoordinatesFromNode_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
return ol.xml.pushParseAndPop(null, return ol.xml.pushParseAndPop(null,
this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, this.GEOMETRY_FLAT_COORDINATES_PARSERS_, node,

42
src/ol/format/gpxformat.js
View File

@@ -71,7 +71,7 @@ ol.format.GPX.SCHEMA_LOCATION_ = 'http://www.topografix.com/GPX/1/1 ' +
* @return {Array.<number>} Flat coordinates. * @return {Array.<number>} Flat coordinates.
*/ */
ol.format.GPX.appendCoordinate_ = function(flatCoordinates, node, values) { ol.format.GPX.appendCoordinate_ = function(flatCoordinates, node, values) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
flatCoordinates.push( flatCoordinates.push(
parseFloat(node.getAttribute('lon')), parseFloat(node.getAttribute('lon')),
@@ -98,9 +98,9 @@ ol.format.GPX.appendCoordinate_ = function(flatCoordinates, node, values) {
* @private * @private
*/ */
ol.format.GPX.parseLink_ = function(node, objectStack) { ol.format.GPX.parseLink_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'link', 'localName should be link'); goog.DEBUG && console.assert(node.localName == 'link', 'localName should be link');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
var href = node.getAttribute('href'); var href = node.getAttribute('href');
if (href !== null) { if (href !== null) {
@@ -116,9 +116,9 @@ ol.format.GPX.parseLink_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GPX.parseExtensions_ = function(node, objectStack) { ol.format.GPX.parseExtensions_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'extensions', goog.DEBUG && console.assert(node.localName == 'extensions',
'localName should be extensions'); 'localName should be extensions');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
values['extensionsNode_'] = node; values['extensionsNode_'] = node;
@@ -131,9 +131,9 @@ ol.format.GPX.parseExtensions_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GPX.parseRtePt_ = function(node, objectStack) { ol.format.GPX.parseRtePt_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'rtept', 'localName should be rtept'); goog.DEBUG && console.assert(node.localName == 'rtept', 'localName should be rtept');
var values = ol.xml.pushParseAndPop( var values = ol.xml.pushParseAndPop(
{}, ol.format.GPX.RTEPT_PARSERS_, node, objectStack); {}, ol.format.GPX.RTEPT_PARSERS_, node, objectStack);
if (values) { if (values) {
@@ -151,9 +151,9 @@ ol.format.GPX.parseRtePt_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GPX.parseTrkPt_ = function(node, objectStack) { ol.format.GPX.parseTrkPt_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'trkpt', 'localName should be trkpt'); goog.DEBUG && console.assert(node.localName == 'trkpt', 'localName should be trkpt');
var values = ol.xml.pushParseAndPop( var values = ol.xml.pushParseAndPop(
{}, ol.format.GPX.TRKPT_PARSERS_, node, objectStack); {}, ol.format.GPX.TRKPT_PARSERS_, node, objectStack);
if (values) { if (values) {
@@ -171,9 +171,9 @@ ol.format.GPX.parseTrkPt_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.GPX.parseTrkSeg_ = function(node, objectStack) { ol.format.GPX.parseTrkSeg_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'trkseg', goog.DEBUG && console.assert(node.localName == 'trkseg',
'localName should be trkseg'); 'localName should be trkseg');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
ol.xml.parseNode(ol.format.GPX.TRKSEG_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.GPX.TRKSEG_PARSERS_, node, objectStack);
@@ -191,9 +191,9 @@ ol.format.GPX.parseTrkSeg_ = function(node, objectStack) {
* @return {ol.Feature|undefined} Track. * @return {ol.Feature|undefined} Track.
*/ */
ol.format.GPX.readRte_ = function(node, objectStack) { ol.format.GPX.readRte_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'rte', 'localName should be rte'); goog.DEBUG && console.assert(node.localName == 'rte', 'localName should be rte');
var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]); var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]);
var values = ol.xml.pushParseAndPop({ var values = ol.xml.pushParseAndPop({
'flatCoordinates': [] 'flatCoordinates': []
@@ -220,9 +220,9 @@ ol.format.GPX.readRte_ = function(node, objectStack) {
* @return {ol.Feature|undefined} Track. * @return {ol.Feature|undefined} Track.
*/ */
ol.format.GPX.readTrk_ = function(node, objectStack) { ol.format.GPX.readTrk_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'trk', 'localName should be trk'); goog.DEBUG && console.assert(node.localName == 'trk', 'localName should be trk');
var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]); var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]);
var values = ol.xml.pushParseAndPop({ var values = ol.xml.pushParseAndPop({
'flatCoordinates': [], 'flatCoordinates': [],
@@ -253,9 +253,9 @@ ol.format.GPX.readTrk_ = function(node, objectStack) {
* @return {ol.Feature|undefined} Waypoint. * @return {ol.Feature|undefined} Waypoint.
*/ */
ol.format.GPX.readWpt_ = function(node, objectStack) { ol.format.GPX.readWpt_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'wpt', 'localName should be wpt'); goog.DEBUG && console.assert(node.localName == 'wpt', 'localName should be wpt');
var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]); var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]);
var values = ol.xml.pushParseAndPop( var values = ol.xml.pushParseAndPop(
{}, ol.format.GPX.WPT_PARSERS_, node, objectStack); {}, ol.format.GPX.WPT_PARSERS_, node, objectStack);
@@ -455,7 +455,7 @@ ol.format.GPX.prototype.readFeature;
* @inheritDoc * @inheritDoc
*/ */
ol.format.GPX.prototype.readFeatureFromNode = function(node, opt_options) { ol.format.GPX.prototype.readFeatureFromNode = function(node, opt_options) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
if (!ol.array.includes(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) { if (!ol.array.includes(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) {
return null; return null;
@@ -491,7 +491,7 @@ ol.format.GPX.prototype.readFeatures;
* @inheritDoc * @inheritDoc
*/ */
ol.format.GPX.prototype.readFeaturesFromNode = function(node, opt_options) { ol.format.GPX.prototype.readFeaturesFromNode = function(node, opt_options) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
if (!ol.array.includes(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) { if (!ol.array.includes(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) {
return []; return [];
@@ -551,7 +551,7 @@ ol.format.GPX.writeLink_ = function(node, value, objectStack) {
ol.format.GPX.writeWptType_ = function(node, coordinate, objectStack) { ol.format.GPX.writeWptType_ = function(node, coordinate, objectStack) {
var context = objectStack[objectStack.length - 1]; var context = objectStack[objectStack.length - 1];
var parentNode = context.node; var parentNode = context.node;
ol.DEBUG && console.assert(ol.xml.isNode(parentNode), goog.DEBUG && console.assert(ol.xml.isNode(parentNode),
'parentNode should be an XML node'); 'parentNode should be an XML node');
var namespaceURI = parentNode.namespaceURI; var namespaceURI = parentNode.namespaceURI;
var properties = context['properties']; var properties = context['properties'];
@@ -858,7 +858,7 @@ ol.format.GPX.GPX_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) {
var nodeName = ol.format.GPX.GEOMETRY_TYPE_TO_NODENAME_[geometry.getType()]; var nodeName = ol.format.GPX.GEOMETRY_TYPE_TO_NODENAME_[geometry.getType()];
if (nodeName) { if (nodeName) {
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
ol.DEBUG && console.assert(ol.xml.isNode(parentNode), goog.DEBUG && console.assert(ol.xml.isNode(parentNode),
'parentNode should be an XML node'); 'parentNode should be an XML node');
return ol.xml.createElementNS(parentNode.namespaceURI, nodeName); return ol.xml.createElementNS(parentNode.namespaceURI, nodeName);
} }

2
src/ol/format/igcformat.js
View File

@@ -153,7 +153,7 @@ ol.format.IGC.prototype.readFeatureFromText = function(text, opt_options) {
} else if (altitudeMode == ol.format.IGCZ.BAROMETRIC) { } else if (altitudeMode == ol.format.IGCZ.BAROMETRIC) {
z = parseInt(m[12], 10); z = parseInt(m[12], 10);
} else { } else {
ol.DEBUG && console.assert(false, 'Unknown altitude mode.'); goog.DEBUG && console.assert(false, 'Unknown altitude mode.');
z = 0; z = 0;
} }
flatCoordinates.push(z); flatCoordinates.push(z);

152
src/ol/format/kmlformat.js
View File

@@ -542,9 +542,9 @@ ol.format.KML.readStyleMapValue_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.IconStyleParser_ = function(node, objectStack) { ol.format.KML.IconStyleParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be an ELEMENT'); 'node.nodeType should be an ELEMENT');
ol.DEBUG && console.assert(node.localName == 'IconStyle', goog.DEBUG && console.assert(node.localName == 'IconStyle',
'localName should be IconStyle'); 'localName should be IconStyle');
// FIXME refreshMode // FIXME refreshMode
// FIXME refreshInterval // FIXME refreshInterval
@@ -641,9 +641,9 @@ ol.format.KML.IconStyleParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.LabelStyleParser_ = function(node, objectStack) { ol.format.KML.LabelStyleParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LabelStyle', goog.DEBUG && console.assert(node.localName == 'LabelStyle',
'localName should be LabelStyle'); 'localName should be LabelStyle');
// FIXME colorMode // FIXME colorMode
var object = ol.xml.pushParseAndPop( var object = ol.xml.pushParseAndPop(
@@ -670,9 +670,9 @@ ol.format.KML.LabelStyleParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.LineStyleParser_ = function(node, objectStack) { ol.format.KML.LineStyleParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LineStyle', goog.DEBUG && console.assert(node.localName == 'LineStyle',
'localName should be LineStyle'); 'localName should be LineStyle');
// FIXME colorMode // FIXME colorMode
// FIXME gx:outerColor // FIXME gx:outerColor
@@ -700,9 +700,9 @@ ol.format.KML.LineStyleParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.PolyStyleParser_ = function(node, objectStack) { ol.format.KML.PolyStyleParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'PolyStyle', goog.DEBUG && console.assert(node.localName == 'PolyStyle',
'localName should be PolyStyle'); 'localName should be PolyStyle');
// FIXME colorMode // FIXME colorMode
var object = ol.xml.pushParseAndPop( var object = ol.xml.pushParseAndPop(
@@ -735,9 +735,9 @@ ol.format.KML.PolyStyleParser_ = function(node, objectStack) {
* @return {Array.<number>} LinearRing flat coordinates. * @return {Array.<number>} LinearRing flat coordinates.
*/ */
ol.format.KML.readFlatLinearRing_ = function(node, objectStack) { ol.format.KML.readFlatLinearRing_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LinearRing', goog.DEBUG && console.assert(node.localName == 'LinearRing',
'localName should be LinearRing'); 'localName should be LinearRing');
return ol.xml.pushParseAndPop(null, return ol.xml.pushParseAndPop(null,
ol.format.KML.FLAT_LINEAR_RING_PARSERS_, node, objectStack); ol.format.KML.FLAT_LINEAR_RING_PARSERS_, node, objectStack);
@@ -750,12 +750,12 @@ ol.format.KML.readFlatLinearRing_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.gxCoordParser_ = function(node, objectStack) { ol.format.KML.gxCoordParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(ol.array.includes( goog.DEBUG && console.assert(ol.array.includes(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI), ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI),
'namespaceURI of the node should be known to the KML parser'); 'namespaceURI of the node should be known to the KML parser');
ol.DEBUG && console.assert(node.localName == 'coord', 'localName should be coord'); goog.DEBUG && console.assert(node.localName == 'coord', 'localName should be coord');
var gxTrackObject = /** @type {ol.KMLGxTrackObject_} */ var gxTrackObject = /** @type {ol.KMLGxTrackObject_} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
var flatCoordinates = gxTrackObject.flatCoordinates; var flatCoordinates = gxTrackObject.flatCoordinates;
@@ -781,12 +781,12 @@ ol.format.KML.gxCoordParser_ = function(node, objectStack) {
* @return {ol.geom.MultiLineString|undefined} MultiLineString. * @return {ol.geom.MultiLineString|undefined} MultiLineString.
*/ */
ol.format.KML.readGxMultiTrack_ = function(node, objectStack) { ol.format.KML.readGxMultiTrack_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(ol.array.includes( goog.DEBUG && console.assert(ol.array.includes(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI), ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI),
'namespaceURI of the node should be known to the KML parser'); 'namespaceURI of the node should be known to the KML parser');
ol.DEBUG && console.assert(node.localName == 'MultiTrack', goog.DEBUG && console.assert(node.localName == 'MultiTrack',
'localName should be MultiTrack'); 'localName should be MultiTrack');
var lineStrings = ol.xml.pushParseAndPop([], var lineStrings = ol.xml.pushParseAndPop([],
ol.format.KML.GX_MULTITRACK_GEOMETRY_PARSERS_, node, objectStack); ol.format.KML.GX_MULTITRACK_GEOMETRY_PARSERS_, node, objectStack);
@@ -806,12 +806,12 @@ ol.format.KML.readGxMultiTrack_ = function(node, objectStack) {
* @return {ol.geom.LineString|undefined} LineString. * @return {ol.geom.LineString|undefined} LineString.
*/ */
ol.format.KML.readGxTrack_ = function(node, objectStack) { ol.format.KML.readGxTrack_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(ol.array.includes( goog.DEBUG && console.assert(ol.array.includes(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI), ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI),
'namespaceURI of the node should be known to the KML parser'); 'namespaceURI of the node should be known to the KML parser');
ol.DEBUG && console.assert(node.localName == 'Track', 'localName should be Track'); goog.DEBUG && console.assert(node.localName == 'Track', 'localName should be Track');
var gxTrackObject = ol.xml.pushParseAndPop( var gxTrackObject = ol.xml.pushParseAndPop(
/** @type {ol.KMLGxTrackObject_} */ ({ /** @type {ol.KMLGxTrackObject_} */ ({
flatCoordinates: [], flatCoordinates: [],
@@ -822,7 +822,7 @@ ol.format.KML.readGxTrack_ = function(node, objectStack) {
} }
var flatCoordinates = gxTrackObject.flatCoordinates; var flatCoordinates = gxTrackObject.flatCoordinates;
var whens = gxTrackObject.whens; var whens = gxTrackObject.whens;
ol.DEBUG && console.assert(flatCoordinates.length / 4 == whens.length, goog.DEBUG && console.assert(flatCoordinates.length / 4 == whens.length,
'the length of the flatCoordinates array divided by 4 should be the ' + 'the length of the flatCoordinates array divided by 4 should be the ' +
'length of the whens array'); 'length of the whens array');
var i, ii; var i, ii;
@@ -843,9 +843,9 @@ ol.format.KML.readGxTrack_ = function(node, objectStack) {
* @return {Object} Icon object. * @return {Object} Icon object.
*/ */
ol.format.KML.readIcon_ = function(node, objectStack) { ol.format.KML.readIcon_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Icon', 'localName should be Icon'); goog.DEBUG && console.assert(node.localName == 'Icon', 'localName should be Icon');
var iconObject = ol.xml.pushParseAndPop( var iconObject = ol.xml.pushParseAndPop(
{}, ol.format.KML.ICON_PARSERS_, node, objectStack); {}, ol.format.KML.ICON_PARSERS_, node, objectStack);
if (iconObject) { if (iconObject) {
@@ -863,7 +863,7 @@ ol.format.KML.readIcon_ = function(node, objectStack) {
* @return {Array.<number>} Flat coordinates. * @return {Array.<number>} Flat coordinates.
*/ */
ol.format.KML.readFlatCoordinatesFromNode_ = function(node, objectStack) { ol.format.KML.readFlatCoordinatesFromNode_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
return ol.xml.pushParseAndPop(null, return ol.xml.pushParseAndPop(null,
ol.format.KML.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, objectStack); ol.format.KML.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, objectStack);
@@ -877,9 +877,9 @@ ol.format.KML.readFlatCoordinatesFromNode_ = function(node, objectStack) {
* @return {ol.geom.LineString|undefined} LineString. * @return {ol.geom.LineString|undefined} LineString.
*/ */
ol.format.KML.readLineString_ = function(node, objectStack) { ol.format.KML.readLineString_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LineString', goog.DEBUG && console.assert(node.localName == 'LineString',
'localName should be LineString'); 'localName should be LineString');
var properties = ol.xml.pushParseAndPop({}, var properties = ol.xml.pushParseAndPop({},
ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node, ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node,
@@ -904,9 +904,9 @@ ol.format.KML.readLineString_ = function(node, objectStack) {
* @return {ol.geom.Polygon|undefined} Polygon. * @return {ol.geom.Polygon|undefined} Polygon.
*/ */
ol.format.KML.readLinearRing_ = function(node, objectStack) { ol.format.KML.readLinearRing_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'LinearRing', goog.DEBUG && console.assert(node.localName == 'LinearRing',
'localName should be LinearRing'); 'localName should be LinearRing');
var properties = ol.xml.pushParseAndPop({}, var properties = ol.xml.pushParseAndPop({},
ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node, ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node,
@@ -932,9 +932,9 @@ ol.format.KML.readLinearRing_ = function(node, objectStack) {
* @return {ol.geom.Geometry} Geometry. * @return {ol.geom.Geometry} Geometry.
*/ */
ol.format.KML.readMultiGeometry_ = function(node, objectStack) { ol.format.KML.readMultiGeometry_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'MultiGeometry', goog.DEBUG && console.assert(node.localName == 'MultiGeometry',
'localName should be MultiGeometry'); 'localName should be MultiGeometry');
var geometries = ol.xml.pushParseAndPop([], var geometries = ol.xml.pushParseAndPop([],
ol.format.KML.MULTI_GEOMETRY_PARSERS_, node, objectStack); ol.format.KML.MULTI_GEOMETRY_PARSERS_, node, objectStack);
@@ -965,7 +965,7 @@ ol.format.KML.readMultiGeometry_ = function(node, objectStack) {
flatCoordinates = point.getFlatCoordinates(); flatCoordinates = point.getFlatCoordinates();
for (i = 1, ii = geometries.length; i < ii; ++i) { for (i = 1, ii = geometries.length; i < ii; ++i) {
geometry = geometries[i]; geometry = geometries[i];
ol.DEBUG && console.assert(geometry.getLayout() == layout, goog.DEBUG && console.assert(geometry.getLayout() == layout,
'geometry layout should be consistent'); 'geometry layout should be consistent');
ol.array.extend(flatCoordinates, geometry.getFlatCoordinates()); ol.array.extend(flatCoordinates, geometry.getFlatCoordinates());
} }
@@ -999,9 +999,9 @@ ol.format.KML.readMultiGeometry_ = function(node, objectStack) {
* @return {ol.geom.Point|undefined} Point. * @return {ol.geom.Point|undefined} Point.
*/ */
ol.format.KML.readPoint_ = function(node, objectStack) { ol.format.KML.readPoint_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Point', 'localName should be Point'); goog.DEBUG && console.assert(node.localName == 'Point', 'localName should be Point');
var properties = ol.xml.pushParseAndPop({}, var properties = ol.xml.pushParseAndPop({},
ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node, ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node,
objectStack); objectStack);
@@ -1009,7 +1009,7 @@ ol.format.KML.readPoint_ = function(node, objectStack) {
ol.format.KML.readFlatCoordinatesFromNode_(node, objectStack); ol.format.KML.readFlatCoordinatesFromNode_(node, objectStack);
if (flatCoordinates) { if (flatCoordinates) {
var point = new ol.geom.Point(null); var point = new ol.geom.Point(null);
ol.DEBUG && console.assert(flatCoordinates.length == 3, goog.DEBUG && console.assert(flatCoordinates.length == 3,
'flatCoordinates should have a length of 3'); 'flatCoordinates should have a length of 3');
point.setFlatCoordinates(ol.geom.GeometryLayout.XYZ, flatCoordinates); point.setFlatCoordinates(ol.geom.GeometryLayout.XYZ, flatCoordinates);
point.setProperties(properties); point.setProperties(properties);
@@ -1027,9 +1027,9 @@ ol.format.KML.readPoint_ = function(node, objectStack) {
* @return {ol.geom.Polygon|undefined} Polygon. * @return {ol.geom.Polygon|undefined} Polygon.
*/ */
ol.format.KML.readPolygon_ = function(node, objectStack) { ol.format.KML.readPolygon_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Polygon', goog.DEBUG && console.assert(node.localName == 'Polygon',
'localName should be Polygon'); 'localName should be Polygon');
var properties = ol.xml.pushParseAndPop(/** @type {Object<string,*>} */ ({}), var properties = ol.xml.pushParseAndPop(/** @type {Object<string,*>} */ ({}),
ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node, ol.format.KML.EXTRUDE_AND_ALTITUDE_MODE_PARSERS_, node,
@@ -1062,9 +1062,9 @@ ol.format.KML.readPolygon_ = function(node, objectStack) {
* @return {Array.<ol.style.Style>} Style. * @return {Array.<ol.style.Style>} Style.
*/ */
ol.format.KML.readStyle_ = function(node, objectStack) { ol.format.KML.readStyle_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Style', 'localName should be Style'); goog.DEBUG && console.assert(node.localName == 'Style', 'localName should be Style');
var styleObject = ol.xml.pushParseAndPop( var styleObject = ol.xml.pushParseAndPop(
{}, ol.format.KML.STYLE_PARSERS_, node, objectStack); {}, ol.format.KML.STYLE_PARSERS_, node, objectStack);
if (!styleObject) { if (!styleObject) {
@@ -1138,9 +1138,9 @@ ol.format.KML.setCommonGeometryProperties_ = function(multiGeometry,
* @private * @private
*/ */
ol.format.KML.DataParser_ = function(node, objectStack) { ol.format.KML.DataParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Data', 'localName should be Data'); goog.DEBUG && console.assert(node.localName == 'Data', 'localName should be Data');
var name = node.getAttribute('name'); var name = node.getAttribute('name');
if (name !== null) { if (name !== null) {
var data = ol.xml.pushParseAndPop( var data = ol.xml.pushParseAndPop(
@@ -1160,9 +1160,9 @@ ol.format.KML.DataParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.ExtendedDataParser_ = function(node, objectStack) { ol.format.KML.ExtendedDataParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ExtendedData', goog.DEBUG && console.assert(node.localName == 'ExtendedData',
'localName should be ExtendedData'); 'localName should be ExtendedData');
ol.xml.parseNode(ol.format.KML.EXTENDED_DATA_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.KML.EXTENDED_DATA_PARSERS_, node, objectStack);
}; };
@@ -1174,9 +1174,9 @@ ol.format.KML.ExtendedDataParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.PairDataParser_ = function(node, objectStack) { ol.format.KML.PairDataParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Pair', 'localName should be Pair'); goog.DEBUG && console.assert(node.localName == 'Pair', 'localName should be Pair');
var pairObject = ol.xml.pushParseAndPop( var pairObject = ol.xml.pushParseAndPop(
{}, ol.format.KML.PAIR_PARSERS_, node, objectStack); {}, ol.format.KML.PAIR_PARSERS_, node, objectStack);
if (!pairObject) { if (!pairObject) {
@@ -1205,9 +1205,9 @@ ol.format.KML.PairDataParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.PlacemarkStyleMapParser_ = function(node, objectStack) { ol.format.KML.PlacemarkStyleMapParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'StyleMap', goog.DEBUG && console.assert(node.localName == 'StyleMap',
'localName should be StyleMap'); 'localName should be StyleMap');
var styleMapValue = ol.format.KML.readStyleMapValue_(node, objectStack); var styleMapValue = ol.format.KML.readStyleMapValue_(node, objectStack);
if (!styleMapValue) { if (!styleMapValue) {
@@ -1230,9 +1230,9 @@ ol.format.KML.PlacemarkStyleMapParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.SchemaDataParser_ = function(node, objectStack) { ol.format.KML.SchemaDataParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'SchemaData', goog.DEBUG && console.assert(node.localName == 'SchemaData',
'localName should be SchemaData'); 'localName should be SchemaData');
ol.xml.parseNode(ol.format.KML.SCHEMA_DATA_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.KML.SCHEMA_DATA_PARSERS_, node, objectStack);
}; };
@@ -1244,9 +1244,9 @@ ol.format.KML.SchemaDataParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.SimpleDataParser_ = function(node, objectStack) { ol.format.KML.SimpleDataParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'SimpleData', goog.DEBUG && console.assert(node.localName == 'SimpleData',
'localName should be SimpleData'); 'localName should be SimpleData');
var name = node.getAttribute('name'); var name = node.getAttribute('name');
if (name !== null) { if (name !== null) {
@@ -1264,9 +1264,9 @@ ol.format.KML.SimpleDataParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.innerBoundaryIsParser_ = function(node, objectStack) { ol.format.KML.innerBoundaryIsParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'innerBoundaryIs', goog.DEBUG && console.assert(node.localName == 'innerBoundaryIs',
'localName should be innerBoundaryIs'); 'localName should be innerBoundaryIs');
/** @type {Array.<number>|undefined} */ /** @type {Array.<number>|undefined} */
var flatLinearRing = ol.xml.pushParseAndPop(undefined, var flatLinearRing = ol.xml.pushParseAndPop(undefined,
@@ -1274,9 +1274,9 @@ ol.format.KML.innerBoundaryIsParser_ = function(node, objectStack) {
if (flatLinearRing) { if (flatLinearRing) {
var flatLinearRings = /** @type {Array.<Array.<number>>} */ var flatLinearRings = /** @type {Array.<Array.<number>>} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
ol.DEBUG && console.assert(Array.isArray(flatLinearRings), goog.DEBUG && console.assert(Array.isArray(flatLinearRings),
'flatLinearRings should be an array'); 'flatLinearRings should be an array');
ol.DEBUG && console.assert(flatLinearRings.length > 0, goog.DEBUG && console.assert(flatLinearRings.length > 0,
'flatLinearRings array should not be empty'); 'flatLinearRings array should not be empty');
flatLinearRings.push(flatLinearRing); flatLinearRings.push(flatLinearRing);
} }
@@ -1289,9 +1289,9 @@ ol.format.KML.innerBoundaryIsParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.outerBoundaryIsParser_ = function(node, objectStack) { ol.format.KML.outerBoundaryIsParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'outerBoundaryIs', goog.DEBUG && console.assert(node.localName == 'outerBoundaryIs',
'localName should be outerBoundaryIs'); 'localName should be outerBoundaryIs');
/** @type {Array.<number>|undefined} */ /** @type {Array.<number>|undefined} */
var flatLinearRing = ol.xml.pushParseAndPop(undefined, var flatLinearRing = ol.xml.pushParseAndPop(undefined,
@@ -1299,9 +1299,9 @@ ol.format.KML.outerBoundaryIsParser_ = function(node, objectStack) {
if (flatLinearRing) { if (flatLinearRing) {
var flatLinearRings = /** @type {Array.<Array.<number>>} */ var flatLinearRings = /** @type {Array.<Array.<number>>} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
ol.DEBUG && console.assert(Array.isArray(flatLinearRings), goog.DEBUG && console.assert(Array.isArray(flatLinearRings),
'flatLinearRings should be an array'); 'flatLinearRings should be an array');
ol.DEBUG && console.assert(flatLinearRings.length > 0, goog.DEBUG && console.assert(flatLinearRings.length > 0,
'flatLinearRings array should not be empty'); 'flatLinearRings array should not be empty');
flatLinearRings[0] = flatLinearRing; flatLinearRings[0] = flatLinearRing;
} }
@@ -1314,9 +1314,9 @@ ol.format.KML.outerBoundaryIsParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.LinkParser_ = function(node, objectStack) { ol.format.KML.LinkParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Link', 'localName should be Link'); goog.DEBUG && console.assert(node.localName == 'Link', 'localName should be Link');
ol.xml.parseNode(ol.format.KML.LINK_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.KML.LINK_PARSERS_, node, objectStack);
}; };
@@ -1327,9 +1327,9 @@ ol.format.KML.LinkParser_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.whenParser_ = function(node, objectStack) { ol.format.KML.whenParser_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'when', 'localName should be when'); goog.DEBUG && console.assert(node.localName == 'when', 'localName should be when');
var gxTrackObject = /** @type {ol.KMLGxTrackObject_} */ var gxTrackObject = /** @type {ol.KMLGxTrackObject_} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
var whens = gxTrackObject.whens; var whens = gxTrackObject.whens;
@@ -1668,10 +1668,10 @@ ol.format.KML.prototype.getExtensions = function() {
* @return {Array.<ol.Feature>|undefined} Features. * @return {Array.<ol.Feature>|undefined} Features.
*/ */
ol.format.KML.prototype.readDocumentOrFolder_ = function(node, objectStack) { ol.format.KML.prototype.readDocumentOrFolder_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
var localName = node.localName; var localName = node.localName;
ol.DEBUG && console.assert(localName == 'Document' || localName == 'Folder', goog.DEBUG && console.assert(localName == 'Document' || localName == 'Folder',
'localName should be Document or Folder'); 'localName should be Document or Folder');
// FIXME use scope somehow // FIXME use scope somehow
var parsersNS = ol.xml.makeStructureNS( var parsersNS = ol.xml.makeStructureNS(
@@ -1699,9 +1699,9 @@ ol.format.KML.prototype.readDocumentOrFolder_ = function(node, objectStack) {
* @return {ol.Feature|undefined} Feature. * @return {ol.Feature|undefined} Feature.
*/ */
ol.format.KML.prototype.readPlacemark_ = function(node, objectStack) { ol.format.KML.prototype.readPlacemark_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Placemark', goog.DEBUG && console.assert(node.localName == 'Placemark',
'localName should be Placemark'); 'localName should be Placemark');
var object = ol.xml.pushParseAndPop({'geometry': null}, var object = ol.xml.pushParseAndPop({'geometry': null},
ol.format.KML.PLACEMARK_PARSERS_, node, objectStack); ol.format.KML.PLACEMARK_PARSERS_, node, objectStack);
@@ -1746,9 +1746,9 @@ ol.format.KML.prototype.readPlacemark_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.prototype.readSharedStyle_ = function(node, objectStack) { ol.format.KML.prototype.readSharedStyle_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Style', 'localName should be Style'); goog.DEBUG && console.assert(node.localName == 'Style', 'localName should be Style');
var id = node.getAttribute('id'); var id = node.getAttribute('id');
if (id !== null) { if (id !== null) {
var style = ol.format.KML.readStyle_(node, objectStack); var style = ol.format.KML.readStyle_(node, objectStack);
@@ -1772,9 +1772,9 @@ ol.format.KML.prototype.readSharedStyle_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.KML.prototype.readSharedStyleMap_ = function(node, objectStack) { ol.format.KML.prototype.readSharedStyleMap_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'StyleMap', goog.DEBUG && console.assert(node.localName == 'StyleMap',
'localName should be StyleMap'); 'localName should be StyleMap');
var id = node.getAttribute('id'); var id = node.getAttribute('id');
if (id === null) { if (id === null) {
@@ -1813,12 +1813,12 @@ ol.format.KML.prototype.readFeature;
* @inheritDoc * @inheritDoc
*/ */
ol.format.KML.prototype.readFeatureFromNode = function(node, opt_options) { ol.format.KML.prototype.readFeatureFromNode = function(node, opt_options) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
if (!ol.array.includes(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) { if (!ol.array.includes(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) {
return null; return null;
} }
ol.DEBUG && console.assert(node.localName == 'Placemark', goog.DEBUG && console.assert(node.localName == 'Placemark',
'localName should be Placemark'); 'localName should be Placemark');
var feature = this.readPlacemark_( var feature = this.readPlacemark_(
node, [this.getReadOptions(node, opt_options)]); node, [this.getReadOptions(node, opt_options)]);
@@ -1848,7 +1848,7 @@ ol.format.KML.prototype.readFeatures;
* @inheritDoc * @inheritDoc
*/ */
ol.format.KML.prototype.readFeaturesFromNode = function(node, opt_options) { ol.format.KML.prototype.readFeaturesFromNode = function(node, opt_options) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
if (!ol.array.includes(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) { if (!ol.array.includes(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) {
return []; return [];
@@ -2344,7 +2344,7 @@ ol.format.KML.writePlacemark_ = function(node, feature, objectStack) {
* @private * @private
*/ */
ol.format.KML.writePrimitiveGeometry_ = function(node, geometry, objectStack) { ol.format.KML.writePrimitiveGeometry_ = function(node, geometry, objectStack) {
ol.DEBUG && console.assert( goog.DEBUG && console.assert(
(geometry instanceof ol.geom.Point) || (geometry instanceof ol.geom.Point) ||
(geometry instanceof ol.geom.LineString) || (geometry instanceof ol.geom.LineString) ||
(geometry instanceof ol.geom.LinearRing), (geometry instanceof ol.geom.LinearRing),
@@ -2369,7 +2369,7 @@ ol.format.KML.writePrimitiveGeometry_ = function(node, geometry, objectStack) {
*/ */
ol.format.KML.writePolygon_ = function(node, polygon, objectStack) { ol.format.KML.writePolygon_ = function(node, polygon, objectStack) {
var linearRings = polygon.getLinearRings(); var linearRings = polygon.getLinearRings();
ol.DEBUG && console.assert(linearRings.length > 0, goog.DEBUG && console.assert(linearRings.length > 0,
'linearRings should not be empty'); 'linearRings should not be empty');
var outerRing = linearRings.shift(); var outerRing = linearRings.shift();
var /** @type {ol.XmlNodeStackItem} */ context = {node: node}; var /** @type {ol.XmlNodeStackItem} */ context = {node: node};
@@ -2768,7 +2768,7 @@ ol.format.KML.GX_NODE_FACTORY_ = function(value, objectStack, opt_nodeName) {
ol.format.KML.DOCUMENT_NODE_FACTORY_ = function(value, objectStack, ol.format.KML.DOCUMENT_NODE_FACTORY_ = function(value, objectStack,
opt_nodeName) { opt_nodeName) {
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
ol.DEBUG && console.assert(ol.xml.isNode(parentNode), goog.DEBUG && console.assert(ol.xml.isNode(parentNode),
'parentNode should be an XML node'); 'parentNode should be an XML node');
return ol.xml.createElementNS(parentNode.namespaceURI, 'Placemark'); return ol.xml.createElementNS(parentNode.namespaceURI, 'Placemark');
}; };
@@ -2786,7 +2786,7 @@ ol.format.KML.GEOMETRY_NODE_FACTORY_ = function(value, objectStack,
opt_nodeName) { opt_nodeName) {
if (value) { if (value) {
var parentNode = objectStack[objectStack.length - 1].node; var parentNode = objectStack[objectStack.length - 1].node;
ol.DEBUG && console.assert(ol.xml.isNode(parentNode), goog.DEBUG && console.assert(ol.xml.isNode(parentNode),
'parentNode should be an XML node'); 'parentNode should be an XML node');
return ol.xml.createElementNS(parentNode.namespaceURI, return ol.xml.createElementNS(parentNode.namespaceURI,
ol.format.KML.GEOMETRY_TYPE_TO_NODENAME_[/** @type {ol.geom.Geometry} */ (value).getType()]); ol.format.KML.GEOMETRY_TYPE_TO_NODENAME_[/** @type {ol.geom.Geometry} */ (value).getType()]);

18
src/ol/format/osmxmlformat.js
View File

@@ -56,9 +56,9 @@ ol.format.OSMXML.prototype.getExtensions = function() {
* @private * @private
*/ */
ol.format.OSMXML.readNode_ = function(node, objectStack) { ol.format.OSMXML.readNode_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'node', 'localName should be node'); goog.DEBUG && console.assert(node.localName == 'node', 'localName should be node');
var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]); var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]);
var state = /** @type {Object} */ (objectStack[objectStack.length - 1]); var state = /** @type {Object} */ (objectStack[objectStack.length - 1]);
var id = node.getAttribute('id'); var id = node.getAttribute('id');
@@ -89,9 +89,9 @@ ol.format.OSMXML.readNode_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.OSMXML.readWay_ = function(node, objectStack) { ol.format.OSMXML.readWay_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'way', 'localName should be way'); goog.DEBUG && console.assert(node.localName == 'way', 'localName should be way');
var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]); var options = /** @type {olx.format.ReadOptions} */ (objectStack[0]);
var id = node.getAttribute('id'); var id = node.getAttribute('id');
var values = ol.xml.pushParseAndPop({ var values = ol.xml.pushParseAndPop({
@@ -129,9 +129,9 @@ ol.format.OSMXML.readWay_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.OSMXML.readNd_ = function(node, objectStack) { ol.format.OSMXML.readNd_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'nd', 'localName should be nd'); goog.DEBUG && console.assert(node.localName == 'nd', 'localName should be nd');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
values.ndrefs.push(node.getAttribute('ref')); values.ndrefs.push(node.getAttribute('ref'));
}; };
@@ -143,9 +143,9 @@ ol.format.OSMXML.readNd_ = function(node, objectStack) {
* @private * @private
*/ */
ol.format.OSMXML.readTag_ = function(node, objectStack) { ol.format.OSMXML.readTag_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'tag', 'localName should be tag'); goog.DEBUG && console.assert(node.localName == 'tag', 'localName should be tag');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
values.tags[node.getAttribute('k')] = node.getAttribute('v'); values.tags[node.getAttribute('k')] = node.getAttribute('v');
}; };
@@ -212,7 +212,7 @@ ol.format.OSMXML.prototype.readFeatures;
* @inheritDoc * @inheritDoc
*/ */
ol.format.OSMXML.prototype.readFeaturesFromNode = function(node, opt_options) { ol.format.OSMXML.prototype.readFeaturesFromNode = function(node, opt_options) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
var options = this.getReadOptions(node, opt_options); var options = this.getReadOptions(node, opt_options);
if (node.localName == 'osm') { if (node.localName == 'osm') {

60
src/ol/format/owsformat.js
View File

@@ -21,7 +21,7 @@ ol.inherits(ol.format.OWS, ol.format.XML);
* @return {Object} OWS object. * @return {Object} OWS object.
*/ */
ol.format.OWS.prototype.readFromDocument = function(doc) { ol.format.OWS.prototype.readFromDocument = function(doc) {
ol.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE, goog.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE,
'doc.nodeType should be DOCUMENT'); 'doc.nodeType should be DOCUMENT');
for (var n = doc.firstChild; n; n = n.nextSibling) { for (var n = doc.firstChild; n; n = n.nextSibling) {
if (n.nodeType == Node.ELEMENT_NODE) { if (n.nodeType == Node.ELEMENT_NODE) {
@@ -37,7 +37,7 @@ ol.format.OWS.prototype.readFromDocument = function(doc) {
* @return {Object} OWS object. * @return {Object} OWS object.
*/ */
ol.format.OWS.prototype.readFromNode = function(node) { ol.format.OWS.prototype.readFromNode = function(node) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
var owsObject = ol.xml.pushParseAndPop({}, var owsObject = ol.xml.pushParseAndPop({},
ol.format.OWS.PARSERS_, node, []); ol.format.OWS.PARSERS_, node, []);
@@ -52,9 +52,9 @@ ol.format.OWS.prototype.readFromNode = function(node) {
* @return {Object|undefined} The address. * @return {Object|undefined} The address.
*/ */
ol.format.OWS.readAddress_ = function(node, objectStack) { ol.format.OWS.readAddress_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Address', goog.DEBUG && console.assert(node.localName == 'Address',
'localName should be Address'); 'localName should be Address');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
ol.format.OWS.ADDRESS_PARSERS_, node, objectStack); ol.format.OWS.ADDRESS_PARSERS_, node, objectStack);
@@ -68,9 +68,9 @@ ol.format.OWS.readAddress_ = function(node, objectStack) {
* @return {Object|undefined} The values. * @return {Object|undefined} The values.
*/ */
ol.format.OWS.readAllowedValues_ = function(node, objectStack) { ol.format.OWS.readAllowedValues_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'AllowedValues', goog.DEBUG && console.assert(node.localName == 'AllowedValues',
'localName should be AllowedValues'); 'localName should be AllowedValues');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
ol.format.OWS.ALLOWED_VALUES_PARSERS_, node, objectStack); ol.format.OWS.ALLOWED_VALUES_PARSERS_, node, objectStack);
@@ -84,9 +84,9 @@ ol.format.OWS.readAllowedValues_ = function(node, objectStack) {
* @return {Object|undefined} The constraint. * @return {Object|undefined} The constraint.
*/ */
ol.format.OWS.readConstraint_ = function(node, objectStack) { ol.format.OWS.readConstraint_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Constraint', goog.DEBUG && console.assert(node.localName == 'Constraint',
'localName should be Constraint'); 'localName should be Constraint');
var name = node.getAttribute('name'); var name = node.getAttribute('name');
if (!name) { if (!name) {
@@ -105,9 +105,9 @@ ol.format.OWS.readConstraint_ = function(node, objectStack) {
* @return {Object|undefined} The contact info. * @return {Object|undefined} The contact info.
*/ */
ol.format.OWS.readContactInfo_ = function(node, objectStack) { ol.format.OWS.readContactInfo_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ContactInfo', goog.DEBUG && console.assert(node.localName == 'ContactInfo',
'localName should be ContactInfo'); 'localName should be ContactInfo');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
ol.format.OWS.CONTACT_INFO_PARSERS_, node, objectStack); ol.format.OWS.CONTACT_INFO_PARSERS_, node, objectStack);
@@ -121,9 +121,9 @@ ol.format.OWS.readContactInfo_ = function(node, objectStack) {
* @return {Object|undefined} The DCP. * @return {Object|undefined} The DCP.
*/ */
ol.format.OWS.readDcp_ = function(node, objectStack) { ol.format.OWS.readDcp_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'DCP', 'localName should be DCP'); goog.DEBUG && console.assert(node.localName == 'DCP', 'localName should be DCP');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
ol.format.OWS.DCP_PARSERS_, node, objectStack); ol.format.OWS.DCP_PARSERS_, node, objectStack);
}; };
@@ -136,9 +136,9 @@ ol.format.OWS.readDcp_ = function(node, objectStack) {
* @return {Object|undefined} The GET object. * @return {Object|undefined} The GET object.
*/ */
ol.format.OWS.readGet_ = function(node, objectStack) { ol.format.OWS.readGet_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Get', 'localName should be Get'); goog.DEBUG && console.assert(node.localName == 'Get', 'localName should be Get');
var href = ol.format.XLink.readHref(node); var href = ol.format.XLink.readHref(node);
if (!href) { if (!href) {
return undefined; return undefined;
@@ -155,9 +155,9 @@ ol.format.OWS.readGet_ = function(node, objectStack) {
* @return {Object|undefined} The HTTP object. * @return {Object|undefined} The HTTP object.
*/ */
ol.format.OWS.readHttp_ = function(node, objectStack) { ol.format.OWS.readHttp_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'HTTP', 'localName should be HTTP'); goog.DEBUG && console.assert(node.localName == 'HTTP', 'localName should be HTTP');
return ol.xml.pushParseAndPop({}, ol.format.OWS.HTTP_PARSERS_, return ol.xml.pushParseAndPop({}, ol.format.OWS.HTTP_PARSERS_,
node, objectStack); node, objectStack);
}; };
@@ -170,9 +170,9 @@ ol.format.OWS.readHttp_ = function(node, objectStack) {
* @return {Object|undefined} The operation. * @return {Object|undefined} The operation.
*/ */
ol.format.OWS.readOperation_ = function(node, objectStack) { ol.format.OWS.readOperation_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Operation', goog.DEBUG && console.assert(node.localName == 'Operation',
'localName should be Operation'); 'localName should be Operation');
var name = node.getAttribute('name'); var name = node.getAttribute('name');
var value = ol.xml.pushParseAndPop({}, var value = ol.xml.pushParseAndPop({},
@@ -195,9 +195,9 @@ ol.format.OWS.readOperation_ = function(node, objectStack) {
*/ */
ol.format.OWS.readOperationsMetadata_ = function(node, ol.format.OWS.readOperationsMetadata_ = function(node,
objectStack) { objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'OperationsMetadata', goog.DEBUG && console.assert(node.localName == 'OperationsMetadata',
'localName should be OperationsMetadata'); 'localName should be OperationsMetadata');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
ol.format.OWS.OPERATIONS_METADATA_PARSERS_, node, ol.format.OWS.OPERATIONS_METADATA_PARSERS_, node,
@@ -212,9 +212,9 @@ ol.format.OWS.readOperationsMetadata_ = function(node,
* @return {Object|undefined} The phone. * @return {Object|undefined} The phone.
*/ */
ol.format.OWS.readPhone_ = function(node, objectStack) { ol.format.OWS.readPhone_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Phone', 'localName should be Phone'); goog.DEBUG && console.assert(node.localName == 'Phone', 'localName should be Phone');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
ol.format.OWS.PHONE_PARSERS_, node, objectStack); ol.format.OWS.PHONE_PARSERS_, node, objectStack);
}; };
@@ -228,9 +228,9 @@ ol.format.OWS.readPhone_ = function(node, objectStack) {
*/ */
ol.format.OWS.readServiceIdentification_ = function(node, ol.format.OWS.readServiceIdentification_ = function(node,
objectStack) { objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ServiceIdentification', goog.DEBUG && console.assert(node.localName == 'ServiceIdentification',
'localName should be ServiceIdentification'); 'localName should be ServiceIdentification');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.OWS.SERVICE_IDENTIFICATION_PARSERS_, node, {}, ol.format.OWS.SERVICE_IDENTIFICATION_PARSERS_, node,
@@ -245,9 +245,9 @@ ol.format.OWS.readServiceIdentification_ = function(node,
* @return {Object|undefined} The service contact. * @return {Object|undefined} The service contact.
*/ */
ol.format.OWS.readServiceContact_ = function(node, objectStack) { ol.format.OWS.readServiceContact_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ServiceContact', goog.DEBUG && console.assert(node.localName == 'ServiceContact',
'localName should be ServiceContact'); 'localName should be ServiceContact');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.OWS.SERVICE_CONTACT_PARSERS_, node, {}, ol.format.OWS.SERVICE_CONTACT_PARSERS_, node,
@@ -262,9 +262,9 @@ ol.format.OWS.readServiceContact_ = function(node, objectStack) {
* @return {Object|undefined} The service provider. * @return {Object|undefined} The service provider.
*/ */
ol.format.OWS.readServiceProvider_ = function(node, objectStack) { ol.format.OWS.readServiceProvider_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ServiceProvider', goog.DEBUG && console.assert(node.localName == 'ServiceProvider',
'localName should be ServiceProvider'); 'localName should be ServiceProvider');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.OWS.SERVICE_PROVIDER_PARSERS_, node, {}, ol.format.OWS.SERVICE_PROVIDER_PARSERS_, node,
@@ -279,9 +279,9 @@ ol.format.OWS.readServiceProvider_ = function(node, objectStack) {
* @return {string|undefined} The value. * @return {string|undefined} The value.
*/ */
ol.format.OWS.readValue_ = function(node, objectStack) { ol.format.OWS.readValue_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Value', 'localName should be Value'); goog.DEBUG && console.assert(node.localName == 'Value', 'localName should be Value');
return ol.format.XSD.readString(node); return ol.format.XSD.readString(node);
}; };

2
src/ol/format/polylineformat.js
View File

@@ -365,7 +365,7 @@ ol.format.Polyline.prototype.writeFeatureText = function(feature, opt_options) {
* @inheritDoc * @inheritDoc
*/ */
ol.format.Polyline.prototype.writeFeaturesText = function(features, opt_options) { ol.format.Polyline.prototype.writeFeaturesText = function(features, opt_options) {
ol.DEBUG && console.assert(features.length == 1, goog.DEBUG && console.assert(features.length == 1,
'features array should have 1 item'); 'features array should have 1 item');
return this.writeFeatureText(features[0], opt_options); return this.writeFeatureText(features[0], opt_options);
}; };

2
src/ol/format/topojsonformat.js
View File

@@ -249,7 +249,7 @@ ol.format.TopoJSON.readFeatureFromGeometry_ = function(object, arcs,
var geometry; var geometry;
var type = object.type; var type = object.type;
var geometryReader = ol.format.TopoJSON.GEOMETRY_READERS_[type]; var geometryReader = ol.format.TopoJSON.GEOMETRY_READERS_[type];
ol.DEBUG && console.assert(geometryReader, 'geometryReader should be defined'); goog.DEBUG && console.assert(geometryReader, 'geometryReader should be defined');
if ((type === 'Point') || (type === 'MultiPoint')) { if ((type === 'Point') || (type === 'MultiPoint')) {
geometry = geometryReader(object, scale, translate); geometry = geometryReader(object, scale, translate);
} else { } else {

18
src/ol/format/wfsformat.js
View File

@@ -176,7 +176,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadata = function(source) {
* FeatureCollection metadata. * FeatureCollection metadata.
*/ */
ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = function(doc) { ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument = function(doc) {
ol.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE, goog.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE,
'doc.nodeType should be DOCUMENT'); 'doc.nodeType should be DOCUMENT');
for (var n = doc.firstChild; n; n = n.nextSibling) { for (var n = doc.firstChild; n; n = n.nextSibling) {
if (n.nodeType == Node.ELEMENT_NODE) { if (n.nodeType == Node.ELEMENT_NODE) {
@@ -206,9 +206,9 @@ ol.format.WFS.FEATURE_COLLECTION_PARSERS_ = {
* FeatureCollection metadata. * FeatureCollection metadata.
*/ */
ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) { ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'FeatureCollection', goog.DEBUG && console.assert(node.localName == 'FeatureCollection',
'localName should be FeatureCollection'); 'localName should be FeatureCollection');
var result = {}; var result = {};
var value = ol.format.XSD.readNonNegativeIntegerString( var value = ol.format.XSD.readNonNegativeIntegerString(
@@ -317,7 +317,7 @@ ol.format.WFS.TRANSACTION_RESPONSE_PARSERS_ = {
* @return {ol.WFSTransactionResponse|undefined} Transaction response. * @return {ol.WFSTransactionResponse|undefined} Transaction response.
*/ */
ol.format.WFS.prototype.readTransactionResponseFromDocument = function(doc) { ol.format.WFS.prototype.readTransactionResponseFromDocument = function(doc) {
ol.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE, goog.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE,
'doc.nodeType should be DOCUMENT'); 'doc.nodeType should be DOCUMENT');
for (var n = doc.firstChild; n; n = n.nextSibling) { for (var n = doc.firstChild; n; n = n.nextSibling) {
if (n.nodeType == Node.ELEMENT_NODE) { if (n.nodeType == Node.ELEMENT_NODE) {
@@ -333,9 +333,9 @@ ol.format.WFS.prototype.readTransactionResponseFromDocument = function(doc) {
* @return {ol.WFSTransactionResponse|undefined} Transaction response. * @return {ol.WFSTransactionResponse|undefined} Transaction response.
*/ */
ol.format.WFS.prototype.readTransactionResponseFromNode = function(node) { ol.format.WFS.prototype.readTransactionResponseFromNode = function(node) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'TransactionResponse', goog.DEBUG && console.assert(node.localName == 'TransactionResponse',
'localName should be TransactionResponse'); 'localName should be TransactionResponse');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {ol.WFSTransactionResponse} */({}), /** @type {ol.WFSTransactionResponse} */({}),
@@ -931,7 +931,7 @@ ol.format.WFS.prototype.readProjection;
* @inheritDoc * @inheritDoc
*/ */
ol.format.WFS.prototype.readProjectionFromDocument = function(doc) { ol.format.WFS.prototype.readProjectionFromDocument = function(doc) {
ol.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE, goog.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE,
'doc.nodeType should be a DOCUMENT'); 'doc.nodeType should be a DOCUMENT');
for (var n = doc.firstChild; n; n = n.nextSibling) { for (var n = doc.firstChild; n; n = n.nextSibling) {
if (n.nodeType == Node.ELEMENT_NODE) { if (n.nodeType == Node.ELEMENT_NODE) {
@@ -946,9 +946,9 @@ ol.format.WFS.prototype.readProjectionFromDocument = function(doc) {
* @inheritDoc * @inheritDoc
*/ */
ol.format.WFS.prototype.readProjectionFromNode = function(node) { ol.format.WFS.prototype.readProjectionFromNode = function(node) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'FeatureCollection', goog.DEBUG && console.assert(node.localName == 'FeatureCollection',
'localName should be FeatureCollection'); 'localName should be FeatureCollection');
if (node.firstElementChild && if (node.firstElementChild &&

4
src/ol/format/wktformat.js
View File

@@ -166,7 +166,7 @@ ol.format.WKT.encodeMultiPolygonGeometry_ = function(geom) {
ol.format.WKT.encode_ = function(geom) { ol.format.WKT.encode_ = function(geom) {
var type = geom.getType(); var type = geom.getType();
var geometryEncoder = ol.format.WKT.GeometryEncoder_[type]; var geometryEncoder = ol.format.WKT.GeometryEncoder_[type];
ol.DEBUG && console.assert(geometryEncoder, 'geometryEncoder should be defined'); goog.DEBUG && console.assert(geometryEncoder, 'geometryEncoder should be defined');
var enc = geometryEncoder(geom); var enc = geometryEncoder(geom);
type = type.toUpperCase(); type = type.toUpperCase();
if (enc.length === 0) { if (enc.length === 0) {
@@ -573,7 +573,7 @@ ol.format.WKT.Parser.prototype.match = function(type) {
ol.format.WKT.Parser.prototype.parse = function() { ol.format.WKT.Parser.prototype.parse = function() {
this.consume_(); this.consume_();
var geometry = this.parseGeometry_(); var geometry = this.parseGeometry_();
ol.DEBUG && console.assert(this.token_.type == ol.format.WKT.TokenType.EOF, goog.DEBUG && console.assert(this.token_.type == ol.format.WKT.TokenType.EOF,
'token type should be end of file'); 'token type should be end of file');
return geometry; return geometry;
}; };

88
src/ol/format/wmscapabilitiesformat.js
View File

@@ -43,7 +43,7 @@ ol.format.WMSCapabilities.prototype.read;
* @return {Object} WMS Capability object. * @return {Object} WMS Capability object.
*/ */
ol.format.WMSCapabilities.prototype.readFromDocument = function(doc) { ol.format.WMSCapabilities.prototype.readFromDocument = function(doc) {
ol.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE, goog.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE,
'doc.nodeType should be DOCUMENT'); 'doc.nodeType should be DOCUMENT');
for (var n = doc.firstChild; n; n = n.nextSibling) { for (var n = doc.firstChild; n; n = n.nextSibling) {
if (n.nodeType == Node.ELEMENT_NODE) { if (n.nodeType == Node.ELEMENT_NODE) {
@@ -59,9 +59,9 @@ ol.format.WMSCapabilities.prototype.readFromDocument = function(doc) {
* @return {Object} WMS Capability object. * @return {Object} WMS Capability object.
*/ */
ol.format.WMSCapabilities.prototype.readFromNode = function(node) { ol.format.WMSCapabilities.prototype.readFromNode = function(node) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'WMS_Capabilities' || goog.DEBUG && console.assert(node.localName == 'WMS_Capabilities' ||
node.localName == 'WMT_MS_Capabilities', node.localName == 'WMT_MS_Capabilities',
'localName should be WMS_Capabilities or WMT_MS_Capabilities'); 'localName should be WMS_Capabilities or WMT_MS_Capabilities');
this.version = node.getAttribute('version').trim(); this.version = node.getAttribute('version').trim();
@@ -79,9 +79,9 @@ ol.format.WMSCapabilities.prototype.readFromNode = function(node) {
* @return {Object|undefined} Attribution object. * @return {Object|undefined} Attribution object.
*/ */
ol.format.WMSCapabilities.readAttribution_ = function(node, objectStack) { ol.format.WMSCapabilities.readAttribution_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Attribution', goog.DEBUG && console.assert(node.localName == 'Attribution',
'localName should be Attribution'); 'localName should be Attribution');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.ATTRIBUTION_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.ATTRIBUTION_PARSERS_, node, objectStack);
@@ -95,9 +95,9 @@ ol.format.WMSCapabilities.readAttribution_ = function(node, objectStack) {
* @return {Object} Bounding box object. * @return {Object} Bounding box object.
*/ */
ol.format.WMSCapabilities.readBoundingBox_ = function(node, objectStack) { ol.format.WMSCapabilities.readBoundingBox_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'BoundingBox', goog.DEBUG && console.assert(node.localName == 'BoundingBox',
'localName should be BoundingBox'); 'localName should be BoundingBox');
var extent = [ var extent = [
@@ -127,9 +127,9 @@ ol.format.WMSCapabilities.readBoundingBox_ = function(node, objectStack) {
* @return {ol.Extent|undefined} Bounding box object. * @return {ol.Extent|undefined} Bounding box object.
*/ */
ol.format.WMSCapabilities.readEXGeographicBoundingBox_ = function(node, objectStack) { ol.format.WMSCapabilities.readEXGeographicBoundingBox_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'EX_GeographicBoundingBox', goog.DEBUG && console.assert(node.localName == 'EX_GeographicBoundingBox',
'localName should be EX_GeographicBoundingBox'); 'localName should be EX_GeographicBoundingBox');
var geographicBoundingBox = ol.xml.pushParseAndPop( var geographicBoundingBox = ol.xml.pushParseAndPop(
{}, {},
@@ -164,9 +164,9 @@ ol.format.WMSCapabilities.readEXGeographicBoundingBox_ = function(node, objectSt
* @return {Object|undefined} Capability object. * @return {Object|undefined} Capability object.
*/ */
ol.format.WMSCapabilities.readCapability_ = function(node, objectStack) { ol.format.WMSCapabilities.readCapability_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Capability', goog.DEBUG && console.assert(node.localName == 'Capability',
'localName should be Capability'); 'localName should be Capability');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.CAPABILITY_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.CAPABILITY_PARSERS_, node, objectStack);
@@ -180,9 +180,9 @@ ol.format.WMSCapabilities.readCapability_ = function(node, objectStack) {
* @return {Object|undefined} Service object. * @return {Object|undefined} Service object.
*/ */
ol.format.WMSCapabilities.readService_ = function(node, objectStack) { ol.format.WMSCapabilities.readService_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Service', goog.DEBUG && console.assert(node.localName == 'Service',
'localName should be Service'); 'localName should be Service');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.SERVICE_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.SERVICE_PARSERS_, node, objectStack);
@@ -196,9 +196,9 @@ ol.format.WMSCapabilities.readService_ = function(node, objectStack) {
* @return {Object|undefined} Contact information object. * @return {Object|undefined} Contact information object.
*/ */
ol.format.WMSCapabilities.readContactInformation_ = function(node, objectStack) { ol.format.WMSCapabilities.readContactInformation_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType shpuld be ELEMENT'); 'node.nodeType shpuld be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ContactInformation', goog.DEBUG && console.assert(node.localName == 'ContactInformation',
'localName should be ContactInformation'); 'localName should be ContactInformation');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.CONTACT_INFORMATION_PARSERS_, {}, ol.format.WMSCapabilities.CONTACT_INFORMATION_PARSERS_,
@@ -213,9 +213,9 @@ ol.format.WMSCapabilities.readContactInformation_ = function(node, objectStack)
* @return {Object|undefined} Contact person object. * @return {Object|undefined} Contact person object.
*/ */
ol.format.WMSCapabilities.readContactPersonPrimary_ = function(node, objectStack) { ol.format.WMSCapabilities.readContactPersonPrimary_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ContactPersonPrimary', goog.DEBUG && console.assert(node.localName == 'ContactPersonPrimary',
'localName should be ContactPersonPrimary'); 'localName should be ContactPersonPrimary');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.CONTACT_PERSON_PARSERS_, {}, ol.format.WMSCapabilities.CONTACT_PERSON_PARSERS_,
@@ -230,9 +230,9 @@ ol.format.WMSCapabilities.readContactPersonPrimary_ = function(node, objectStack
* @return {Object|undefined} Contact address object. * @return {Object|undefined} Contact address object.
*/ */
ol.format.WMSCapabilities.readContactAddress_ = function(node, objectStack) { ol.format.WMSCapabilities.readContactAddress_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'ContactAddress', goog.DEBUG && console.assert(node.localName == 'ContactAddress',
'localName should be ContactAddress'); 'localName should be ContactAddress');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.CONTACT_ADDRESS_PARSERS_, {}, ol.format.WMSCapabilities.CONTACT_ADDRESS_PARSERS_,
@@ -247,9 +247,9 @@ ol.format.WMSCapabilities.readContactAddress_ = function(node, objectStack) {
* @return {Array.<string>|undefined} Format array. * @return {Array.<string>|undefined} Format array.
*/ */
ol.format.WMSCapabilities.readException_ = function(node, objectStack) { ol.format.WMSCapabilities.readException_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Exception', goog.DEBUG && console.assert(node.localName == 'Exception',
'localName should be Exception'); 'localName should be Exception');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
[], ol.format.WMSCapabilities.EXCEPTION_PARSERS_, node, objectStack); [], ol.format.WMSCapabilities.EXCEPTION_PARSERS_, node, objectStack);
@@ -263,9 +263,9 @@ ol.format.WMSCapabilities.readException_ = function(node, objectStack) {
* @return {Object|undefined} Layer object. * @return {Object|undefined} Layer object.
*/ */
ol.format.WMSCapabilities.readCapabilityLayer_ = function(node, objectStack) { ol.format.WMSCapabilities.readCapabilityLayer_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Layer', 'localName should be Layer'); goog.DEBUG && console.assert(node.localName == 'Layer', 'localName should be Layer');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.LAYER_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.LAYER_PARSERS_, node, objectStack);
}; };
@@ -278,9 +278,9 @@ ol.format.WMSCapabilities.readCapabilityLayer_ = function(node, objectStack) {
* @return {Object|undefined} Layer object. * @return {Object|undefined} Layer object.
*/ */
ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) { ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Layer', 'localName should be Layer'); goog.DEBUG && console.assert(node.localName == 'Layer', 'localName should be Layer');
var parentLayerObject = /** @type {Object.<string,*>} */ var parentLayerObject = /** @type {Object.<string,*>} */
(objectStack[objectStack.length - 1]); (objectStack[objectStack.length - 1]);
@@ -360,9 +360,9 @@ ol.format.WMSCapabilities.readLayer_ = function(node, objectStack) {
* @return {Object} Dimension object. * @return {Object} Dimension object.
*/ */
ol.format.WMSCapabilities.readDimension_ = function(node, objectStack) { ol.format.WMSCapabilities.readDimension_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Dimension', goog.DEBUG && console.assert(node.localName == 'Dimension',
'localName should be Dimension'); 'localName should be Dimension');
var dimensionObject = { var dimensionObject = {
'name': node.getAttribute('name'), 'name': node.getAttribute('name'),
@@ -387,7 +387,7 @@ ol.format.WMSCapabilities.readDimension_ = function(node, objectStack) {
* @return {Object|undefined} Online resource object. * @return {Object|undefined} Online resource object.
*/ */
ol.format.WMSCapabilities.readFormatOnlineresource_ = function(node, objectStack) { ol.format.WMSCapabilities.readFormatOnlineresource_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_, {}, ol.format.WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_,
@@ -402,9 +402,9 @@ ol.format.WMSCapabilities.readFormatOnlineresource_ = function(node, objectStack
* @return {Object|undefined} Request object. * @return {Object|undefined} Request object.
*/ */
ol.format.WMSCapabilities.readRequest_ = function(node, objectStack) { ol.format.WMSCapabilities.readRequest_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Request', goog.DEBUG && console.assert(node.localName == 'Request',
'localName should be Request'); 'localName should be Request');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.REQUEST_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.REQUEST_PARSERS_, node, objectStack);
@@ -418,9 +418,9 @@ ol.format.WMSCapabilities.readRequest_ = function(node, objectStack) {
* @return {Object|undefined} DCP type object. * @return {Object|undefined} DCP type object.
*/ */
ol.format.WMSCapabilities.readDCPType_ = function(node, objectStack) { ol.format.WMSCapabilities.readDCPType_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'DCPType', goog.DEBUG && console.assert(node.localName == 'DCPType',
'localName should be DCPType'); 'localName should be DCPType');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.DCPTYPE_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.DCPTYPE_PARSERS_, node, objectStack);
@@ -434,9 +434,9 @@ ol.format.WMSCapabilities.readDCPType_ = function(node, objectStack) {
* @return {Object|undefined} HTTP object. * @return {Object|undefined} HTTP object.
*/ */
ol.format.WMSCapabilities.readHTTP_ = function(node, objectStack) { ol.format.WMSCapabilities.readHTTP_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'HTTP', 'localName should be HTTP'); goog.DEBUG && console.assert(node.localName == 'HTTP', 'localName should be HTTP');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.HTTP_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.HTTP_PARSERS_, node, objectStack);
}; };
@@ -449,7 +449,7 @@ ol.format.WMSCapabilities.readHTTP_ = function(node, objectStack) {
* @return {Object|undefined} Operation type object. * @return {Object|undefined} Operation type object.
*/ */
ol.format.WMSCapabilities.readOperationType_ = function(node, objectStack) { ol.format.WMSCapabilities.readOperationType_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.OPERATIONTYPE_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.OPERATIONTYPE_PARSERS_, node, objectStack);
@@ -463,7 +463,7 @@ ol.format.WMSCapabilities.readOperationType_ = function(node, objectStack) {
* @return {Object|undefined} Online resource object. * @return {Object|undefined} Online resource object.
*/ */
ol.format.WMSCapabilities.readSizedFormatOnlineresource_ = function(node, objectStack) { ol.format.WMSCapabilities.readSizedFormatOnlineresource_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
var formatOnlineresource = var formatOnlineresource =
ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack); ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack);
@@ -486,9 +486,9 @@ ol.format.WMSCapabilities.readSizedFormatOnlineresource_ = function(node, object
* @return {Object|undefined} Authority URL object. * @return {Object|undefined} Authority URL object.
*/ */
ol.format.WMSCapabilities.readAuthorityURL_ = function(node, objectStack) { ol.format.WMSCapabilities.readAuthorityURL_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'AuthorityURL', goog.DEBUG && console.assert(node.localName == 'AuthorityURL',
'localName should be AuthorityURL'); 'localName should be AuthorityURL');
var authorityObject = var authorityObject =
ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack); ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack);
@@ -507,9 +507,9 @@ ol.format.WMSCapabilities.readAuthorityURL_ = function(node, objectStack) {
* @return {Object|undefined} Metadata URL object. * @return {Object|undefined} Metadata URL object.
*/ */
ol.format.WMSCapabilities.readMetadataURL_ = function(node, objectStack) { ol.format.WMSCapabilities.readMetadataURL_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'MetadataURL', goog.DEBUG && console.assert(node.localName == 'MetadataURL',
'localName should be MetadataURL'); 'localName should be MetadataURL');
var metadataObject = var metadataObject =
ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack); ol.format.WMSCapabilities.readFormatOnlineresource_(node, objectStack);
@@ -528,9 +528,9 @@ ol.format.WMSCapabilities.readMetadataURL_ = function(node, objectStack) {
* @return {Object|undefined} Style object. * @return {Object|undefined} Style object.
*/ */
ol.format.WMSCapabilities.readStyle_ = function(node, objectStack) { ol.format.WMSCapabilities.readStyle_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Style', 'localName should be Style'); goog.DEBUG && console.assert(node.localName == 'Style', 'localName should be Style');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
{}, ol.format.WMSCapabilities.STYLE_PARSERS_, node, objectStack); {}, ol.format.WMSCapabilities.STYLE_PARSERS_, node, objectStack);
}; };
@@ -543,9 +543,9 @@ ol.format.WMSCapabilities.readStyle_ = function(node, objectStack) {
* @return {Array.<string>|undefined} Keyword list. * @return {Array.<string>|undefined} Keyword list.
*/ */
ol.format.WMSCapabilities.readKeywordList_ = function(node, objectStack) { ol.format.WMSCapabilities.readKeywordList_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'KeywordList', goog.DEBUG && console.assert(node.localName == 'KeywordList',
'localName should be KeywordList'); 'localName should be KeywordList');
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
[], ol.format.WMSCapabilities.KEYWORDLIST_PARSERS_, node, objectStack); [], ol.format.WMSCapabilities.KEYWORDLIST_PARSERS_, node, objectStack);

4
src/ol/format/wmsgetfeatureinfoformat.js
View File

@@ -71,7 +71,7 @@ ol.format.WMSGetFeatureInfo.layerIdentifier_ = '_layer';
ol.format.WMSGetFeatureInfo.prototype.readFeatures_ = function(node, objectStack) { ol.format.WMSGetFeatureInfo.prototype.readFeatures_ = function(node, objectStack) {
node.setAttribute('namespaceURI', this.featureNS_); node.setAttribute('namespaceURI', this.featureNS_);
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
var localName = node.localName; var localName = node.localName;
/** @type {Array.<ol.Feature>} */ /** @type {Array.<ol.Feature>} */
@@ -87,7 +87,7 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures_ = function(node, objectStack
} }
var context = objectStack[0]; var context = objectStack[0];
ol.DEBUG && console.assert(layer.localName.indexOf( goog.DEBUG && console.assert(layer.localName.indexOf(
ol.format.WMSGetFeatureInfo.layerIdentifier_) >= 0, ol.format.WMSGetFeatureInfo.layerIdentifier_) >= 0,
'localName of layer node should match layerIdentifier'); 'localName of layer node should match layerIdentifier');

14
src/ol/format/wmtscapabilitiesformat.js
View File

@@ -44,7 +44,7 @@ ol.format.WMTSCapabilities.prototype.read;
* @return {Object} WMTS Capability object. * @return {Object} WMTS Capability object.
*/ */
ol.format.WMTSCapabilities.prototype.readFromDocument = function(doc) { ol.format.WMTSCapabilities.prototype.readFromDocument = function(doc) {
ol.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE, goog.DEBUG && console.assert(doc.nodeType == Node.DOCUMENT_NODE,
'doc.nodeType should be DOCUMENT'); 'doc.nodeType should be DOCUMENT');
for (var n = doc.firstChild; n; n = n.nextSibling) { for (var n = doc.firstChild; n; n = n.nextSibling) {
if (n.nodeType == Node.ELEMENT_NODE) { if (n.nodeType == Node.ELEMENT_NODE) {
@@ -60,9 +60,9 @@ ol.format.WMTSCapabilities.prototype.readFromDocument = function(doc) {
* @return {Object} WMTS Capability object. * @return {Object} WMTS Capability object.
*/ */
ol.format.WMTSCapabilities.prototype.readFromNode = function(node) { ol.format.WMTSCapabilities.prototype.readFromNode = function(node) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Capabilities', goog.DEBUG && console.assert(node.localName == 'Capabilities',
'localName should be Capabilities'); 'localName should be Capabilities');
var version = node.getAttribute('version').trim(); var version = node.getAttribute('version').trim();
var WMTSCapabilityObject = this.owsParser_.readFromNode(node); var WMTSCapabilityObject = this.owsParser_.readFromNode(node);
@@ -83,9 +83,9 @@ ol.format.WMTSCapabilities.prototype.readFromNode = function(node) {
* @return {Object|undefined} Attribution object. * @return {Object|undefined} Attribution object.
*/ */
ol.format.WMTSCapabilities.readContents_ = function(node, objectStack) { ol.format.WMTSCapabilities.readContents_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Contents', goog.DEBUG && console.assert(node.localName == 'Contents',
'localName should be Contents'); 'localName should be Contents');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
@@ -100,9 +100,9 @@ ol.format.WMTSCapabilities.readContents_ = function(node, objectStack) {
* @return {Object|undefined} Layers object. * @return {Object|undefined} Layers object.
*/ */
ol.format.WMTSCapabilities.readLayer_ = function(node, objectStack) { ol.format.WMTSCapabilities.readLayer_ = function(node, objectStack) {
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
ol.DEBUG && console.assert(node.localName == 'Layer', 'localName should be Layer'); goog.DEBUG && console.assert(node.localName == 'Layer', 'localName should be Layer');
return ol.xml.pushParseAndPop({}, return ol.xml.pushParseAndPop({},
ol.format.WMTSCapabilities.LAYER_PARSERS_, node, objectStack); ol.format.WMTSCapabilities.LAYER_PARSERS_, node, objectStack);
}; };

6
src/ol/format/xmlfeatureformat.js
View File

@@ -208,7 +208,7 @@ ol.format.XMLFeature.prototype.readProjectionFromNode = function(node) {
*/ */
ol.format.XMLFeature.prototype.writeFeature = function(feature, opt_options) { ol.format.XMLFeature.prototype.writeFeature = function(feature, opt_options) {
var node = this.writeFeatureNode(feature, opt_options); var node = this.writeFeatureNode(feature, opt_options);
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
return this.xmlSerializer_.serializeToString(node); return this.xmlSerializer_.serializeToString(node);
}; };
@@ -229,7 +229,7 @@ ol.format.XMLFeature.prototype.writeFeatureNode = function(feature, opt_options)
*/ */
ol.format.XMLFeature.prototype.writeFeatures = function(features, opt_options) { ol.format.XMLFeature.prototype.writeFeatures = function(features, opt_options) {
var node = this.writeFeaturesNode(features, opt_options); var node = this.writeFeaturesNode(features, opt_options);
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
return this.xmlSerializer_.serializeToString(node); return this.xmlSerializer_.serializeToString(node);
}; };
@@ -249,7 +249,7 @@ ol.format.XMLFeature.prototype.writeFeaturesNode = function(features, opt_option
*/ */
ol.format.XMLFeature.prototype.writeGeometry = function(geometry, opt_options) { ol.format.XMLFeature.prototype.writeGeometry = function(geometry, opt_options) {
var node = this.writeGeometryNode(geometry, opt_options); var node = this.writeGeometryNode(geometry, opt_options);
ol.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE, goog.DEBUG && console.assert(node.nodeType == Node.ELEMENT_NODE,
'node.nodeType should be ELEMENT'); 'node.nodeType should be ELEMENT');
return this.xmlSerializer_.serializeToString(node); return this.xmlSerializer_.serializeToString(node);
}; };

4
src/ol/format/xsdformat.js
View File

@@ -145,8 +145,8 @@ ol.format.XSD.writeDecimalTextNode = function(node, decimal) {
* @param {number} nonNegativeInteger Non negative integer. * @param {number} nonNegativeInteger Non negative integer.
*/ */
ol.format.XSD.writeNonNegativeIntegerTextNode = function(node, nonNegativeInteger) { ol.format.XSD.writeNonNegativeIntegerTextNode = function(node, nonNegativeInteger) {
ol.DEBUG && console.assert(nonNegativeInteger >= 0, 'value should be more than 0'); goog.DEBUG && console.assert(nonNegativeInteger >= 0, 'value should be more than 0');
ol.DEBUG && console.assert(nonNegativeInteger == (nonNegativeInteger | 0), goog.DEBUG && console.assert(nonNegativeInteger == (nonNegativeInteger | 0),
'value should be an integer value'); 'value should be an integer value');
var string = nonNegativeInteger.toString(); var string = nonNegativeInteger.toString();
node.appendChild(ol.xml.DOCUMENT.createTextNode(string)); node.appendChild(ol.xml.DOCUMENT.createTextNode(string));

4
src/ol/geom/circle.js
View File

@@ -162,7 +162,7 @@ ol.geom.Circle.prototype.intersectsExtent = function(extent) {
*/ */
ol.geom.Circle.prototype.setCenter = function(center) { ol.geom.Circle.prototype.setCenter = function(center) {
var stride = this.stride; var stride = this.stride;
ol.DEBUG && console.assert(center.length == stride, goog.DEBUG && console.assert(center.length == stride,
'center array length should match stride'); 'center array length should match stride');
var radius = this.flatCoordinates[stride] - this.flatCoordinates[0]; var radius = this.flatCoordinates[stride] - this.flatCoordinates[0];
var flatCoordinates = center.slice(); var flatCoordinates = center.slice();
@@ -222,7 +222,7 @@ ol.geom.Circle.prototype.setFlatCoordinates = function(layout, flatCoordinates)
* @api * @api
*/ */
ol.geom.Circle.prototype.setRadius = function(radius) { ol.geom.Circle.prototype.setRadius = function(radius) {
ol.DEBUG && console.assert(this.flatCoordinates, goog.DEBUG && console.assert(this.flatCoordinates,
'truthy this.flatCoordinates expected'); 'truthy this.flatCoordinates expected');
this.flatCoordinates[this.stride] = this.flatCoordinates[0] + radius; this.flatCoordinates[this.stride] = this.flatCoordinates[0] + radius;
this.changed(); this.changed();

2
src/ol/geom/flat/closestflatgeom.js
View File

@@ -147,7 +147,7 @@ ol.geom.flat.closest.getClosestPoint = function(flatCoordinates, offset, end,
return minSquaredDistance; return minSquaredDistance;
} }
} }
ol.DEBUG && console.assert(maxDelta > 0, 'maxDelta should be larger than 0'); goog.DEBUG && console.assert(maxDelta > 0, 'maxDelta should be larger than 0');
var tmpPoint = opt_tmpPoint ? opt_tmpPoint : [NaN, NaN]; var tmpPoint = opt_tmpPoint ? opt_tmpPoint : [NaN, NaN];
var index = offset + stride; var index = offset + stride;
while (index < end) { while (index < end) {

4
src/ol/geom/flat/containsflatgeom.js
View File

@@ -64,7 +64,7 @@ ol.geom.flat.contains.linearRingContainsXY = function(flatCoordinates, offset, e
* @return {boolean} Contains (x, 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) {
ol.DEBUG && console.assert(ends.length > 0, 'ends should not be an empty array'); goog.DEBUG && console.assert(ends.length > 0, 'ends should not be an empty array');
if (ends.length === 0) { if (ends.length === 0) {
return false; return false;
} }
@@ -93,7 +93,7 @@ ol.geom.flat.contains.linearRingsContainsXY = function(flatCoordinates, offset,
* @return {boolean} Contains (x, 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) {
ol.DEBUG && console.assert(endss.length > 0, 'endss should not be an empty array'); goog.DEBUG && console.assert(endss.length > 0, 'endss should not be an empty array');
if (endss.length === 0) { if (endss.length === 0) {
return false; return false;
} }

4
src/ol/geom/flat/deflateflatgeom.js
View File

@@ -9,7 +9,7 @@ goog.provide('ol.geom.flat.deflate');
* @return {number} offset Offset. * @return {number} offset Offset.
*/ */
ol.geom.flat.deflate.coordinate = function(flatCoordinates, offset, coordinate, stride) { ol.geom.flat.deflate.coordinate = function(flatCoordinates, offset, coordinate, stride) {
ol.DEBUG && console.assert(coordinate.length == stride, goog.DEBUG && console.assert(coordinate.length == stride,
'length of the coordinate array should match stride'); 'length of the coordinate array should match stride');
var i, ii; var i, ii;
for (i = 0, ii = coordinate.length; i < ii; ++i) { for (i = 0, ii = coordinate.length; i < ii; ++i) {
@@ -30,7 +30,7 @@ ol.geom.flat.deflate.coordinates = function(flatCoordinates, offset, coordinates
var i, ii; var i, ii;
for (i = 0, ii = coordinates.length; i < ii; ++i) { for (i = 0, ii = coordinates.length; i < ii; ++i) {
var coordinate = coordinates[i]; var coordinate = coordinates[i];
ol.DEBUG && console.assert(coordinate.length == stride, goog.DEBUG && console.assert(coordinate.length == stride,
'length of coordinate array should match stride'); 'length of coordinate array should match stride');
var j; var j;
for (j = 0; j < stride; ++j) { for (j = 0; j < stride; ++j) {

2
src/ol/geom/flat/flipflatgeom.js
View File

@@ -16,7 +16,7 @@ ol.geom.flat.flip.flipXY = function(flatCoordinates, offset, end, stride, opt_de
dest = opt_dest; dest = opt_dest;
destOffset = opt_destOffset !== undefined ? opt_destOffset : 0; destOffset = opt_destOffset !== undefined ? opt_destOffset : 0;
} else { } else {
ol.DEBUG && console.assert(opt_destOffset === undefined, goog.DEBUG && console.assert(opt_destOffset === undefined,
'opt_destOffSet should be defined'); 'opt_destOffSet should be defined');
dest = []; dest = [];
destOffset = 0; destOffset = 0;

4
src/ol/geom/flat/geodesicflatgeom.js
View File

@@ -64,7 +64,7 @@ ol.geom.flat.geodesic.line_ = function(interpolate, transform, squaredTolerance)
// segment. // segment.
flatCoordinates.push(b[0], b[1]); flatCoordinates.push(b[0], b[1]);
key = fracB.toString(); key = fracB.toString();
ol.DEBUG && console.assert(!(key in fractions), goog.DEBUG && console.assert(!(key in fractions),
'fractions object should contain key : ' + key); 'fractions object should contain key : ' + key);
fractions[key] = true; fractions[key] = true;
} else { } else {
@@ -75,7 +75,7 @@ ol.geom.flat.geodesic.line_ = function(interpolate, transform, squaredTolerance)
geoStack.push(geoB, geoM, geoM, geoA); geoStack.push(geoB, geoM, geoM, geoA);
} }
} }
ol.DEBUG && console.assert(maxIterations > 0, goog.DEBUG && console.assert(maxIterations > 0,
'maxIterations should be more than 0'); 'maxIterations should be more than 0');
return flatCoordinates; return flatCoordinates;

2
src/ol/geom/flat/interiorpointflatgeom.js
View File

@@ -78,7 +78,7 @@ ol.geom.flat.interiorpoint.linearRings = function(flatCoordinates, offset,
* @return {Array.<number>} Interior points. * @return {Array.<number>} Interior points.
*/ */
ol.geom.flat.interiorpoint.linearRingss = function(flatCoordinates, offset, endss, stride, flatCenters) { ol.geom.flat.interiorpoint.linearRingss = function(flatCoordinates, offset, endss, stride, flatCenters) {
ol.DEBUG && console.assert(2 * endss.length == flatCenters.length, goog.DEBUG && console.assert(2 * endss.length == flatCenters.length,
'endss.length times 2 should be flatCenters.length'); 'endss.length times 2 should be flatCenters.length');
var interiorPoints = []; var interiorPoints = [];
var i, ii; var i, ii;

12
src/ol/geom/flat/interpolateflatgeom.js
View File

@@ -16,13 +16,13 @@ goog.require('ol.math');
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 does not work when vertices are repeated // FIXME does not work when vertices are repeated
// FIXME interpolate extra dimensions // FIXME interpolate extra dimensions
ol.DEBUG && console.assert(0 <= fraction && fraction <= 1, goog.DEBUG && console.assert(0 <= fraction && fraction <= 1,
'fraction should be in between 0 and 1'); 'fraction should be in between 0 and 1');
var pointX = NaN; var pointX = NaN;
var pointY = NaN; var pointY = NaN;
var n = (end - offset) / stride; var n = (end - offset) / stride;
if (n === 0) { if (n === 0) {
ol.DEBUG && console.assert(false, 'n cannot be 0'); goog.DEBUG && console.assert(false, 'n cannot be 0');
} else if (n == 1) { } else if (n == 1) {
pointX = flatCoordinates[offset]; pointX = flatCoordinates[offset];
pointY = flatCoordinates[offset + 1]; pointY = flatCoordinates[offset + 1];
@@ -120,8 +120,8 @@ ol.geom.flat.lineStringCoordinateAtM = function(flatCoordinates, offset, end, st
return flatCoordinates.slice((lo - 1) * stride, (lo - 1) * stride + stride); return flatCoordinates.slice((lo - 1) * stride, (lo - 1) * stride + stride);
} }
var m1 = flatCoordinates[(lo + 1) * stride - 1]; var m1 = flatCoordinates[(lo + 1) * stride - 1];
ol.DEBUG && console.assert(m0 < m, 'm0 should be less than m'); goog.DEBUG && console.assert(m0 < m, 'm0 should be less than m');
ol.DEBUG && console.assert(m <= m1, 'm should be less than or equal to m1'); goog.DEBUG && console.assert(m <= m1, 'm should be less than or equal to m1');
var t = (m - m0) / (m1 - m0); var t = (m - m0) / (m1 - m0);
coordinate = []; coordinate = [];
var i; var i;
@@ -130,7 +130,7 @@ ol.geom.flat.lineStringCoordinateAtM = function(flatCoordinates, offset, end, st
flatCoordinates[lo * stride + i], t)); flatCoordinates[lo * stride + i], t));
} }
coordinate.push(m); coordinate.push(m);
ol.DEBUG && console.assert(coordinate.length == stride, goog.DEBUG && console.assert(coordinate.length == stride,
'length of coordinate array should match stride'); 'length of coordinate array should match stride');
return coordinate; return coordinate;
}; };
@@ -185,7 +185,7 @@ ol.geom.flat.lineStringsCoordinateAtM = function(
} }
offset = end; offset = end;
} }
ol.DEBUG && console.assert(false, goog.DEBUG && console.assert(false,
'ol.geom.flat.lineStringsCoordinateAtM should have returned'); 'ol.geom.flat.lineStringsCoordinateAtM should have returned');
return null; return null;
}; };

4
src/ol/geom/flat/intersectsextent.js
View File

@@ -106,7 +106,7 @@ ol.geom.flat.intersectsextent.linearRing = function(flatCoordinates, offset, end
* @return {boolean} True if the geometry and the extent intersect. * @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) {
ol.DEBUG && console.assert(ends.length > 0, 'ends should not be an empty array'); goog.DEBUG && console.assert(ends.length > 0, 'ends should not be an empty array');
if (!ol.geom.flat.intersectsextent.linearRing( if (!ol.geom.flat.intersectsextent.linearRing(
flatCoordinates, offset, ends[0], stride, extent)) { flatCoordinates, offset, ends[0], stride, extent)) {
return false; return false;
@@ -134,7 +134,7 @@ ol.geom.flat.intersectsextent.linearRings = function(flatCoordinates, offset, en
* @return {boolean} True if the geometry and the extent intersect. * @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) {
ol.DEBUG && console.assert(endss.length > 0, 'endss should not be an empty array'); goog.DEBUG && console.assert(endss.length > 0, 'endss should not be an empty array');
var i, ii; var i, ii;
for (i = 0, ii = endss.length; i < ii; ++i) { for (i = 0, ii = endss.length; i < ii; ++i) {
var ends = endss[i]; var ends = endss[i];

2
src/ol/geom/geometry.js
View File

@@ -261,7 +261,7 @@ ol.geom.Geometry.prototype.translate = function(deltaX, deltaY) {};
* @api stable * @api stable
*/ */
ol.geom.Geometry.prototype.transform = function(source, destination) { ol.geom.Geometry.prototype.transform = function(source, destination) {
ol.DEBUG && console.assert( goog.DEBUG && console.assert(
ol.proj.get(source).getUnits() !== ol.proj.Units.TILE_PIXELS && ol.proj.get(source).getUnits() !== ol.proj.Units.TILE_PIXELS &&
ol.proj.get(destination).getUnits() !== ol.proj.Units.TILE_PIXELS, ol.proj.get(destination).getUnits() !== ol.proj.Units.TILE_PIXELS,
'cannot transform geometries with TILE_PIXELS units'); 'cannot transform geometries with TILE_PIXELS units');

2
src/ol/geom/linestring.js
View File

@@ -66,7 +66,7 @@ ol.inherits(ol.geom.LineString, ol.geom.SimpleGeometry);
* @api stable * @api stable
*/ */
ol.geom.LineString.prototype.appendCoordinate = function(coordinate) { ol.geom.LineString.prototype.appendCoordinate = function(coordinate) {
ol.DEBUG && console.assert(coordinate.length == this.stride, goog.DEBUG && console.assert(coordinate.length == this.stride,
'length of coordinate array should match stride'); 'length of coordinate array should match stride');
if (!this.flatCoordinates) { if (!this.flatCoordinates) {
this.flatCoordinates = coordinate.slice(); this.flatCoordinates = coordinate.slice();

12
src/ol/geom/multilinestring.js
View File

@@ -59,7 +59,7 @@ ol.inherits(ol.geom.MultiLineString, ol.geom.SimpleGeometry);
* @api stable * @api stable
*/ */
ol.geom.MultiLineString.prototype.appendLineString = function(lineString) { ol.geom.MultiLineString.prototype.appendLineString = function(lineString) {
ol.DEBUG && console.assert(lineString.getLayout() == this.layout, goog.DEBUG && console.assert(lineString.getLayout() == this.layout,
'layout of lineString should match the layout'); 'layout of lineString should match the layout');
if (!this.flatCoordinates) { if (!this.flatCoordinates) {
this.flatCoordinates = lineString.getFlatCoordinates().slice(); this.flatCoordinates = lineString.getFlatCoordinates().slice();
@@ -165,7 +165,7 @@ ol.geom.MultiLineString.prototype.getEnds = function() {
* @api stable * @api stable
*/ */
ol.geom.MultiLineString.prototype.getLineString = function(index) { ol.geom.MultiLineString.prototype.getLineString = function(index) {
ol.DEBUG && console.assert(0 <= index && index < this.ends_.length, goog.DEBUG && console.assert(0 <= index && index < this.ends_.length,
'index should be in between 0 and length of the this.ends_ array'); 'index should be in between 0 and length of the this.ends_ array');
if (index < 0 || this.ends_.length <= index) { if (index < 0 || this.ends_.length <= index) {
return null; return null;
@@ -286,13 +286,13 @@ ol.geom.MultiLineString.prototype.setCoordinates = function(coordinates, opt_lay
*/ */
ol.geom.MultiLineString.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) { ol.geom.MultiLineString.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) {
if (!flatCoordinates) { if (!flatCoordinates) {
ol.DEBUG && console.assert(ends && ends.length === 0, goog.DEBUG && console.assert(ends && ends.length === 0,
'ends must be truthy and ends.length should be 0'); 'ends must be truthy and ends.length should be 0');
} else if (ends.length === 0) { } else if (ends.length === 0) {
ol.DEBUG && console.assert(flatCoordinates.length === 0, goog.DEBUG && console.assert(flatCoordinates.length === 0,
'flatCoordinates should be an empty array'); 'flatCoordinates should be an empty array');
} else { } else {
ol.DEBUG && console.assert(flatCoordinates.length == ends[ends.length - 1], goog.DEBUG && console.assert(flatCoordinates.length == ends[ends.length - 1],
'length of flatCoordinates array should match the last value of ends'); 'length of flatCoordinates array should match the last value of ends');
} }
this.setFlatCoordinatesInternal(layout, flatCoordinates); this.setFlatCoordinatesInternal(layout, flatCoordinates);
@@ -315,7 +315,7 @@ ol.geom.MultiLineString.prototype.setLineStrings = function(lineStrings) {
layout = lineString.getLayout(); layout = lineString.getLayout();
} else { } else {
// FIXME better handle the case of non-matching layouts // FIXME better handle the case of non-matching layouts
ol.DEBUG && console.assert(lineString.getLayout() == layout, goog.DEBUG && console.assert(lineString.getLayout() == layout,
'layout of lineString should match layout'); 'layout of lineString should match layout');
} }
ol.array.extend(flatCoordinates, lineString.getFlatCoordinates()); ol.array.extend(flatCoordinates, lineString.getFlatCoordinates());

4
src/ol/geom/multipoint.js
View File

@@ -34,7 +34,7 @@ ol.inherits(ol.geom.MultiPoint, ol.geom.SimpleGeometry);
* @api stable * @api stable
*/ */
ol.geom.MultiPoint.prototype.appendPoint = function(point) { ol.geom.MultiPoint.prototype.appendPoint = function(point) {
ol.DEBUG && console.assert(point.getLayout() == this.layout, goog.DEBUG && console.assert(point.getLayout() == this.layout,
'the layout of point should match layout'); 'the layout of point should match layout');
if (!this.flatCoordinates) { if (!this.flatCoordinates) {
this.flatCoordinates = point.getFlatCoordinates().slice(); this.flatCoordinates = point.getFlatCoordinates().slice();
@@ -103,7 +103,7 @@ ol.geom.MultiPoint.prototype.getCoordinates = function() {
ol.geom.MultiPoint.prototype.getPoint = function(index) { ol.geom.MultiPoint.prototype.getPoint = function(index) {
var n = !this.flatCoordinates ? var n = !this.flatCoordinates ?
0 : this.flatCoordinates.length / this.stride; 0 : this.flatCoordinates.length / this.stride;
ol.DEBUG && console.assert(0 <= index && index < n, goog.DEBUG && console.assert(0 <= index && index < n,
'index should be in between 0 and n'); 'index should be in between 0 and n');
if (index < 0 || n <= index) { if (index < 0 || n <= index) {
return null; return null;

14
src/ol/geom/multipolygon.js
View File

@@ -88,7 +88,7 @@ ol.inherits(ol.geom.MultiPolygon, ol.geom.SimpleGeometry);
* @api stable * @api stable
*/ */
ol.geom.MultiPolygon.prototype.appendPolygon = function(polygon) { ol.geom.MultiPolygon.prototype.appendPolygon = function(polygon) {
ol.DEBUG && console.assert(polygon.getLayout() == this.layout, goog.DEBUG && console.assert(polygon.getLayout() == this.layout,
'layout of polygon should match layout'); 'layout of polygon should match layout');
/** @type {Array.<number>} */ /** @type {Array.<number>} */
var ends; var ends;
@@ -279,7 +279,7 @@ ol.geom.MultiPolygon.prototype.getSimplifiedGeometryInternal = function(squaredT
* @api stable * @api stable
*/ */
ol.geom.MultiPolygon.prototype.getPolygon = function(index) { ol.geom.MultiPolygon.prototype.getPolygon = function(index) {
ol.DEBUG && console.assert(0 <= index && index < this.endss_.length, goog.DEBUG && console.assert(0 <= index && index < this.endss_.length,
'index should be in between 0 and the length of this.endss_'); 'index should be in between 0 and the length of this.endss_');
if (index < 0 || this.endss_.length <= index) { if (index < 0 || this.endss_.length <= index) {
return null; return null;
@@ -389,13 +389,13 @@ ol.geom.MultiPolygon.prototype.setCoordinates = function(coordinates, opt_layout
* @param {Array.<Array.<number>>} endss Endss. * @param {Array.<Array.<number>>} endss Endss.
*/ */
ol.geom.MultiPolygon.prototype.setFlatCoordinates = function(layout, flatCoordinates, endss) { ol.geom.MultiPolygon.prototype.setFlatCoordinates = function(layout, flatCoordinates, endss) {
ol.DEBUG && console.assert(endss, 'endss must be truthy'); goog.DEBUG && console.assert(endss, 'endss must be truthy');
if (!flatCoordinates || flatCoordinates.length === 0) { if (!flatCoordinates || flatCoordinates.length === 0) {
ol.DEBUG && console.assert(endss.length === 0, 'the length of endss should be 0'); goog.DEBUG && console.assert(endss.length === 0, 'the length of endss should be 0');
} else { } else {
ol.DEBUG && console.assert(endss.length > 0, 'endss cannot be an empty array'); goog.DEBUG && console.assert(endss.length > 0, 'endss cannot be an empty array');
var ends = endss[endss.length - 1]; var ends = endss[endss.length - 1];
ol.DEBUG && console.assert(flatCoordinates.length == ends[ends.length - 1], goog.DEBUG && console.assert(flatCoordinates.length == ends[ends.length - 1],
'the length of flatCoordinates should be the last value of ends'); 'the length of flatCoordinates should be the last value of ends');
} }
this.setFlatCoordinatesInternal(layout, flatCoordinates); this.setFlatCoordinatesInternal(layout, flatCoordinates);
@@ -418,7 +418,7 @@ ol.geom.MultiPolygon.prototype.setPolygons = function(polygons) {
layout = polygon.getLayout(); layout = polygon.getLayout();
} else { } else {
// FIXME better handle the case of non-matching layouts // FIXME better handle the case of non-matching layouts
ol.DEBUG && console.assert(polygon.getLayout() == layout, goog.DEBUG && console.assert(polygon.getLayout() == layout,
'layout of polygon should be layout'); 'layout of polygon should be layout');
} }
var offset = flatCoordinates.length; var offset = flatCoordinates.length;

12
src/ol/geom/polygon.js
View File

@@ -88,7 +88,7 @@ ol.inherits(ol.geom.Polygon, ol.geom.SimpleGeometry);
* @api stable * @api stable
*/ */
ol.geom.Polygon.prototype.appendLinearRing = function(linearRing) { ol.geom.Polygon.prototype.appendLinearRing = function(linearRing) {
ol.DEBUG && console.assert(linearRing.getLayout() == this.layout, goog.DEBUG && console.assert(linearRing.getLayout() == this.layout,
'layout of linearRing should match layout'); 'layout of linearRing should match layout');
if (!this.flatCoordinates) { if (!this.flatCoordinates) {
this.flatCoordinates = linearRing.getFlatCoordinates().slice(); this.flatCoordinates = linearRing.getFlatCoordinates().slice();
@@ -236,7 +236,7 @@ ol.geom.Polygon.prototype.getLinearRingCount = function() {
* @api stable * @api stable
*/ */
ol.geom.Polygon.prototype.getLinearRing = function(index) { ol.geom.Polygon.prototype.getLinearRing = function(index) {
ol.DEBUG && console.assert(0 <= index && index < this.ends_.length, goog.DEBUG && console.assert(0 <= index && index < this.ends_.length,
'index should be in between 0 and and length of this.ends_'); 'index should be in between 0 and and length of this.ends_');
if (index < 0 || this.ends_.length <= index) { if (index < 0 || this.ends_.length <= index) {
return null; return null;
@@ -357,13 +357,13 @@ ol.geom.Polygon.prototype.setCoordinates = function(coordinates, opt_layout) {
*/ */
ol.geom.Polygon.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) { ol.geom.Polygon.prototype.setFlatCoordinates = function(layout, flatCoordinates, ends) {
if (!flatCoordinates) { if (!flatCoordinates) {
ol.DEBUG && console.assert(ends && ends.length === 0, goog.DEBUG && console.assert(ends && ends.length === 0,
'ends must be an empty array'); 'ends must be an empty array');
} else if (ends.length === 0) { } else if (ends.length === 0) {
ol.DEBUG && console.assert(flatCoordinates.length === 0, goog.DEBUG && console.assert(flatCoordinates.length === 0,
'flatCoordinates should be an empty array'); 'flatCoordinates should be an empty array');
} else { } else {
ol.DEBUG && console.assert(flatCoordinates.length == ends[ends.length - 1], goog.DEBUG && console.assert(flatCoordinates.length == ends[ends.length - 1],
'the length of flatCoordinates should be the last entry of ends'); 'the length of flatCoordinates should be the last entry of ends');
} }
this.setFlatCoordinatesInternal(layout, flatCoordinates); this.setFlatCoordinatesInternal(layout, flatCoordinates);
@@ -460,7 +460,7 @@ ol.geom.Polygon.makeRegular = function(polygon, center, radius, opt_angle) {
var layout = polygon.getLayout(); var layout = polygon.getLayout();
var stride = polygon.getStride(); var stride = polygon.getStride();
var ends = polygon.getEnds(); var ends = polygon.getEnds();
ol.DEBUG && console.assert(ends.length === 1, 'only 1 ring is supported'); goog.DEBUG && console.assert(ends.length === 1, 'only 1 ring is supported');
var sides = flatCoordinates.length / stride - 1; var sides = flatCoordinates.length / stride - 1;
var startAngle = opt_angle ? opt_angle : 0; var startAngle = opt_angle ? opt_angle : 0;
var angle, offset; var angle, offset;

4
src/ol/geom/simplegeometry.js
View File

@@ -57,7 +57,7 @@ ol.geom.SimpleGeometry.getLayoutForStride_ = function(stride) {
} else if (stride == 4) { } else if (stride == 4) {
layout = ol.geom.GeometryLayout.XYZM; layout = ol.geom.GeometryLayout.XYZM;
} }
ol.DEBUG && console.assert(layout, 'unsupported stride: ' + stride); goog.DEBUG && console.assert(layout, 'unsupported stride: ' + stride);
return /** @type {ol.geom.GeometryLayout} */ (layout); return /** @type {ol.geom.GeometryLayout} */ (layout);
}; };
@@ -75,7 +75,7 @@ ol.geom.SimpleGeometry.getStrideForLayout = function(layout) {
} else if (layout == ol.geom.GeometryLayout.XYZM) { } else if (layout == ol.geom.GeometryLayout.XYZM) {
stride = 4; stride = 4;
} }
ol.DEBUG && console.assert(stride, 'unsupported layout: ' + layout); goog.DEBUG && console.assert(stride, 'unsupported layout: ' + layout);
return /** @type {number} */ (stride); return /** @type {number} */ (stride);
}; };

34
src/ol/graticule.js
View File

@@ -92,7 +92,7 @@ ol.Graticule = function(opt_options) {
* @private * @private
*/ */
this.maxLines_ = options.maxLines !== undefined ? options.maxLines : 100; this.maxLines_ = options.maxLines !== undefined ? options.maxLines : 100;
ol.DEBUG && console.assert(this.maxLines_ > 0, goog.DEBUG && console.assert(this.maxLines_ > 0,
'this.maxLines_ should be more than 0'); 'this.maxLines_ should be more than 0');
/** /**
@@ -333,13 +333,13 @@ ol.Graticule.prototype.getMap = function() {
*/ */
ol.Graticule.prototype.getMeridian_ = function(lon, minLat, maxLat, ol.Graticule.prototype.getMeridian_ = function(lon, minLat, maxLat,
squaredTolerance, index) { squaredTolerance, index) {
ol.DEBUG && console.assert(lon >= this.minLon_, goog.DEBUG && console.assert(lon >= this.minLon_,
'lon should be larger than or equal to this.minLon_'); 'lon should be larger than or equal to this.minLon_');
ol.DEBUG && console.assert(lon <= this.maxLon_, goog.DEBUG && console.assert(lon <= this.maxLon_,
'lon should be smaller than or equal to this.maxLon_'); 'lon should be smaller than or equal to this.maxLon_');
var flatCoordinates = ol.geom.flat.geodesic.meridian(lon, var flatCoordinates = ol.geom.flat.geodesic.meridian(lon,
minLat, maxLat, this.projection_, squaredTolerance); minLat, maxLat, this.projection_, squaredTolerance);
ol.DEBUG && console.assert(flatCoordinates.length > 0, goog.DEBUG && console.assert(flatCoordinates.length > 0,
'flatCoordinates cannot be empty'); 'flatCoordinates cannot be empty');
var lineString = this.meridians_[index] !== undefined ? var lineString = this.meridians_[index] !== undefined ?
this.meridians_[index] : new ol.geom.LineString(null); this.meridians_[index] : new ol.geom.LineString(null);
@@ -369,13 +369,13 @@ ol.Graticule.prototype.getMeridians = function() {
*/ */
ol.Graticule.prototype.getParallel_ = function(lat, minLon, maxLon, ol.Graticule.prototype.getParallel_ = function(lat, minLon, maxLon,
squaredTolerance, index) { squaredTolerance, index) {
ol.DEBUG && console.assert(lat >= this.minLat_, goog.DEBUG && console.assert(lat >= this.minLat_,
'lat should be larger than or equal to this.minLat_'); 'lat should be larger than or equal to this.minLat_');
ol.DEBUG && console.assert(lat <= this.maxLat_, goog.DEBUG && console.assert(lat <= this.maxLat_,
'lat should be smaller than or equal to this.maxLat_'); 'lat should be smaller than or equal to this.maxLat_');
var flatCoordinates = ol.geom.flat.geodesic.parallel(lat, var flatCoordinates = ol.geom.flat.geodesic.parallel(lat,
this.minLon_, this.maxLon_, this.projection_, squaredTolerance); this.minLon_, this.maxLon_, this.projection_, squaredTolerance);
ol.DEBUG && console.assert(flatCoordinates.length > 0, goog.DEBUG && console.assert(flatCoordinates.length > 0,
'flatCoordinates cannot be empty'); 'flatCoordinates cannot be empty');
var lineString = this.parallels_[index] !== undefined ? var lineString = this.parallels_[index] !== undefined ?
this.parallels_[index] : new ol.geom.LineString(null); this.parallels_[index] : new ol.geom.LineString(null);
@@ -455,7 +455,7 @@ ol.Graticule.prototype.handlePostCompose_ = function(e) {
* @private * @private
*/ */
ol.Graticule.prototype.updateProjectionInfo_ = function(projection) { ol.Graticule.prototype.updateProjectionInfo_ = function(projection) {
ol.DEBUG && console.assert(projection, 'projection cannot be null'); goog.DEBUG && console.assert(projection, 'projection cannot be null');
var epsg4326Projection = ol.proj.get('EPSG:4326'); var epsg4326Projection = ol.proj.get('EPSG:4326');
@@ -474,19 +474,19 @@ ol.Graticule.prototype.updateProjectionInfo_ = function(projection) {
var minLatP = worldExtentP[1]; var minLatP = worldExtentP[1];
var minLonP = worldExtentP[0]; var minLonP = worldExtentP[0];
ol.DEBUG && console.assert(extent, 'extent cannot be null'); goog.DEBUG && console.assert(extent, 'extent cannot be null');
ol.DEBUG && console.assert(maxLat !== undefined, 'maxLat should be defined'); goog.DEBUG && console.assert(maxLat !== undefined, 'maxLat should be defined');
ol.DEBUG && console.assert(maxLon !== undefined, 'maxLon should be defined'); goog.DEBUG && console.assert(maxLon !== undefined, 'maxLon should be defined');
ol.DEBUG && console.assert(minLat !== undefined, 'minLat should be defined'); goog.DEBUG && console.assert(minLat !== undefined, 'minLat should be defined');
ol.DEBUG && console.assert(minLon !== undefined, 'minLon should be defined'); goog.DEBUG && console.assert(minLon !== undefined, 'minLon should be defined');
ol.DEBUG && console.assert(maxLatP !== undefined, goog.DEBUG && console.assert(maxLatP !== undefined,
'projected maxLat should be defined'); 'projected maxLat should be defined');
ol.DEBUG && console.assert(maxLonP !== undefined, goog.DEBUG && console.assert(maxLonP !== undefined,
'projected maxLon should be defined'); 'projected maxLon should be defined');
ol.DEBUG && console.assert(minLatP !== undefined, goog.DEBUG && console.assert(minLatP !== undefined,
'projected minLat should be defined'); 'projected minLat should be defined');
ol.DEBUG && console.assert(minLonP !== undefined, goog.DEBUG && console.assert(minLonP !== undefined,
'projected minLon should be defined'); 'projected minLon should be defined');
this.maxLat_ = maxLat; this.maxLat_ = maxLat;

4
src/ol/image.js
View File

@@ -130,7 +130,7 @@ ol.Image.prototype.load = function() {
if (this.state == ol.ImageState.IDLE || this.state == ol.ImageState.ERROR) { if (this.state == ol.ImageState.IDLE || this.state == ol.ImageState.ERROR) {
this.state = ol.ImageState.LOADING; this.state = ol.ImageState.LOADING;
this.changed(); this.changed();
ol.DEBUG && console.assert(!this.imageListenerKeys_, goog.DEBUG && console.assert(!this.imageListenerKeys_,
'this.imageListenerKeys_ should be null'); 'this.imageListenerKeys_ should be null');
this.imageListenerKeys_ = [ this.imageListenerKeys_ = [
ol.events.listenOnce(this.image_, ol.events.EventType.ERROR, ol.events.listenOnce(this.image_, ol.events.EventType.ERROR,
@@ -157,7 +157,7 @@ ol.Image.prototype.setImage = function(image) {
* @private * @private
*/ */
ol.Image.prototype.unlistenImage_ = function() { ol.Image.prototype.unlistenImage_ = function() {
ol.DEBUG && console.assert(this.imageListenerKeys_, goog.DEBUG && console.assert(this.imageListenerKeys_,
'this.imageListenerKeys_ should not be null'); 'this.imageListenerKeys_ should not be null');
this.imageListenerKeys_.forEach(ol.events.unlistenByKey); this.imageListenerKeys_.forEach(ol.events.unlistenByKey);
this.imageListenerKeys_ = null; this.imageListenerKeys_ = null;

2
src/ol/imagebase.js
View File

@@ -108,7 +108,7 @@ ol.ImageBase.prototype.getPixelRatio = function() {
* @return {number} Resolution. * @return {number} Resolution.
*/ */
ol.ImageBase.prototype.getResolution = function() { ol.ImageBase.prototype.getResolution = function() {
ol.DEBUG && console.assert(this.resolution !== undefined, 'resolution not yet set'); goog.DEBUG && console.assert(this.resolution !== undefined, 'resolution not yet set');
return /** @type {number} */ (this.resolution); return /** @type {number} */ (this.resolution);
}; };

2
src/ol/imagecanvas.js
View File

@@ -76,7 +76,7 @@ ol.ImageCanvas.prototype.handleLoad_ = function(err) {
*/ */
ol.ImageCanvas.prototype.load = function() { ol.ImageCanvas.prototype.load = function() {
if (this.state == ol.ImageState.IDLE) { if (this.state == ol.ImageState.IDLE) {
ol.DEBUG && console.assert(this.loader_, 'this.loader_ must be set'); goog.DEBUG && console.assert(this.loader_, 'this.loader_ must be set');
this.state = ol.ImageState.LOADING; this.state = ol.ImageState.LOADING;
this.changed(); this.changed();
this.loader_(this.handleLoad_.bind(this)); this.loader_(this.handleLoad_.bind(this));

4
src/ol/imagetile.js
View File

@@ -145,7 +145,7 @@ ol.ImageTile.prototype.load = function() {
if (this.state == ol.TileState.IDLE || this.state == ol.TileState.ERROR) { if (this.state == ol.TileState.IDLE || this.state == ol.TileState.ERROR) {
this.state = ol.TileState.LOADING; this.state = ol.TileState.LOADING;
this.changed(); this.changed();
ol.DEBUG && console.assert(!this.imageListenerKeys_, goog.DEBUG && console.assert(!this.imageListenerKeys_,
'this.imageListenerKeys_ should be null'); 'this.imageListenerKeys_ should be null');
this.imageListenerKeys_ = [ this.imageListenerKeys_ = [
ol.events.listenOnce(this.image_, ol.events.EventType.ERROR, ol.events.listenOnce(this.image_, ol.events.EventType.ERROR,
@@ -164,7 +164,7 @@ ol.ImageTile.prototype.load = function() {
* @private * @private
*/ */
ol.ImageTile.prototype.unlistenImage_ = function() { ol.ImageTile.prototype.unlistenImage_ = function() {
ol.DEBUG && console.assert(this.imageListenerKeys_, goog.DEBUG && console.assert(this.imageListenerKeys_,
'this.imageListenerKeys_ should not be null'); 'this.imageListenerKeys_ should not be null');
this.imageListenerKeys_.forEach(ol.events.unlistenByKey); this.imageListenerKeys_.forEach(ol.events.unlistenByKey);
this.imageListenerKeys_ = null; this.imageListenerKeys_ = null;

2
src/ol/interaction/doubleclickzoominteraction.js
View File

@@ -54,7 +54,7 @@ ol.interaction.DoubleClickZoom.handleEvent = function(mapBrowserEvent) {
var anchor = mapBrowserEvent.coordinate; var anchor = mapBrowserEvent.coordinate;
var delta = browserEvent.shiftKey ? -this.delta_ : this.delta_; var delta = browserEvent.shiftKey ? -this.delta_ : this.delta_;
var view = map.getView(); var view = map.getView();
ol.DEBUG && console.assert(view, 'map must have a view'); goog.DEBUG && console.assert(view, 'map must have a view');
ol.interaction.Interaction.zoomByDelta( ol.interaction.Interaction.zoomByDelta(
map, view, delta, anchor, this.duration_); map, view, delta, anchor, this.duration_);
mapBrowserEvent.preventDefault(); mapBrowserEvent.preventDefault();

6
src/ol/interaction/draganddropinteraction.js
View File

@@ -96,13 +96,13 @@ ol.interaction.DragAndDrop.handleStop_ = function(event) {
ol.interaction.DragAndDrop.prototype.handleResult_ = function(file, event) { ol.interaction.DragAndDrop.prototype.handleResult_ = function(file, event) {
var result = event.target.result; var result = event.target.result;
var map = this.getMap(); var map = this.getMap();
ol.DEBUG && console.assert(map, 'map must be set'); goog.DEBUG && console.assert(map, 'map must be set');
var projection = this.projection_; var projection = this.projection_;
if (!projection) { if (!projection) {
var view = map.getView(); var view = map.getView();
ol.DEBUG && console.assert(view, 'map must have view'); goog.DEBUG && console.assert(view, 'map must have view');
projection = view.getProjection(); projection = view.getProjection();
ol.DEBUG && console.assert(projection !== undefined, goog.DEBUG && console.assert(projection !== undefined,
'projection should be defined'); 'projection should be defined');
} }
var formatConstructors = this.formatConstructors_; var formatConstructors = this.formatConstructors_;

2
src/ol/interaction/dragpaninteraction.js
View File

@@ -68,7 +68,7 @@ ol.inherits(ol.interaction.DragPan, ol.interaction.Pointer);
* @private * @private
*/ */
ol.interaction.DragPan.handleDragEvent_ = function(mapBrowserEvent) { ol.interaction.DragPan.handleDragEvent_ = function(mapBrowserEvent) {
ol.DEBUG && console.assert(this.targetPointers.length >= 1, goog.DEBUG && console.assert(this.targetPointers.length >= 1,
'the length of this.targetPointers should be more than 1'); 'the length of this.targetPointers should be more than 1');
var centroid = var centroid =
ol.interaction.Pointer.centroid(this.targetPointers); ol.interaction.Pointer.centroid(this.targetPointers);

12
src/ol/interaction/drawinteraction.js
View File

@@ -515,7 +515,7 @@ ol.interaction.Draw.prototype.startDrawing_ = function(event) {
new ol.geom.LineString(this.sketchLineCoords_)); new ol.geom.LineString(this.sketchLineCoords_));
} }
var geometry = this.geometryFunction_(this.sketchCoords_); var geometry = this.geometryFunction_(this.sketchCoords_);
ol.DEBUG && console.assert(geometry !== undefined, 'geometry should be defined'); goog.DEBUG && console.assert(geometry !== undefined, 'geometry should be defined');
this.sketchFeature_ = new ol.Feature(); this.sketchFeature_ = new ol.Feature();
if (this.geometryName_) { if (this.geometryName_) {
this.sketchFeature_.setGeometryName(this.geometryName_); this.sketchFeature_.setGeometryName(this.geometryName_);
@@ -551,7 +551,7 @@ ol.interaction.Draw.prototype.modifyDrawing_ = function(event) {
} }
last[0] = coordinate[0]; last[0] = coordinate[0];
last[1] = coordinate[1]; last[1] = coordinate[1];
ol.DEBUG && console.assert(this.sketchCoords_, 'sketchCoords_ expected'); goog.DEBUG && console.assert(this.sketchCoords_, 'sketchCoords_ expected');
this.geometryFunction_( this.geometryFunction_(
/** @type {!ol.Coordinate|!Array.<ol.Coordinate>|!Array.<Array.<ol.Coordinate>>} */ (this.sketchCoords_), /** @type {!ol.Coordinate|!Array.<ol.Coordinate>|!Array.<Array.<ol.Coordinate>>} */ (this.sketchCoords_),
geometry); geometry);
@@ -644,7 +644,7 @@ ol.interaction.Draw.prototype.removeLastPoint = function() {
*/ */
ol.interaction.Draw.prototype.finishDrawing = function() { ol.interaction.Draw.prototype.finishDrawing = function() {
var sketchFeature = this.abortDrawing_(); var sketchFeature = this.abortDrawing_();
ol.DEBUG && console.assert(sketchFeature, 'sketchFeature expected to be truthy'); goog.DEBUG && console.assert(sketchFeature, 'sketchFeature expected to be truthy');
var coordinates = this.sketchCoords_; var coordinates = this.sketchCoords_;
var geometry = /** @type {ol.geom.SimpleGeometry} */ (sketchFeature.getGeometry()); var geometry = /** @type {ol.geom.SimpleGeometry} */ (sketchFeature.getGeometry());
if (this.mode_ === ol.interaction.DrawMode.LINE_STRING) { if (this.mode_ === ol.interaction.DrawMode.LINE_STRING) {
@@ -710,10 +710,10 @@ ol.interaction.Draw.prototype.abortDrawing_ = function() {
*/ */
ol.interaction.Draw.prototype.extend = function(feature) { ol.interaction.Draw.prototype.extend = function(feature) {
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
ol.DEBUG && console.assert(this.mode_ == ol.interaction.DrawMode.LINE_STRING, goog.DEBUG && console.assert(this.mode_ == ol.interaction.DrawMode.LINE_STRING,
'interaction mode must be "line"'); 'interaction mode must be "line"');
ol.DEBUG && console.assert(geometry, 'feature must have a geometry'); goog.DEBUG && console.assert(geometry, 'feature must have a geometry');
ol.DEBUG && console.assert(geometry.getType() == ol.geom.GeometryType.LINE_STRING, goog.DEBUG && console.assert(geometry.getType() == ol.geom.GeometryType.LINE_STRING,
'feature geometry must be a line string'); 'feature geometry must be a line string');
var lineString = /** @type {ol.geom.LineString} */ (geometry); var lineString = /** @type {ol.geom.LineString} */ (geometry);
this.sketchFeature_ = feature; this.sketchFeature_ = feature;

2
src/ol/interaction/keyboardpaninteraction.js
View File

@@ -87,7 +87,7 @@ ol.interaction.KeyboardPan.handleEvent = function(mapBrowserEvent) {
keyCode == ol.events.KeyCode.UP)) { keyCode == ol.events.KeyCode.UP)) {
var map = mapBrowserEvent.map; var map = mapBrowserEvent.map;
var view = map.getView(); var view = map.getView();
ol.DEBUG && console.assert(view, 'map must have view'); goog.DEBUG && console.assert(view, 'map must have view');
var mapUnitsDelta = view.getResolution() * this.pixelDelta_; var mapUnitsDelta = view.getResolution() * this.pixelDelta_;
var deltaX = 0, deltaY = 0; var deltaX = 0, deltaY = 0;
if (keyCode == ol.events.KeyCode.DOWN) { if (keyCode == ol.events.KeyCode.DOWN) {

2
src/ol/interaction/keyboardzoominteraction.js
View File

@@ -74,7 +74,7 @@ ol.interaction.KeyboardZoom.handleEvent = function(mapBrowserEvent) {
var delta = (charCode == '+'.charCodeAt(0)) ? this.delta_ : -this.delta_; var delta = (charCode == '+'.charCodeAt(0)) ? this.delta_ : -this.delta_;
map.render(); map.render();
var view = map.getView(); var view = map.getView();
ol.DEBUG && console.assert(view, 'map must have view'); goog.DEBUG && console.assert(view, 'map must have view');
ol.interaction.Interaction.zoomByDelta( ol.interaction.Interaction.zoomByDelta(
map, view, delta, undefined, this.duration_); map, view, delta, undefined, this.duration_);
mapBrowserEvent.preventDefault(); mapBrowserEvent.preventDefault();

4
src/ol/interaction/modifyinteraction.js
View File

@@ -841,7 +841,7 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) {
this.setGeometryCoordinates_(geometry, coordinates); this.setGeometryCoordinates_(geometry, coordinates);
var rTree = this.rBush_; var rTree = this.rBush_;
ol.DEBUG && console.assert(segment !== undefined, 'segment should be defined'); goog.DEBUG && console.assert(segment !== undefined, 'segment should be defined');
rTree.remove(segmentData); rTree.remove(segmentData);
this.updateSegmentIndices_(geometry, index, depth, 1); this.updateSegmentIndices_(geometry, index, depth, 1);
var newSegmentData = /** @type {ol.ModifySegmentDataType} */ ({ var newSegmentData = /** @type {ol.ModifySegmentDataType} */ ({
@@ -982,7 +982,7 @@ ol.interaction.Modify.prototype.removeVertex_ = function() {
segments.push(right.segment[1]); segments.push(right.segment[1]);
} }
if (left !== undefined && right !== undefined) { if (left !== undefined && right !== undefined) {
ol.DEBUG && console.assert(newIndex >= 0, 'newIndex should be larger than 0'); goog.DEBUG && console.assert(newIndex >= 0, 'newIndex should be larger than 0');
var newSegmentData = /** @type {ol.ModifySegmentDataType} */ ({ var newSegmentData = /** @type {ol.ModifySegmentDataType} */ ({
depth: segmentData.depth, depth: segmentData.depth,

2
src/ol/interaction/mousewheelzoominteraction.js
View File

@@ -131,7 +131,7 @@ ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) {
var delta = ol.math.clamp(this.delta_, -maxDelta, maxDelta); var delta = ol.math.clamp(this.delta_, -maxDelta, maxDelta);
var view = map.getView(); var view = map.getView();
ol.DEBUG && console.assert(view, 'map must have view'); goog.DEBUG && console.assert(view, 'map must have view');
map.render(); map.render();
ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_, ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_,

2
src/ol/interaction/pinchrotateinteraction.js
View File

@@ -73,7 +73,7 @@ ol.inherits(ol.interaction.PinchRotate, ol.interaction.Pointer);
* @private * @private
*/ */
ol.interaction.PinchRotate.handleDragEvent_ = function(mapBrowserEvent) { ol.interaction.PinchRotate.handleDragEvent_ = function(mapBrowserEvent) {
ol.DEBUG && console.assert(this.targetPointers.length >= 2, goog.DEBUG && console.assert(this.targetPointers.length >= 2,
'length of this.targetPointers should be greater than or equal to 2'); 'length of this.targetPointers should be greater than or equal to 2');
var rotationDelta = 0.0; var rotationDelta = 0.0;

2
src/ol/interaction/pinchzoominteraction.js
View File

@@ -61,7 +61,7 @@ ol.inherits(ol.interaction.PinchZoom, ol.interaction.Pointer);
* @private * @private
*/ */
ol.interaction.PinchZoom.handleDragEvent_ = function(mapBrowserEvent) { ol.interaction.PinchZoom.handleDragEvent_ = function(mapBrowserEvent) {
ol.DEBUG && console.assert(this.targetPointers.length >= 2, goog.DEBUG && console.assert(this.targetPointers.length >= 2,
'length of this.targetPointers should be 2 or more'); 'length of this.targetPointers should be 2 or more');
var scaleDelta = 1.0; var scaleDelta = 1.0;

12
src/ol/layer/heatmaplayer.js
View File

@@ -100,12 +100,12 @@ ol.layer.Heatmap = function(opt_options) {
} else { } else {
weightFunction = weight; weightFunction = weight;
} }
ol.DEBUG && console.assert(typeof weightFunction === 'function', goog.DEBUG && console.assert(typeof weightFunction === 'function',
'weightFunction should be a function'); 'weightFunction should be a function');
this.setStyle(function(feature, resolution) { this.setStyle(function(feature, resolution) {
ol.DEBUG && console.assert(this.styleCache_, 'this.styleCache_ expected'); goog.DEBUG && console.assert(this.styleCache_, 'this.styleCache_ expected');
ol.DEBUG && console.assert(this.circleImage_ !== undefined, goog.DEBUG && console.assert(this.circleImage_ !== undefined,
'this.circleImage_ should be defined'); 'this.circleImage_ should be defined');
var weight = weightFunction(feature); var weight = weightFunction(feature);
var opacity = weight !== undefined ? ol.math.clamp(weight, 0, 1) : 1; var opacity = weight !== undefined ? ol.math.clamp(weight, 0, 1) : 1;
@@ -173,7 +173,7 @@ ol.layer.Heatmap.createGradient_ = function(colors) {
ol.layer.Heatmap.prototype.createCircle_ = function() { ol.layer.Heatmap.prototype.createCircle_ = function() {
var radius = this.getRadius(); var radius = this.getRadius();
var blur = this.getBlur(); var blur = this.getBlur();
ol.DEBUG && console.assert(radius !== undefined && blur !== undefined, goog.DEBUG && console.assert(radius !== undefined && blur !== undefined,
'radius and blur should be defined'); 'radius and blur should be defined');
var halfSize = radius + blur + 1; var halfSize = radius + blur + 1;
var size = 2 * halfSize; var size = 2 * halfSize;
@@ -246,9 +246,9 @@ ol.layer.Heatmap.prototype.handleStyleChanged_ = function() {
* @private * @private
*/ */
ol.layer.Heatmap.prototype.handleRender_ = function(event) { ol.layer.Heatmap.prototype.handleRender_ = function(event) {
ol.DEBUG && console.assert(event.type == ol.render.EventType.RENDER, goog.DEBUG && console.assert(event.type == ol.render.EventType.RENDER,
'event.type should be RENDER'); 'event.type should be RENDER');
ol.DEBUG && console.assert(this.gradient_, 'this.gradient_ expected'); goog.DEBUG && console.assert(this.gradient_, 'this.gradient_ expected');
var context = event.context; var context = event.context;
var canvas = context.canvas; var canvas = context.canvas;
var image = context.getImageData(0, 0, canvas.width, canvas.height); var image = context.getImageData(0, 0, canvas.width, canvas.height);

4
src/ol/layer/layergroup.js
View File

@@ -130,7 +130,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) { ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element); var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
var key = ol.getUid(layer).toString(); var key = ol.getUid(layer).toString();
ol.DEBUG && console.assert(!(key in this.listenerKeys_), goog.DEBUG && console.assert(!(key in this.listenerKeys_),
'listeners already registered'); 'listeners already registered');
this.listenerKeys_[key] = [ this.listenerKeys_[key] = [
ol.events.listen(layer, ol.ObjectEventType.PROPERTYCHANGE, ol.events.listen(layer, ol.ObjectEventType.PROPERTYCHANGE,
@@ -149,7 +149,7 @@ ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) { ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.element); var layer = /** @type {ol.layer.Base} */ (collectionEvent.element);
var key = ol.getUid(layer).toString(); var key = ol.getUid(layer).toString();
ol.DEBUG && console.assert(key in this.listenerKeys_, 'no listeners to unregister'); goog.DEBUG && console.assert(key in this.listenerKeys_, 'no listeners to unregister');
this.listenerKeys_[key].forEach(ol.events.unlistenByKey); this.listenerKeys_[key].forEach(ol.events.unlistenByKey);
delete this.listenerKeys_[key]; delete this.listenerKeys_[key];
this.changed(); this.changed();

4
src/ol/layer/vectorlayer.js
View File

@@ -32,7 +32,7 @@ ol.layer.Vector = function(opt_options) {
var options = opt_options ? var options = opt_options ?
opt_options : /** @type {olx.layer.VectorOptions} */ ({}); opt_options : /** @type {olx.layer.VectorOptions} */ ({});
ol.DEBUG && console.assert( goog.DEBUG && console.assert(
options.renderOrder === undefined || !options.renderOrder || options.renderOrder === undefined || !options.renderOrder ||
typeof options.renderOrder === 'function', typeof options.renderOrder === 'function',
'renderOrder must be a comparator function'); 'renderOrder must be a comparator function');
@@ -158,7 +158,7 @@ ol.layer.Vector.prototype.getUpdateWhileInteracting = function() {
* Render order. * Render order.
*/ */
ol.layer.Vector.prototype.setRenderOrder = function(renderOrder) { ol.layer.Vector.prototype.setRenderOrder = function(renderOrder) {
ol.DEBUG && console.assert( goog.DEBUG && console.assert(
renderOrder === undefined || !renderOrder || renderOrder === undefined || !renderOrder ||
typeof renderOrder === 'function', typeof renderOrder === 'function',
'renderOrder must be a comparator function'); 'renderOrder must be a comparator function');

16
src/ol/map.js
View File

@@ -479,7 +479,7 @@ ol.inherits(ol.Map, ol.Object);
*/ */
ol.Map.prototype.addControl = function(control) { ol.Map.prototype.addControl = function(control) {
var controls = this.getControls(); var controls = this.getControls();
ol.DEBUG && console.assert(controls !== undefined, 'controls should be defined'); goog.DEBUG && console.assert(controls !== undefined, 'controls should be defined');
controls.push(control); controls.push(control);
}; };
@@ -491,7 +491,7 @@ ol.Map.prototype.addControl = function(control) {
*/ */
ol.Map.prototype.addInteraction = function(interaction) { ol.Map.prototype.addInteraction = function(interaction) {
var interactions = this.getInteractions(); var interactions = this.getInteractions();
ol.DEBUG && console.assert(interactions !== undefined, goog.DEBUG && console.assert(interactions !== undefined,
'interactions should be defined'); 'interactions should be defined');
interactions.push(interaction); interactions.push(interaction);
}; };
@@ -517,7 +517,7 @@ ol.Map.prototype.addLayer = function(layer) {
*/ */
ol.Map.prototype.addOverlay = function(overlay) { ol.Map.prototype.addOverlay = function(overlay) {
var overlays = this.getOverlays(); var overlays = this.getOverlays();
ol.DEBUG && console.assert(overlays !== undefined, 'overlays should be defined'); goog.DEBUG && console.assert(overlays !== undefined, 'overlays should be defined');
overlays.push(overlay); overlays.push(overlay);
}; };
@@ -974,7 +974,7 @@ ol.Map.prototype.handleMapBrowserEvent = function(mapBrowserEvent) {
this.focus_ = mapBrowserEvent.coordinate; this.focus_ = mapBrowserEvent.coordinate;
mapBrowserEvent.frameState = this.frameState_; mapBrowserEvent.frameState = this.frameState_;
var interactions = this.getInteractions(); var interactions = this.getInteractions();
ol.DEBUG && console.assert(interactions !== undefined, goog.DEBUG && console.assert(interactions !== undefined,
'interactions should be defined'); 'interactions should be defined');
var interactionsArray = interactions.getArray(); var interactionsArray = interactions.getArray();
var i; var i;
@@ -1059,7 +1059,7 @@ ol.Map.prototype.handleTargetChanged_ = function() {
var targetElement; var targetElement;
if (this.getTarget()) { if (this.getTarget()) {
targetElement = this.getTargetElement(); targetElement = this.getTargetElement();
ol.DEBUG && console.assert(targetElement !== null, goog.DEBUG && console.assert(targetElement !== null,
'expects a non-null value for targetElement'); 'expects a non-null value for targetElement');
} }
@@ -1200,7 +1200,7 @@ ol.Map.prototype.render = function() {
*/ */
ol.Map.prototype.removeControl = function(control) { ol.Map.prototype.removeControl = function(control) {
var controls = this.getControls(); var controls = this.getControls();
ol.DEBUG && console.assert(controls !== undefined, 'controls should be defined'); goog.DEBUG && console.assert(controls !== undefined, 'controls should be defined');
return controls.remove(control); return controls.remove(control);
}; };
@@ -1214,7 +1214,7 @@ ol.Map.prototype.removeControl = function(control) {
*/ */
ol.Map.prototype.removeInteraction = function(interaction) { ol.Map.prototype.removeInteraction = function(interaction) {
var interactions = this.getInteractions(); var interactions = this.getInteractions();
ol.DEBUG && console.assert(interactions !== undefined, goog.DEBUG && console.assert(interactions !== undefined,
'interactions should be defined'); 'interactions should be defined');
return interactions.remove(interaction); return interactions.remove(interaction);
}; };
@@ -1242,7 +1242,7 @@ ol.Map.prototype.removeLayer = function(layer) {
*/ */
ol.Map.prototype.removeOverlay = function(overlay) { ol.Map.prototype.removeOverlay = function(overlay) {
var overlays = this.getOverlays(); var overlays = this.getOverlays();
ol.DEBUG && console.assert(overlays !== undefined, 'overlays should be defined'); goog.DEBUG && console.assert(overlays !== undefined, 'overlays should be defined');
return overlays.remove(overlay); return overlays.remove(overlay);
}; };

4
src/ol/mapbrowserevent.js
View File

@@ -271,11 +271,11 @@ ol.MapBrowserEventHandler.prototype.handlePointerUp_ = function(pointerEvent) {
// to 0). // to 0).
// See http://www.w3.org/TR/pointerevents/#button-states // See http://www.w3.org/TR/pointerevents/#button-states
if (!this.dragging_ && this.isMouseActionButton_(pointerEvent)) { if (!this.dragging_ && this.isMouseActionButton_(pointerEvent)) {
ol.DEBUG && console.assert(this.down_, 'this.down_ must be truthy'); goog.DEBUG && console.assert(this.down_, 'this.down_ must be truthy');
this.emulateClick_(this.down_); this.emulateClick_(this.down_);
} }
ol.DEBUG && console.assert(this.activePointers_ >= 0, goog.DEBUG && console.assert(this.activePointers_ >= 0,
'this.activePointers_ should be equal to or larger than 0'); 'this.activePointers_ should be equal to or larger than 0');
if (this.activePointers_ === 0) { if (this.activePointers_ === 0) {
this.dragListenerKeys_.forEach(ol.events.unlistenByKey); this.dragListenerKeys_.forEach(ol.events.unlistenByKey);

2
src/ol/math.js
View File

@@ -105,7 +105,7 @@ ol.math.squaredDistance = function(x1, y1, x2, y2) {
ol.math.solveLinearSystem = function(mat) { ol.math.solveLinearSystem = function(mat) {
var n = mat.length; var n = mat.length;
if (ol.DEBUG) { if (goog.DEBUG) {
for (var row = 0; row < n; row++) { for (var row = 0; row < n; row++) {
console.assert(mat[row].length == n + 1, console.assert(mat[row].length == n + 1,
'every row should have correct number of columns'); 'every row should have correct number of columns');

8
src/ol/ol.js
View File

@@ -14,14 +14,6 @@ goog.provide('ol');
ol.ASSUME_TOUCH = false; ol.ASSUME_TOUCH = false;
/**
* @define {boolean} Debug mode. When set to `false` (recommended for
* production), debug assertion checks will be stripped out of the build.
* Default is `true`.
*/
ol.DEBUG = true;
/** /**
* TODO: rename this to something having to do with tile grids * TODO: rename this to something having to do with tile grids
* see https://github.com/openlayers/ol3/issues/2076 * see https://github.com/openlayers/ol3/issues/2076

12
src/ol/overlay.js
View File

@@ -430,8 +430,8 @@ ol.Overlay.prototype.panIntoView_ = function() {
* @private * @private
*/ */
ol.Overlay.prototype.getRect_ = function(element, size) { ol.Overlay.prototype.getRect_ = function(element, size) {
ol.DEBUG && console.assert(element, 'element should be defined'); goog.DEBUG && console.assert(element, 'element should be defined');
ol.DEBUG && console.assert(size !== undefined, 'size should be defined'); goog.DEBUG && console.assert(size !== undefined, 'size should be defined');
var box = element.getBoundingClientRect(); var box = element.getBoundingClientRect();
var offsetX = box.left + ol.global.pageXOffset; var offsetX = box.left + ol.global.pageXOffset;
@@ -494,14 +494,14 @@ ol.Overlay.prototype.updatePixelPosition = function() {
* @protected * @protected
*/ */
ol.Overlay.prototype.updateRenderedPosition = function(pixel, mapSize) { ol.Overlay.prototype.updateRenderedPosition = function(pixel, mapSize) {
ol.DEBUG && console.assert(pixel, 'pixel should not be null'); goog.DEBUG && console.assert(pixel, 'pixel should not be null');
ol.DEBUG && console.assert(mapSize !== undefined, 'mapSize should be defined'); goog.DEBUG && console.assert(mapSize !== undefined, 'mapSize should be defined');
var style = this.element_.style; var style = this.element_.style;
var offset = this.getOffset(); var offset = this.getOffset();
ol.DEBUG && console.assert(Array.isArray(offset), 'offset should be an array'); goog.DEBUG && console.assert(Array.isArray(offset), 'offset should be an array');
var positioning = this.getPositioning(); var positioning = this.getPositioning();
ol.DEBUG && console.assert(positioning !== undefined, goog.DEBUG && console.assert(positioning !== undefined,
'positioning should be defined'); 'positioning should be defined');
var offsetX = offset[0]; var offsetX = offset[0];

4
src/ol/proj/epsg3857projection.js
View File

@@ -113,7 +113,7 @@ ol.proj.EPSG3857.fromEPSG4326 = function(input, opt_output, opt_dimension) {
output = new Array(length); output = new Array(length);
} }
} }
ol.DEBUG && console.assert(output.length % dimension === 0, goog.DEBUG && console.assert(output.length % dimension === 0,
'modulus of output.length with dimension should be 0'); 'modulus of output.length with dimension should be 0');
for (var i = 0; i < length; i += dimension) { for (var i = 0; i < length; i += dimension) {
output[i] = ol.proj.EPSG3857.RADIUS * Math.PI * input[i] / 180; output[i] = ol.proj.EPSG3857.RADIUS * Math.PI * input[i] / 180;
@@ -144,7 +144,7 @@ ol.proj.EPSG3857.toEPSG4326 = function(input, opt_output, opt_dimension) {
output = new Array(length); output = new Array(length);
} }
} }
ol.DEBUG && console.assert(output.length % dimension === 0, goog.DEBUG && console.assert(output.length % dimension === 0,
'modulus of output.length with dimension should be 0'); 'modulus of output.length with dimension should be 0');
for (var i = 0; i < length; i += dimension) { for (var i = 0; i < length; i += dimension) {
output[i] = 180 * input[i] / (ol.proj.EPSG3857.RADIUS * Math.PI); output[i] = 180 * input[i] / (ol.proj.EPSG3857.RADIUS * Math.PI);

12
src/ol/proj/proj.js
View File

@@ -136,7 +136,7 @@ ol.proj.Projection = function(options) {
var projections = ol.proj.projections_; var projections = ol.proj.projections_;
var code = options.code; var code = options.code;
ol.DEBUG && console.assert(code !== undefined, goog.DEBUG && console.assert(code !== undefined,
'Option "code" is required for constructing instance'); 'Option "code" is required for constructing instance');
if (ol.ENABLE_PROJ4JS) { if (ol.ENABLE_PROJ4JS) {
var proj4js = ol.proj.proj4_ || ol.global['proj4']; var proj4js = ol.proj.proj4_ || ol.global['proj4'];
@@ -416,7 +416,7 @@ if (ol.ENABLE_PROJ4JS) {
* @api * @api
*/ */
ol.proj.setProj4 = function(proj4) { ol.proj.setProj4 = function(proj4) {
ol.DEBUG && console.assert(typeof proj4 == 'function', goog.DEBUG && console.assert(typeof proj4 == 'function',
'proj4 argument should be a function'); 'proj4 argument should be a function');
ol.proj.proj4_ = proj4; ol.proj.proj4_ = proj4;
}; };
@@ -608,9 +608,9 @@ ol.proj.removeTransform = function(source, destination) {
var sourceCode = source.getCode(); var sourceCode = source.getCode();
var destinationCode = destination.getCode(); var destinationCode = destination.getCode();
var transforms = ol.proj.transforms_; var transforms = ol.proj.transforms_;
ol.DEBUG && console.assert(sourceCode in transforms, goog.DEBUG && console.assert(sourceCode in transforms,
'sourceCode should be in transforms'); 'sourceCode should be in transforms');
ol.DEBUG && console.assert(destinationCode in transforms[sourceCode], goog.DEBUG && console.assert(destinationCode in transforms[sourceCode],
'destinationCode should be in transforms of sourceCode'); 'destinationCode should be in transforms of sourceCode');
var transform = transforms[sourceCode][destinationCode]; var transform = transforms[sourceCode][destinationCode];
delete transforms[sourceCode][destinationCode]; delete transforms[sourceCode][destinationCode];
@@ -741,7 +741,7 @@ ol.proj.getTransformFromProjections = function(sourceProjection, destinationProj
transform = transforms[sourceCode][destinationCode]; transform = transforms[sourceCode][destinationCode];
} }
if (transform === undefined) { if (transform === undefined) {
ol.DEBUG && console.assert(transform !== undefined, 'transform should be defined'); goog.DEBUG && console.assert(transform !== undefined, 'transform should be defined');
transform = ol.proj.identityTransform; transform = ol.proj.identityTransform;
} }
return transform; return transform;
@@ -757,7 +757,7 @@ ol.proj.getTransformFromProjections = function(sourceProjection, destinationProj
ol.proj.identityTransform = function(input, opt_output, opt_dimension) { ol.proj.identityTransform = function(input, opt_output, opt_dimension) {
if (opt_output !== undefined && input !== opt_output) { if (opt_output !== undefined && input !== opt_output) {
// TODO: consider making this a warning instead // TODO: consider making this a warning instead
ol.DEBUG && console.assert(false, 'This should not be used internally.'); goog.DEBUG && console.assert(false, 'This should not be used internally.');
for (var i = 0, ii = input.length; i < ii; ++i) { for (var i = 0, ii = input.length; i < ii; ++i) {
opt_output[i] = input[i]; opt_output[i] = input[i];
} }

10
src/ol/render/box.js
View File

@@ -63,8 +63,8 @@ ol.render.Box.prototype.disposeInternal = function() {
ol.render.Box.prototype.render_ = function() { ol.render.Box.prototype.render_ = function() {
var startPixel = this.startPixel_; var startPixel = this.startPixel_;
var endPixel = this.endPixel_; var endPixel = this.endPixel_;
ol.DEBUG && console.assert(startPixel, 'this.startPixel_ must be truthy'); goog.DEBUG && console.assert(startPixel, 'this.startPixel_ must be truthy');
ol.DEBUG && console.assert(endPixel, 'this.endPixel_ must be truthy'); goog.DEBUG && console.assert(endPixel, 'this.endPixel_ must be truthy');
var px = 'px'; var px = 'px';
var style = this.element_.style; var style = this.element_.style;
style.left = Math.min(startPixel[0], endPixel[0]) + px; style.left = Math.min(startPixel[0], endPixel[0]) + px;
@@ -106,11 +106,11 @@ ol.render.Box.prototype.setPixels = function(startPixel, endPixel) {
* Creates or updates the cached geometry. * Creates or updates the cached geometry.
*/ */
ol.render.Box.prototype.createOrUpdateGeometry = function() { ol.render.Box.prototype.createOrUpdateGeometry = function() {
ol.DEBUG && console.assert(this.startPixel_, goog.DEBUG && console.assert(this.startPixel_,
'this.startPixel_ must be truthy'); 'this.startPixel_ must be truthy');
ol.DEBUG && console.assert(this.endPixel_, goog.DEBUG && console.assert(this.endPixel_,
'this.endPixel_ must be truthy'); 'this.endPixel_ must be truthy');
ol.DEBUG && console.assert(this.map_, 'this.map_ must be truthy'); goog.DEBUG && console.assert(this.map_, 'this.map_ must be truthy');
var startPixel = this.startPixel_; var startPixel = this.startPixel_;
var endPixel = this.endPixel_; var endPixel = this.endPixel_;
var pixels = [ var pixels = [

20
src/ol/render/canvas/canvasimmediate.js
View File

@@ -244,8 +244,8 @@ ol.render.canvas.Immediate.prototype.drawImages_ = function(flatCoordinates, off
if (!this.image_) { if (!this.image_) {
return; return;
} }
ol.DEBUG && console.assert(offset === 0, 'offset should be 0'); goog.DEBUG && console.assert(offset === 0, 'offset should be 0');
ol.DEBUG && console.assert(end == flatCoordinates.length, goog.DEBUG && console.assert(end == flatCoordinates.length,
'end should be equal to the length of flatCoordinates'); 'end should be equal to the length of flatCoordinates');
var pixelCoordinates = ol.geom.flat.transform.transform2D( var pixelCoordinates = ol.geom.flat.transform.transform2D(
flatCoordinates, offset, end, 2, this.transform_, flatCoordinates, offset, end, 2, this.transform_,
@@ -309,8 +309,8 @@ ol.render.canvas.Immediate.prototype.drawText_ = function(flatCoordinates, offse
this.setContextStrokeState_(this.textStrokeState_); this.setContextStrokeState_(this.textStrokeState_);
} }
this.setContextTextState_(this.textState_); this.setContextTextState_(this.textState_);
ol.DEBUG && console.assert(offset === 0, 'offset should be 0'); goog.DEBUG && console.assert(offset === 0, 'offset should be 0');
ol.DEBUG && console.assert(end == flatCoordinates.length, goog.DEBUG && console.assert(end == flatCoordinates.length,
'end should be equal to the length of flatCoordinates'); 'end should be equal to the length of flatCoordinates');
var pixelCoordinates = ol.geom.flat.transform.transform2D( var pixelCoordinates = ol.geom.flat.transform.transform2D(
flatCoordinates, offset, end, stride, this.transform_, flatCoordinates, offset, end, stride, this.transform_,
@@ -476,7 +476,7 @@ ol.render.canvas.Immediate.prototype.drawGeometry = function(geometry) {
this.drawCircle(/** @type {ol.geom.Circle} */ (geometry)); this.drawCircle(/** @type {ol.geom.Circle} */ (geometry));
break; break;
default: default:
ol.DEBUG && console.assert(false, 'Unsupported geometry type: ' + type); goog.DEBUG && console.assert(false, 'Unsupported geometry type: ' + type);
} }
}; };
@@ -498,7 +498,7 @@ ol.render.canvas.Immediate.prototype.drawFeature = function(feature, style) {
return; return;
} }
this.setStyle(style); this.setStyle(style);
ol.DEBUG && console.assert(geometry, 'geometry must be truthy'); goog.DEBUG && console.assert(geometry, 'geometry must be truthy');
this.drawGeometry(geometry); this.drawGeometry(geometry);
}; };
@@ -852,10 +852,10 @@ ol.render.canvas.Immediate.prototype.setImageStyle = function(imageStyle) {
var imageImage = imageStyle.getImage(1); var imageImage = imageStyle.getImage(1);
var imageOrigin = imageStyle.getOrigin(); var imageOrigin = imageStyle.getOrigin();
var imageSize = imageStyle.getSize(); var imageSize = imageStyle.getSize();
ol.DEBUG && console.assert(imageAnchor, 'imageAnchor must be truthy'); goog.DEBUG && console.assert(imageAnchor, 'imageAnchor must be truthy');
ol.DEBUG && console.assert(imageImage, 'imageImage must be truthy'); goog.DEBUG && console.assert(imageImage, 'imageImage must be truthy');
ol.DEBUG && console.assert(imageOrigin, 'imageOrigin must be truthy'); goog.DEBUG && console.assert(imageOrigin, 'imageOrigin must be truthy');
ol.DEBUG && console.assert(imageSize, 'imageSize must be truthy'); goog.DEBUG && console.assert(imageSize, 'imageSize must be truthy');
this.imageAnchorX_ = imageAnchor[0]; this.imageAnchorX_ = imageAnchor[0];
this.imageAnchorY_ = imageAnchor[1]; this.imageAnchorY_ = imageAnchor[1];
this.imageHeight_ = imageSize[1]; this.imageHeight_ = imageSize[1];

172
src/ol/render/canvas/canvasreplay.js
View File

@@ -245,7 +245,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
this.coordinates, 0, this.coordinates.length, 2, this.coordinates, 0, this.coordinates.length, 2,
transform, this.pixelCoordinates_); transform, this.pixelCoordinates_);
ol.transform.setFromArray(this.renderedTransform_, transform); ol.transform.setFromArray(this.renderedTransform_, transform);
ol.DEBUG && console.assert(pixelCoordinates === this.pixelCoordinates_, goog.DEBUG && console.assert(pixelCoordinates === this.pixelCoordinates_,
'pixelCoordinates should be the same as this.pixelCoordinates_'); 'pixelCoordinates should be the same as this.pixelCoordinates_');
} }
var skipFeatures = !ol.object.isEmpty(skippedFeaturesHash); var skipFeatures = !ol.object.isEmpty(skippedFeaturesHash);
@@ -279,7 +279,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
case ol.render.canvas.Instruction.CIRCLE: case ol.render.canvas.Instruction.CIRCLE:
ol.DEBUG && console.assert(typeof instruction[1] === 'number', goog.DEBUG && console.assert(typeof instruction[1] === 'number',
'second instruction should be a number'); 'second instruction should be a number');
d = /** @type {number} */ (instruction[1]); d = /** @type {number} */ (instruction[1]);
var x1 = pixelCoordinates[d]; var x1 = pixelCoordinates[d];
@@ -297,10 +297,10 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
case ol.render.canvas.Instruction.DRAW_IMAGE: case ol.render.canvas.Instruction.DRAW_IMAGE:
ol.DEBUG && console.assert(typeof instruction[1] === 'number', goog.DEBUG && console.assert(typeof instruction[1] === 'number',
'second instruction should be a number'); 'second instruction should be a number');
d = /** @type {number} */ (instruction[1]); d = /** @type {number} */ (instruction[1]);
ol.DEBUG && console.assert(typeof instruction[2] === 'number', goog.DEBUG && console.assert(typeof instruction[2] === 'number',
'third instruction should be a number'); 'third instruction should be a number');
dd = /** @type {number} */ (instruction[2]); dd = /** @type {number} */ (instruction[2]);
var image = /** @type {HTMLCanvasElement|HTMLVideoElement|Image} */ var image = /** @type {HTMLCanvasElement|HTMLVideoElement|Image} */
@@ -356,31 +356,31 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
case ol.render.canvas.Instruction.DRAW_TEXT: case ol.render.canvas.Instruction.DRAW_TEXT:
ol.DEBUG && console.assert(typeof instruction[1] === 'number', goog.DEBUG && console.assert(typeof instruction[1] === 'number',
'2nd instruction should be a number'); '2nd instruction should be a number');
d = /** @type {number} */ (instruction[1]); d = /** @type {number} */ (instruction[1]);
ol.DEBUG && console.assert(typeof instruction[2] === 'number', goog.DEBUG && console.assert(typeof instruction[2] === 'number',
'3rd instruction should be a number'); '3rd instruction should be a number');
dd = /** @type {number} */ (instruction[2]); dd = /** @type {number} */ (instruction[2]);
ol.DEBUG && console.assert(typeof instruction[3] === 'string', goog.DEBUG && console.assert(typeof instruction[3] === 'string',
'4th instruction should be a string'); '4th instruction should be a string');
text = /** @type {string} */ (instruction[3]); text = /** @type {string} */ (instruction[3]);
ol.DEBUG && console.assert(typeof instruction[4] === 'number', goog.DEBUG && console.assert(typeof instruction[4] === 'number',
'5th instruction should be a number'); '5th instruction should be a number');
var offsetX = /** @type {number} */ (instruction[4]) * pixelRatio; var offsetX = /** @type {number} */ (instruction[4]) * pixelRatio;
ol.DEBUG && console.assert(typeof instruction[5] === 'number', goog.DEBUG && console.assert(typeof instruction[5] === 'number',
'6th instruction should be a number'); '6th instruction should be a number');
var offsetY = /** @type {number} */ (instruction[5]) * pixelRatio; var offsetY = /** @type {number} */ (instruction[5]) * pixelRatio;
ol.DEBUG && console.assert(typeof instruction[6] === 'number', goog.DEBUG && console.assert(typeof instruction[6] === 'number',
'7th instruction should be a number'); '7th instruction should be a number');
rotation = /** @type {number} */ (instruction[6]); rotation = /** @type {number} */ (instruction[6]);
ol.DEBUG && console.assert(typeof instruction[7] === 'number', goog.DEBUG && console.assert(typeof instruction[7] === 'number',
'8th instruction should be a number'); '8th instruction should be a number');
scale = /** @type {number} */ (instruction[7]) * pixelRatio; scale = /** @type {number} */ (instruction[7]) * pixelRatio;
ol.DEBUG && console.assert(typeof instruction[8] === 'boolean', goog.DEBUG && console.assert(typeof instruction[8] === 'boolean',
'9th instruction should be a boolean'); '9th instruction should be a boolean');
fill = /** @type {boolean} */ (instruction[8]); fill = /** @type {boolean} */ (instruction[8]);
ol.DEBUG && console.assert(typeof instruction[9] === 'boolean', goog.DEBUG && console.assert(typeof instruction[9] === 'boolean',
'10th instruction should be a boolean'); '10th instruction should be a boolean');
stroke = /** @type {boolean} */ (instruction[9]); stroke = /** @type {boolean} */ (instruction[9]);
for (; d < dd; d += 2) { for (; d < dd; d += 2) {
@@ -441,10 +441,10 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
case ol.render.canvas.Instruction.MOVE_TO_LINE_TO: case ol.render.canvas.Instruction.MOVE_TO_LINE_TO:
ol.DEBUG && console.assert(typeof instruction[1] === 'number', goog.DEBUG && console.assert(typeof instruction[1] === 'number',
'2nd instruction should be a number'); '2nd instruction should be a number');
d = /** @type {number} */ (instruction[1]); d = /** @type {number} */ (instruction[1]);
ol.DEBUG && console.assert(typeof instruction[2] === 'number', goog.DEBUG && console.assert(typeof instruction[2] === 'number',
'3rd instruction should be a number'); '3rd instruction should be a number');
dd = /** @type {number} */ (instruction[2]); dd = /** @type {number} */ (instruction[2]);
x = pixelCoordinates[d]; x = pixelCoordinates[d];
@@ -470,7 +470,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
case ol.render.canvas.Instruction.SET_FILL_STYLE: case ol.render.canvas.Instruction.SET_FILL_STYLE:
ol.DEBUG && console.assert( goog.DEBUG && console.assert(
ol.colorlike.isColorLike(instruction[1]), ol.colorlike.isColorLike(instruction[1]),
'2nd instruction should be a string, ' + '2nd instruction should be a string, ' +
'CanvasPattern, or CanvasGradient'); 'CanvasPattern, or CanvasGradient');
@@ -478,17 +478,17 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
case ol.render.canvas.Instruction.SET_STROKE_STYLE: case ol.render.canvas.Instruction.SET_STROKE_STYLE:
ol.DEBUG && console.assert(typeof instruction[1] === 'string', goog.DEBUG && console.assert(typeof instruction[1] === 'string',
'2nd instruction should be a string'); '2nd instruction should be a string');
ol.DEBUG && console.assert(typeof instruction[2] === 'number', goog.DEBUG && console.assert(typeof instruction[2] === 'number',
'3rd instruction should be a number'); '3rd instruction should be a number');
ol.DEBUG && console.assert(typeof instruction[3] === 'string', goog.DEBUG && console.assert(typeof instruction[3] === 'string',
'4rd instruction should be a string'); '4rd instruction should be a string');
ol.DEBUG && console.assert(typeof instruction[4] === 'string', goog.DEBUG && console.assert(typeof instruction[4] === 'string',
'5th instruction should be a string'); '5th instruction should be a string');
ol.DEBUG && console.assert(typeof instruction[5] === 'number', goog.DEBUG && console.assert(typeof instruction[5] === 'number',
'6th instruction should be a number'); '6th instruction should be a number');
ol.DEBUG && console.assert(instruction[6], goog.DEBUG && console.assert(instruction[6],
'7th instruction should not be null'); '7th instruction should not be null');
var usePixelRatio = instruction[7] !== undefined ? var usePixelRatio = instruction[7] !== undefined ?
instruction[7] : true; instruction[7] : true;
@@ -506,11 +506,11 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
case ol.render.canvas.Instruction.SET_TEXT_STYLE: case ol.render.canvas.Instruction.SET_TEXT_STYLE:
ol.DEBUG && console.assert(typeof instruction[1] === 'string', goog.DEBUG && console.assert(typeof instruction[1] === 'string',
'2nd instruction should be a string'); '2nd instruction should be a string');
ol.DEBUG && console.assert(typeof instruction[2] === 'string', goog.DEBUG && console.assert(typeof instruction[2] === 'string',
'3rd instruction should be a string'); '3rd instruction should be a string');
ol.DEBUG && console.assert(typeof instruction[3] === 'string', goog.DEBUG && console.assert(typeof instruction[3] === 'string',
'4th instruction should be a string'); '4th instruction should be a string');
context.font = /** @type {string} */ (instruction[1]); context.font = /** @type {string} */ (instruction[1]);
context.textAlign = /** @type {string} */ (instruction[2]); context.textAlign = /** @type {string} */ (instruction[2]);
@@ -522,13 +522,13 @@ ol.render.canvas.Replay.prototype.replay_ = function(
++i; ++i;
break; break;
default: default:
ol.DEBUG && console.assert(false, 'Unknown canvas render instruction'); goog.DEBUG && console.assert(false, 'Unknown canvas render instruction');
++i; // consume the instruction anyway, to avoid an infinite loop ++i; // consume the instruction anyway, to avoid an infinite loop
break; break;
} }
} }
// assert that all instructions were consumed // assert that all instructions were consumed
ol.DEBUG && console.assert(i == instructions.length, goog.DEBUG && console.assert(i == instructions.length,
'all instructions should be consumed'); 'all instructions should be consumed');
return undefined; return undefined;
}; };
@@ -589,11 +589,11 @@ ol.render.canvas.Replay.prototype.reverseHitDetectionInstructions_ = function()
instruction = hitDetectionInstructions[i]; instruction = hitDetectionInstructions[i];
type = /** @type {ol.render.canvas.Instruction} */ (instruction[0]); type = /** @type {ol.render.canvas.Instruction} */ (instruction[0]);
if (type == ol.render.canvas.Instruction.END_GEOMETRY) { if (type == ol.render.canvas.Instruction.END_GEOMETRY) {
ol.DEBUG && console.assert(begin == -1, 'begin should be -1'); goog.DEBUG && console.assert(begin == -1, 'begin should be -1');
begin = i; begin = i;
} else if (type == ol.render.canvas.Instruction.BEGIN_GEOMETRY) { } else if (type == ol.render.canvas.Instruction.BEGIN_GEOMETRY) {
instruction[2] = i; instruction[2] = i;
ol.DEBUG && console.assert(begin >= 0, goog.DEBUG && console.assert(begin >= 0,
'begin should be larger than or equal to 0'); 'begin should be larger than or equal to 0');
ol.array.reverseSubArray(this.hitDetectionInstructions, begin, i); ol.array.reverseSubArray(this.hitDetectionInstructions, begin, i);
begin = -1; begin = -1;
@@ -607,11 +607,11 @@ ol.render.canvas.Replay.prototype.reverseHitDetectionInstructions_ = function()
* @param {ol.Feature|ol.render.Feature} feature Feature. * @param {ol.Feature|ol.render.Feature} feature Feature.
*/ */
ol.render.canvas.Replay.prototype.endGeometry = function(geometry, feature) { ol.render.canvas.Replay.prototype.endGeometry = function(geometry, feature) {
ol.DEBUG && console.assert(this.beginGeometryInstruction1_, goog.DEBUG && console.assert(this.beginGeometryInstruction1_,
'this.beginGeometryInstruction1_ should not be null'); 'this.beginGeometryInstruction1_ should not be null');
this.beginGeometryInstruction1_[2] = this.instructions.length; this.beginGeometryInstruction1_[2] = this.instructions.length;
this.beginGeometryInstruction1_ = null; this.beginGeometryInstruction1_ = null;
ol.DEBUG && console.assert(this.beginGeometryInstruction2_, goog.DEBUG && console.assert(this.beginGeometryInstruction2_,
'this.beginGeometryInstruction2_ should not be null'); 'this.beginGeometryInstruction2_ should not be null');
this.beginGeometryInstruction2_[2] = this.hitDetectionInstructions.length; this.beginGeometryInstruction2_[2] = this.hitDetectionInstructions.length;
this.beginGeometryInstruction2_ = null; this.beginGeometryInstruction2_ = null;
@@ -755,25 +755,25 @@ ol.render.canvas.ImageReplay.prototype.drawPoint = function(pointGeometry, featu
if (!this.image_) { if (!this.image_) {
return; return;
} }
ol.DEBUG && console.assert(this.anchorX_ !== undefined, goog.DEBUG && console.assert(this.anchorX_ !== undefined,
'this.anchorX_ should be defined'); 'this.anchorX_ should be defined');
ol.DEBUG && console.assert(this.anchorY_ !== undefined, goog.DEBUG && console.assert(this.anchorY_ !== undefined,
'this.anchorY_ should be defined'); 'this.anchorY_ should be defined');
ol.DEBUG && console.assert(this.height_ !== undefined, goog.DEBUG && console.assert(this.height_ !== undefined,
'this.height_ should be defined'); 'this.height_ should be defined');
ol.DEBUG && console.assert(this.opacity_ !== undefined, goog.DEBUG && console.assert(this.opacity_ !== undefined,
'this.opacity_ should be defined'); 'this.opacity_ should be defined');
ol.DEBUG && console.assert(this.originX_ !== undefined, goog.DEBUG && console.assert(this.originX_ !== undefined,
'this.originX_ should be defined'); 'this.originX_ should be defined');
ol.DEBUG && console.assert(this.originY_ !== undefined, goog.DEBUG && console.assert(this.originY_ !== undefined,
'this.originY_ should be defined'); 'this.originY_ should be defined');
ol.DEBUG && console.assert(this.rotateWithView_ !== undefined, goog.DEBUG && console.assert(this.rotateWithView_ !== undefined,
'this.rotateWithView_ should be defined'); 'this.rotateWithView_ should be defined');
ol.DEBUG && console.assert(this.rotation_ !== undefined, goog.DEBUG && console.assert(this.rotation_ !== undefined,
'this.rotation_ should be defined'); 'this.rotation_ should be defined');
ol.DEBUG && console.assert(this.scale_ !== undefined, goog.DEBUG && console.assert(this.scale_ !== undefined,
'this.scale_ should be defined'); 'this.scale_ should be defined');
ol.DEBUG && console.assert(this.width_ !== undefined, goog.DEBUG && console.assert(this.width_ !== undefined,
'this.width_ should be defined'); 'this.width_ should be defined');
this.beginGeometry(pointGeometry, feature); this.beginGeometry(pointGeometry, feature);
var flatCoordinates = pointGeometry.getFlatCoordinates(); var flatCoordinates = pointGeometry.getFlatCoordinates();
@@ -807,25 +807,25 @@ ol.render.canvas.ImageReplay.prototype.drawMultiPoint = function(multiPointGeome
if (!this.image_) { if (!this.image_) {
return; return;
} }
ol.DEBUG && console.assert(this.anchorX_ !== undefined, goog.DEBUG && console.assert(this.anchorX_ !== undefined,
'this.anchorX_ should be defined'); 'this.anchorX_ should be defined');
ol.DEBUG && console.assert(this.anchorY_ !== undefined, goog.DEBUG && console.assert(this.anchorY_ !== undefined,
'this.anchorY_ should be defined'); 'this.anchorY_ should be defined');
ol.DEBUG && console.assert(this.height_ !== undefined, goog.DEBUG && console.assert(this.height_ !== undefined,
'this.height_ should be defined'); 'this.height_ should be defined');
ol.DEBUG && console.assert(this.opacity_ !== undefined, goog.DEBUG && console.assert(this.opacity_ !== undefined,
'this.opacity_ should be defined'); 'this.opacity_ should be defined');
ol.DEBUG && console.assert(this.originX_ !== undefined, goog.DEBUG && console.assert(this.originX_ !== undefined,
'this.originX_ should be defined'); 'this.originX_ should be defined');
ol.DEBUG && console.assert(this.originY_ !== undefined, goog.DEBUG && console.assert(this.originY_ !== undefined,
'this.originY_ should be defined'); 'this.originY_ should be defined');
ol.DEBUG && console.assert(this.rotateWithView_ !== undefined, goog.DEBUG && console.assert(this.rotateWithView_ !== undefined,
'this.rotateWithView_ should be defined'); 'this.rotateWithView_ should be defined');
ol.DEBUG && console.assert(this.rotation_ !== undefined, goog.DEBUG && console.assert(this.rotation_ !== undefined,
'this.rotation_ should be defined'); 'this.rotation_ should be defined');
ol.DEBUG && console.assert(this.scale_ !== undefined, goog.DEBUG && console.assert(this.scale_ !== undefined,
'this.scale_ should be defined'); 'this.scale_ should be defined');
ol.DEBUG && console.assert(this.width_ !== undefined, goog.DEBUG && console.assert(this.width_ !== undefined,
'this.width_ should be defined'); 'this.width_ should be defined');
this.beginGeometry(multiPointGeometry, feature); this.beginGeometry(multiPointGeometry, feature);
var flatCoordinates = multiPointGeometry.getFlatCoordinates(); var flatCoordinates = multiPointGeometry.getFlatCoordinates();
@@ -878,18 +878,18 @@ ol.render.canvas.ImageReplay.prototype.finish = function() {
* @inheritDoc * @inheritDoc
*/ */
ol.render.canvas.ImageReplay.prototype.setImageStyle = function(imageStyle) { ol.render.canvas.ImageReplay.prototype.setImageStyle = function(imageStyle) {
ol.DEBUG && console.assert(imageStyle, 'imageStyle should not be null'); goog.DEBUG && console.assert(imageStyle, 'imageStyle should not be null');
var anchor = imageStyle.getAnchor(); var anchor = imageStyle.getAnchor();
ol.DEBUG && console.assert(anchor, 'anchor should not be null'); goog.DEBUG && console.assert(anchor, 'anchor should not be null');
var size = imageStyle.getSize(); var size = imageStyle.getSize();
ol.DEBUG && console.assert(size, 'size should not be null'); goog.DEBUG && console.assert(size, 'size should not be null');
var hitDetectionImage = imageStyle.getHitDetectionImage(1); var hitDetectionImage = imageStyle.getHitDetectionImage(1);
ol.DEBUG && console.assert(hitDetectionImage, goog.DEBUG && console.assert(hitDetectionImage,
'hitDetectionImage should not be null'); 'hitDetectionImage should not be null');
var image = imageStyle.getImage(1); var image = imageStyle.getImage(1);
ol.DEBUG && console.assert(image, 'image should not be null'); goog.DEBUG && console.assert(image, 'image should not be null');
var origin = imageStyle.getOrigin(); var origin = imageStyle.getOrigin();
ol.DEBUG && console.assert(origin, 'origin should not be null'); goog.DEBUG && console.assert(origin, 'origin should not be null');
this.anchorX_ = anchor[0]; this.anchorX_ = anchor[0];
this.anchorY_ = anchor[1]; this.anchorY_ = anchor[1];
this.hitDetectionImage_ = hitDetectionImage; this.hitDetectionImage_ = hitDetectionImage;
@@ -1001,13 +1001,13 @@ ol.render.canvas.LineStringReplay.prototype.setStrokeStyle_ = function() {
var lineJoin = state.lineJoin; var lineJoin = state.lineJoin;
var lineWidth = state.lineWidth; var lineWidth = state.lineWidth;
var miterLimit = state.miterLimit; var miterLimit = state.miterLimit;
ol.DEBUG && console.assert(strokeStyle !== undefined, goog.DEBUG && console.assert(strokeStyle !== undefined,
'strokeStyle should be defined'); 'strokeStyle should be defined');
ol.DEBUG && console.assert(lineCap !== undefined, 'lineCap should be defined'); goog.DEBUG && console.assert(lineCap !== undefined, 'lineCap should be defined');
ol.DEBUG && console.assert(lineDash, 'lineDash should not be null'); goog.DEBUG && console.assert(lineDash, 'lineDash should not be null');
ol.DEBUG && console.assert(lineJoin !== undefined, 'lineJoin should be defined'); goog.DEBUG && console.assert(lineJoin !== undefined, 'lineJoin should be defined');
ol.DEBUG && console.assert(lineWidth !== undefined, 'lineWidth should be defined'); goog.DEBUG && console.assert(lineWidth !== undefined, 'lineWidth should be defined');
ol.DEBUG && console.assert(miterLimit !== undefined, 'miterLimit should be defined'); goog.DEBUG && console.assert(miterLimit !== undefined, 'miterLimit should be defined');
if (state.currentStrokeStyle != strokeStyle || if (state.currentStrokeStyle != strokeStyle ||
state.currentLineCap != lineCap || state.currentLineCap != lineCap ||
!ol.array.equals(state.currentLineDash, lineDash) || !ol.array.equals(state.currentLineDash, lineDash) ||
@@ -1038,7 +1038,7 @@ ol.render.canvas.LineStringReplay.prototype.setStrokeStyle_ = function() {
*/ */
ol.render.canvas.LineStringReplay.prototype.drawLineString = function(lineStringGeometry, feature) { ol.render.canvas.LineStringReplay.prototype.drawLineString = function(lineStringGeometry, feature) {
var state = this.state_; var state = this.state_;
ol.DEBUG && console.assert(state, 'state should not be null'); goog.DEBUG && console.assert(state, 'state should not be null');
var strokeStyle = state.strokeStyle; var strokeStyle = state.strokeStyle;
var lineWidth = state.lineWidth; var lineWidth = state.lineWidth;
if (strokeStyle === undefined || lineWidth === undefined) { if (strokeStyle === undefined || lineWidth === undefined) {
@@ -1065,7 +1065,7 @@ ol.render.canvas.LineStringReplay.prototype.drawLineString = function(lineString
*/ */
ol.render.canvas.LineStringReplay.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) { ol.render.canvas.LineStringReplay.prototype.drawMultiLineString = function(multiLineStringGeometry, feature) {
var state = this.state_; var state = this.state_;
ol.DEBUG && console.assert(state, 'state should not be null'); goog.DEBUG && console.assert(state, 'state should not be null');
var strokeStyle = state.strokeStyle; var strokeStyle = state.strokeStyle;
var lineWidth = state.lineWidth; var lineWidth = state.lineWidth;
if (strokeStyle === undefined || lineWidth === undefined) { if (strokeStyle === undefined || lineWidth === undefined) {
@@ -1097,7 +1097,7 @@ ol.render.canvas.LineStringReplay.prototype.drawMultiLineString = function(multi
*/ */
ol.render.canvas.LineStringReplay.prototype.finish = function() { ol.render.canvas.LineStringReplay.prototype.finish = function() {
var state = this.state_; var state = this.state_;
ol.DEBUG && console.assert(state, 'state should not be null'); goog.DEBUG && console.assert(state, 'state should not be null');
if (state.lastStroke != this.coordinates.length) { if (state.lastStroke != this.coordinates.length) {
this.instructions.push([ol.render.canvas.Instruction.STROKE]); this.instructions.push([ol.render.canvas.Instruction.STROKE]);
} }
@@ -1110,9 +1110,9 @@ ol.render.canvas.LineStringReplay.prototype.finish = function() {
* @inheritDoc * @inheritDoc
*/ */
ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) { ol.render.canvas.LineStringReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
ol.DEBUG && console.assert(this.state_, 'this.state_ should not be null'); goog.DEBUG && console.assert(this.state_, 'this.state_ should not be null');
ol.DEBUG && console.assert(!fillStyle, 'fillStyle should be null'); goog.DEBUG && console.assert(!fillStyle, 'fillStyle should be null');
ol.DEBUG && console.assert(strokeStyle, 'strokeStyle should not be null'); goog.DEBUG && console.assert(strokeStyle, 'strokeStyle should not be null');
var strokeStyleColor = strokeStyle.getColor(); var strokeStyleColor = strokeStyle.getColor();
this.state_.strokeStyle = ol.color.asString(strokeStyleColor ? this.state_.strokeStyle = ol.color.asString(strokeStyleColor ?
strokeStyleColor : ol.render.canvas.defaultStrokeStyle); strokeStyleColor : ol.render.canvas.defaultStrokeStyle);
@@ -1226,7 +1226,7 @@ ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = function(flatCo
this.instructions.push(fillInstruction); this.instructions.push(fillInstruction);
} }
if (state.strokeStyle !== undefined) { if (state.strokeStyle !== undefined) {
ol.DEBUG && console.assert(state.lineWidth !== undefined, goog.DEBUG && console.assert(state.lineWidth !== undefined,
'state.lineWidth should be defined'); 'state.lineWidth should be defined');
var strokeInstruction = [ol.render.canvas.Instruction.STROKE]; var strokeInstruction = [ol.render.canvas.Instruction.STROKE];
this.instructions.push(strokeInstruction); this.instructions.push(strokeInstruction);
@@ -1241,14 +1241,14 @@ ol.render.canvas.PolygonReplay.prototype.drawFlatCoordinatess_ = function(flatCo
*/ */
ol.render.canvas.PolygonReplay.prototype.drawCircle = function(circleGeometry, feature) { ol.render.canvas.PolygonReplay.prototype.drawCircle = function(circleGeometry, feature) {
var state = this.state_; var state = this.state_;
ol.DEBUG && console.assert(state, 'state should not be null'); goog.DEBUG && console.assert(state, 'state should not be null');
var fillStyle = state.fillStyle; var fillStyle = state.fillStyle;
var strokeStyle = state.strokeStyle; var strokeStyle = state.strokeStyle;
if (fillStyle === undefined && strokeStyle === undefined) { if (fillStyle === undefined && strokeStyle === undefined) {
return; return;
} }
if (strokeStyle !== undefined) { if (strokeStyle !== undefined) {
ol.DEBUG && console.assert(state.lineWidth !== undefined, goog.DEBUG && console.assert(state.lineWidth !== undefined,
'state.lineWidth should be defined'); 'state.lineWidth should be defined');
} }
this.setFillStrokeStyles_(); this.setFillStrokeStyles_();
@@ -1278,7 +1278,7 @@ ol.render.canvas.PolygonReplay.prototype.drawCircle = function(circleGeometry, f
this.instructions.push(fillInstruction); this.instructions.push(fillInstruction);
} }
if (state.strokeStyle !== undefined) { if (state.strokeStyle !== undefined) {
ol.DEBUG && console.assert(state.lineWidth !== undefined, goog.DEBUG && console.assert(state.lineWidth !== undefined,
'state.lineWidth should be defined'); 'state.lineWidth should be defined');
var strokeInstruction = [ol.render.canvas.Instruction.STROKE]; var strokeInstruction = [ol.render.canvas.Instruction.STROKE];
this.instructions.push(strokeInstruction); this.instructions.push(strokeInstruction);
@@ -1293,14 +1293,14 @@ ol.render.canvas.PolygonReplay.prototype.drawCircle = function(circleGeometry, f
*/ */
ol.render.canvas.PolygonReplay.prototype.drawPolygon = function(polygonGeometry, feature) { ol.render.canvas.PolygonReplay.prototype.drawPolygon = function(polygonGeometry, feature) {
var state = this.state_; var state = this.state_;
ol.DEBUG && console.assert(state, 'state should not be null'); goog.DEBUG && console.assert(state, 'state should not be null');
var fillStyle = state.fillStyle; var fillStyle = state.fillStyle;
var strokeStyle = state.strokeStyle; var strokeStyle = state.strokeStyle;
if (fillStyle === undefined && strokeStyle === undefined) { if (fillStyle === undefined && strokeStyle === undefined) {
return; return;
} }
if (strokeStyle !== undefined) { if (strokeStyle !== undefined) {
ol.DEBUG && console.assert(state.lineWidth !== undefined, goog.DEBUG && console.assert(state.lineWidth !== undefined,
'state.lineWidth should be defined'); 'state.lineWidth should be defined');
} }
this.setFillStrokeStyles_(); this.setFillStrokeStyles_();
@@ -1328,14 +1328,14 @@ ol.render.canvas.PolygonReplay.prototype.drawPolygon = function(polygonGeometry,
*/ */
ol.render.canvas.PolygonReplay.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) { ol.render.canvas.PolygonReplay.prototype.drawMultiPolygon = function(multiPolygonGeometry, feature) {
var state = this.state_; var state = this.state_;
ol.DEBUG && console.assert(state, 'state should not be null'); goog.DEBUG && console.assert(state, 'state should not be null');
var fillStyle = state.fillStyle; var fillStyle = state.fillStyle;
var strokeStyle = state.strokeStyle; var strokeStyle = state.strokeStyle;
if (fillStyle === undefined && strokeStyle === undefined) { if (fillStyle === undefined && strokeStyle === undefined) {
return; return;
} }
if (strokeStyle !== undefined) { if (strokeStyle !== undefined) {
ol.DEBUG && console.assert(state.lineWidth !== undefined, goog.DEBUG && console.assert(state.lineWidth !== undefined,
'state.lineWidth should be defined'); 'state.lineWidth should be defined');
} }
this.setFillStrokeStyles_(); this.setFillStrokeStyles_();
@@ -1367,7 +1367,7 @@ ol.render.canvas.PolygonReplay.prototype.drawMultiPolygon = function(multiPolygo
* @inheritDoc * @inheritDoc
*/ */
ol.render.canvas.PolygonReplay.prototype.finish = function() { ol.render.canvas.PolygonReplay.prototype.finish = function() {
ol.DEBUG && console.assert(this.state_, 'this.state_ should not be null'); goog.DEBUG && console.assert(this.state_, 'this.state_ should not be null');
this.reverseHitDetectionInstructions_(); this.reverseHitDetectionInstructions_();
this.state_ = null; this.state_ = null;
// We want to preserve topology when drawing polygons. Polygons are // We want to preserve topology when drawing polygons. Polygons are
@@ -1404,8 +1404,8 @@ ol.render.canvas.PolygonReplay.prototype.getBufferedMaxExtent = function() {
* @inheritDoc * @inheritDoc
*/ */
ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) { ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyle = function(fillStyle, strokeStyle) {
ol.DEBUG && console.assert(this.state_, 'this.state_ should not be null'); goog.DEBUG && console.assert(this.state_, 'this.state_ should not be null');
ol.DEBUG && console.assert(fillStyle || strokeStyle, goog.DEBUG && console.assert(fillStyle || strokeStyle,
'fillStyle or strokeStyle should not be null'); 'fillStyle or strokeStyle should not be null');
var state = this.state_; var state = this.state_;
if (fillStyle) { if (fillStyle) {
@@ -1469,11 +1469,11 @@ ol.render.canvas.PolygonReplay.prototype.setFillStrokeStyles_ = function() {
state.currentFillStyle = state.fillStyle; state.currentFillStyle = state.fillStyle;
} }
if (strokeStyle !== undefined) { if (strokeStyle !== undefined) {
ol.DEBUG && console.assert(lineCap !== undefined, 'lineCap should be defined'); goog.DEBUG && console.assert(lineCap !== undefined, 'lineCap should be defined');
ol.DEBUG && console.assert(lineDash, 'lineDash should not be null'); goog.DEBUG && console.assert(lineDash, 'lineDash should not be null');
ol.DEBUG && console.assert(lineJoin !== undefined, 'lineJoin should be defined'); goog.DEBUG && console.assert(lineJoin !== undefined, 'lineJoin should be defined');
ol.DEBUG && console.assert(lineWidth !== undefined, 'lineWidth should be defined'); goog.DEBUG && console.assert(lineWidth !== undefined, 'lineWidth should be defined');
ol.DEBUG && console.assert(miterLimit !== undefined, goog.DEBUG && console.assert(miterLimit !== undefined,
'miterLimit should be defined'); 'miterLimit should be defined');
if (state.currentStrokeStyle != strokeStyle || if (state.currentStrokeStyle != strokeStyle ||
state.currentLineCap != lineCap || state.currentLineCap != lineCap ||
@@ -1942,7 +1942,7 @@ ol.render.canvas.ReplayGroup.prototype.getReplay = function(zIndex, replayType)
var replay = replays[replayType]; var replay = replays[replayType];
if (replay === undefined) { if (replay === undefined) {
var Constructor = ol.render.canvas.BATCH_CONSTRUCTORS_[replayType]; var Constructor = ol.render.canvas.BATCH_CONSTRUCTORS_[replayType];
ol.DEBUG && console.assert(Constructor !== undefined, goog.DEBUG && console.assert(Constructor !== undefined,
replayType + replayType +
' constructor missing from ol.render.canvas.BATCH_CONSTRUCTORS_'); ' constructor missing from ol.render.canvas.BATCH_CONSTRUCTORS_');
replay = new Constructor(this.tolerance_, this.maxExtent_, replay = new Constructor(this.tolerance_, this.maxExtent_,

2
src/ol/render/renderfeature.js
View File

@@ -25,7 +25,7 @@ ol.render.Feature = function(type, flatCoordinates, ends, properties) {
*/ */
this.extent_; this.extent_;
ol.DEBUG && console.assert(type === ol.geom.GeometryType.POINT || goog.DEBUG && console.assert(type === ol.geom.GeometryType.POINT ||
type === ol.geom.GeometryType.MULTI_POINT || type === ol.geom.GeometryType.MULTI_POINT ||
type === ol.geom.GeometryType.LINE_STRING || type === ol.geom.GeometryType.LINE_STRING ||
type === ol.geom.GeometryType.MULTI_LINE_STRING || type === ol.geom.GeometryType.MULTI_LINE_STRING ||

6
src/ol/render/vector.js
View File

@@ -88,7 +88,7 @@ ol.renderer.vector.renderFeature = function(
imageStyle.load(); imageStyle.load();
} }
imageState = imageStyle.getImageState(); imageState = imageStyle.getImageState();
ol.DEBUG && console.assert(imageState == ol.style.ImageState.LOADING, goog.DEBUG && console.assert(imageState == ol.style.ImageState.LOADING,
'imageState should be LOADING'); 'imageState should be LOADING');
imageStyle.listenImageChange(listener, thisArg); imageStyle.listenImageChange(listener, thisArg);
loading = true; loading = true;
@@ -116,7 +116,7 @@ ol.renderer.vector.renderFeature_ = function(
var simplifiedGeometry = geometry.getSimplifiedGeometry(squaredTolerance); var simplifiedGeometry = geometry.getSimplifiedGeometry(squaredTolerance);
var geometryRenderer = var geometryRenderer =
ol.renderer.vector.GEOMETRY_RENDERERS_[simplifiedGeometry.getType()]; ol.renderer.vector.GEOMETRY_RENDERERS_[simplifiedGeometry.getType()];
ol.DEBUG && console.assert(geometryRenderer !== undefined, goog.DEBUG && console.assert(geometryRenderer !== undefined,
'geometryRenderer should be defined'); 'geometryRenderer should be defined');
geometryRenderer(replayGroup, simplifiedGeometry, style, feature); geometryRenderer(replayGroup, simplifiedGeometry, style, feature);
}; };
@@ -135,7 +135,7 @@ ol.renderer.vector.renderGeometryCollectionGeometry_ = function(replayGroup, geo
for (i = 0, ii = geometries.length; i < ii; ++i) { for (i = 0, ii = geometries.length; i < ii; ++i) {
var geometryRenderer = var geometryRenderer =
ol.renderer.vector.GEOMETRY_RENDERERS_[geometries[i].getType()]; ol.renderer.vector.GEOMETRY_RENDERERS_[geometries[i].getType()];
ol.DEBUG && console.assert(geometryRenderer !== undefined, goog.DEBUG && console.assert(geometryRenderer !== undefined,
'geometryRenderer should be defined'); 'geometryRenderer should be defined');
geometryRenderer(replayGroup, geometries[i], style, feature); geometryRenderer(replayGroup, geometries[i], style, feature);
} }

4
src/ol/render/webgl/webglimmediate.js
View File

@@ -98,7 +98,7 @@ ol.render.webgl.Immediate.prototype.drawGeometry = function(geometry) {
this.drawGeometryCollection(/** @type {ol.geom.GeometryCollection} */ (geometry), null); this.drawGeometryCollection(/** @type {ol.geom.GeometryCollection} */ (geometry), null);
break; break;
default: default:
ol.DEBUG && console.assert(false, 'Unsupported geometry type: ' + type); goog.DEBUG && console.assert(false, 'Unsupported geometry type: ' + type);
} }
}; };
@@ -114,7 +114,7 @@ ol.render.webgl.Immediate.prototype.drawFeature = function(feature, style) {
return; return;
} }
this.setStyle(style); this.setStyle(style);
ol.DEBUG && console.assert(geometry, 'geometry must be truthy'); goog.DEBUG && console.assert(geometry, 'geometry must be truthy');
this.drawGeometry(geometry); this.drawGeometry(geometry);
}; };

76
src/ol/render/webgl/webglreplay.js
View File

@@ -225,9 +225,9 @@ ol.render.webgl.ImageReplay.prototype.getDeleteResourcesFunction = function(cont
// be used by other ImageReplay instances (for other layers). And // be used by other ImageReplay instances (for other layers). And
// they will be deleted when disposing of the ol.webgl.Context // they will be deleted when disposing of the ol.webgl.Context
// object. // object.
ol.DEBUG && console.assert(this.verticesBuffer_, goog.DEBUG && console.assert(this.verticesBuffer_,
'verticesBuffer must not be null'); 'verticesBuffer must not be null');
ol.DEBUG && console.assert(this.indicesBuffer_, goog.DEBUG && console.assert(this.indicesBuffer_,
'indicesBuffer must not be null'); 'indicesBuffer must not be null');
var verticesBuffer = this.verticesBuffer_; var verticesBuffer = this.verticesBuffer_;
var indicesBuffer = this.indicesBuffer_; var indicesBuffer = this.indicesBuffer_;
@@ -259,20 +259,20 @@ ol.render.webgl.ImageReplay.prototype.getDeleteResourcesFunction = function(cont
* @private * @private
*/ */
ol.render.webgl.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) { ol.render.webgl.ImageReplay.prototype.drawCoordinates_ = function(flatCoordinates, offset, end, stride) {
ol.DEBUG && console.assert(this.anchorX_ !== undefined, 'anchorX is defined'); goog.DEBUG && console.assert(this.anchorX_ !== undefined, 'anchorX is defined');
ol.DEBUG && console.assert(this.anchorY_ !== undefined, 'anchorY is defined'); goog.DEBUG && console.assert(this.anchorY_ !== undefined, 'anchorY is defined');
ol.DEBUG && console.assert(this.height_ !== undefined, 'height is defined'); goog.DEBUG && console.assert(this.height_ !== undefined, 'height is defined');
ol.DEBUG && console.assert(this.imageHeight_ !== undefined, goog.DEBUG && console.assert(this.imageHeight_ !== undefined,
'imageHeight is defined'); 'imageHeight is defined');
ol.DEBUG && console.assert(this.imageWidth_ !== undefined, 'imageWidth is defined'); goog.DEBUG && console.assert(this.imageWidth_ !== undefined, 'imageWidth is defined');
ol.DEBUG && console.assert(this.opacity_ !== undefined, 'opacity is defined'); goog.DEBUG && console.assert(this.opacity_ !== undefined, 'opacity is defined');
ol.DEBUG && console.assert(this.originX_ !== undefined, 'originX is defined'); goog.DEBUG && console.assert(this.originX_ !== undefined, 'originX is defined');
ol.DEBUG && console.assert(this.originY_ !== undefined, 'originY is defined'); goog.DEBUG && console.assert(this.originY_ !== undefined, 'originY is defined');
ol.DEBUG && console.assert(this.rotateWithView_ !== undefined, goog.DEBUG && console.assert(this.rotateWithView_ !== undefined,
'rotateWithView is defined'); 'rotateWithView is defined');
ol.DEBUG && console.assert(this.rotation_ !== undefined, 'rotation is defined'); goog.DEBUG && console.assert(this.rotation_ !== undefined, 'rotation is defined');
ol.DEBUG && console.assert(this.scale_ !== undefined, 'scale is defined'); goog.DEBUG && console.assert(this.scale_ !== undefined, 'scale is defined');
ol.DEBUG && console.assert(this.width_ !== undefined, 'width is defined'); goog.DEBUG && console.assert(this.width_ !== undefined, 'width is defined');
var anchorX = /** @type {number} */ (this.anchorX_); var anchorX = /** @type {number} */ (this.anchorX_);
var anchorY = /** @type {number} */ (this.anchorY_); var anchorY = /** @type {number} */ (this.anchorY_);
var height = /** @type {number} */ (this.height_); var height = /** @type {number} */ (this.height_);
@@ -399,10 +399,10 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
var gl = context.getGL(); var gl = context.getGL();
this.groupIndices_.push(this.indices_.length); this.groupIndices_.push(this.indices_.length);
ol.DEBUG && console.assert(this.images_.length === this.groupIndices_.length, goog.DEBUG && console.assert(this.images_.length === this.groupIndices_.length,
'number of images and groupIndices match'); 'number of images and groupIndices match');
this.hitDetectionGroupIndices_.push(this.indices_.length); this.hitDetectionGroupIndices_.push(this.indices_.length);
ol.DEBUG && console.assert(this.hitDetectionImages_.length === goog.DEBUG && console.assert(this.hitDetectionImages_.length ===
this.hitDetectionGroupIndices_.length, this.hitDetectionGroupIndices_.length,
'number of hitDetectionImages and hitDetectionGroupIndices match'); 'number of hitDetectionImages and hitDetectionGroupIndices match');
@@ -412,7 +412,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
var indices = this.indices_; var indices = this.indices_;
var bits = context.hasOESElementIndexUint ? 32 : 16; var bits = context.hasOESElementIndexUint ? 32 : 16;
ol.DEBUG && console.assert(indices[indices.length - 1] < Math.pow(2, bits), goog.DEBUG && console.assert(indices[indices.length - 1] < Math.pow(2, bits),
'Too large element index detected [%s] (OES_element_index_uint "%s")', 'Too large element index detected [%s] (OES_element_index_uint "%s")',
indices[indices.length - 1], context.hasOESElementIndexUint); indices[indices.length - 1], context.hasOESElementIndexUint);
@@ -425,12 +425,12 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
var texturePerImage = {}; var texturePerImage = {};
this.createTextures_(this.textures_, this.images_, texturePerImage, gl); this.createTextures_(this.textures_, this.images_, texturePerImage, gl);
ol.DEBUG && console.assert(this.textures_.length === this.groupIndices_.length, goog.DEBUG && console.assert(this.textures_.length === this.groupIndices_.length,
'number of textures and groupIndices match'); 'number of textures and groupIndices match');
this.createTextures_(this.hitDetectionTextures_, this.hitDetectionImages_, this.createTextures_(this.hitDetectionTextures_, this.hitDetectionImages_,
texturePerImage, gl); texturePerImage, gl);
ol.DEBUG && console.assert(this.hitDetectionTextures_.length === goog.DEBUG && console.assert(this.hitDetectionTextures_.length ===
this.hitDetectionGroupIndices_.length, this.hitDetectionGroupIndices_.length,
'number of hitDetectionTextures and hitDetectionGroupIndices match'); 'number of hitDetectionTextures and hitDetectionGroupIndices match');
@@ -462,7 +462,7 @@ ol.render.webgl.ImageReplay.prototype.finish = function(context) {
* @param {WebGLRenderingContext} gl Gl. * @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) {
ol.DEBUG && console.assert(textures.length === 0, goog.DEBUG && console.assert(textures.length === 0,
'upon creation, textures is empty'); 'upon creation, textures is empty');
var texture, image, uid, i; var texture, image, uid, i;
@@ -507,12 +507,12 @@ ol.render.webgl.ImageReplay.prototype.replay = function(context,
var gl = context.getGL(); var gl = context.getGL();
// bind the vertices buffer // bind the vertices buffer
ol.DEBUG && console.assert(this.verticesBuffer_, goog.DEBUG && console.assert(this.verticesBuffer_,
'verticesBuffer must not be null'); 'verticesBuffer must not be null');
context.bindBuffer(ol.webgl.ARRAY_BUFFER, this.verticesBuffer_); context.bindBuffer(ol.webgl.ARRAY_BUFFER, this.verticesBuffer_);
// bind the indices buffer // bind the indices buffer
ol.DEBUG && console.assert(this.indicesBuffer_, goog.DEBUG && console.assert(this.indicesBuffer_,
'indecesBuffer must not be null'); 'indecesBuffer must not be null');
context.bindBuffer(ol.webgl.ELEMENT_ARRAY_BUFFER, this.indicesBuffer_); context.bindBuffer(ol.webgl.ELEMENT_ARRAY_BUFFER, this.indicesBuffer_);
@@ -611,7 +611,7 @@ ol.render.webgl.ImageReplay.prototype.replay = function(context,
* @param {Array.<number>} groupIndices Texture group indices. * @param {Array.<number>} 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) {
ol.DEBUG && console.assert(textures.length === groupIndices.length, goog.DEBUG && console.assert(textures.length === groupIndices.length,
'number of textures and groupIndeces match'); 'number of textures and groupIndeces match');
var elementType = context.hasOESElementIndexUint ? var elementType = context.hasOESElementIndexUint ?
ol.webgl.UNSIGNED_INT : ol.webgl.UNSIGNED_SHORT; ol.webgl.UNSIGNED_INT : ol.webgl.UNSIGNED_SHORT;
@@ -785,7 +785,7 @@ ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayAll_ = function(gl,
*/ */
ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayOneByOne_ = function(gl, context, skippedFeaturesHash, featureCallback, ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayOneByOne_ = function(gl, context, skippedFeaturesHash, featureCallback,
opt_hitExtent) { opt_hitExtent) {
ol.DEBUG && console.assert(this.hitDetectionTextures_.length === goog.DEBUG && console.assert(this.hitDetectionTextures_.length ===
this.hitDetectionGroupIndices_.length, this.hitDetectionGroupIndices_.length,
'number of hitDetectionTextures and hitDetectionGroupIndices match'); 'number of hitDetectionTextures and hitDetectionGroupIndices match');
var elementType = context.hasOESElementIndexUint ? var elementType = context.hasOESElementIndexUint ?
@@ -850,21 +850,21 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) {
var rotation = imageStyle.getRotation(); var rotation = imageStyle.getRotation();
var size = imageStyle.getSize(); var size = imageStyle.getSize();
var scale = imageStyle.getScale(); var scale = imageStyle.getScale();
ol.DEBUG && console.assert(anchor, 'imageStyle anchor is not null'); goog.DEBUG && console.assert(anchor, 'imageStyle anchor is not null');
ol.DEBUG && console.assert(image, 'imageStyle image is not null'); goog.DEBUG && console.assert(image, 'imageStyle image is not null');
ol.DEBUG && console.assert(imageSize, goog.DEBUG && console.assert(imageSize,
'imageStyle imageSize is not null'); 'imageStyle imageSize is not null');
ol.DEBUG && console.assert(hitDetectionImage, goog.DEBUG && console.assert(hitDetectionImage,
'imageStyle hitDetectionImage is not null'); 'imageStyle hitDetectionImage is not null');
ol.DEBUG && console.assert(hitDetectionImageSize, goog.DEBUG && console.assert(hitDetectionImageSize,
'imageStyle hitDetectionImageSize is not null'); 'imageStyle hitDetectionImageSize is not null');
ol.DEBUG && console.assert(opacity !== undefined, 'imageStyle opacity is defined'); goog.DEBUG && console.assert(opacity !== undefined, 'imageStyle opacity is defined');
ol.DEBUG && console.assert(origin, 'imageStyle origin is not null'); goog.DEBUG && console.assert(origin, 'imageStyle origin is not null');
ol.DEBUG && console.assert(rotateWithView !== undefined, goog.DEBUG && console.assert(rotateWithView !== undefined,
'imageStyle rotateWithView is defined'); 'imageStyle rotateWithView is defined');
ol.DEBUG && console.assert(rotation !== undefined, 'imageStyle rotation is defined'); goog.DEBUG && console.assert(rotation !== undefined, 'imageStyle rotation is defined');
ol.DEBUG && console.assert(size, 'imageStyle size is not null'); goog.DEBUG && console.assert(size, 'imageStyle size is not null');
ol.DEBUG && console.assert(scale !== undefined, 'imageStyle scale is defined'); goog.DEBUG && console.assert(scale !== undefined, 'imageStyle scale is defined');
var currentImage; var currentImage;
if (this.images_.length === 0) { if (this.images_.length === 0) {
@@ -873,7 +873,7 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) {
currentImage = this.images_[this.images_.length - 1]; currentImage = this.images_[this.images_.length - 1];
if (ol.getUid(currentImage) != ol.getUid(image)) { if (ol.getUid(currentImage) != ol.getUid(image)) {
this.groupIndices_.push(this.indices_.length); this.groupIndices_.push(this.indices_.length);
ol.DEBUG && console.assert(this.groupIndices_.length === this.images_.length, goog.DEBUG && console.assert(this.groupIndices_.length === this.images_.length,
'number of groupIndices and images match'); 'number of groupIndices and images match');
this.images_.push(image); this.images_.push(image);
} }
@@ -886,7 +886,7 @@ ol.render.webgl.ImageReplay.prototype.setImageStyle = function(imageStyle) {
this.hitDetectionImages_[this.hitDetectionImages_.length - 1]; this.hitDetectionImages_[this.hitDetectionImages_.length - 1];
if (ol.getUid(currentImage) != ol.getUid(hitDetectionImage)) { if (ol.getUid(currentImage) != ol.getUid(hitDetectionImage)) {
this.hitDetectionGroupIndices_.push(this.indices_.length); this.hitDetectionGroupIndices_.push(this.indices_.length);
ol.DEBUG && console.assert(this.hitDetectionGroupIndices_.length === goog.DEBUG && console.assert(this.hitDetectionGroupIndices_.length ===
this.hitDetectionImages_.length, this.hitDetectionImages_.length,
'number of hitDetectionGroupIndices and hitDetectionImages match'); 'number of hitDetectionGroupIndices and hitDetectionImages match');
this.hitDetectionImages_.push(hitDetectionImage); this.hitDetectionImages_.push(hitDetectionImage);
@@ -987,7 +987,7 @@ ol.render.webgl.ReplayGroup.prototype.getReplay = function(zIndex, replayType) {
var replay = this.replays_[replayType]; var replay = this.replays_[replayType];
if (replay === undefined) { if (replay === undefined) {
var constructor = ol.render.webgl.BATCH_CONSTRUCTORS_[replayType]; var constructor = ol.render.webgl.BATCH_CONSTRUCTORS_[replayType];
ol.DEBUG && console.assert(constructor !== undefined, goog.DEBUG && console.assert(constructor !== undefined,
replayType + replayType +
' constructor missing from ol.render.webgl.BATCH_CONSTRUCTORS_'); ' constructor missing from ol.render.webgl.BATCH_CONSTRUCTORS_');
replay = new constructor(this.tolerance_, this.maxExtent_); replay = new constructor(this.tolerance_, this.maxExtent_);

2
src/ol/renderer/canvas/canvasimagelayerrenderer.js
View File

@@ -162,7 +162,7 @@ ol.renderer.canvas.ImageLayer.prototype.prepareFrame = function(frameState, laye
if (!ol.ENABLE_RASTER_REPROJECTION) { if (!ol.ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection(); var sourceProjection = imageSource.getProjection();
if (sourceProjection) { if (sourceProjection) {
ol.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection), goog.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
'projection and sourceProjection are equivalent'); 'projection and sourceProjection are equivalent');
projection = sourceProjection; projection = sourceProjection;
} }

2
src/ol/renderer/canvas/canvasmaprenderer.js
View File

@@ -82,7 +82,7 @@ ol.renderer.canvas.Map.prototype.createLayerRenderer = function(layer) {
} else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) { } else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) {
return new ol.renderer.canvas.VectorLayer(layer); return new ol.renderer.canvas.VectorLayer(layer);
} else { } else {
ol.DEBUG && console.assert(false, 'unexpected layer configuration'); goog.DEBUG && console.assert(false, 'unexpected layer configuration');
return null; return null;
} }
}; };

2
src/ol/renderer/canvas/canvastilelayerrenderer.js
View File

@@ -142,7 +142,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = function(
if (!drawableTile(tile) && tile.interimTile) { if (!drawableTile(tile) && tile.interimTile) {
tile = tile.interimTile; tile = tile.interimTile;
} }
ol.DEBUG && console.assert(tile); goog.DEBUG && console.assert(tile);
if (drawableTile(tile)) { if (drawableTile(tile)) {
tilesToDrawByZ[z][tile.tileCoord.toString()] = tile; tilesToDrawByZ[z][tile.tileCoord.toString()] = tile;
continue; continue;

2
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
View File

@@ -172,7 +172,7 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtCoordinate = function(c
* @return {?} Callback result. * @return {?} Callback result.
*/ */
function(feature) { function(feature) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature'); goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString(); var key = ol.getUid(feature).toString();
if (!(key in features)) { if (!(key in features)) {
features[key] = true; features[key] = true;

2
src/ol/renderer/canvas/canvasvectortilelayerrenderer.js
View File

@@ -306,7 +306,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.forEachFeatureAtCoordinate = functi
* @return {?} Callback result. * @return {?} Callback result.
*/ */
function(feature) { function(feature) {
ol.DEBUG && console.assert(feature, 'received a feature'); goog.DEBUG && console.assert(feature, 'received a feature');
var key = ol.getUid(feature).toString(); var key = ol.getUid(feature).toString();
if (!(key in features)) { if (!(key in features)) {
features[key] = true; features[key] = true;

2
src/ol/renderer/dom/domimagelayerrenderer.js
View File

@@ -96,7 +96,7 @@ ol.renderer.dom.ImageLayer.prototype.prepareFrame = function(frameState, layerSt
if (!ol.ENABLE_RASTER_REPROJECTION) { if (!ol.ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection(); var sourceProjection = imageSource.getProjection();
if (sourceProjection) { if (sourceProjection) {
ol.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection), goog.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
'projection and sourceProjection are equivalent'); 'projection and sourceProjection are equivalent');
projection = sourceProjection; projection = sourceProjection;
} }

2
src/ol/renderer/dom/dommaprenderer.js
View File

@@ -100,7 +100,7 @@ ol.renderer.dom.Map.prototype.createLayerRenderer = function(layer) {
} else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) { } else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) {
layerRenderer = new ol.renderer.dom.VectorLayer(layer); layerRenderer = new ol.renderer.dom.VectorLayer(layer);
} else { } else {
ol.DEBUG && console.assert(false, 'unexpected layer configuration'); goog.DEBUG && console.assert(false, 'unexpected layer configuration');
return null; return null;
} }
return layerRenderer; return layerRenderer;

4
src/ol/renderer/dom/domtilelayerrenderer.js
View File

@@ -128,7 +128,7 @@ ol.renderer.dom.TileLayer.prototype.prepareFrame = function(frameState, layerSta
if (!drawable && tile.interimTile) { if (!drawable && tile.interimTile) {
tile = tile.interimTile; tile = tile.interimTile;
} }
ol.DEBUG && console.assert(tile); goog.DEBUG && console.assert(tile);
tileState = tile.getState(); tileState = tile.getState();
if (tileState == ol.TileState.LOADED) { if (tileState == ol.TileState.LOADED) {
tilesToDrawByZ[z][tile.tileCoord.toString()] = tile; tilesToDrawByZ[z][tile.tileCoord.toString()] = tile;
@@ -332,7 +332,7 @@ ol.renderer.dom.TileLayerZ_.prototype.addTile = function(tile, tileGutter) {
var tileCoordZ = tileCoord[0]; var tileCoordZ = tileCoord[0];
var tileCoordX = tileCoord[1]; var tileCoordX = tileCoord[1];
var tileCoordY = tileCoord[2]; var tileCoordY = tileCoord[2];
ol.DEBUG && console.assert(tileCoordZ == this.tileCoordOrigin_[0], goog.DEBUG && console.assert(tileCoordZ == this.tileCoordOrigin_[0],
'tileCoordZ matches z of tileCoordOrigin'); 'tileCoordZ matches z of tileCoordOrigin');
var tileCoordKey = tileCoord.toString(); var tileCoordKey = tileCoord.toString();
if (tileCoordKey in this.tiles_) { if (tileCoordKey in this.tiles_) {

2
src/ol/renderer/dom/domvectorlayerrenderer.js
View File

@@ -190,7 +190,7 @@ ol.renderer.dom.VectorLayer.prototype.forEachFeatureAtCoordinate = function(coor
* @return {?} Callback result. * @return {?} Callback result.
*/ */
function(feature) { function(feature) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature'); goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString(); var key = ol.getUid(feature).toString();
if (!(key in features)) { if (!(key in features)) {
features[key] = true; features[key] = true;

4
src/ol/renderer/layerrenderer.js
View File

@@ -143,7 +143,7 @@ ol.renderer.Layer.prototype.loadImage = function(image) {
imageState != ol.ImageState.ERROR) { imageState != ol.ImageState.ERROR) {
// the image is either "idle" or "loading", register the change // the image is either "idle" or "loading", register the change
// listener (a noop if the listener was already registered) // listener (a noop if the listener was already registered)
ol.DEBUG && console.assert(imageState == ol.ImageState.IDLE || goog.DEBUG && console.assert(imageState == ol.ImageState.IDLE ||
imageState == ol.ImageState.LOADING, imageState == ol.ImageState.LOADING,
'imageState is "idle" or "loading"'); 'imageState is "idle" or "loading"');
ol.events.listen(image, ol.events.EventType.CHANGE, ol.events.listen(image, ol.events.EventType.CHANGE,
@@ -152,7 +152,7 @@ ol.renderer.Layer.prototype.loadImage = function(image) {
if (imageState == ol.ImageState.IDLE) { if (imageState == ol.ImageState.IDLE) {
image.load(); image.load();
imageState = image.getState(); imageState = image.getState();
ol.DEBUG && console.assert(imageState == ol.ImageState.LOADING || goog.DEBUG && console.assert(imageState == ol.ImageState.LOADING ||
imageState == ol.ImageState.LOADED, imageState == ol.ImageState.LOADED,
'imageState is "loading" or "loaded"'); 'imageState is "loading" or "loaded"');
} }

10
src/ol/renderer/maprenderer.js
View File

@@ -66,7 +66,7 @@ ol.renderer.Map.prototype.calculateMatrices2D = function(frameState) {
var viewState = frameState.viewState; var viewState = frameState.viewState;
var coordinateToPixelTransform = frameState.coordinateToPixelTransform; var coordinateToPixelTransform = frameState.coordinateToPixelTransform;
var pixelToCoordinateTransform = frameState.pixelToCoordinateTransform; var pixelToCoordinateTransform = frameState.pixelToCoordinateTransform;
ol.DEBUG && console.assert(coordinateToPixelTransform, goog.DEBUG && console.assert(coordinateToPixelTransform,
'frameState has a coordinateToPixelTransform'); 'frameState has a coordinateToPixelTransform');
ol.transform.compose(coordinateToPixelTransform, ol.transform.compose(coordinateToPixelTransform,
@@ -135,7 +135,7 @@ ol.renderer.Map.prototype.forEachFeatureAtCoordinate = function(coordinate, fram
* @return {?} Callback result. * @return {?} Callback result.
*/ */
function forEachFeatureAtCoordinate(feature, layer) { function forEachFeatureAtCoordinate(feature, layer) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature'); goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString(); var key = ol.getUid(feature).toString();
var managed = frameState.layerStates[ol.getUid(layer)].managed; var managed = frameState.layerStates[ol.getUid(layer)].managed;
if (!(key in frameState.skippedFeatureUids && !managed)) { if (!(key in frameState.skippedFeatureUids && !managed)) {
@@ -264,7 +264,7 @@ ol.renderer.Map.prototype.getLayerRenderer = function(layer) {
* @return {ol.renderer.Layer} Layer renderer. * @return {ol.renderer.Layer} Layer renderer.
*/ */
ol.renderer.Map.prototype.getLayerRendererByKey = function(layerKey) { ol.renderer.Map.prototype.getLayerRendererByKey = function(layerKey) {
ol.DEBUG && console.assert(layerKey in this.layerRenderers_, goog.DEBUG && console.assert(layerKey in this.layerRenderers_,
'given layerKey (%s) exists in layerRenderers', layerKey); 'given layerKey (%s) exists in layerRenderers', layerKey);
return this.layerRenderers_[layerKey]; return this.layerRenderers_[layerKey];
}; };
@@ -309,12 +309,12 @@ ol.renderer.Map.prototype.handleLayerRendererChange_ = function() {
* @private * @private
*/ */
ol.renderer.Map.prototype.removeLayerRendererByKey_ = function(layerKey) { ol.renderer.Map.prototype.removeLayerRendererByKey_ = function(layerKey) {
ol.DEBUG && console.assert(layerKey in this.layerRenderers_, goog.DEBUG && console.assert(layerKey in this.layerRenderers_,
'given layerKey (%s) exists in layerRenderers', layerKey); 'given layerKey (%s) exists in layerRenderers', layerKey);
var layerRenderer = this.layerRenderers_[layerKey]; var layerRenderer = this.layerRenderers_[layerKey];
delete this.layerRenderers_[layerKey]; delete this.layerRenderers_[layerKey];
ol.DEBUG && console.assert(layerKey in this.layerRendererListeners_, goog.DEBUG && console.assert(layerKey in this.layerRendererListeners_,
'given layerKey (%s) exists in layerRendererListeners', layerKey); 'given layerKey (%s) exists in layerRendererListeners', layerKey);
ol.events.unlistenByKey(this.layerRendererListeners_[layerKey]); ol.events.unlistenByKey(this.layerRendererListeners_[layerKey]);
delete this.layerRendererListeners_[layerKey]; delete this.layerRendererListeners_[layerKey];

4
src/ol/renderer/webgl/webglimagelayerrenderer.js
View File

@@ -119,7 +119,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
if (!ol.ENABLE_RASTER_REPROJECTION) { if (!ol.ENABLE_RASTER_REPROJECTION) {
var sourceProjection = imageSource.getProjection(); var sourceProjection = imageSource.getProjection();
if (sourceProjection) { if (sourceProjection) {
ol.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection), goog.DEBUG && console.assert(ol.proj.equivalent(projection, sourceProjection),
'projection and sourceProjection are equivalent'); 'projection and sourceProjection are equivalent');
projection = sourceProjection; projection = sourceProjection;
} }
@@ -150,7 +150,7 @@ ol.renderer.webgl.ImageLayer.prototype.prepareFrame = function(frameState, layer
} }
if (image) { if (image) {
ol.DEBUG && console.assert(texture, 'texture is truthy'); goog.DEBUG && console.assert(texture, 'texture is truthy');
var canvas = this.mapRenderer.getContext().getCanvas(); var canvas = this.mapRenderer.getContext().getCanvas();

6
src/ol/renderer/webgl/webglmaprenderer.js
View File

@@ -85,7 +85,7 @@ ol.renderer.webgl.Map = function(container, map) {
preserveDrawingBuffer: false, preserveDrawingBuffer: false,
stencil: true stencil: true
}); });
ol.DEBUG && console.assert(this.gl_, 'got a WebGLRenderingContext'); goog.DEBUG && console.assert(this.gl_, 'got a WebGLRenderingContext');
/** /**
* @private * @private
@@ -182,7 +182,7 @@ ol.renderer.webgl.Map.prototype.bindTileTexture = function(tile, tileSize, tileG
var tileKey = tile.getKey(); var tileKey = tile.getKey();
if (this.textureCache_.containsKey(tileKey)) { if (this.textureCache_.containsKey(tileKey)) {
var textureCacheEntry = this.textureCache_.get(tileKey); var textureCacheEntry = this.textureCache_.get(tileKey);
ol.DEBUG && console.assert(textureCacheEntry, goog.DEBUG && console.assert(textureCacheEntry,
'a texture cache entry exists for key %s', tileKey); 'a texture cache entry exists for key %s', tileKey);
gl.bindTexture(ol.webgl.TEXTURE_2D, textureCacheEntry.texture); gl.bindTexture(ol.webgl.TEXTURE_2D, textureCacheEntry.texture);
if (textureCacheEntry.magFilter != magFilter) { if (textureCacheEntry.magFilter != magFilter) {
@@ -248,7 +248,7 @@ ol.renderer.webgl.Map.prototype.createLayerRenderer = function(layer) {
} else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) { } else if (ol.ENABLE_VECTOR && layer instanceof ol.layer.Vector) {
return new ol.renderer.webgl.VectorLayer(this, layer); return new ol.renderer.webgl.VectorLayer(this, layer);
} else { } else {
ol.DEBUG && console.assert(false, 'unexpected layer configuration'); goog.DEBUG && console.assert(false, 'unexpected layer configuration');
return null; return null;
} }
}; };

2
src/ol/renderer/webgl/webgltilelayerrenderer.js
View File

@@ -258,7 +258,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS
if (!drawable && tile.interimTile) { if (!drawable && tile.interimTile) {
tile = tile.interimTile; tile = tile.interimTile;
} }
ol.DEBUG && console.assert(tile); goog.DEBUG && console.assert(tile);
tileState = tile.getState(); tileState = tile.getState();
if (tileState == ol.TileState.LOADED) { if (tileState == ol.TileState.LOADED) {
if (mapRenderer.isTileTextureLoaded(tile)) { if (mapRenderer.isTileTextureLoaded(tile)) {

2
src/ol/renderer/webgl/webglvectorlayerrenderer.js
View File

@@ -120,7 +120,7 @@ ol.renderer.webgl.VectorLayer.prototype.forEachFeatureAtCoordinate = function(co
* @return {?} Callback result. * @return {?} Callback result.
*/ */
function(feature) { function(feature) {
ol.DEBUG && console.assert(feature !== undefined, 'received a feature'); goog.DEBUG && console.assert(feature !== undefined, 'received a feature');
var key = ol.getUid(feature).toString(); var key = ol.getUid(feature).toString();
if (!(key in features)) { if (!(key in features)) {
features[key] = true; features[key] = true;

2
src/ol/reproj/image.js
View File

@@ -194,7 +194,7 @@ ol.reproj.Image.prototype.load = function() {
* @private * @private
*/ */
ol.reproj.Image.prototype.unlistenSource_ = function() { ol.reproj.Image.prototype.unlistenSource_ = function() {
ol.DEBUG && console.assert(this.sourceListenerKey_, goog.DEBUG && console.assert(this.sourceListenerKey_,
'this.sourceListenerKey_ should not be null'); 'this.sourceListenerKey_ should not be null');
ol.events.unlistenByKey(/** @type {!ol.EventsKey} */ (this.sourceListenerKey_)); ol.events.unlistenByKey(/** @type {!ol.EventsKey} */ (this.sourceListenerKey_));
this.sourceListenerKey_ = null; this.sourceListenerKey_ = null;

8
src/ol/reproj/tile.js
View File

@@ -181,7 +181,7 @@ ol.reproj.Tile = function(sourceProj, sourceTileGrid,
sourceExtent, this.sourceZ_); sourceExtent, this.sourceZ_);
var tilesRequired = sourceRange.getWidth() * sourceRange.getHeight(); var tilesRequired = sourceRange.getWidth() * sourceRange.getHeight();
if (ol.DEBUG && !(tilesRequired < ol.RASTER_REPROJECTION_MAX_SOURCE_TILES)) { if (goog.DEBUG && !(tilesRequired < ol.RASTER_REPROJECTION_MAX_SOURCE_TILES)) {
console.assert(false, 'reasonable number of tiles is required'); console.assert(false, 'reasonable number of tiles is required');
this.state = ol.TileState.ERROR; this.state = ol.TileState.ERROR;
return; return;
@@ -284,7 +284,7 @@ ol.reproj.Tile.prototype.load = function() {
var leftToLoad = 0; var leftToLoad = 0;
ol.DEBUG && console.assert(!this.sourcesListenerKeys_, goog.DEBUG && console.assert(!this.sourcesListenerKeys_,
'this.sourcesListenerKeys_ should be null'); 'this.sourcesListenerKeys_ should be null');
this.sourcesListenerKeys_ = []; this.sourcesListenerKeys_ = [];
@@ -302,7 +302,7 @@ ol.reproj.Tile.prototype.load = function() {
state == ol.TileState.EMPTY) { state == ol.TileState.EMPTY) {
ol.events.unlistenByKey(sourceListenKey); ol.events.unlistenByKey(sourceListenKey);
leftToLoad--; leftToLoad--;
ol.DEBUG && console.assert(leftToLoad >= 0, goog.DEBUG && console.assert(leftToLoad >= 0,
'leftToLoad should not be negative'); 'leftToLoad should not be negative');
if (leftToLoad === 0) { if (leftToLoad === 0) {
this.unlistenSources_(); this.unlistenSources_();
@@ -332,7 +332,7 @@ ol.reproj.Tile.prototype.load = function() {
* @private * @private
*/ */
ol.reproj.Tile.prototype.unlistenSources_ = function() { ol.reproj.Tile.prototype.unlistenSources_ = function() {
ol.DEBUG && console.assert(this.sourcesListenerKeys_, goog.DEBUG && console.assert(this.sourcesListenerKeys_,
'this.sourcesListenerKeys_ should not be null'); 'this.sourcesListenerKeys_ should not be null');
this.sourcesListenerKeys_.forEach(ol.events.unlistenByKey); this.sourcesListenerKeys_.forEach(ol.events.unlistenByKey);
this.sourcesListenerKeys_ = null; this.sourcesListenerKeys_ = null;

2
src/ol/reproj/triangulation.js
View File

@@ -117,7 +117,7 @@ ol.reproj.Triangulation = function(sourceProj, targetProj, targetExtent,
// Fix coordinates (ol.proj returns wrapped coordinates, "unwrap" here). // Fix coordinates (ol.proj returns wrapped coordinates, "unwrap" here).
// This significantly simplifies the rest of the reprojection process. // This significantly simplifies the rest of the reprojection process.
ol.DEBUG && console.assert(this.sourceWorldWidth_ !== null); goog.DEBUG && console.assert(this.sourceWorldWidth_ !== null);
var leftBound = Infinity; var leftBound = Infinity;
this.triangles_.forEach(function(triangle, i, arr) { this.triangles_.forEach(function(triangle, i, arr) {
leftBound = Math.min(leftBound, leftBound = Math.min(leftBound,

4
src/ol/source/bingmapssource.js
View File

@@ -90,7 +90,7 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = function(response)
} }
//var copyright = response.copyright; // FIXME do we need to display this? //var copyright = response.copyright; // FIXME do we need to display this?
var resource = response.resourceSets[0].resources[0]; var resource = response.resourceSets[0].resources[0];
ol.DEBUG && console.assert(resource.imageWidth == resource.imageHeight, goog.DEBUG && console.assert(resource.imageWidth == resource.imageHeight,
'resource has imageWidth equal to imageHeight, i.e. is square'); 'resource has imageWidth equal to imageHeight, i.e. is square');
var maxZoom = this.maxZoom_ == -1 ? resource.zoomMax : this.maxZoom_; var maxZoom = this.maxZoom_ == -1 ? resource.zoomMax : this.maxZoom_;
@@ -121,7 +121,7 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = function(response)
* @return {string|undefined} Tile URL. * @return {string|undefined} Tile URL.
*/ */
function(tileCoord, pixelRatio, projection) { function(tileCoord, pixelRatio, projection) {
ol.DEBUG && console.assert(ol.proj.equivalent( goog.DEBUG && console.assert(ol.proj.equivalent(
projection, sourceProjection), projection, sourceProjection),
'projections are equivalent'); 'projections are equivalent');
if (!tileCoord) { if (!tileCoord) {

4
src/ol/source/clustersource.js
View File

@@ -136,7 +136,7 @@ ol.source.Cluster.prototype.cluster_ = function() {
ol.extent.buffer(extent, mapDistance, extent); ol.extent.buffer(extent, mapDistance, extent);
var neighbors = this.source_.getFeaturesInExtent(extent); var neighbors = this.source_.getFeaturesInExtent(extent);
ol.DEBUG && console.assert(neighbors.length >= 1, 'at least one neighbor found'); goog.DEBUG && console.assert(neighbors.length >= 1, 'at least one neighbor found');
neighbors = neighbors.filter(function(neighbor) { neighbors = neighbors.filter(function(neighbor) {
var uid = ol.getUid(neighbor).toString(); var uid = ol.getUid(neighbor).toString();
if (!(uid in clustered)) { if (!(uid in clustered)) {
@@ -150,7 +150,7 @@ ol.source.Cluster.prototype.cluster_ = function() {
} }
} }
} }
ol.DEBUG && console.assert( goog.DEBUG && console.assert(
Object.keys(clustered).length == this.source_.getFeatures().length, Object.keys(clustered).length == this.source_.getFeatures().length,
'number of clustered equals number of features in the source'); 'number of clustered equals number of features in the source');
}; };

2
src/ol/source/imagearcgisrestsource.js
View File

@@ -195,7 +195,7 @@ ol.source.ImageArcGISRest.prototype.getImageLoadFunction = function() {
*/ */
ol.source.ImageArcGISRest.prototype.getRequestUrl_ = function(extent, size, pixelRatio, projection, params) { ol.source.ImageArcGISRest.prototype.getRequestUrl_ = function(extent, size, pixelRatio, projection, params) {
ol.DEBUG && console.assert(this.url_ !== undefined, 'url is defined'); goog.DEBUG && console.assert(this.url_ !== undefined, 'url is defined');
// ArcGIS Server only wants the numeric portion of the projection ID. // ArcGIS Server only wants the numeric portion of the projection ID.
var srid = projection.getCode().split(':').pop(); var srid = projection.getCode().split(':').pop();

2
src/ol/source/imagesource.js
View File

@@ -37,7 +37,7 @@ ol.source.Image = function(options) {
*/ */
this.resolutions_ = options.resolutions !== undefined ? this.resolutions_ = options.resolutions !== undefined ?
options.resolutions : null; options.resolutions : null;
ol.DEBUG && console.assert(!this.resolutions_ || goog.DEBUG && console.assert(!this.resolutions_ ||
ol.array.isSorted(this.resolutions_, ol.array.isSorted(this.resolutions_,
function(a, b) { function(a, b) {
return b - a; return b - a;

2
src/ol/source/imagevectorsource.js
View File

@@ -168,7 +168,7 @@ ol.source.ImageVector.prototype.forEachFeatureAtCoordinate = function(
* @return {?} Callback result. * @return {?} Callback result.
*/ */
function(feature) { function(feature) {
ol.DEBUG && console.assert(feature !== undefined, 'passed a feature'); goog.DEBUG && console.assert(feature !== undefined, 'passed a feature');
var key = ol.getUid(feature).toString(); var key = ol.getUid(feature).toString();
if (!(key in features)) { if (!(key in features)) {
features[key] = true; features[key] = true;

2
src/ol/source/imagewmssource.js
View File

@@ -135,7 +135,7 @@ ol.source.ImageWMS.GETFEATUREINFO_IMAGE_SIZE_ = [101, 101];
*/ */
ol.source.ImageWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resolution, projection, params) { ol.source.ImageWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resolution, projection, params) {
ol.DEBUG && console.assert(!('VERSION' in params), goog.DEBUG && console.assert(!('VERSION' in params),
'key VERSION is not allowed in params'); 'key VERSION is not allowed in params');
if (this.url_ === undefined) { if (this.url_ === undefined) {

2
src/ol/source/rastersource.js
View File

@@ -424,7 +424,7 @@ ol.source.Raster.createRenderer_ = function(source) {
} else if (source instanceof ol.source.Image) { } else if (source instanceof ol.source.Image) {
renderer = ol.source.Raster.createImageRenderer_(source); renderer = ol.source.Raster.createImageRenderer_(source);
} else { } else {
ol.DEBUG && console.assert(false, 'Unsupported source type: ' + source); goog.DEBUG && console.assert(false, 'Unsupported source type: ' + source);
} }
return renderer; return renderer;
}; };

4
src/ol/source/stamensource.js
View File

@@ -88,11 +88,11 @@ ol.source.Stamen = function(options) {
var i = options.layer.indexOf('-'); var i = options.layer.indexOf('-');
var provider = i == -1 ? options.layer : options.layer.slice(0, i); var provider = i == -1 ? options.layer : options.layer.slice(0, i);
ol.DEBUG && console.assert(provider in ol.source.StamenProviderConfig, goog.DEBUG && console.assert(provider in ol.source.StamenProviderConfig,
'known provider configured'); 'known provider configured');
var providerConfig = ol.source.StamenProviderConfig[provider]; var providerConfig = ol.source.StamenProviderConfig[provider];
ol.DEBUG && console.assert(options.layer in ol.source.StamenLayerConfig, goog.DEBUG && console.assert(options.layer in ol.source.StamenLayerConfig,
'known layer configured'); 'known layer configured');
var layerConfig = ol.source.StamenLayerConfig[options.layer]; var layerConfig = ol.source.StamenLayerConfig[options.layer];

4
src/ol/source/tileimagesource.js
View File

@@ -301,8 +301,8 @@ ol.source.TileImage.prototype.getTileInternal = function(z, x, y, pixelRatio, pr
// cases we attempt to assign an interim tile to the new tile. // cases we attempt to assign an interim tile to the new tile.
var /** @type {ol.Tile} */ interimTile = tile; var /** @type {ol.Tile} */ interimTile = tile;
if (tile.interimTile && tile.interimTile.key == key) { if (tile.interimTile && tile.interimTile.key == key) {
ol.DEBUG && console.assert(tile.interimTile.getState() == ol.TileState.LOADED); goog.DEBUG && console.assert(tile.interimTile.getState() == ol.TileState.LOADED);
ol.DEBUG && console.assert(tile.interimTile.interimTile === null); goog.DEBUG && console.assert(tile.interimTile.interimTile === null);
tile = tile.interimTile; tile = tile.interimTile;
if (interimTile.getState() == ol.TileState.LOADED) { if (interimTile.getState() == ol.TileState.LOADED) {
tile.interimTile = interimTile; tile.interimTile = interimTile;

2
src/ol/source/tilejsonsource.js
View File

@@ -117,7 +117,7 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function(tileJSON) {
} }
if (tileJSON.scheme !== undefined) { if (tileJSON.scheme !== undefined) {
ol.DEBUG && console.assert(tileJSON.scheme == 'xyz', 'tileJSON-scheme is "xyz"'); goog.DEBUG && console.assert(tileJSON.scheme == 'xyz', 'tileJSON-scheme is "xyz"');
} }
var minZoom = tileJSON.minzoom || 0; var minZoom = tileJSON.minzoom || 0;
var maxZoom = tileJSON.maxzoom || 22; var maxZoom = tileJSON.maxzoom || 22;

Some files were not shown because too many files have changed in this diff Show More