Changeset 6127

Timestamp:

02/08/08 14:41:49 (1 year ago)

Author:

euzuro

Message:

merging bits from trunk into sandbox

Files:

• sandbox/euzuro/pop/doc/authors.txt (modified) (1 diff)
• sandbox/euzuro/pop/examples/animated_panning.html (added)
• sandbox/euzuro/pop/lib/OpenLayers/Control.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Control/DragFeature.js (modified) (10 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Control/ModifyFeature.js (modified) (7 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Control/Navigation.js (modified) (8 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Control/OverviewMap.js (modified) (7 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Format/SLD.js (modified) (3 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Map.js (modified) (6 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Rule.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Rule/Comparison.js (modified) (6 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Rule/FeatureId.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Rule/Logical.js (modified) (6 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Style.js (modified) (7 diffs)
• sandbox/euzuro/pop/tests/Control/test_DragFeature.html (modified) (6 diffs)
• sandbox/euzuro/pop/tests/Control/test_ModifyFeature.html (modified) (2 diffs)
• sandbox/euzuro/pop/tests/Control/test_Navigation.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/Control/test_OverviewMap.html (modified) (4 diffs)
• sandbox/euzuro/pop/tests/Control/test_PanZoom.html (modified) (8 diffs)
• sandbox/euzuro/pop/tests/Control/test_Permalink.html (modified) (6 diffs)
• sandbox/euzuro/pop/tests/Layer/test_Grid.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/Layer/test_KaMap.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/Rule/test_Logical.html (modified) (2 diffs)
• sandbox/euzuro/pop/tests/test_Map.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/test_Style.html (modified) (1 diff)

sandbox/euzuro/pop/doc/authors.txt

@@ -35 +35 @@
-Some portions of OpenLayers are used under the MIT license, availabie in 
-doc/licenses/MIT-LICENSE.txt.
+
+Some portions of OpenLayers are Copyright 2001 Robert Penner, and are used 
+under the BSD license, available in doc/licenses/BSD-LICENSE.txt

sandbox/euzuro/pop/lib/OpenLayers/Control.js

@@ -140 +140 @@
-            this.handler = null;
-        }
+        if(this.handlers) {
+            for(var key in this.handlers) {
+                if(this.handlers.hasOwnProperty(key) &&
+                   typeof this.handlers[key].destroy == "function") {
+                    this.handlers[key].destroy();
+                }
+            }
+            this.handlers = null;
+        }
-        if (this.map) {
-            this.map.removeControl(this);

sandbox/euzuro/pop/lib/OpenLayers/Control/DragFeature.js

@@ -78 +78 @@
-
-    /**
-     * Property: dragHandler
-     * {<OpenLayers.Handler.Drag>}
-     */
-    dragHandler: null,
-
-    /**
-     * Property: dragCallbacks
-     * {Object} The functions that are sent to the drag handler for callback.
-     */
-    dragCallbacks: {},
-
-    /**
-     * Property: featureHandler
-     * {<OpenLayers.Handler.Feature>}
-     */
-    featureHandler: null,
-
-    /**
@@ -120 +108 @@
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        this.layer = layer;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-    
@@ -142 +134 @@
-    destroy: function() {
-        this.layer = null;
-        this.dragHandler.destroy();
-        this.featureHandler.destroy();
-        OpenLayers.Control.prototype.destroy.apply(this, []);
-    },
@@ -155 +145 @@
-     */
-    activate: function() {
-featureHandler
+handlers.feature
-                OpenLayers.Control.prototype.activate.apply(this, arguments));
-    },
@@ -168 +158 @@
-    deactivate: function() {
-        // the return from the handlers is unimportant in this case
-dragHandler
-featureHandler
+handlers.drag
+handlers.feature
-        this.feature = null;
-        this.dragging = false;
@@ -185 +175 @@
-     */
-    overFeature: function(feature) {
-dragHandler
+handlers.drag
-            this.feature = feature;
-dragHandler
+handlers.drag
-            this.over = true;
-            // TBD replace with CSS classes
@@ -239 +229 @@
-    upFeature: function(pixel) {
-        if(!this.over) {
-dragHandler
+handlers.drag
-            this.feature = null;
-            // TBD replace with CSS classes
@@ -266 +256 @@
-     */
-    outFeature: function(feature) {
-dragHandler
+handlers.drag
-            this.over = false;
-dragHandler
+handlers.drag
-            // TBD replace with CSS classes
-            this.map.div.style.cursor = "default";
@@ -284 +274 @@
-     */
-    cancel: function() {
-dragHandler
+handlers.drag
-        this.over = false;
-    },
@@ -296 +286 @@
-     */
-    setMap: function(map) {
-dragHandler
-featureHandler
+handlers.drag
+handlers.feature
-        OpenLayers.Control.prototype.setMap.apply(this, arguments);
-    },

sandbox/euzuro/pop/lib/OpenLayers/Control/ModifyFeature.js

@@ -84 +84 @@
-    
-    /**
-keyboardHandler
-<OpenLayers.Handler.Keyboard>
-
-keyboardHandler
+handlers
+Object
+
+handlers
-    
-    /**
@@ -217 +217 @@
-            keypress: this.handleKeypress
-        };
-keyboardHandler = new OpenLayers.Handler.Keyboard(
-this, keyboardOptions
-)
+handlers = {
+keyboard: new OpenLayers.Handler.Keyboard(this, keyboardOptions)
+}
-    },
-
@@ -230 +230 @@
-        this.selectControl.destroy();
-        this.dragControl.destroy();
-        this.keyboardHandler.destroy();
-        OpenLayers.Control.prototype.destroy.apply(this, []);
-    },
@@ -243 +242 @@
-    activate: function() {
-        return (this.selectControl.activate() &&
-keyboardHandler
+handlers.keyboard
-                OpenLayers.Control.prototype.activate.apply(this, arguments));
-    },
@@ -267 +266 @@
-            }
-            this.selectControl.deactivate();
-keyboardHandler
+handlers.keyboard
-            deactivated = true;
-        }
@@ -353 +352 @@
-                                                   [feature]);
-                this.dragControl.lastPixel = pixel;
-dragHandler
-dragHandler
-dragHandler
+handlers.drag
+handlers.drag
+handlers.drag
-            }
-        }
@@ -487 +486 @@
-            if(vertex &&
-               OpenLayers.Util.indexOf(this.vertices, vertex) != -1 &&
-dragHandler
+handlers.drag
-               vertex.geometry.parent) {
-                // remove the vertex

sandbox/euzuro/pop/lib/OpenLayers/Control/Navigation.js

@@ -37 +37 @@
-    zoomBox: null,
-
-    /** 
-     * Property: wheelHandler
-     * {<OpenLayers.Handler.MouseWheel>}
-     */
-    wheelHandler: null,
-
-    /**
-     * Constructor: OpenLayers.Control.Navigation
@@ -52 +46 @@
-     */
-    initialize: function(options) {
+        this.handlers = {};
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-    },
@@ -62 +57 @@
-     */
-    destroy: function() {
-        OpenLayers.Control.prototype.destroy.apply(this,arguments);
-
-        this.deactivate();
-
@@ -71 +64 @@
-        this.dragPan = null;
-
-        if (this.wheelHandler) {
-            this.wheelHandler.destroy();
-        }
-        this.wheelHandler = null;
-
-        if (this.clickHandler) {
-            this.clickHandler.destroy();
-        }
-        this.clickHandler = null;
-        
-        if (this.zoomBox) {
-            this.zoomBox.destroy();
-        }
-        this.zoomBox = null;
+        OpenLayers.Control.prototype.destroy.apply(this,arguments);
-    },
-    
@@ -92 +76 @@
-    activate: function() {
-        this.dragPan.activate();
-wheelHandler
-clickHandler
+handlers.wheel
+handlers.click
-        this.zoomBox.activate();
-        return OpenLayers.Control.prototype.activate.apply(this,arguments);
@@ -104 +88 @@
-        this.zoomBox.deactivate();
-        this.dragPan.deactivate();
-clickHandler
-wheelHandler
+handlers.click
+handlers.wheel
-        return OpenLayers.Control.prototype.deactivate.apply(this,arguments);
-    },
@@ -113 +97 @@
-     */
-    draw: function() {
-clickHandler
+handlers.click
-                                        { 'dblclick': this.defaultDblClick },
-                                        {
@@ -124 +108 @@
-        this.dragPan.draw();
-        this.zoomBox.draw();
-wheelHandler
+handlers.wheel
-                                    this, {"up"  : this.wheelUp,
-                                           "down": this.wheelDown} );

sandbox/euzuro/pop/lib/OpenLayers/Control/OverviewMap.js

@@ -99 +99 @@
-    
-    /**
-dragHandler
-<OpenLayers.Handler.Drag>} A handler for dragging the extent rectangle.
-
-dragHandler
+handlers
+Object}
+
+handlers
-
-    /**
@@ -115 +115 @@
-    initialize: function(options) {
-        this.layers = [];
+        this.handlers = {};
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-    },
@@ -126 +127 @@
-            return;
-        }
-
-
+
-
-        this.mapDiv.removeChild(this.extentRectangle);
@@ -281 +281 @@
-     */
-    rectDrag: function(px) {
-dragHandler
-dragHandler
+handlers.drag
+handlers.drag
-        if(deltaX != 0 || deltaY != 0) {
-            var rectTop = this.rectPxBounds.top;
@@ -457 +457 @@
-        this.hComp = (this.hComp) ? this.hComp : 2;
-
-dragHandler
+handlers.drag
-            this, {move: this.rectDrag, done: this.updateMapToRect},
-            {map: this.ovmap}
-        );
-clickHandler
+handlers.click
-            this, {
-                "click": this.mapDivClick
@@ -471 +471 @@
-            }
-        );
-clickHandler
+handlers.click
-        
-        this.rectEvents = new OpenLayers.Events(this, this.extentRectangle,
-                                                null, true);
-        this.rectEvents.register("mouseover", this, function(e) {
-dragHandler
-dragHandler
+handlers.drag
+handlers.drag
-            }
-        });
-        this.rectEvents.register("mouseout", this, function(e) {
-dragHandler
-dragHandler
+handlers.drag
+handlers.drag
-            }
-        });
@@ -512 +512 @@
-    updateMapToRect: function() {
-        var lonLatBounds = this.getMapBoundsFromRectBounds(this.rectPxBounds);
-setCenter(lonLatBounds.getCenterLonLat(), this.map.zoom
+panTo(lonLatBounds.getCenterLonLat()
-    },
-

sandbox/euzuro/pop/lib/OpenLayers/Format/SLD.js

@@ -344 +344 @@
-            for (var i=0; i<filters.length; i++) {
-                if (filters[i].nodeType == 1) {
-children
+rules
-                }
-            }
@@ -358 +358 @@
-            for (var i=0; i<filters.length; i++) {
-                if (filters[i].nodeType == 1) {
-children
+rules
-                }
-            }
@@ -369 +369 @@
-            var rule = new OpenLayers.Rule.Logical(
-                    {type: OpenLayers.Rule.Logical.NOT});
-children
+rules
-            return rule;
-        }

sandbox/euzuro/pop/lib/OpenLayers/Map.js

@@ -374 +374 @@
-            //  Note that this is ok, as updateSize() does nothing if the 
-            //  map's size has not actually changed.
+            this.updateSizeDestroy = OpenLayers.Function.bind(this.updateSize, 
+                this);
-            OpenLayers.Event.observe(window, 'resize',
-OpenLayers.Function.bind(this.updateSize, this)
+this.updateSizeDestroy
-        }
-        
@@ -435 +437 @@
-     */
-    unloadDestroy: null,
+    
+    /**
+     * Method: updateSizeDestroy
+     * When the map is destroyed, we need to stop listening to updateSize
+     *    events: this method stores the function we need to unregister in 
+     *    non-IE browsers.
+     */
+    updateSizeDestroy: null,
-
-    /**
@@ -449 +459 @@
-        OpenLayers.Event.stopObserving(window, 'unload', this.unloadDestroy);
-        this.unloadDestroy = null;
+
+        if (this.updateSizeDestroy) {
+            OpenLayers.Event.stopObserving(window, 'resize', 
+                                           this.updateSizeDestroy);
+        } else {
+            this.events.unregister("resize", this, this.updateSize);
+        }    
-
-        if (this.layers != null) {
@@ -1230 +1247 @@
-     * dx - {Integer}
-     * dy - {Integer}
-
-
-
+
+
+
+
+
+
+
+
-        // getCenter
-        var centerPx = this.getViewPortPxFromLonLat(this.getCenter());
@@ -1242 +1264 @@
-        if (!newCenterPx.equals(centerPx)) {
-            var newCenterLonLat = this.getLonLatFromViewPortPx(newCenterPx);
-
+
+
+
+
+
-        }
-
-   },
+   
+   /** 
+     * APIMethod: panTo
+     * Allows user to pan to a new lonlat
+     * If the new lonlat is in the current extent the map will slide smoothly
+     * 
+     * Parameters:
+     * lonlat - {<OpenLayers.Lonlat>}
+     */
+    panTo: function(lonlat) {
+        if (this.getExtent().containsLonLat(lonlat)) {
+            if (!this.panTween) {
+                this.panTween = new OpenLayers.Tween(OpenLayers.Easing.Expo.easeOut);
+            }
+            var center = this.getCenter();
+            var from = {
+                lon: center.lon,
+                lat: center.lat
+            };
+            var to = {
+                lon: lonlat.lon,
+                lat: lonlat.lat
+            };
+            this.panTween.start(from, to, 50, {
+                callbacks: {
+                    start: OpenLayers.Function.bind(function(lonlat) {
+                        this.events.triggerEvent("movestart");
+                    }, this),
+                    eachStep: OpenLayers.Function.bind(function(lonlat) {
+                        var lonlat = new OpenLayers.LonLat(lonlat.lon, lonlat.lat);
+                        this.moveTo(lonlat, this.zoom, true);
+                    }, this),
+                    done: OpenLayers.Function.bind(function(lonlat) {
+                        this.events.triggerEvent("moveend");
+                    }, this)
+                }
+            });
+        } else {
+            this.setCenter(lonlat);
+        }
+    },
-
-    /**
@@ -1286 +1353 @@
-        // noEvent is false by default
-        var noEvent = options.noEvent;
+
+        if (this.panTween && options.caller == "setCenter") {
+            this.panTween.stop();
+        }    
-             
-        if (!this.center && !this.isValidLonLat(lonlat)) {

sandbox/euzuro/pop/lib/OpenLayers/Rule.js

@@ -20 +20 @@
-     */
-    name: 'default',
+    
+    /**
+     * Property: context
+     * {Object} An optional object with properties that the rule and its
+     * symbolizers' property values should be evaluatad against. If no
+     * context is specified, feature.attributes will be used
+     */
+    context: null,
-
-    /**
@@ -94 +102 @@
-     */
-    evaluate: function(feature) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    },
-    
+    /**
+     * Method: getContext
+     * Gets the context for evaluating this rule
+     * 
+     * Paramters:
+     * feature - {<OpenLayers.Feature>} feature to take the context from if
+     *           none is specified.
+     */
+    getContext: function(feature) {
+        var context = this.context;
+        if (!context) {
+            context = feature.attributes || feature.data;
+        }
+        return context;
+    },
+        
-    CLASS_NAME: "OpenLayers.Rule"
-});

sandbox/euzuro/pop/lib/OpenLayers/Rule/Comparison.js

@@ -34 +34 @@
-     * APIProperty: property
-     * {String}
-feature attribute
+context property
-     */
-    property: null,
@@ -85 +85 @@
-    /**
-     * APIMethod: evaluate
-feature
-
-
-feature - {<OpenLayers.Feature>} feature
+context
+
+
+context - {Object} context
-     * 
-     * Returns:
@@ -94 +94 @@
-     */
-    evaluate: function(feature) {
-
+
+
+
+
-        switch(this.type) {
-            case OpenLayers.Rule.Comparison.EQUAL_TO:
@@ -101 +104 @@
-            case OpenLayers.Rule.Comparison.LESS_THAN_OR_EQUAL_TO:
-            case OpenLayers.Rule.Comparison.GREATER_THAN_OR_EQUAL_TO:
-feature
+context
-            
-            case OpenLayers.Rule.Comparison.BETWEEN:
-                var result =
-attributes
+context
-                result = result &&
-attributes
+context
-                return result;
-            case OpenLayers.Rule.Comparison.LIKE:
-                var regexp = new RegExp(this.value,
-                                "gi");
-attributes
+context
-        }
-    },
@@ -166 +169 @@
-     * 
-     * Parameters:
-feature  - {<OpenLayers.Feature>
+context  - {Object
-     * property - {String} or {Number}
-     * value    - {String} or {Number}, same as property
@@ -173 +176 @@
-     * {boolean}
-     */
-
-
+
-        switch (this.type) {
-            case OpenLayers.Rule.Comparison.EQUAL_TO:
-attributes
+context
-            case OpenLayers.Rule.Comparison.NOT_EQUAL_TO:
-attributes
+context
-            case OpenLayers.Rule.Comparison.LESS_THAN:
-attributes
+context
-            case OpenLayers.Rule.Comparison.GREATER_THAN:
-attributes
+context
-            case OpenLayers.Rule.Comparison.LESS_THAN_OR_EQUAL_TO:
-attributes
+context
-            case OpenLayers.Rule.Comparison.GREATER_THAN_OR_EQUAL_TO:
-attributes
+context
-        }      
-    },

sandbox/euzuro/pop/lib/OpenLayers/Rule/FeatureId.js

@@ -54 +54 @@
-     */
-    evaluate: function(feature) {
+        if (!OpenLayers.Rule.prototype.evaluate.apply(this, arguments)) {
+            return false;
+        }
-        for (var i=0; i<this.fids.length; i++) {
-            var fid = feature.fid || feature.id;

sandbox/euzuro/pop/lib/OpenLayers/Rule/Logical.js

@@ -21 +21 @@
-     * {Array(<OpenLayers.Rule>)} child rules for this rule
-     */
-children
+rules
-     
-    /**
@@ -44 +44 @@
-     */
-    initialize: function(options) {
-children
+rules
-        OpenLayers.Rule.prototype.initialize.apply(this, [options]);
-    },
@@ -53 +53 @@
-     */
-    destroy: function() {
-children
-children
+rules
+rules
-        }
-children
+rules
-        OpenLayers.Rule.prototype.destroy.apply(this, arguments);
-    },
@@ -71 +71 @@
-     */
-    evaluate: function(feature) {
+        if (!OpenLayers.Rule.prototype.evaluate.apply(this, arguments)) {
+            return false;
+        }
-        switch(this.type) {
-            case OpenLayers.Rule.Logical.AND:
-children
-children
+rules
+rules
-                        return false;
-                    }
@@ -81 +84 @@
-                
-            case OpenLayers.Rule.Logical.OR:
-children
-children
+rules
+rules
-                        return true;
-                    }
@@ -89 +92 @@
-            
-            case OpenLayers.Rule.Logical.NOT:
-children
+rules
-        }
-    },

sandbox/euzuro/pop/lib/OpenLayers/Style.js

@@ -113 +113 @@
-        var rules = this.rules;
-
-
+, context
-        var elseRules = [];
-        var appliedRules = false;
-        for(var i=0; i<rules.length; i++) {
-            rule = rules[i];
+            context = rule.context;
+            if (!context) {
+                context = feature.attributes || feature.data;
+            }
-            // does the rule apply?
-            var applies = rule.evaluate(feature);
-            
-            if (rule.minScaleDenominator || rule.maxScaleDenominator) {
-                var scale = feature.layer.map.getScale();
-            }
-            
-            // check if within minScale/maxScale bounds
-            if (rule.minScaleDenominator) {
-                applies = scale >= OpenLayers.Style.createLiteral(
-                        rule.minScaleDenominator, feature);
-            }
-            if (applies && rule.maxScaleDenominator) {
-                applies = scale < OpenLayers.Style.createLiteral(
-                        rule.maxScaleDenominator, feature);
-            }
-
-            if(applies) {
-                if(rule instanceof OpenLayers.Rule && rule.elseFilter) {
@@ -140 +130 @@
-                } else {
-                    appliedRules = true;
-
+, context
-                }
-            }
@@ -149 +139 @@
-            appliedRules = true;
-            for(var i=0; i<elseRules.length; i++) {
-
-
-
-
-
-
+
+
+
-
-        // don't display if there were rules but none applied
@@ -173 +160 @@
-     * style - {Object}
-     * feature - {<OpenLayer.Feature.Vector>}
+     * context - {Object}
-     *
-     * Returns:
-     * {Object} A style with new symbolizer applied.
-     */
-
+, context
-        var symbolizerPrefix = feature.geometry ?
-                this.getSymbolizerPrefix(feature.geometry) :
-                OpenLayers.Style.SYMBOLIZER_PREFIXES[0];
-
+        var symbolizer = rule.symbolizer[symbolizerPrefix];
+
-        // merge the style with the current style
-var symbolizer = rule.symbolizer[symbolizerPrefix];
-return OpenLayers.Util.extend(style, symbolizer
+return this.createLiterals(
+        OpenLayers.Util.extend(style, symbolizer), context
-    },
-    
@@ -195 +185 @@
-     * style   - {Object} style to create literals for. Will be modified
-     *           inline.
-
+
+