Changeset 6579

Timestamp:

03/22/08 13:26:27 (10 months ago)

Author:

crschmidt

Message:

merge trunk -r6500:HEAD

Files:

• sandbox/euzuro/pop/apidoc_config/Menu.txt (modified) (8 diffs)
• sandbox/euzuro/pop/build/full.cfg (modified) (1 diff)
• sandbox/euzuro/pop/build/library.cfg (modified) (1 diff)
• sandbox/euzuro/pop/build/lite.cfg (modified) (1 diff)
• sandbox/euzuro/pop/doc_config/Menu.txt (modified) (10 diffs)
• sandbox/euzuro/pop/examples/click.html (modified) (3 diffs)
• sandbox/euzuro/pop/examples/hover-handler.html (modified) (1 diff)
• sandbox/euzuro/pop/examples/layerswitcher.html (modified) (1 diff)
• sandbox/euzuro/pop/examples/styles-context.html (copied) (copied from trunk/openlayers/examples/styles-context.html)
• sandbox/euzuro/pop/examples/tasmania/sld-tasmania.xml (modified) (1 diff)
• sandbox/euzuro/pop/examples/wmc.html (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/BaseTypes.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Control/ScaleLine.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Control/SelectFeature.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Format/GeoRSS.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Format/SLD.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Format/WMC.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Format/WMC/v1.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Handler/Feature.js (modified) (2 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Handler/MouseWheel.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Lang/cs-CZ.js (copied) (copied from trunk/openlayers/lib/OpenLayers/Lang/cs-CZ.js)
• sandbox/euzuro/pop/lib/OpenLayers/Layer.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Layer/FixedZoomLevels.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Layer/GML.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Layer/GeoRSS.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Renderer/Elements.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Renderer/SVG.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Style.js (modified) (5 diffs)
• sandbox/euzuro/pop/lib/OpenLayers/Tile/WFS.js (modified) (1 diff)
• sandbox/euzuro/pop/lib/OpenLayers/Util.js (modified) (6 diffs)
• sandbox/euzuro/pop/tests/Layer/test_Google.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/Layer/test_Grid.html (modified) (1 diff)
• sandbox/euzuro/pop/tests/test_BaseTypes.html (modified) (2 diffs)
• sandbox/euzuro/pop/tests/test_Style.html (modified) (3 diffs)

sandbox/euzuro/pop/apidoc_config/Menu.txt

@@ -67 +67 @@
-   Group: Control  {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }  # Group: Control
-
@@ -109 +107 @@
-   Group: Format  {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }  # Group: Format
-
@@ -150 +153 @@
-      File: Drag  (no auto-title, OpenLayers/Handler/Drag.js)
-      File: Feature  (no auto-title, OpenLayers/Handler/Feature.js)
+      File: Hover  (no auto-title, OpenLayers/Handler/Hover.js)
-      File: Keyboard  (no auto-title, OpenLayers/Handler/Keyboard.js)
-      File: MouseWheel  (no auto-title, OpenLayers/Handler/MouseWheel.js)
@@ -159 +163 @@
-
-   File: Icon  (no auto-title, OpenLayers/Icon.js)
+
+   Group: Lang  {
+
+      File: Lang  (no auto-title, OpenLayers/Lang.js)
+      File: Lang["de"]  (no auto-title, OpenLayers/Lang/de.js)
+      File: Lang["en"]  (no auto-title, OpenLayers/Lang/en.js)
+      File: Lang["en-CA"]  (no auto-title, OpenLayers/Lang/en-CA.js)
+      File: Lang["fr"]  (no auto-title, OpenLayers/Lang/fr.js)
+      }  # Group: Lang
-
-   Group: Layer  {
@@ -173 +186 @@
-      File: Image  (no auto-title, OpenLayers/Layer/Image.js)
-      File: KaMap  (no auto-title, OpenLayers/Layer/KaMap.js)
+      File: MapGuide  (no auto-title, OpenLayers/Layer/MapGuide.js)
-      File: MapServer  (no auto-title, OpenLayers/Layer/MapServer.js)
-      File: MapServer.Untiled  (no auto-title, OpenLayers/Layer/MapServer/Untiled.js)
-      File: Markers  (no auto-title, OpenLayers/Layer/Markers.js)
-      File: MultiMap  (no auto-title, OpenLayers/Layer/MultiMap.js)
+      File: PointTrack  (no auto-title, OpenLayers/Layer/PointTrack.js)
-      File: SphericalMercator  (no auto-title, OpenLayers/Layer/SphericalMercator.js)
-      File: Text  (no auto-title, OpenLayers/Layer/Text.js)
@@ -198 +213 @@
-      }  # Group: Marker
-
-   File: Projection  (no auto-title, OpenLayers/Projection.js)
-   File: Rule  (no auto-title, OpenLayers/Rule.js)
-   File: Style  (no auto-title, OpenLayers/Style.js)
-
-   Group: Popup  {
-
-
+no auto-title, 
-      File: Anchored  (no auto-title, OpenLayers/Popup/Anchored.js)
-      File: AnchoredBubble  (no auto-title, OpenLayers/Popup/AnchoredBubble.js)
-      }  # Group: Popup
-
+   File: Projection  (no auto-title, OpenLayers/Projection.js)
+
-   Group: Renderer  {
-
-
+no auto-title, 
-      File: Elements  (no auto-title, OpenLayers/Renderer/Elements.js)
-      File: SVG  (no auto-title, OpenLayers/Renderer/SVG.js)
@@ -217 +230 @@
-      }  # Group: Renderer
-
+   Group: Rule  {
+
+      File: Rule  (no auto-title, OpenLayers/Rule.js)
+      File: Comparison  (no auto-title, OpenLayers/Rule/Comparison.js)
+      File: FeatureId  (no auto-title, OpenLayers/Rule/FeatureId.js)
+      File: Logical  (no auto-title, OpenLayers/Rule/Logical.js)
+      }  # Group: Rule
+
+   File: Style  (no auto-title, OpenLayers/Style.js)
+   File: StyleMap  (no auto-title, OpenLayers/StyleMap.js)
+
-   Group: Tile  {
-
@@ -224 +248 @@
-      }  # Group: Tile
-
-
-
-
-
-
-
-
-
+
+
-   }  # Group: OpenLayers
-

sandbox/euzuro/pop/build/full.cfg

@@ -17 +17 @@
-OpenLayers/Lang/en-CA.js
-OpenLayers/Lang/fr.js
+OpenLayers/Lang/cs-CZ.js

sandbox/euzuro/pop/build/library.cfg

@@ -47 +47 @@
-OpenLayers/Renderer/VML.js
-OpenLayers/Renderer.js
+OpenLayers/Lang/de.js
+OpenLayers/Lang/en-CA.js
+OpenLayers/Lang/fr.js
+OpenLayers/Lang/cs-CZ.js
-
-

sandbox/euzuro/pop/build/lite.cfg

@@ -22 +22 @@
-Firebug/firebug.js
-Firebug/firebugx.js
+OpenLayers/Lang/de.js
+OpenLayers/Lang/en-CA.js
+OpenLayers/Lang/fr.js
+OpenLayers/Lang/cs-CZ.js
+

sandbox/euzuro/pop/doc_config/Menu.txt

@@ -67 +67 @@
-   Group: Control  {
-
-
+no auto-title, 
-      File: ArgParser  (no auto-title, OpenLayers/Control/ArgParser.js)
-      File: Attribution  (no auto-title, OpenLayers/Control/Attribution.js)
+      File: Control.Button  (no auto-title, OpenLayers/Control/Button.js)
-      File: DragFeature  (no auto-title, OpenLayers/Control/DragFeature.js)
-      File: DragPan  (no auto-title, OpenLayers/Control/DragPan.js)
@@ -81 +82 @@
-      File: MouseToolbar  (no auto-title, OpenLayers/Control/MouseToolbar.js)
-      File: Navigation  (no auto-title, OpenLayers/Control/Navigation.js)
+      File: NavigationHistory  (no auto-title, OpenLayers/Control/NavigationHistory.js)
-      File: NavToolbar  (no auto-title, OpenLayers/Control/NavToolbar.js)
-      File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js)
@@ -88 +90 @@
-      File: Permalink  (no auto-title, OpenLayers/Control/Permalink.js)
-      File: Scale  (no auto-title, OpenLayers/Control/Scale.js)
+      File: ScaleLine  (no auto-title, OpenLayers/Control/ScaleLine.js)
-      File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js)
-      File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js)
@@ -105 +108 @@
-
-      File: Format  (no auto-title, OpenLayers/Format.js)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }  # Group: Format
-
@@ -145 +153 @@
-      File: Drag  (no auto-title, OpenLayers/Handler/Drag.js)
-      File: Feature  (no auto-title, OpenLayers/Handler/Feature.js)
+      File: Hover  (no auto-title, OpenLayers/Handler/Hover.js)
-      File: Keyboard  (no auto-title, OpenLayers/Handler/Keyboard.js)
-      File: MouseWheel  (no auto-title, OpenLayers/Handler/MouseWheel.js)
@@ -154 +163 @@
-
-   File: Icon  (no auto-title, OpenLayers/Icon.js)
+
+   Group: Lang  {
+
+      File: Lang  (no auto-title, OpenLayers/Lang.js)
+      File: Lang["de"]  (no auto-title, OpenLayers/Lang/de.js)
+      File: Lang["en"]  (no auto-title, OpenLayers/Lang/en.js)
+      File: Lang["en-CA"]  (no auto-title, OpenLayers/Lang/en-CA.js)
+      File: Lang["fr"]  (no auto-title, OpenLayers/Lang/fr.js)
+      }  # Group: Lang
-
-   Group: Layer  {
@@ -168 +186 @@
-      File: Image  (no auto-title, OpenLayers/Layer/Image.js)
-      File: KaMap  (no auto-title, OpenLayers/Layer/KaMap.js)
+      File: MapGuide  (no auto-title, OpenLayers/Layer/MapGuide.js)
-      File: MapServer  (no auto-title, OpenLayers/Layer/MapServer.js)
-      File: MapServer.Untiled  (no auto-title, OpenLayers/Layer/MapServer/Untiled.js)
-      File: Markers  (no auto-title, OpenLayers/Layer/Markers.js)
-      File: MultiMap  (no auto-title, OpenLayers/Layer/MultiMap.js)
+      File: PointTrack  (no auto-title, OpenLayers/Layer/PointTrack.js)
-      File: SphericalMercator  (no auto-title, OpenLayers/Layer/SphericalMercator.js)
-      File: Text  (no auto-title, OpenLayers/Layer/Text.js)
@@ -193 +213 @@
-      }  # Group: Marker
-
-   File: Projection  (no auto-title, OpenLayers/Projection.js)
-   File: Rule  (no auto-title, OpenLayers/Rule.js)
-   File: Style  (no auto-title, OpenLayers/Style.js)
-
-   Group: Popup  {
-
-
+no auto-title, 
-      File: Anchored  (no auto-title, OpenLayers/Popup/Anchored.js)
-      File: AnchoredBubble  (no auto-title, OpenLayers/Popup/AnchoredBubble.js)
-      }  # Group: Popup
-
+   File: Projection  (no auto-title, OpenLayers/Projection.js)
+
-   Group: Renderer  {
-
-
+no auto-title, 
-      File: Elements  (no auto-title, OpenLayers/Renderer/Elements.js)
-      File: SVG  (no auto-title, OpenLayers/Renderer/SVG.js)
@@ -212 +230 @@
-      }  # Group: Renderer
-
+   Group: Rule  {
+
+      File: Rule  (no auto-title, OpenLayers/Rule.js)
+      File: Comparison  (no auto-title, OpenLayers/Rule/Comparison.js)
+      File: FeatureId  (no auto-title, OpenLayers/Rule/FeatureId.js)
+      File: Logical  (no auto-title, OpenLayers/Rule/Logical.js)
+      }  # Group: Rule
+
+   File: Style  (no auto-title, OpenLayers/Style.js)
+   File: StyleMap  (no auto-title, OpenLayers/StyleMap.js)
+
-   Group: Tile  {
-
@@ -219 +248 @@
-      }  # Group: Tile
-
-
-
-
-
-
-
-
-
+
+
-   }  # Group: OpenLayers
-

