[OpenLayers-Commits] r3592 - in sandbox/euzuro/untiled3/lib/OpenLayers: . Control Geometry Handler Layer Tile
commits at openlayers.org
commits at openlayers.org
Thu Jul 5 14:10:24 EDT 2007
Author: euzuro
Date: 2007-07-05 14:10:22 -0400 (Thu, 05 Jul 2007)
New Revision: 3592
Modified:
sandbox/euzuro/untiled3/lib/OpenLayers/Console.js
sandbox/euzuro/untiled3/lib/OpenLayers/Control/Navigation.js
sandbox/euzuro/untiled3/lib/OpenLayers/Control/OverviewMap.js
sandbox/euzuro/untiled3/lib/OpenLayers/Format.js
sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Collection.js
sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/LineString.js
sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiLineString.js
sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPoint.js
sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPolygon.js
sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Point.js
sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Polygon.js
sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Path.js
sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Point.js
sandbox/euzuro/untiled3/lib/OpenLayers/Layer.js
sandbox/euzuro/untiled3/lib/OpenLayers/Layer/EventPane.js
sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Image.js
sandbox/euzuro/untiled3/lib/OpenLayers/Layer/MapServer.js
sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Vector.js
sandbox/euzuro/untiled3/lib/OpenLayers/Layer/WMS.js
sandbox/euzuro/untiled3/lib/OpenLayers/Tile/Image.js
sandbox/euzuro/untiled3/lib/OpenLayers/Tile/WFS.js
Log:
bring up changes from trunk
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Console.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Console.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Console.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -201,9 +201,7 @@
*/
count: function() {},
- /**
- * Constant: CLASS_NAME
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Console"
};
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Control/Navigation.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Control/Navigation.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Control/Navigation.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -8,6 +8,9 @@
* @requires OpenLayers/Handler/MouseWheel.js
*
* Class: OpenLayers.Control.Navigation
+ *
+ * Inherits:
+ * - <OpenLayers.Control>
*/
OpenLayers.Control.Navigation = OpenLayers.Class.create();
OpenLayers.Control.Navigation.prototype =
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Control/OverviewMap.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Control/OverviewMap.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Control/OverviewMap.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -683,10 +683,7 @@
return px;
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of this class
- */
+ /** @final @type String */
CLASS_NAME: 'OpenLayers.Control.OverviewMap'
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Format.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Format.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Format.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -56,10 +56,7 @@
alert("Write not implemented.");
},
- /**
- * Constant: CLASS_NAME
- * {String} OpenLayers.Format
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Format"
};
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Collection.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Collection.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Collection.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -273,9 +273,6 @@
return equivalent;
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Geometry.Collection"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/LineString.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/LineString.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/LineString.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -44,9 +44,6 @@
}
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Geometry.LineString"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiLineString.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiLineString.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiLineString.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -38,9 +38,6 @@
arguments);
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Geometry.MultiLineString"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPoint.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPoint.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPoint.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -63,9 +63,6 @@
this.removeComponent(point);
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Geometry.MultiPoint"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPolygon.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPolygon.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/MultiPolygon.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -39,9 +39,6 @@
arguments);
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Geometry.MultiPolygon"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Point.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Point.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Point.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -132,8 +132,6 @@
this.y = this.y + y;
},
- /** Constant: CLASS_NAME
- * {String} Name of this class
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Geometry.Point"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Polygon.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Polygon.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Geometry/Polygon.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -58,9 +58,6 @@
return area;
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Geometry.Polygon"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Path.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Path.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Path.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -240,9 +240,6 @@
return false;
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Handler.Path"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Point.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Point.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Handler/Point.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -263,9 +263,6 @@
}
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Handler.Point"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Layer/EventPane.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Layer/EventPane.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Layer/EventPane.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -361,9 +361,6 @@
return moPixel;
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of this class
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Layer.EventPane"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Image.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Image.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Image.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -204,9 +204,6 @@
return this.url;
},
- /**
- * Constant: CLASS_NAME
- * {String} OpenLayers.Layer.Image
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Layer.Image"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Layer/MapServer.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Layer/MapServer.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Layer/MapServer.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -1,7 +1,7 @@
/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
* See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
* for the full text of the license. */
-// @requires OpenLayers/Layer/Grid.js
+
/**
* @requires OpenLayers/Layer/Grid.js
*
@@ -16,37 +16,27 @@
OpenLayers.Layer.MapServer.prototype =
OpenLayers.Class.inherit( OpenLayers.Layer.Grid, {
- /**
- * Constant: DEFAULT_PARAMS
- * {Object} Hashtable of default parameter key/value pairs
- */
+ /**
+ * Constant: DEFAULT_PARAMS
+ * {Object} Hashtable of default parameter key/value pairs
+ */
DEFAULT_PARAMS: {
- mode: "map",
- map_imagetype: "png"
- },
+ mode: "map",
+ map_imagetype: "png"
+ },
- /**
- * Constructor: OpenLayers.Layer.MapServer
- * Create a new MapServer layer object
- *
- * Example:
- * (code)
- * layer = new OpenLayers.Layer.MapServer( "OpenLayers WMS",
- * "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'},
- * {gutter: 15});
- * (end)
- *
- * Parameters:
- * name - {String} A name for the layer
- * url - {String} Base url for the MapServer CGI
- * (e.g. http://www2.dmsolutions.ca/cgi-bin/mapserv)
- * params - {Object} An object with key/value pairs representing the
- * GetMap query string parameters and parameter values.
- * options - {Ojbect} Hashtable of extra options to tag onto the layer
- *
- * Return:
- * A new OpenLayers.Layer.MapServer instance
- */
+ /**
+ * Constructor: OpenLayers.Layer.MapServer
+ * Create a new MapServer layer object
+ *
+ * Parameters:
+ * name - {String} A name for the layer
+ * url - {String} Base url for the MapServer CGI
+ * (e.g. http://www2.dmsolutions.ca/cgi-bin/mapserv)
+ * params - {Object} An object with key/value pairs representing the
+ * GetMap query string parameters and parameter values.
+ * options - {Ojbect} Hashtable of extra options to tag onto the layer
+ */
initialize: function(name, url, params, options) {
var newArguments = new Array();
newArguments.push(name, url, params, options);
@@ -90,14 +80,15 @@
},
/**
- * addTile creates a tile, initializes it, and
- * adds it to the layer div.
- *
- * @param {<OpenLayers.Bounds>} bounds
- *
- * @returns The added OpenLayers.Tile.Image
- * @type OpenLayers.Tile.Image
- */
+ * Method: addTile
+ * Creates a tile, initializes it, and adds it to the layer div.
+ *
+ * Parameters:
+ * bounds - {<OpenLayers.Bounds>}
+ *
+ * Return:
+ * {<OpenLayers.Tile.Image>} The added OpenLayers.Tile.Image
+ */
addTile:function(bounds,position) {
var url = this.getURL(bounds);
return new OpenLayers.Tile.Image(this, position, bounds, url, this.tileSize);
@@ -108,12 +99,13 @@
* Return a query string for this layer
*
* Parameters:
- * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox for the
- * request
+ * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox
+ * for the request
*
* Return:
- * {String} A string with the layer's url and parameters and also the
- * passed-in bounds and appropriate tile size specified as parameters
+ * {String} A string with the layer's url and parameters and also
+ * the passed-in bounds and appropriate tile size specified
+ * as parameters.
*/
getURL: function (bounds) {
bounds = this.adjustBounds(bounds);
@@ -136,19 +128,18 @@
},
/**
- * Method: getFullRequestString
- * combine the layer's url with its params and these newParams.
- *
- * Parameter: {Object} newParams
- * new parameters that should be added to the request string.
- *
- * Parameter: {String} altUrl
- * optional, replace the URL in the full request string with the
- * provided URL.
- *
- * Return: {String}
- * A string with the layer's url and parameters embedded in it.
- */
+ * Method: getFullRequestString
+ * combine the layer's url with its params and these newParams.
+ *
+ * Parameter:
+ * newParams - {Object} New parameters that should be added to the
+ * request string.
+ * altUrl - {String} (optional) Replace the URL in the full request
+ * string with the provided URL.
+ *
+ * Return:
+ * {String} A string with the layer's url and parameters embedded in it.
+ */
getFullRequestString:function(newParams, altUrl) {
// use layer's url unless altUrl passed in
var url = (altUrl == null) ? this.url : altUrl;
@@ -176,12 +167,13 @@
}
var paramsString = OpenLayers.Util.getParameterString(allParams);
- /* MapServer needs '+' seperating things like bounds/height/width.
- Since typically this is URL encoded, we use a slight hack: we
- depend on the list-like functionality of getParameterString to
- leave ',' only in the case of list items (since otherwise it is
- encoded) then do a regular expression replace on the , characters
- to '+' */
+ // MapServer needs '+' seperating things like bounds/height/width.
+ // Since typically this is URL encoded, we use a slight hack: we
+ // depend on the list-like functionality of getParameterString to
+ // leave ',' only in the case of list items (since otherwise it is
+ // encoded) then do a regular expression replace on the , characters
+ // to '+'
+ //
paramsString = paramsString.replace(/,/g, "+");
if (paramsString != "") {
@@ -200,9 +192,7 @@
}
return requestString;
},
- /**
- * Constant: CLASS_NAME
- * {String} OpenLayers.Layer.MapServer
- */
+
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Layer.MapServer"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Vector.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Vector.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Layer/Vector.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -431,9 +431,6 @@
preFeatureInsert: function(feature) {
},
- /**
- * Constant: CLASS_NAME
- * {String} 'OpenLayers.Layer.Vector'
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Layer.Vector"
});
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Layer/WMS.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Layer/WMS.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Layer/WMS.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -40,7 +40,10 @@
*/
reproject: true,
- /** @type Boolean */
+ /**
+ * APIProperty: isBaseLayer
+ * {Boolean} Default is true for WMS layer
+ */
isBaseLayer: true,
/**
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Layer.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Layer.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Layer.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -412,9 +412,12 @@
}
},
- /**
- * @returns The size that the image should be, taking into account gutters
- * @tile OpenLayers.Size
+ /**
+ * APIMethod: getImageSize
+ *
+ * Return:
+ * {<OpenLayers.Size>} The size that the image should be, taking into
+ * account gutters.
*/
getImageSize: function() {
return (this.imageSize || this.tileSize);
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Tile/Image.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Tile/Image.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Tile/Image.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -232,10 +232,7 @@
}
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Tile.Image"
}
);
Modified: sandbox/euzuro/untiled3/lib/OpenLayers/Tile/WFS.js
===================================================================
--- sandbox/euzuro/untiled3/lib/OpenLayers/Tile/WFS.js 2007-07-05 17:57:27 UTC (rev 3591)
+++ sandbox/euzuro/untiled3/lib/OpenLayers/Tile/WFS.js 2007-07-05 18:10:22 UTC (rev 3592)
@@ -148,10 +148,7 @@
}
},
- /**
- * Constant: CLASS_NAME
- * {String} Name of class.
- */
+ /** @final @type String */
CLASS_NAME: "OpenLayers.Tile.WFS"
}
);
More information about the Commits
mailing list