[OpenLayers-Commits] r2347 - sandbox/vector-2.4/lib/OpenLayers/Geometry

[commits at openlayers.org]

Author: sderle
Date: 2007-03-05 16:36:24 -0500 (Mon, 05 Mar 2007)
New Revision: 2347

Modified:
   sandbox/vector-2.4/lib/OpenLayers/Geometry/Aggregate.js
   sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiLineString.js
   sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPoint.js
   sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPolygon.js
   sandbox/vector-2.4/lib/OpenLayers/Geometry/Polygon.js
Log:
Change Geometry.Aggregate to Collection to fall more in line with OGC Simple Feature model naming.

Modified: sandbox/vector-2.4/lib/OpenLayers/Geometry/Aggregate.js
===================================================================
--- sandbox/vector-2.4/lib/OpenLayers/Geometry/Aggregate.js	2007-03-05 21:34:43 UTC (rev 2346)
+++ sandbox/vector-2.4/lib/OpenLayers/Geometry/Aggregate.js	2007-03-05 21:36:24 UTC (rev 2347)
@@ -7,8 +7,8 @@
  *
  * @requires OpenLayers/Geometry.js
  */
-OpenLayers.Geometry.Aggregate = function() {}
-OpenLayers.Geometry.Aggregate.prototype = OpenLayers.Class.inherit( OpenLayers.Geometry, {
+OpenLayers.Geometry.Collection = function() {}
+OpenLayers.Geometry.Collection.prototype = OpenLayers.Class.inherit( OpenLayers.Geometry, {
 
     /**
      * @returns An exact clone of this OpenLayers.Feature
@@ -167,5 +167,5 @@
     },
 
     /** @final @type String */
-    CLASS_NAME: "OpenLayers.Geometry.Aggregate"
+    CLASS_NAME: "OpenLayers.Geometry.Collection"
 });

Modified: sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiLineString.js
===================================================================
--- sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiLineString.js	2007-03-05 21:34:43 UTC (rev 2346)
+++ sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiLineString.js	2007-03-05 21:36:24 UTC (rev 2347)
@@ -5,12 +5,12 @@
 /**
  * @class
  *
- * @requires OpenLayers/Geometry/Aggregate.js
+ * @requires OpenLayers/Geometry/Collection.js
  */
 OpenLayers.Geometry.MultiLineString = OpenLayers.Class.create();
 
 OpenLayers.Geometry.MultiLineString.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Aggregate, {
+    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
 
     /**
     * @constructor
@@ -41,7 +41,7 @@
                 throw "component should be an OpenLayers.Geometry.LineString";
             }
         }
-        OpenLayers.Geometry.Aggregate.prototype.addComponents.apply(this, arguments);
+        OpenLayers.Geometry.Collection.prototype.addComponents.apply(this, arguments);
         
     },
     
@@ -51,7 +51,7 @@
      * @param {Array|OpenLayers.Geometry.LineString} lineString(s) to add
      */
     removeComponents: function(components) {
-        OpenLayers.Geometry.Aggregate.prototype.removeComponents.apply(this, components);
+        OpenLayers.Geometry.Collection.prototype.removeComponents.apply(this, components);
     },
 
     /** @final @type String */

Modified: sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPoint.js
===================================================================
--- sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPoint.js	2007-03-05 21:34:43 UTC (rev 2346)
+++ sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPoint.js	2007-03-05 21:36:24 UTC (rev 2347)
@@ -5,12 +5,12 @@
 /**
  * @class
  *
- * @requires OpenLayers/Geometry/Aggregate.js
+ * @requires OpenLayers/Geometry/Collection.js
  */
 OpenLayers.Geometry.MultiPoint = OpenLayers.Class.create();
 
 OpenLayers.Geometry.MultiPoint.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Aggregate, {
+    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
 
     /**
     * @constructor
@@ -41,7 +41,7 @@
                 throw "component should be an OpenLayers.Geometry.Point";
             }
         }
-        OpenLayers.Geometry.Aggregate.prototype.addComponents.apply(this, arguments);
+        OpenLayers.Geometry.Collection.prototype.addComponents.apply(this, arguments);
     },
     
     /**
@@ -50,7 +50,7 @@
      * @param {Array|OpenLayers.Geometry.Point} point(s) to add
      */
     removeComponents: function(components) {
-        OpenLayers.Geometry.Aggregate.prototype.removeComponents.apply(this, arguments);
+        OpenLayers.Geometry.Collection.prototype.removeComponents.apply(this, arguments);
     },
 
     /** @final @type String */

Modified: sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPolygon.js
===================================================================
--- sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPolygon.js	2007-03-05 21:34:43 UTC (rev 2346)
+++ sandbox/vector-2.4/lib/OpenLayers/Geometry/MultiPolygon.js	2007-03-05 21:36:24 UTC (rev 2347)
@@ -5,12 +5,12 @@
 /**
  * @class
  *
- * @requires OpenLayers/Geometry/Aggregate.js
+ * @requires OpenLayers/Geometry/Collection.js
  */
 OpenLayers.Geometry.MultiPolygon = OpenLayers.Class.create();
 
 OpenLayers.Geometry.MultiPolygon.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Aggregate, {
+    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
 
     /**
     * @constructor
@@ -40,7 +40,7 @@
                 throw "component should be an OpenLayers.Geometry.Polygon but is " + components[i].CLASS_NAME;
             }
         }
-        OpenLayers.Geometry.Aggregate.prototype.addComponents.apply(this, arguments);
+        OpenLayers.Geometry.Collection.prototype.addComponents.apply(this, arguments);
     },
     
     /**
@@ -49,7 +49,7 @@
      * @param {Array|OpenLayers.Geometry.Polygon} point(s) to add
      */
     removeComponents: function(components) {
-        OpenLayers.Geometry.Aggregate.prototype.removeComponents.apply(this, arguments);
+        OpenLayers.Geometry.Collection.prototype.removeComponents.apply(this, arguments);
     },
 
     /** @final @type String */

Modified: sandbox/vector-2.4/lib/OpenLayers/Geometry/Polygon.js
===================================================================
--- sandbox/vector-2.4/lib/OpenLayers/Geometry/Polygon.js	2007-03-05 21:34:43 UTC (rev 2346)
+++ sandbox/vector-2.4/lib/OpenLayers/Geometry/Polygon.js	2007-03-05 21:36:24 UTC (rev 2347)
@@ -9,7 +9,7 @@
  */
 OpenLayers.Geometry.Polygon = OpenLayers.Class.create();
 OpenLayers.Geometry.Polygon.prototype =
-    OpenLayers.Class.inherit(OpenLayers.Geometry.Aggregate, {
+    OpenLayers.Class.inherit(OpenLayers.Geometry.Collection, {
 
     /**
     * @constructor
@@ -39,7 +39,7 @@
                 throw "component should be an OpenLayers.Geometry.LinearRing but is " + components[i].CLASS_NAME;
             }
         }
-        OpenLayers.Geometry.Aggregate.prototype.addComponents.apply(this, arguments);
+        OpenLayers.Geometry.Collection.prototype.addComponents.apply(this, arguments);
     },
     
     /**
@@ -48,7 +48,7 @@
      * @param {Array|OpenLayers.Geometry.Polygon} point(s) to add
      */
     removeComponents: function(components) {
-        OpenLayers.Geometry.Aggregate.prototype.removeComponents.apply(this, arguments);
+        OpenLayers.Geometry.Collection.prototype.removeComponents.apply(this, arguments);
     },
     
     /**