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

Merge pull request #7 from fredj/3320

Browse Source 
Replace OpenLayers.Console.error with exceptions. r=elemoine,bbinet (closes #3320)
This commit is contained in:
Frédéric Junod
2011-10-06 02:03:48 -07:00
parent 91cd42bfe6 7b410915a0
commit 00e2e1bd59
55 changed files with 91 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/OpenLayers/Layer/GML.js
View File

@@ -7,7 +7,6 @@
* @requires OpenLayers/Layer/Vector.js
* @requires OpenLayers/Request/XMLHttpRequest.js
* @requires OpenLayers/Console.js
* @requires OpenLayers/Lang.js
*/
/**
@@ -167,7 +166,7 @@ OpenLayers.Layer.GML = OpenLayers.Class(OpenLayers.Layer.Vector, {
* request - {String}
*/
requestFailure: function(request) {
OpenLayers.Console.userError(OpenLayers.i18n("errorLoadingGML", {'url':this.url}));
OpenLayers.Console.userError('Error in loading GML file ' + this.url);
this.events.triggerEvent("loadend");
},

11
lib/OpenLayers/Layer/PointTrack.js
View File

@@ -5,7 +5,6 @@
/**
* @requires OpenLayers/Layer/Vector.js
* @requires OpenLayers/Console.js
*/
/**
@@ -64,10 +63,8 @@ OpenLayers.Layer.PointTrack = OpenLayers.Class(OpenLayers.Layer.Vector, {
*/
addNodes: function(pointFeatures, options) {
if (pointFeatures.length < 2) {
OpenLayers.Console.error(
"At least two point features have to be added to create" +
"a line from");
return;
throw new Error("At least two point features have to be added to " +
"create a line from");
}
var lines = new Array(pointFeatures.length-1);
@@ -81,9 +78,7 @@ OpenLayers.Layer.PointTrack = OpenLayers.Class(OpenLayers.Layer.Vector, {
var lonlat = pointFeature.lonlat;
endPoint = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
} else if(endPoint.CLASS_NAME != "OpenLayers.Geometry.Point") {
OpenLayers.Console.error(
"Only features with point geometries are supported.");
return;
throw new TypeError("Only features with point geometries are supported.");
}
if(i > 0) {

11
lib/OpenLayers/Layer/Vector.js
View File

@@ -565,9 +565,8 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
if (this.geometryType &&
!(feature.geometry instanceof this.geometryType)) {
var throwStr = OpenLayers.i18n('componentShouldBe',
{'geomType':this.geometryType.prototype.CLASS_NAME});
throw throwStr;
throw new TypeError('addFeatures: component should be an ' +
this.geometryType.prototype.CLASS_NAME);
}
//give feature reference to its layer
@@ -827,8 +826,10 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
*/
getFeatureFromEvent: function(evt) {
if (!this.renderer) {
OpenLayers.Console.error(OpenLayers.i18n("getFeatureError"));
return null;
throw new Error('getFeatureFromEvent called on layer with no ' +
'renderer. This usually means you destroyed a ' +
'layer, but not some handler which is associated ' +
'with it.');
}
var feature = null;
var featureId = this.renderer.getFeatureIdFromEvent(evt);