Changeset 2020

Timestamp:

12/06/06 22:47:42 (2 years ago)

Author:

camerons

Message:

#434 Now querying multiple layers works based on querying layers below the top using BoundingBox queries. Still need to address point queries, and aggregate geometries.

Files:

• sandbox/vector/lib/OpenLayers/BaseTypes.js (modified) (1 diff)
• sandbox/vector/lib/OpenLayers/Control/EditingAttributes.js (modified) (7 diffs)
• sandbox/vector/lib/OpenLayers/Feature.js (modified) (3 diffs)
• sandbox/vector/lib/OpenLayers/Geometry.js (modified) (2 diffs)
• sandbox/vector/lib/OpenLayers/Geometry/Aggregate.js (modified) (1 diff)
• sandbox/vector/lib/OpenLayers/Parser/GML.js (modified) (3 diffs)

sandbox/vector/lib/OpenLayers/BaseTypes.js

@@ -488 +488 @@
-                this.top=(top>this.top)?top:this.top;
-            }else{
-<this.left)?left:this.lef
-<this.bottom)?bottom:this.bottom
+>this.right)?left:this.righ
+>this.top)?bottom:this.top
-            }
-        }

sandbox/vector/lib/OpenLayers/Control/EditingAttributes.js

@@ -28 +28 @@
-    
-    /**
+     * Register for mousedown events
+     */
+    turnOn: function() {
+
+        this.setLayer();
+        
+        this.defaultMouseDown = this.defaultMouseDown.bindAsEventListener(this);
+        this.map.events.register( "mousedown", this, this.defaultMouseDown);
+    },
+
+    /**
+     *
+     */
+    turnOff: function() {
+        this.map.events.unregister( "mousedown", this, this.defaultMouseDown);
+    },
+    
+    /**
-     * Render an array of attributes into a popup.
-     * @param attributes Attributes array to render
-     */
-    setContent: function(attributes) {
-       
-       
-
+        
+        
+
-        //configure main div
-        this.div.style.position = "absolute";
@@ -50 +68 @@
-
-        this.innerDiv = document.createElement("div");
-       
+        
-        this.innerDiv.id = "layersDiv";
-        this.innerDiv.style.paddingTop = "2px";
@@ -57 +75 @@
-        this.innerDiv.style.paddingRight = "2px";
-        this.innerDiv.style.backgroundColor = this.activeColor;
-       
+        
-
-        Rico.Corner.round(this.div, {corners: "tl bl",
@@ -65 +83 @@
-
-        Rico.Corner.changeOpacity(this.innerDiv, 0.75);
-
+
-        attribs=attributes.getAttributes();
-        for (var i = 0; i < attribs.length; i++) {
@@ -85 +103 @@
-            this.innerDiv.appendChild(attributeDiv);
-        }
-
+
-        // minimize button div
-        var imgLocation = OpenLayers.Util.getImagesLocation();
@@ -105 +123 @@
-        this.div.appendChild(this.minimizeDiv);
-
-       
+        
-        OpenLayers.Event.observe(this.div, "mouseup", this.ignoreEvent);
-        OpenLayers.Event.observe(this.div, "mousedown", this.ignoreEvent);
@@ -130 +148 @@
-    },
-
+    /**
+     * Add the Geometry that has been selected to the Event.
+     * The top geometry layer is selected first, this is done using
+     * SVG/VML feature selection and is accurate. If a feature is not
+     * found, features in layers below are progressively queried using
+     * the BoundingBox of the feature. (Ie, it is not very accurate).
+     * See http://trac.openlayers.org/ticket/434 for more info.
+     *
+     * @param {Event} evt
+     */
+    setEventContext: function(evt) {
+        // calculate the mouse position
+        var lonlat = this.map.getLonLatFromLayerPx(evt.xy);
+        evt.point = new OpenLayers.Geometry.Point(lonlat.lon, lonlat.lat);
+
+        // For the top layer, query the SVG/VML feature
+        if(map.layers.length>0){
+            evt.targetGeometry = map.layers[map.layers.length-1].renderer.getGeometryFromEvent(evt);
+        }
+        // For remaining layers, query features based on feature bounds.
+        // Exit loop when a feature is found.
+        for(var i=map.layers.length-1;(!evt.targetGeometry&&(i>=0));i--){
+            if(map.layers[i].getVisibility()&&map.layers[i].isVector){
+                for(var f=0;!evt.targetGeometry&&(f<map.layers[i].features.length);f++){
+                    if(map.layers[i].features[f].atPoint(lonlat)){
+                        evt.targetGeometry=map.layers[i].features[f].geometry;
+                    }
+                    
+                }
+            }
+        }
+        
+        // reset evt.point if modes are activated.
+        if (this.editingModes) {
+            for (var i = 0; i < this.editingModes.length; i++) {
+                var snappingCoordinates = 
+                    this.editingModes[i].calculatePoint(evt.point, evt.targetGeometry, this.geometry, this.layer);
+
+                if (snappingCoordinates) {
+                    evt.point = snappingCoordinates;                    
+                    break;
+                }
+            }
+        }
+    },
+
-    /** Hide all the contents of the control, shrink the size, 
-     *   add the maximize icon

sandbox/vector/lib/OpenLayers/Feature.js

@@ -60 +60 @@
-    initialize: function(layer, geometry, data) {
-        this.layer = layer;
-       
+        
-        this.data = (data != null) ? data : new Object();
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_"); 
@@ -169 +169 @@
-     */
-    setGeometry: function(geometry) {
-       
-   
-   
-   
-       
+        
+    
+    
+    
+        
-    },
-    
@@ -217 +217 @@
-
-    /**
+     * Takes an lonLat point and returns true if the feature is at this location.
+     * @param {OpenLayers.LonLat} lonlat
+     * @return Boolean
+     */
+    atPoint: function(lonlat){
+        var atPoint=false;
+        if(this.geometry){
+            atPoint=this.geometry.atPoint(lonlat);
+        }
+        return atPoint;
+    },
+
+    /**
-     * Set geometry style
-     *

sandbox/vector/lib/OpenLayers/Geometry.js

@@ -14 +14 @@
-    /** @type OpenLayers.Bounds */
-    bounds: null,
-
-   
-   
-   
-   
-   
-   
+
+    
+    
+    
+    
+    
+    
-    
-    /**
@@ -30 +30 @@
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME+ "_");
-    },
-    
-    /**
-     * Set the bounds for this Geometry.
-     * @param {OpenLayers.Bounds} bounds
-     */
-    setBounds: function(bounds){
-        this.bounds=bounds;
-    },
-    
-    /**
-     * Extend the existing bounds to include the new bounds. If existing
-     * bounds=null, then set a new Bounds.
-     * @param {Object} bounds
-     */
-    extendBounds: function(bounds){
-        if(!this.bounds){
-            this.setBounds(bounds);
-        }else{
-            this.bounds.extendBounds(bounds);
-        }
-    },
-    
-    /**
-     * Get the bounds for this Geometry. The bounds will be null if not it has
-     * not been set.
-     * Once the bounds is set, it is not calculated again, this makes queries
-     * faster.
-     * @return {OpenLayers.Bounds}
-     */
-    getBounds: function(){
-        return this.bounds;
-    },
-    
+    /**
+     * Set the bounds for this Geometry.
+     * @param {OpenLayers.Bounds} bounds
+     */
+    setBounds: function(bounds){
+        this.bounds=bounds;
+    },
+    
+    /**
+     * Extend the existing bounds to include the new bounds. If existing
+     * bounds=null, then set a new Bounds.
+     * @param {Object} bounds
+     */
+    extendBounds: function(bounds){
+        if(!this.bounds){
+            this.setBounds(bounds);
+        }else{
+            this.bounds.extendBounds(bounds);
+        }
+    },
+    
+    /**
+     * Get the bounds for this Geometry. The bounds will be null if not it has
+     * not been set.
+     * Once the bounds is set, it is not calculated again, this makes queries
+     * faster.
+     * @return {OpenLayers.Bounds}
+     */
+    getBounds: function(){
+        return this.bounds;
+    },
+    
+    /**
+     * Takes an lonLat point and returns true if the geometry is at this location.
+     * This is only an approximation based on the bounds of the geometry.
+     * @param {OpenLayers.LonLat} lonlat
+     * @return Boolean
+     */
+    atPoint: function(lonlat){
+        var atPoint=false;
+        if(this.bounds){
+            atPoint=(this.bounds.bottom<=lonlat.lat)
+                && (lonlat.lat<=this.bounds.top)
+                && (this.bounds.left<=lonlat.lon)
+                && (lonlat.lon<=this.bounds.right);
+        }
+        return atPoint;
+    },
+
-    CLASS_NAME: "OpenLayers.Geometry"
-};

sandbox/vector/lib/OpenLayers/Geometry/Aggregate.js

@@ -46 +46 @@
-    },
-
+//  /**
+//   * Takes an lonLat point and returns true if the feature is at this location.
+//   * @param {OpenLayers.LonLat} lonlat
+//   * @return Boolean
+//   */
+//  atPoint: function(lonlat){
+//      var atPoint=false;
+//      var bounds;
+//      if(this.components){
+//          for(var i=0;!atPoint&&(i<this.components.length);i++){
+//              atPoint=this.components[i].atPoint(lonlat);
+//          }
+//      }else{
+//          // The following code is probably not required as
+//          // agregate geometries will always have components. Right?
+//          // Cameron Shorter.
+//          if(this.bounds){
+//              atPoint=(this.bounds.bottom<=lonlat.lat)
+//                  && (lonlat.lat<=this.bounds.top)
+//                  && (this.bounds.left<=lonlat.lon)
+//                  && (lonlat.lon<=this.bounds.right);
+//          }
+//      }
+//      return atPoint;
+//  },
+
-    CLASS_NAME: "OpenLayers.Geometry.Aggregate"
-});

sandbox/vector/lib/OpenLayers/Parser/GML.js

@@ -95 +95 @@
-                polygon = this.parsePolygonNode(polygons[i],geom);
-                geom.addComponents(polygon);
-               
+                
-            }
-        }
@@ -184 +184 @@
-        var rings = [];
-        var p;
-       
+        
-        for (var i = 0; i < linearRings.length; i++) {
-            p = this.parseCoords(linearRings[i]);
-           
-           
-           
-               
-           
-               
-           
+            
+            
+            
+                
+            
+                
+            
-            rings.push(ring1);
-        }
@@ -247 +247 @@
-                y=parseFloat(nums[i+1]);
-                p.points.push(new OpenLayers.Geometry.Point(x,y));
-
-               
-                   
-               
-                   
-               
+
+                
+                    
+                
+                    
+                
-            }
-        }