[Commits] r1938 - in sandbox/fvanderbiest/geoext.ux/ux/Measure: examples lib/GeoExt.ux

commits at geoext.org commits at geoext.org
Tue Mar 9 11:51:49 CET 2010


Author: fvanderbiest
Date: 2010-03-09 11:51:49 +0100 (Tue, 09 Mar 2010)
New Revision: 1938

Added:
   sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureArea.js
   sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureLength.js
   sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasurePosition.js
Removed:
   sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Area.js
   sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Length.js
   sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Position.js
Modified:
   sandbox/fvanderbiest/geoext.ux/ux/Measure/examples/Measure.html
Log:
Measure ux: child classes renamed

Modified: sandbox/fvanderbiest/geoext.ux/ux/Measure/examples/Measure.html
===================================================================
--- sandbox/fvanderbiest/geoext.ux/ux/Measure/examples/Measure.html	2010-03-09 10:49:53 UTC (rev 1937)
+++ sandbox/fvanderbiest/geoext.ux/ux/Measure/examples/Measure.html	2010-03-09 10:51:49 UTC (rev 1938)
@@ -14,9 +14,9 @@
         
         <!-- script resources for this ux -->
         <script type="text/javascript" src="../lib/GeoExt.ux/Measure.js"></script>
-        <script type="text/javascript" src="../lib/GeoExt.ux/Measure.Area.js"></script>
-        <script type="text/javascript" src="../lib/GeoExt.ux/Measure.Length.js"></script>
-        <script type="text/javascript" src="../lib/GeoExt.ux/Measure.Position.js"></script>
+        <script type="text/javascript" src="../lib/GeoExt.ux/MeasureArea.js"></script>
+        <script type="text/javascript" src="../lib/GeoExt.ux/MeasureLength.js"></script>
+        <script type="text/javascript" src="../lib/GeoExt.ux/MeasurePosition.js"></script>
         
         <script type="text/javascript" src="Measure.js"></script>
     </head>

Deleted: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Area.js
===================================================================
--- sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Area.js	2010-03-09 10:49:53 UTC (rev 1937)
+++ sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Area.js	2010-03-09 10:51:49 UTC (rev 1938)
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2008-2009 The Open Source Geospatial Foundation
- * 
- * Published under the BSD license.
- * See http://svn.geoext.org/core/trunk/geoext/license.txt for the full text
- * of the license.
- */
-
-Ext.namespace("GeoExt.ux")
-
-/*
- * @requires GeoExt.ux/Measure.js
- */
-
-/** api: (define)
- *  module = GeoExt.ux.MeasureArea
- *  class = MeasureArea
- */
-
-/** api: constructor
- *  .. class:: MeasureArea
- * 
- *  A GeoExt.Action configured for area measurements
- *  JSBuild: need to include OpenLayers/Handler/Polygon.js
- */
-GeoExt.ux.MeasureArea = Ext.extend(GeoExt.ux.Measure, {
-    
-    /** private: method[constructor]
-     */
-    constructor: function(config) {
-        Ext.applyIf(config, {
-            iconCls: 'gx-map-measurearea',
-            tooltip: "Area measurement",
-            template: '<p>{[values.measure.toFixed(this.decimals) + " "'
-                +'+ values.units + "<sup>2</sup>"]}</p>'
-        });
-        arguments.callee.superclass.constructor.call(this,
-            OpenLayers.Handler.Polygon, config);
-    }
-});

Deleted: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Length.js
===================================================================
--- sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Length.js	2010-03-09 10:49:53 UTC (rev 1937)
+++ sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Length.js	2010-03-09 10:51:49 UTC (rev 1938)
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2008-2009 The Open Source Geospatial Foundation
- * 
- * Published under the BSD license.
- * See http://svn.geoext.org/core/trunk/geoext/license.txt for the full text
- * of the license.
- */
-
-Ext.namespace("GeoExt.ux")
-
-/*
- * @requires GeoExt.ux/Measure.js
- */
-
-/** api: (define)
- *  module = GeoExt.ux.MeasureLength
- *  class = MeasureLength
- */
-
-/** api: constructor
- *  .. class:: MeasureLength
- * 
- *  A GeoExt.Action configured for length measurements
- *  JSBuild: need to include OpenLayers/Handler/Path.js
- */
-GeoExt.ux.MeasureLength = Ext.extend(GeoExt.ux.Measure, {
-    
-    /** private: method[constructor]
-     */
-    constructor: function(config) {
-        Ext.applyIf(config, {
-            iconCls: 'gx-map-measurelength',
-            tooltip: "Length measurement",
-            template: '<p>{[values.measure.toFixed(this.decimals) + " "'+
-                '+ values.units]}</p>'
-        });
-        arguments.callee.superclass.constructor.call(this, 
-            OpenLayers.Handler.Path, config);
-    }
-});

