Changeset 217 for branches/branch-1.2/zoo-api/js

Timestamp:

May 31, 2011, 3:30:49 AM (13 years ago)

Author:

djay

Message:

Merge trunk r111:r216 into branch-1.2

Location:

branches/branch-1.2

Files:

• . (modified) (1 prop)
• zoo-api/js/ZOO-api.js (modified) (4 diffs)
• zoo-api/js/ZOO-proj4js.js (modified) (1 diff)

branches/branch-1.2/zoo-api/js/ZOO-api.js

@@ -21 +21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
+ */
+
+/**
+ * Copyright 2005-2010 OpenLayers Contributors, released under the Clear BSD
+ * license. Please see http://svn.openlayers.org/trunk/openlayers/license.txt
+ * for the full text of the license.
  */
 
@@ -3198 +3204 @@
     },
     /**
-     * Method: parseGeometry.polygon
+     * Method: parseGeometry.envelope
      * Given a GML node representing an envelope, create a
      *     ZOO polygon geometry.
@@ -4090 +4096 @@
    * Method: calculateBounds
    * Recalculate the bounds by iterating through the components and 
-   * calling calling extendBounds() on each item.
+   * calling extendBounds() on each item.
    */
   calculateBounds: function() {
@@ -4247 +4253 @@
    *     the earth.
    *
+   * Parameters:
    * projection - {<ZOO.Projection>} The spatial reference system
    *     for the geometry coordinates.  If not provided, Geographic/WGS84 is

branches/branch-1.2/zoo-api/js/ZOO-proj4js.js

@@ -21 +21 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
+ */
+
+/**
+ * Author:       Mike Adair madairATdmsolutions.ca
+ *               Richard Greenwood rich@greenwoodmap.com
+ * License:      LGPL as per: http://www.gnu.org/copyleft/lesser.html
+ * $Id: Proj.js 2956 2007-07-09 12:17:52Z steven $
  */