Changeset 6369

Timestamp:

02/25/08 22:00:00 (11 months ago)

Author:

achipa

Message:

Followed general prototype extension deprecation rules
Added forgotten tests
Added forgotten TimePosition control

Files:

• sandbox/achipa/openlayers/examples/time-select-control.html (modified) (2 diffs)
• sandbox/achipa/openlayers/examples/timed-point-track-markers.html (modified) (1 diff)
• sandbox/achipa/openlayers/lib/OpenLayers.js (modified) (1 diff)
• sandbox/achipa/openlayers/lib/OpenLayers/BaseTypes.js (modified) (2 diffs)
• sandbox/achipa/openlayers/lib/OpenLayers/BaseTypes/ExtDate.js (deleted)
• sandbox/achipa/openlayers/lib/OpenLayers/Control/PanTimeBar.js (modified) (1 diff)
• sandbox/achipa/openlayers/lib/OpenLayers/Control/TimePosition.js (added)
• sandbox/achipa/openlayers/lib/OpenLayers/Layer.js (modified) (3 diffs)
• sandbox/achipa/openlayers/lib/OpenLayers/Layer/TimedPointTrack.js (modified) (5 diffs)
• sandbox/achipa/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• sandbox/achipa/openlayers/tests/test_BaseTypes.html (modified) (1 diff)
• sandbox/achipa/openlayers/tests/test_Layer.html (modified) (1 diff)
• sandbox/achipa/openlayers/tests/test_Map.html (modified) (1 diff)
• sandbox/achipa/openlayers/theme/default/style.css (modified) (1 diff)

sandbox/achipa/openlayers/examples/time-select-control.html

@@ -23 +23 @@
-            timeBar = new OpenLayers.Control.PanTimeBar();
-            map.addControl(timeBar);
+            map.addControl(new OpenLayers.Control.TimePosition());
+            map.addControl(new OpenLayers.Control.MousePosition());
-        }
-
@@ -72 +74 @@
-
-        function setTime() {
-Date.fromRFC3339
+OpenLayers.Date.smartParse
-            map.setTime(targetdate);
-        }

sandbox/achipa/openlayers/examples/timed-point-track-markers.html