Deleted: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Position.js
===================================================================
--- sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Position.js	2010-03-09 10:49:53 UTC (rev 1937)
+++ sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Position.js	2010-03-09 10:51:49 UTC (rev 1938)
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2008-2009 The Open Source Geospatial Foundation
- * 
- * Published under the BSD license.
- * See http://svn.geoext.org/core/trunk/geoext/license.txt for the full text
- * of the license.
- */
-
-Ext.namespace("GeoExt.ux")
-
-/*
- * @requires GeoExt.ux/Measure.js
- */
-
-/** api: (define)
- *  module = GeoExt.ux.MeasurePosition
- *  class = MeasurePosition
- */
-
-/** api: constructor
- *  .. class:: MeasurePosition
- * 
- *  A GeoExt.Action configured for position measurements
- *  JSBuild: need to include OpenLayers/Handler/Point.js
- */
-GeoExt.ux.MeasurePosition = Ext.extend(GeoExt.ux.Measure, {
-    
-    // FIXME: this depends on http://trac.openlayers.org/ticket/2511 for point measurements
-    
-    /** private: method[constructor]
-     */
-    constructor: function(config) {
-        var scope = {
-            decimals: (config.hasOwnProperty('decimals')) ? 
-                config.decimals : 2
-        };
-        
-        Ext.applyIf(config, {
-            iconCls: 'gx-map-measureposition',
-            tooltip: "Position measurement"
-        });
-        
-        arguments.callee.superclass.constructor.call(this, 
-            OpenLayers.Handler.Point, config);
-        
-        if (this.control.map.units == 'degrees' || this.control.map.units == 'dd') {
-            this.template = new Ext.XTemplate(
-                '<p>{["lon: "+values.geometry.x.toFixed(this.decimals) + "&deg;"]}</p>'+
-                '<p>{["lat: "+values.geometry.y.toFixed(this.decimals) + "&deg;"]}</p>', 
-            scope);
-        } else {
-            this.template = new Ext.XTemplate(
-                '<p>{["X: "+values.geometry.x.toFixed(this.decimals) '+
-                '+ " " + values.units]}</p>'+
-                '<p>{["Y: "+values.geometry.y.toFixed(this.decimals) '+
-                '+ " " + values.units]}</p>', 
-            scope);
-        }
-        this.template.compile();
-    }
-});

Copied: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureArea.js (from rev 1937, sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Area.js)
===================================================================
--- sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureArea.js	                        (rev 0)
+++ sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureArea.js	2010-03-09 10:51:49 UTC (rev 1938)
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2008-2009 The Open Source Geospatial Foundation
+ * 
+ * Published under the BSD license.
+ * See http://svn.geoext.org/core/trunk/geoext/license.txt for the full text
+ * of the license.
+ */
+
+Ext.namespace("GeoExt.ux")
+
+/*
+ * @requires GeoExt.ux/Measure.js
+ */
+
+/** api: (define)
+ *  module = GeoExt.ux.MeasureArea
+ *  class = MeasureArea
+ */
+
+/** api: constructor
+ *  .. class:: MeasureArea
+ * 
+ *  A GeoExt.Action configured for area measurements
+ *  JSBuild: need to include OpenLayers/Handler/Polygon.js
+ */
+GeoExt.ux.MeasureArea = Ext.extend(GeoExt.ux.Measure, {
+    
+    /** private: method[constructor]
+     */
+    constructor: function(config) {
+        Ext.applyIf(config, {
+            iconCls: 'gx-map-measurearea',
+            tooltip: "Area measurement",
+            template: '<p>{[values.measure.toFixed(this.decimals) + " "'
+                +'+ values.units + "<sup>2</sup>"]}</p>'
+        });
+        arguments.callee.superclass.constructor.call(this,
+            OpenLayers.Handler.Polygon, config);
+    }
+});