sandbox/euzuro/pop/examples/click.html

@@ -13 +13 @@
-        <script src="../lib/OpenLayers.js"></script>
-        <script type="text/javascript">
+OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {                
+                defaultHandlerOptions: {
+                    'single': true,
+                    'double': false,
+                    'pixelTolerance': 0,
+                    'stopSingle': false,
+                    'stopDouble': false
+                },
+
+                initialize: function(options) {
+                    this.handlerOptions = OpenLayers.Util.extend(
+                        {}, this.defaultHandlerOptions
+                    );
+                    OpenLayers.Control.prototype.initialize.apply(
+                        this, arguments
+                    ); 
+                    this.handler = new OpenLayers.Handler.Click(
+                        this, {
+                            'click': this.trigger,
+                        }, this.handlerOptions
+                    );
+                }, 
+
+                trigger: function(e) {
+                    var lonlat = map.getLonLatFromViewPortPx(e.xy);
+                    alert("You clicked near " + lonlat.lat + " N, " +
+                                              + lonlat.lon + " E");
+                },
+
+            });
-            var map;
-            function init(){
@@ -30 +60 @@
-                // map.setCenter(new OpenLayers.LonLat(0, 0), 0);
-                map.zoomToMaxExtent();
-map.events.register("click", map, function(e) {
-    var lonlat = map.getLonLatFromViewPortPx(e.xy
-    alert("You clicked near " + lonlat.lat + " N, " +
-                              + lonlat.lon + " E"
-
+
+var click = new OpenLayers.Control.Click(
+map.addControl(click);
+click.activate(
+
-            }
-        </script>
@@ -45 +75 @@
-
-        <p id="shortdesc">
-
+
+
-        </p>
-
-        <div id="map"></div>
-    
-
+
+
+
-    </body>
-</html>

sandbox/euzuro/pop/examples/hover-handler.html

@@ -121 +121 @@
-                }
-
+                map.addControl(new OpenLayers.Control.MousePosition());
-                map.zoomToMaxExtent();
-            }

sandbox/euzuro/pop/examples/layerswitcher.html

@@ -15 +15 @@
-        function init(){
-            map = new OpenLayers.Map('map', { controls: [] });
+            map.addControl(new OpenLayers.Control.Navigation());
-
-            map.addControl(new OpenLayers.Control.LayerSwitcher({'div':OpenLayers.Util.getElement('layerswitcher')}));

sandbox/euzuro/pop/examples/tasmania/sld-tasmania.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+http://
-  <sld:NamedLayer>
-    <sld:Name>WaterBodies</sld:Name>

sandbox/euzuro/pop/examples/wmc.html

@@ -20 +20 @@
-        OpenLayers.Util.onImageLoadErrorColor = "transparent";
-        
-
+{'layerOptions': {buffer: 0}}
-        var doc, context, map;
-        
@@ -138 +138 @@
-        <textarea id="wmc">paste WMC doc here</textarea>
-    <div id="docs">
-
+
+
+
+
-    </div>
-  </body>

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

@@ -107 +107 @@
-     *     to the tokens in the format string.  If no context is sent, the
-     *     window object will be used.
+     * args - {Array} Optional arguments to pass to any functions found in
+     *     the context.  If a context property is a function, the token
+     *     will be replaced by the return from the function called with
+     *     these arguments.
-     *
-     * Returns:
-     * {String} A string with tokens replaced from the context object.
-     */
-
+, args
-        if(!context) {
-            context = window;
-        }
-        var tokens = template.split("${");
-
+, replacement
-        for(var i=1; i<tokens.length; i++) {
-            item = tokens[i];
-            last = item.indexOf("}"); 
-
-
-
+
+
+
+
+
+
+
+
-            } else {
-                tokens[i] = "${" + item;

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

@@ -155 +155 @@
-        }
-
+        var curMapUnits = this.map.units;
+        var inches = OpenLayers.INCHES_PER_UNIT;
+
-        // convert maxWidth to map units
-
+ * inches[curMapUnits]
-
-        // decide whether to use large or small scale units     
-        var topUnits;
-        var bottomUnits;
-0.1
+100000
-            topUnits = this.topOutUnits;
-            bottomUnits = this.bottomOutUnits;
@@ -170 +173 @@
-
-        // and to map units units
-
-
-
-
+
+
-
-        // now trim this down to useful block length

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

@@ -7 +7 @@
- * @requires OpenLayers/Control.js
- * @requires OpenLayers/Feature/Vector.js
+ * @requires OpenLayers/Handler/Feature.js
- */
-

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

@@ -165 +165 @@
-
-    /**
-Geometry
+Feature
-     * Return a feature from a GeoRSS Item.
-     *

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

@@ -369 +369 @@
-            var rule = new OpenLayers.Rule.Logical(
-                    {type: OpenLayers.Rule.Logical.NOT});
-
+
+
+
+
+
+
-            return rule;
-        }

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

@@ -27 +27 @@
-     */
-    version: null,
+
+    /**
+     * Property: layerOptions
+     * {Object} Default options for layers created by the parser. These
+     *     options are overridden by the options which are read from the 
+     *     capabilities document.
+     */
+    layerOptions: null, 
-    
-    /**
@@ -81 +89 @@
-            ];
-            if(!format) {
-S capabilities
+C
-                      version;
-            }

sandbox/euzuro/pop/lib/OpenLayers/Format/WMC/v1.js

@@ -194 +194 @@
-     */
-    getLayerFromInfo: function(layerInfo) {
+        var options = layerInfo.options;
+        if (this.layerOptions) {
+            OpenLayers.Util.applyDefaults(options, this.layerOptions);
+        }
-        var layer = new OpenLayers.Layer.WMS(
-            layerInfo.title,
-            layerInfo.href,
-            layerInfo.params,
-layerInfo.
+
-        );
-        return layer;

sandbox/euzuro/pop/lib/OpenLayers/Handler/Feature.js

@@ -34 +34 @@
-    /**
-     * Property: feature
-feature currently being handl
+last feature that was hover
-     */
-    feature: null,
@@ -247 +247 @@
-                    this.triggerCallback(type, 'out', [this.lastFeature]);
-                }
+                // next time the mouse goes in a feature whose geometry type
+                // doesn't match we don't want to call the 'out' callback
+                // again, so let's set this.feature to null so that
+                // previouslyIn will evaluate to false the next time
+                // we enter handle. Yes, a bit hackish...
+                this.feature = null;
-            }
-        } else {

sandbox/euzuro/pop/lib/OpenLayers/Handler/MouseWheel.js

@@ -105 +105 @@
-            if (!overLayerDiv) {
-                for(var i=0; i < this.map.layers.length; i++) {
-
+
+
+
+
+
-                        overLayerDiv = true;
-                        break;

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

@@ -605 +605 @@
-     */
-    display: function(display) {
+        var inRange = this.calculateInRange();
-        if (display != (this.div.style.display != "none")) {
-
+ && inRange
-        }
-    },

sandbox/euzuro/pop/lib/OpenLayers/Layer/FixedZoomLevels.js

@@ -111 +111 @@
-                this.resolutions[resolutionsIndex++] = this.RESOLUTIONS[i];            
-            }
-
+
+
+
-    },
-    

sandbox/euzuro/pop/lib/OpenLayers/Layer/GML.js

@@ -132 +132 @@
-        var doc = request.responseXML;
-        
-
+ || !doc.documentElement
-            doc = request.responseText;
-        }

sandbox/euzuro/pop/lib/OpenLayers/Layer/GeoRSS.js

@@ -132 +132 @@
-    parseData: function(ajaxRequest) {
-        var doc = ajaxRequest.responseXML;
-
-parseXMLString
+ || !doc.documentElement
+Format.XML.prototype.read
-        }
-        

sandbox/euzuro/pop/lib/OpenLayers/Renderer/Elements.js

@@ -177 +177 @@
-        var options = {
-            'isFilled': true,
-true
+!!style.strokeWidth
-        };
-        switch (geometry.CLASS_NAME) {

sandbox/euzuro/pop/lib/OpenLayers/Renderer/SVG.js

@@ -193 +193 @@
-        style = style  || node._style;
-        options = options || node._options;
-
-
-
+
+
-            if (style.externalGraphic) {
-x = parseFloat(x
+var x = parseFloat(node.getAttributeNS(null, "cx")
-                var y = parseFloat(node.getAttributeNS(null, "cy"));
-                

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

@@ -116 +116 @@
-     */
-    createSymbolizer: function(feature) {
-
+
+
-        
-        var rules = this.rules;
@@ -174 +175 @@
-        var symbolizer = rule.symbolizer[symbolizerPrefix] || rule.symbolizer;
-
-        var context = this.context || feature.attributes || feature.data;
-        
-        // merge the style with the current style
-        return this.createLiterals(
-context
+feature
-    },
-    
@@ -189 +188 @@
-     * style   - {Object} style to create literals for. Will be modified
-     *           inline.
-
-
-
+
-     * 
-     * Returns:
-     * {Object} the modified style
-     */