@@ -67 +67 @@
-
-        function setTime() {
-Date.fromRFC3339
+OpenLayers.Date.smartParse
-            lineLayer.permanentHighlight = OpenLayers.Util.getElement('phighlight').checked;
-            lineLayer.interpolatePoints = OpenLayers.Util.getElement('ipoints').checked;

sandbox/achipa/openlayers/lib/OpenLayers.js

@@ -152 +152 @@
-            "OpenLayers/Control/Permalink.js",
-            "OpenLayers/Control/Scale.js",
+            "OpenLayers/Control/TimePosition.js",
-            "OpenLayers/Control/LayerSwitcher.js",
-            "OpenLayers/Control/DrawFeature.js",

sandbox/achipa/openlayers/lib/OpenLayers/BaseTypes.js

@@ -10 +10 @@
- * @requires OpenLayers/BaseTypes/Bounds.js
- * @requires OpenLayers/BaseTypes/Element.js
- * @requires OpenLayers/BaseTypes/DateTime.js
- */
-
-/**
- * Header: OpenLayers Base Types
- and function
+, function and date
- */
-
@@ -475 +474 @@
-    
-};
+
+/*********************
+ *                   *
+ *      DATE         * 
+ *                   * 
+ *********************/
+
+OpenLayers.Date = {
+
+/**
+ * APIMethod: contains
+ * Return whether the parameter date is fully contained within the interval of the Date method
+ * in whose context this function is called
+ *
+ * Parameters:
+ * {Date} source date context
+ * {Date} targetdate
+ *
+ * Returns:
+ * {bool}
+ */
+
+    contains: function(source, targetdate) {
+        if (targetdate >= source && OpenLayers.Date.getEndDate(targetdate) <= OpenLayers.Date.getEndDate(source))
+            return true;
+        return false;
+    },
+
+/**
+ * APIMethod: getEndDate
+ * Returns a {Date} object with the value of the end of the interval represented in this object
+ *
+ * Parameters:
+ * {Date} source date context
+ *
+ * Returns:
+ * {Date}
+ */
+    getEndDate: function(source) {
+        return new Date(source.getTime() + source.duration);
+    },
+
+/**
+ * APIMethod: merge
+ * Extends the start or duration of this Date object so it encompasses the interval targetdate object as well
+ * as the currect interval.
+ *
+ * Parameters:
+ * {Date} source date context
+ * {Date} targetdate
+ */
+    merge: function(source, targetdate) {
+        var range = new Date(source);
+        if (targetdate < source) {
+            range.duration += source - targetdate;
+        range.setTime(targetdate.getTime());
+        }
+        var extend = OpenLayers.Date.getEndDate(targetdate) - OpenLayers.Date.getEndDate(source);
+        if ( extend > 0){
+            range.duration += extend;
+        }
+        return range;
+    },
+
+/**
+ * APIMethod: getPlaceInInterval
+ * Returns a float value between 0 and 1 depending on where the targetdate parameter is in the
+ * date objects' time interval. If targetdate starts earlier than the date object, 0 is returned,
+ * if it starts after the end of the date object, 1 is returned.
+ *
+ * The optional second {bool} parameter defines whether the center of the
+ * targetdate's interval should be used (default is false).
+ *
+ * Parameters:
+ * {Date} source date context
+ * {Date} targetdate
+ * {bool} use center of targetdate if it's an interval
+ *
+ * Returns:
+ * {float} 0.0 - 1.0
+ */
+    getPlaceInInterval: function(source, targetdate, center) {
+        if (!targetdate) return 0.0;
+        if (!source.duration) return 0.0;
+        var centerdate = new Date(targetdate);
+        if (center && targetdate.duration != 0)
+            centerdate.setTime(targetdate.getTime() + targetdate.duration/2);
+
+        if (centerdate > OpenLayers.Date.getEndDate(source))
+            return 1.0;
+        else if (source >= centerdate) // using <= to accomodate for non-interval datetimes
+            return 0.0;
+        else
+            return (centerdate - source) / source.duration ;
+    },
+
+/**
+ * APIMethod: equals
+ * Returns whether the targetdate is equal by both start times and duration to the objects'
+ *
+ * Parameters:
+ * {Date} source date context
+ * {Date} targetdate
+ *
+ * Returns:
+ * {bool}
+ */
+    equals: function(source, targetdate) {
+        if (source == null || targetdate == null) return false;
+        if (source.getTime() == targetdate.getTime() && source.duration == targetdate.duration) return true;
+        return false;
+    },
+
+
+/**
+ * APIMethod: smartParse
+ * Parse String date regardless is it's RFC3339 or RFC822
+ *
+ * Parameters:
+ * {String} source date string
+ *
+ * Returns:
+ * {Date}
+ */
+    smartParse: function(datestr) {
+        var targetdate = new Date();
+        targetdate.setTime(Date.parse(datestr));
+        if (datestr && !targetdate.getTime()) {
+            var pattern = /\D+/;
+            var datearray = datestr.split(pattern);
+            targetdate.setTime(Date.UTC(datearray[0], datearray[1]-1, datearray[2], datearray[3], datearray[4], datearray[5]));
+        }
+        return targetdate;
+    }
+};
+
+Date.prototype.duration = 0;

sandbox/achipa/openlayers/lib/OpenLayers/Control/PanTimeBar.js