Property changes on: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureArea.js
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureLength.js (from rev 1937, sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Length.js)
===================================================================
--- sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureLength.js	                        (rev 0)
+++ sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureLength.js	2010-03-09 10:51:49 UTC (rev 1938)
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2008-2009 The Open Source Geospatial Foundation
+ * 
+ * Published under the BSD license.
+ * See http://svn.geoext.org/core/trunk/geoext/license.txt for the full text
+ * of the license.
+ */
+
+Ext.namespace("GeoExt.ux")
+
+/*
+ * @requires GeoExt.ux/Measure.js
+ */
+
+/** api: (define)
+ *  module = GeoExt.ux.MeasureLength
+ *  class = MeasureLength
+ */
+
+/** api: constructor
+ *  .. class:: MeasureLength
+ * 
+ *  A GeoExt.Action configured for length measurements
+ *  JSBuild: need to include OpenLayers/Handler/Path.js
+ */
+GeoExt.ux.MeasureLength = Ext.extend(GeoExt.ux.Measure, {
+    
+    /** private: method[constructor]
+     */
+    constructor: function(config) {
+        Ext.applyIf(config, {
+            iconCls: 'gx-map-measurelength',
+            tooltip: "Length measurement",
+            template: '<p>{[values.measure.toFixed(this.decimals) + " "'+
+                '+ values.units]}</p>'
+        });
+        arguments.callee.superclass.constructor.call(this, 
+            OpenLayers.Handler.Path, config);
+    }
+});


Property changes on: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasureLength.js
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasurePosition.js (from rev 1937, sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/Measure.Position.js)
===================================================================
--- sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasurePosition.js	                        (rev 0)
+++ sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasurePosition.js	2010-03-09 10:51:49 UTC (rev 1938)
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2008-2009 The Open Source Geospatial Foundation
+ * 
+ * Published under the BSD license.
+ * See http://svn.geoext.org/core/trunk/geoext/license.txt for the full text
+ * of the license.
+ */
+
+Ext.namespace("GeoExt.ux")
+
+/*
+ * @requires GeoExt.ux/Measure.js
+ */
+
+/** api: (define)
+ *  module = GeoExt.ux.MeasurePosition
+ *  class = MeasurePosition
+ */
+
+/** api: constructor
+ *  .. class:: MeasurePosition
+ * 
+ *  A GeoExt.Action configured for position measurements
+ *  JSBuild: need to include OpenLayers/Handler/Point.js
+ */
+GeoExt.ux.MeasurePosition = Ext.extend(GeoExt.ux.Measure, {
+    
+    // FIXME: this depends on http://trac.openlayers.org/ticket/2511 for point measurements
+    
+    /** private: method[constructor]
+     */
+    constructor: function(config) {
+        var scope = {
+            decimals: (config.hasOwnProperty('decimals')) ? 
+                config.decimals : 2
+        };
+        
+        Ext.applyIf(config, {
+            iconCls: 'gx-map-measureposition',
+            tooltip: "Position measurement"
+        });
+        
+        arguments.callee.superclass.constructor.call(this, 
+            OpenLayers.Handler.Point, config);
+        
+        if (this.control.map.units == 'degrees' || this.control.map.units == 'dd') {
+            this.template = new Ext.XTemplate(
+                '<p>{["lon: "+values.geometry.x.toFixed(this.decimals) + "&deg;"]}</p>'+
+                '<p>{["lat: "+values.geometry.y.toFixed(this.decimals) + "&deg;"]}</p>', 
+            scope);
+        } else {
+            this.template = new Ext.XTemplate(
+                '<p>{["X: "+values.geometry.x.toFixed(this.decimals) '+
+                '+ " " + values.units]}</p>'+
+                '<p>{["Y: "+values.geometry.y.toFixed(this.decimals) '+
+                '+ " " + values.units]}</p>', 
+            scope);
+        }
+        this.template.compile();
+    }
+});


Property changes on: sandbox/fvanderbiest/geoext.ux/ux/Measure/lib/GeoExt.ux/MeasurePosition.js
___________________________________________________________________
Name: svn:mergeinfo
   + 



More information about the Commits mailing list