@@ -383 +383 @@
-            has = false;
-            for (j=0; j < this.time.length; j++) {
-this.time[j].equals(
+OpenLayers.Date.equals(this.time[j],
-                    has = true
-                    continue;

sandbox/achipa/openlayers/lib/OpenLayers/Layer.js

@@ -1043 +1043 @@
-    },
-
-    getDateTimeIntervals: function () {
-        return this.datetimeIntervals;
-    },
-
-    /**
-     * Method: setTime
@@ -1056 +1052 @@
-            return;
-
-this.currentDateTime.equals(
+OpenLayers.Date.equals(this.currentDateTime,
-            this.currentDateTime = dt;
-        }
@@ -1067 +1063 @@
-     */
-    setTimeFromMap: function () {
-
-
-
-
-
-
+
-    },
-

sandbox/achipa/openlayers/lib/OpenLayers/Layer/TimedPointTrack.js

@@ -90 +90 @@
-    updateHighlight: function(){
-        this.renderer.eraseFeatures([this.highlight]);
-this.currentDateTime.getEndDate(
+OpenLayers.Date.getEndDate(this.currentDateTime
-            return;
-      
@@ -100 +100 @@
-               Math.min(                                           // than the result to the closer point in time
-                   Math.abs( this.features[i].dateTime - this.currentDateTime ),
-this.features[i].dateTime.getEndDate(
+OpenLayers.Date.getEndDate(this.features[i].dateTime
-                   )
-this.features[i].dateTime.contains(
+OpenLayers.Date.contains(this.features[i].dateTime, 
-        ){
-                closesttime = this.features[i].dateTime;
@@ -115 +115 @@
-        // if PointTrack was to work with something else, this would have to be adapted, too
-            closestpoint = new OpenLayers.Geometry.Point(
-closestfeature.dateTime.getPlaceInInterval(
-closestfeature.dateTime.getPlaceInInterval(
+OpenLayers.Date.getPlaceInInterval(closestfeature.dateTime,
+OpenLayers.Date.getPlaceInInterval(closestfeature.dateTime,
-        );
-        }
@@ -137 +137 @@
-     */
-    dateTimeFromFeatures: function() {
-Date.UTC(2038,0,0)
-Date.UTC(1970,0,0)
+null
+null
-        for(var i = 0; i < this.features.length; i++) {
-            if (this.features[i].attributes["pubdate"]) {
-Date.fromRFC3339
-
+OpenLayers.Date.smartParse
+ || !begin
-                    begin = pubdate;
-
+ || !end
-                    end = pubdate;
-            }
@@ -178 +178 @@
-
-        if (pointFeature.data)
-Date.fromRFC3339
+OpenLayers.Date.smartParse
-        else if (pointFeature.attributes)
-Date.fromRFC3339
+OpenLayers.Date.smartParse
-            
-            if (!endPoint) {

sandbox/achipa/openlayers/lib/OpenLayers/Map.js

@@ -1936 +1936 @@
-     */
-    setTime: function (dt) {
-this.currentDateTime.equals(
+OpenLayers.Date.equals(this.currentDateTime,
-            this.currentDateTime = dt;
-
-
-
+
+
-        
-    },

sandbox/achipa/openlayers/tests/test_BaseTypes.html

@@ -240 +240 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  </script>

sandbox/achipa/openlayers/tests/test_Layer.html

@@ -349 +349 @@
-    }
-
+    function test_layer_temporal(t) {
+        t.plan(3);
+        var map = new OpenLayers.Map('map');
+        layer = new OpenLayers.Layer();
+    var d1 = new Date(Date.parse("Jul 8, 2005"));
+    var d2 = new Date(Date.parse("Jul 9, 2005"));
+    var d3 = new Date(Date.parse("Jul 10, 2005"));
+        map.addLayer(layer);
+        layer.datetimeIntervals = [ d1, d2, d3 ]; 
+        map.setTime(d2);
+        layer.setTimeFromMap();
+        t.eq(OpenLayers.Date.equals(layer.getStartTime(), d1), true, "First date");
+        t.eq(OpenLayers.Date.equals(layer.getStopTime(), d3), true, "Last date");
+        t.eq(OpenLayers.Date.equals(layer.currentDateTime, d2), true, "Time on layer set");
+    }
-
-

sandbox/achipa/openlayers/tests/test_Map.html

@@ -976 +976 @@
-    }
-
+    function test_Map_setTime (t) {
+        t.plan( 2 );    
+        map = new OpenLayers.Map('map');
+        map.events.register("datechanged", {count: 0}, function() {
+            this.count++;
+            t.ok(true, "datechanged event was triggered");
+        });
+
+        var d= new Date(Date.parse("Jul 8, 2005"));
+        map.setTime(d);
+        t.eq(OpenLayers.Date.equals(map.currentDateTime, d), true, "Map date set");
+        map.setTime(new Date(Date.parse("Jul 8, 2005"))); // just to check that we don't get excessive events
+    }
+
-    function test_99_Map_destroy (t) {
-        t.plan( 3 );    

sandbox/achipa/openlayers/theme/default/style.css

@@ -36 +36 @@
-    bottom: 0em;
-    right: 3px;
+    display: block;
+    position: absolute;
+    font-family: Arial;
+    font-size: smaller;
+}
+
+div.olControlTimePosition {
+    bottom: 0em;
+    left: 3px;
-    display: block;
-    position: absolute;