Tagging the 2.10 rc2 Release

git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.10-rc2@10716 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
Commit fixes for:
2010-09-02 21:47:14 +00:00 · 2010-09-02 21:43:25 +00:00 · 2010-08-26 14:42:51 +00:00 · 2010-08-26 14:35:00 +00:00 · 2010-08-26 14:34:30 +00:00 · 2010-08-25 12:13:57 +00:00
494 changed files with 19734 additions and 2647 deletions
--- a/build/build.py
+++ b/build/build.py
@@ -4,6 +4,7 @@ import sys
 sys.path.append("../tools")
 import mergejs

+def build():
    have_compressor = None
    try:
        import jsmin
@@ -48,3 +49,6 @@ print "Writing to %s." % outputFilename
    file(outputFilename, "w").write(minimized)

    print "Done."
+
+if __name__ == '__main__':
+  build()
--- a/build/license.txt
+++ b/build/license.txt
@@ -2,8 +2,8 @@

  OpenLayers.js -- OpenLayers Map Viewer Library

-  Copyright 2005-2008 MetaCarta, Inc., released under the Clear BSD license.
-  Please see http://svn.openlayers.org/trunk/openlayers/license.txt
+  Copyright 2005-2010 OpenLayers Contributors, released under the Clear BSD
+  license. Please see http://svn.openlayers.org/trunk/openlayers/license.txt
  for the full text of the license.

  Includes compressed code under the following licenses:
--- a/examples/SLDSelect.html
+++ b/examples/SLDSelect.html
@@ -0,0 +1,196 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>OpenLayers SLD based selection control</title>
+    <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
+    <link rel="stylesheet" href="style.css" type="text/css" />
+    <style type="text/css">
+        .olControlSLDSelectBoxActive {
+            cursor: crosshair;
+        }
+        .olControlSLDSelectPolygonActive {
+            cursor: crosshair;
+        }
+        .olControlSLDSelectLineActive {
+            cursor: crosshair;
+        }
+        .olControlSLDSelectPointActive {
+            cursor: pointer;
+        }
+    </style>
+    <script src="../lib/OpenLayers.js"></script>
+    <script type="text/javascript">
+        var map, controls, layers;
+
+        function init(){
+            OpenLayers.ProxyHost= "proxy.cgi?url=";
+            map = new OpenLayers.Map('map', {allOverlays: true, controls: []});
+            var url = "http://demo.opengeo.org/geoserver/wms";
+            layers = {
+                states: new OpenLayers.Layer.WMS("State boundary", url,
+                    {layers: 'topp:tasmania_state_boundaries', format: 'image/gif', transparent: 'TRUE'},
+                    {singleTile: true}),
+                roads: new OpenLayers.Layer.WMS("Roads", url,
+                    {layers: 'topp:tasmania_roads', format: 'image/gif', transparent: 'TRUE'},
+                    {singleTile: true}),
+                waterbodies: new OpenLayers.Layer.WMS("Water bodies", url,
+                    {layers: 'topp:tasmania_water_bodies', format: 'image/gif', transparent: 'TRUE'},
+                    {singleTile: true}),
+                cities: new OpenLayers.Layer.WMS("Cities", url,
+                    {layers: 'topp:tasmania_cities', format: 'image/gif', transparent: 'TRUE'},
+                    {singleTile: true})
+            };
+
+            for (var key in layers) {
+                map.addLayer(layers[key]);
+            }
+
+            map.setCenter(new OpenLayers.LonLat(146.65748632815,-42.230763671875), 7);
+
+            map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+            controls = {
+                navigation: new OpenLayers.Control.Navigation(),
+                box: new OpenLayers.Control.SLDSelect(
+                    OpenLayers.Handler.RegularPolygon,
+                    {
+                        displayClass: 'olControlSLDSelectBox', 
+                        layers: [layers['waterbodies']],
+                        handlerOptions: {irregular: true}
+                    }
+                ),
+                polygon: new OpenLayers.Control.SLDSelect(
+                    OpenLayers.Handler.Polygon,
+                    {
+                        displayClass: 'olControlSLDSelectPolygon',
+                        layers: [layers['waterbodies']]
+                    }
+                ),
+                line: new OpenLayers.Control.SLDSelect(
+                    OpenLayers.Handler.Path,
+                    {
+                        displayClass: 'olControlSLDSelectLine',
+                        layers: [layers['waterbodies']]
+                    }
+                ),
+                point: new OpenLayers.Control.SLDSelect(
+                    OpenLayers.Handler.Click,
+                    {
+                        displayClass: 'olControlSLDSelectPoint',
+                        layers: [layers['waterbodies']]
+                    }
+                ),
+                circle: new OpenLayers.Control.SLDSelect(
+                    OpenLayers.Handler.RegularPolygon,
+                    {
+                        displayClass: 'olControlSLDSelectBox',
+                        layers: [layers['waterbodies']],
+                        handlerOptions: {sides: 30}
+                    }
+                )
+            };
+
+            for(var key in controls) {
+                map.addControl(controls[key]);
+            }
+        }
+
+        function toggleControl(element) {
+            for(var key in controls) {
+                var control = controls[key];
+                if(element.value == key && element.checked) {
+                    control.activate();
+                } else {
+                    control.deactivate();
+                }
+            }
+        }
+
+        function toggleSelectionLayer(element) {
+            var selectLayers = [];
+            var elements = element.value.split("_");
+            for (var key in layers) {
+                var layer = layers[key];
+                for (var i=0, len=elements.length; i<len; i++) {
+                    var value = elements[i];
+                    if (value == key && element.checked) {
+                        selectLayers.push(layer);
+                    }
+                }
+            }
+            for (var i=0, len=this.map.controls.length; i<len; i++) {
+                var control = this.map.controls[i];
+                if (control instanceof OpenLayers.Control.SLDSelect) {
+                    control.setLayers(selectLayers);
+                }
+            }
+        }
+
+    </script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">SLD based selection on WMS layers</h1>
+
+    <div id="tags"></div>
+
+    <div id="shortdesc">Using Styled Layer Descriptors to make a selection on WMS layers</div>
+
+    <div id="map" style="width: 512; height: 256; border: 1px solid red;"></div>
+
+    <div id="docs">
+        This example uses the OpenLayers.Control.SLDSelect to select features in a WMS
+        layer. The features are highlighted using Styled Layer Descriptors (SLD). The
+        control supports point, box, line and polygon selection modes by configuring the
+        appriopriate handler.
+    </div>
+
+    <div id="controls">
+        <ul id="controlToggle"><b>Map Controls</b>
+            <li>
+                <input type="radio" name="control" value="navigation" id="noneToggle" onclick="toggleControl(this);" CHECKED>
+                <label for="noneToggle">navigate</label>
+            </li>
+            <li>
+                <input type="radio" name="control" value="box" id="boxToggle" onclick="toggleControl(this);">
+                <label for="boxToggle">SLD select with box</label>
+            </li>
+            <li>
+                <input type="radio" name="control" value="polygon" id="polygonToggle" onclick="toggleControl(this);">
+                <label for="polygonToggle">SLD select with polygon</label>
+            </li>
+            <li>
+                <input type="radio" name="control" value="line" id="lineToggle" onclick="toggleControl(this);">
+                <label for="lineToggle">SLD select with line</label>
+            </li>
+            <li>
+                <input type="radio" name="control" value="point" id="pointToggle" onclick="toggleControl(this);">
+                <label for="pointToggle">SLD select with point</label>
+            </li>
+            <li>
+                <input type="radio" name="control" value="circle" id="circleToggle" onclick="toggleControl(this);">
+                <label for="circleToggle">SLD select with circle</label>
+            </li>
+        </ul>
+    </div>
+    <div id="layers">
+        <ul id="layerToggle"><b>Selection layer</b>
+            <li>
+                <input type="radio" name="layer" value="waterbodies" id="waterbodiesToggle" onclick="toggleSelectionLayer(this);" CHECKED>
+                <label for="noneToggle">Water bodies</label>
+            </li>
+            <li>
+                <input type="radio" name="layer" value="cities" id="citiesToggle" onclick="toggleSelectionLayer(this);">
+                <label for="citiesToggle">Cities</label>
+            </li>
+            <li>
+                <input type="radio" name="layer" value="roads" id="roadsToggle" onclick="toggleSelectionLayer(this);">
+                <label for="roadsToggle">Roads</label>
+            </li>
+            <li>
+                <input type="radio" name="layer" value="roads_cities" id="roadsCitiesToggle" onclick="toggleSelectionLayer(this);">
+                <label for="roadsCitiesToggle">Roads and cities</label>
+            </li>
+        </ul>
+    </div>
+
+  </body>
+</html>
--- a/examples/WMSPost.html
+++ b/examples/WMSPost.html
@@ -124,7 +124,7 @@

            var layer = new OpenLayers.Layer.WMS(
                "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {
                    layers: 'basic'
                }
--- a/examples/accessible.html
+++ b/examples/accessible.html
@@ -38,7 +38,7 @@
                map = new OpenLayers.Map('map', options);
                var wms = new OpenLayers.Layer.WMS(
                    "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0?",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?",
                    {layers: 'basic'}
                );
                map.addLayer(wms);
--- a/examples/all-overlays-google.html
+++ b/examples/all-overlays-google.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers All Overlays with Google and OSM</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/google.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+        <script src="../lib/OpenLayers.js"></script>
+        <script src="all-overlays-google.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">All Overlays with Google and OSM</h1>
+        <p id="shortdesc">
+            Using the Google and OSM layers as overlays.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                Using the allOverlays property on the map, the first layer added
+                must initially be visible.  This example demonstrates the use of 
+                a Google layer and an OSM layer treated as overlays.
+            </p><p>
+                See the <a href="all-overlays-google.js" target="_blank">
+                all-overlays-google.js source</a> to see how this is done.
+            </p>
+        </div>
+    </body>
+</html>
--- a/examples/all-overlays-google.js
+++ b/examples/all-overlays-google.js
@@ -0,0 +1,19 @@
+var map;
+
+function init() {
+
+    map = new OpenLayers.Map({
+        div: "map",
+        allOverlays: true
+    });
+
+    var osm = new OpenLayers.Layer.OSM();
+    var gmap = new OpenLayers.Layer.Google("Google Streets", {visibility: false});
+
+    // note that first layer must be visible
+    map.addLayers([osm, gmap]);
+
+    map.addControl(new OpenLayers.Control.LayerSwitcher());
+    map.zoomToMaxExtent();
+
+}
--- a/examples/animated_panning.html
+++ b/examples/animated_panning.html
@@ -36,7 +36,7 @@
        function init(){
            map = new OpenLayers.Map('map', {numZoomLevels: 2});
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
                
            map.addLayer(layer);
            map.zoomToMaxExtent();
@@ -47,7 +47,7 @@

            map2 = new OpenLayers.Map('map2', {'panMethod': null, numZoomLevels: 2} );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
                
            map2.addLayer(layer);
            map2.zoomToMaxExtent();
--- a/examples/attribution.html
+++ b/examples/attribution.html
@@ -11,8 +11,8 @@
                map = new OpenLayers.Map('map');

                var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'},
-                    {'attribution': 'Provided by <a href="http://labs.metacarta.com/">MetaCarta</a>'});
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'},
+                    {'attribution': 'Provided by OSGeo'});

                var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
                    "http://t1.hypercube.telascience.org/cgi-bin/landsat7", 
--- a/examples/baseLayers.html
+++ b/examples/baseLayers.html
@@ -33,7 +33,7 @@
                map = new OpenLayers.Map( 'map' );

                var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                          "http://labs.metacarta.com/wms/vmap0",
+                          "http://vmap0.tiles.osgeo.org/wms/vmap0",
                          {layers: 'basic'} );
                var google = new OpenLayers.Layer.Google( "Google Hybrid" , {type: G_HYBRID_MAP });
                var ve = new OpenLayers.Layer.VirtualEarth( "VE");
@@ -53,8 +53,8 @@
            }

            function add() {
-                var url = 'http://boston.openguides.org/markers/AQUA.png';
-                var sz = new OpenLayers.Size(10, 17);
+                var url = 'http://www.openlayers.org/dev/img/marker.png';
+                var sz = new OpenLayers.Size(21, 25);
                var calculateOffset = function(size) {
                                    return new OpenLayers.Pixel(-(size.w/2), -size.h);
                                 };
--- a/examples/behavior-fixed-http-gml.html
+++ b/examples/behavior-fixed-http-gml.html
@@ -10,7 +10,7 @@
            function init(){
                map = new OpenLayers.Map('map');
                var wms = new OpenLayers.Layer.WMS(
-                    "OpenLayers WMS", "http://labs.metacarta.com/wms/vmap0",
+                    "OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'}
                );

--- a/examples/boxes-vector.html
+++ b/examples/boxes-vector.html
@@ -16,7 +16,7 @@
                map = new OpenLayers.Map('map');

                var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'} );

                var boxes  = new OpenLayers.Layer.Vector( "Boxes" );
    
--- a/examples/boxes.html
+++ b/examples/boxes.html
@@ -16,7 +16,7 @@
                map = new OpenLayers.Map('map');

                var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'} );

                var boxes  = new OpenLayers.Layer.Boxes( "Boxes" );
    
--- a/examples/browser-name.html
+++ b/examples/browser-name.html
@@ -47,7 +47,7 @@
            };

            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'},
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'},
                options);

            var options2 = {
--- a/examples/buffer.html
+++ b/examples/buffer.html
@@ -13,15 +13,15 @@
            function init(){
                map = new OpenLayers.Map( 'map' );
                layer = new OpenLayers.Layer.WMS( "0 buffer: OpenLayers WMS",
-                        "http://labs.metacarta.com/wms/vmap0",
+                        "http://vmap0.tiles.osgeo.org/wms/vmap0",
                        {layers: 'basic'}, {'buffer':0} );
                map.addLayer(layer);
                layer = new OpenLayers.Layer.WMS( "1 buffer: OpenLayers WMS",
-                        "http://labs.metacarta.com/wms/vmap0",
+                        "http://vmap0.tiles.osgeo.org/wms/vmap0",
                        {layers: 'basic'}, {'buffer':1} );
                map.addLayer(layer);
                layer = new OpenLayers.Layer.WMS( "4 buffer: OpenLayers WMS",
-                        "http://labs.metacarta.com/wms/vmap0",
+                        "http://vmap0.tiles.osgeo.org/wms/vmap0",
                        {layers: 'basic'}, {'buffer':4} );
                map.addLayer(layer);
                map.addControl(new OpenLayers.Control.LayerSwitcher())
--- a/examples/click-handler.html
+++ b/examples/click-handler.html
@@ -81,7 +81,7 @@
                map = new OpenLayers.Map('map');
                var layer = new OpenLayers.Layer.WMS(
                    "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'}
                );
                map.addLayers([layer]);
--- a/examples/click.html
+++ b/examples/click.html
@@ -41,7 +41,7 @@
                map = new OpenLayers.Map('map');

                var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'} );

            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
                "http://t1.hypercube.telascience.org/cgi-bin/landsat7", 
--- a/examples/controls.html
+++ b/examples/controls.html
@@ -26,7 +26,7 @@
    

                var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} );
                var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
                    "http://t1.hypercube.telascience.org/cgi-bin/landsat7", 
--- a/examples/custom-control-point.html
+++ b/examples/custom-control-point.html
@@ -14,7 +14,7 @@
            map = new OpenLayers.Map( $('map') );

            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );

            var control = new OpenLayers.Control();
            OpenLayers.Util.extend(control, {
--- a/examples/custom-control.html
+++ b/examples/custom-control.html
@@ -13,7 +13,7 @@
            function init(){
                map = new OpenLayers.Map('map');
                layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                        "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                        "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );

                var control = new OpenLayers.Control();
                OpenLayers.Util.extend(control, {
--- a/examples/custom-style.html
+++ b/examples/custom-style.html
@@ -25,7 +25,7 @@
                var options = {theme: null};
                map = new OpenLayers.Map('map', options);
                layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                        "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                        "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );

                map.addControl(new OpenLayers.Control.MousePosition());
                map.addLayer(layer);
--- a/examples/document-drag.html
+++ b/examples/document-drag.html
@@ -14,7 +14,7 @@
                new OpenLayers.Control.Attribution()
            ]} );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} );
            map.addLayer(layer);
            map.zoomToMaxExtent();
--- a/examples/doubleSetCenter.html
+++ b/examples/doubleSetCenter.html
@@ -20,7 +20,7 @@
        <script defer="defer" type="text/javascript">
            var map = new OpenLayers.Map('map');
            var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(wms);
            map.setCenter(new OpenLayers.LonLat(100,10));
            map.setCenter(new OpenLayers.LonLat(1,1));
--- a/examples/drag-feature.html
+++ b/examples/drag-feature.html
@@ -21,7 +21,7 @@
            function init(){
                map = new OpenLayers.Map('map');
                var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'});
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'});
    
                vectors = new OpenLayers.Layer.Vector("Vector Layer");

--- a/examples/draw-feature.html
+++ b/examples/draw-feature.html
@@ -24,7 +24,7 @@
                map = new OpenLayers.Map('map');

                var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'});
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'});

                var pointLayer = new OpenLayers.Layer.Vector("Point Layer");
                var lineLayer = new OpenLayers.Layer.Vector("Line Layer");
--- a/examples/dynamic-text-layer.html
+++ b/examples/dynamic-text-layer.html
@@ -10,7 +10,7 @@
            function init(){
                map = new OpenLayers.Map('map');
                var wms = new OpenLayers.Layer.WMS(
-                    "OpenLayers WMS", "http://labs.metacarta.com/wms/vmap0",
+                    "OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'}
                );

--- a/examples/editingtoolbar-outside.html
+++ b/examples/editingtoolbar-outside.html
@@ -24,7 +24,7 @@
            map = new OpenLayers.Map('map', {theme: null});
            layer = new OpenLayers.Layer.WMS(
                "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: "basic"}
            );
            map.addLayer(layer);
--- a/examples/editingtoolbar.html
+++ b/examples/editingtoolbar.html
@@ -15,7 +15,7 @@

            function init(){
                layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                        "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                        "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
    
                vlayer = new OpenLayers.Layer.Vector( "Editable" );
                map = new OpenLayers.Map( 'map', {
--- a/examples/events.html
+++ b/examples/events.html
@@ -106,7 +106,7 @@
                
                var vmap = new OpenLayers.Layer.WMS(
                    "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'}
                );
                var landsat = new OpenLayers.Layer.WMS(
--- a/examples/example.html
+++ b/examples/example.html
@@ -15,7 +15,7 @@

            var ol_wms = new OpenLayers.Layer.WMS(
                "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}
            );

--- a/examples/filter-strategy.html
+++ b/examples/filter-strategy.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers Filter Strategy Example</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/google.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <script src="../lib/OpenLayers.js"></script>
+        <script>OpenLayers.ImgPath = "../img/";</script>
+        <script src="filter-strategy.js"></script>
+        <style>
+            .olControlAttribution {
+                font-size: 9px;
+                bottom: 2px;
+            }
+        </style>
+    </head>
+    <body onload="init()">
+        <h1 id="title">Filter Strategy</h1>
+        <p id="shortdesc">
+            Demonstrates the filter strategy for limiting features passed to the layer.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <label for="span">time span (seconds)</label>
+        <select id="span" name="span">
+            <option value="15">15</option>
+            <option value="30">30</option>
+            <option value="60" selected>60</option>
+            <option value="120">120</option>
+            <option value="240">240</option>
+        </select>
+        <input type="button" id="start" value="start">
+        <input type="button" id="stop" value="stop"><br><br>
+        <div id="docs">
+            <p>
+                This example uses a filter strategy to limit the features that are passed
+                to a layer.  Features bound for this layer have a <code>when</code> attribute
+                with date values.  A filter strategy is constructed with a between filter
+                that limits the span of dates shown.  A simple animation cycles through
+                the domain of the <code>when</code> values, calling <code>setFilter</code>
+                on the strategy with an updated filter.
+            </p><p>
+                View the <a href="filter-strategy.js" target="_blank">filter-strategy.js</a>
+                source to see how this is done
+            </p>
+        </div>
+    </body>
+</html>
--- a/examples/filter-strategy.js
+++ b/examples/filter-strategy.js
@@ -0,0 +1,89 @@
+var map, filter, filterStrategy;
+
+var startDate = new Date(1272736800000); // lower bound of when values
+var endDate = new Date(1272737100000); // upper value of when values
+var step = 8; // sencods to advance each interval
+var interval = 0.125; // seconds between each step in the animation
+
+function init() {
+
+    // add behavior to elements
+    document.getElementById("start").onclick = startAnimation;
+    document.getElementById("stop").onclick = stopAnimation;
+    var spanEl = document.getElementById("span");
+
+    var mercator = new OpenLayers.Projection("EPSG:900913");
+    var geographic = new OpenLayers.Projection("EPSG:4326");
+    map = new OpenLayers.Map("map");
+    
+    var osm = new OpenLayers.Layer.OSM();
+    
+    filter = new OpenLayers.Filter.Comparison({
+        type: OpenLayers.Filter.Comparison.BETWEEN,
+        property: "when",
+        lowerBoundary: startDate,
+        upperBoundary: new Date(startDate.getTime() + (parseInt(spanEl.value, 10) * 1000))
+    });
+
+    filterStrategy = new OpenLayers.Strategy.Filter({filter: filter});
+
+    var flights = new OpenLayers.Layer.Vector("Aircraft Locations", {
+        projection: geographic,
+        strategies: [new OpenLayers.Strategy.Fixed(), filterStrategy],
+        protocol: new OpenLayers.Protocol.HTTP({
+            url: "kml-track.kml",
+            format: new OpenLayers.Format.KML({
+                extractTracks: true
+                //,extractStyles: true // use style from KML instead of styleMap below
+            })
+        }),
+        styleMap: new OpenLayers.StyleMap({
+            "default": new OpenLayers.Style({
+                graphicName: "circle",
+                pointRadius: 3,
+                fillOpacity: 0.25,
+                fillColor: "#ffcc66",
+                strokeColor: "#ff9933",
+                strokeWidth: 1
+            })
+        }),
+        renderers: ["Canvas", "SVG", "VML"]
+    });
+    
+    map.addLayers([osm, flights]);
+    map.setCenter(new OpenLayers.LonLat(-93.2735, 44.8349).transform(geographic, mercator), 8);
+    
+};
+
+var animationTimer;
+var currentDate;
+function startAnimation() {
+    if (animationTimer) {
+        stopAnimation(true);
+    }
+    if (!currentDate) {
+        currentDate = startDate;
+    }
+    var spanEl = document.getElementById("span");
+    var next = function() {
+        var span = parseInt(spanEl.value, 10);
+        if (currentDate < endDate) {
+            filter.lowerBoundary = currentDate;
+            filter.upperBoundary = new Date(currentDate.getTime() + (span * 1000));
+            filterStrategy.setFilter(filter);
+            currentDate = new Date(currentDate.getTime() + (step * 1000))
+        } else {
+            stopAnimation(true);
+        }
+    }
+    animationTimer = window.setInterval(next, interval * 1000);
+}
+
+function stopAnimation(reset) {
+    window.clearInterval(animationTimer);
+    animationTimer = null;
+    if (reset === true) {
+        currentDate = null;
+    }
+}
+
--- a/examples/fractional-zoom.html
+++ b/examples/fractional-zoom.html
@@ -13,7 +13,7 @@
                  numZoomLevels: 10 });
            var wms = new OpenLayers.Layer.WMS(
                "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}
            );
            map.addLayers([wms]);
--- a/examples/fullScreen.html
+++ b/examples/fullScreen.html
@@ -26,7 +26,7 @@
                map = new OpenLayers.Map('map');

            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} );
            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
                "http://t1.hypercube.telascience.org/cgi-bin/landsat7", 
--- a/examples/geojson.html
+++ b/examples/geojson.html
@@ -12,7 +12,7 @@
        function init(){
            map = new OpenLayers.Map( 'map' );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} );
            map.addLayer(layer);
            map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
--- a/examples/georss-flickr.html
+++ b/examples/georss-flickr.html
@@ -16,7 +16,7 @@
            map = new OpenLayers.Map('map', {maxResolution:'auto'});
            
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            
            map.setCenter(new OpenLayers.LonLat(0, 0), 0);
--- a/examples/georss-markers.html
+++ b/examples/georss-markers.html
@@ -11,7 +11,7 @@
        function init(){
            map = new OpenLayers.Map('map', {maxResolution:'auto'});
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            map.setCenter(new OpenLayers.LonLat(0, 0), 0);
            map.addControl(new OpenLayers.Control.LayerSwitcher());
--- a/examples/georss.html
+++ b/examples/georss.html
@@ -11,7 +11,7 @@
        function init(){
            map = new OpenLayers.Map('map', {maxResolution:'auto'});
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            map.setCenter(new OpenLayers.LonLat(0, 0), 0);
            map.addControl(new OpenLayers.Control.LayerSwitcher());
--- a/examples/getfeatureinfo-control.html
+++ b/examples/getfeatureinfo-control.html
@@ -37,7 +37,6 @@
            text-align:left;
            font-size:100%;
            font-weight:bold;
-            text-transform:uppercase;
            padding:.2em .2em;
 	}

--- a/examples/gml-layer.html
+++ b/examples/gml-layer.html
@@ -13,7 +13,7 @@
        function init(){
            map = new OpenLayers.Map('map');
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            map.zoomToExtent(new OpenLayers.Bounds(-3.922119,44.335327,4.866943,49.553833));
            map.addLayer(new OpenLayers.Layer.GML("GML", "gml/polygon.xml"));
--- a/examples/google-v3-alloverlays.html
+++ b/examples/google-v3-alloverlays.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers Google (v3) Layer Example</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/google.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+        <script src="../lib/OpenLayers.js"></script>
+        <script src="google-v3-alloverlays.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">Google (v3) allOverlays Layer Example</h1>
+        <p id="shortdesc">
+            Demonstrate use the Google Maps v3 API with allOverlays set to true on the map.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                You can also use Google layers as overlays, e.g. in a map with
+                allOverlays set to true. Note some of the layers disappear as
+                you zoom in to levels that are not supported by all layers.  See the 
+                <a href="google-v3-alloverlays.js" target="_blank">google-v3-alloverlays.js source</a> 
+                to see how this is done.
+            </p>
+        </div>
+    </body>
+</html>
--- a/examples/google-v3-alloverlays.js
+++ b/examples/google-v3-alloverlays.js
@@ -0,0 +1,35 @@
+var map;
+
+function init() {
+    map = new OpenLayers.Map('map', {allOverlays: true});
+    map.addControl(new OpenLayers.Control.LayerSwitcher());
+    
+    // the SATELLITE layer has all 22 zoom level, so we add it first to
+    // become the internal base layer that determines the zoom levels of the
+    // map.
+    var gsat = new OpenLayers.Layer.Google(
+        "Google Satellite",
+        {type: google.maps.MapTypeId.SATELLITE, numZoomLevels: 22}
+    );
+    var gphy = new OpenLayers.Layer.Google(
+        "Google Physical",
+        {type: google.maps.MapTypeId.TERRAIN, visibility: false}
+    );
+    var gmap = new OpenLayers.Layer.Google(
+        "Google Streets", // the default
+        {numZoomLevels: 20, visibility: false}
+    );
+    var ghyb = new OpenLayers.Layer.Google(
+        "Google Hybrid",
+        {type: google.maps.MapTypeId.HYBRID, numZoomLevels: 22, visibility: false}
+    );
+
+    map.addLayers([gsat, gphy, gmap, ghyb]);
+
+    // Google.v3 uses EPSG:900913 as projection, so we have to
+    // transform our coordinates
+    map.setCenter(new OpenLayers.LonLat(10.2, 48.9).transform(
+        new OpenLayers.Projection("EPSG:4326"),
+        map.getProjectionObject()
+    ), 5);
+}
--- a/examples/google-v3.html
+++ b/examples/google-v3.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers Google (v3) Layer Example</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/google.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+        <script src="../lib/OpenLayers.js"></script>
+        <script src="google-v3.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">Google (v3) Layer Example</h1>
+        <p id="shortdesc">
+            Demonstrate use the Google Maps v3 API.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                If you use the Google Maps v3 API with a Google layer, you don't
+                need to include an API key.  This layer only works in the 
+                spherical mercator projection.  See the 
+                <a href="google-v3.js" target="_blank">google-v3.js source</a> 
+                to see how this is done.
+            <p>
+                In order to position the Google attribution div in the default 
+                location, you must include the extra theme/default/google.css 
+                stylesheet.
+            </p>
+        </div>
+    </body>
+</html>
--- a/examples/google-v3.js
+++ b/examples/google-v3.js
@@ -0,0 +1,32 @@
+var map;
+
+function init() {
+    map = new OpenLayers.Map('map');
+    map.addControl(new OpenLayers.Control.LayerSwitcher());
+    
+    var gphy = new OpenLayers.Layer.Google(
+        "Google Physical",
+        {type: google.maps.MapTypeId.TERRAIN}
+    );
+    var gmap = new OpenLayers.Layer.Google(
+        "Google Streets", // the default
+        {numZoomLevels: 20}
+    );
+    var ghyb = new OpenLayers.Layer.Google(
+        "Google Hybrid",
+        {type: google.maps.MapTypeId.HYBRID, numZoomLevels: 20}
+    );
+    var gsat = new OpenLayers.Layer.Google(
+        "Google Satellite",
+        {type: google.maps.MapTypeId.SATELLITE, numZoomLevels: 22}
+    );
+
+    map.addLayers([gphy, gmap, ghyb, gsat]);
+
+    // Google.v3 uses EPSG:900913 as projection, so we have to
+    // transform our coordinates
+    map.setCenter(new OpenLayers.LonLat(10.2, 48.9).transform(
+        new OpenLayers.Projection("EPSG:4326"),
+        map.getProjectionObject()
+    ), 5);
+}
--- a/examples/graticule.html
+++ b/examples/graticule.html
@@ -23,19 +23,20 @@
        <script type="text/javascript">
            Proj4js.defs["EPSG:42304"]="+title=Atlas of Canada, LCC +proj=lcc +lat_1=49 +lat_2=77 +lat_0=49 +lon_0=-95 +x_0=0 +y_0=0 +ellps=GRS80 +datum=NAD83 +units=m +no_defs";
            
+            var graticuleCtl1, graticuleCtl2;
            var map1, map2;
            function init(){
              initLonLat();
              initProjected();
            }
            function initLonLat(){
+                graticuleCtl1 = new OpenLayers.Control.Graticule({
+                    numPoints: 2, 
+                    labelled: true
+                });
                map1 = new OpenLayers.Map('map', {
                    controls: [
-                    new OpenLayers.Control.Graticule({
-                          numPoints: 2, 
-                          labelled: true,
-                          visible: true
-                      }),
+                      graticuleCtl1,
                      new OpenLayers.Control.LayerSwitcher(),
                      new OpenLayers.Control.PanZoomBar(),
                      new OpenLayers.Control.Navigation()
@@ -43,7 +44,7 @@
                });

                var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'}, {wrapDateLine: true} );

                map1.addLayers([ol_wms]);
@@ -52,12 +53,13 @@
            
            function initProjected(){
                var extent = new OpenLayers.Bounds(-2200000,-712631,3072800,3840000);
-                var mapOptions = {
-                      controls: [
-                      new OpenLayers.Control.Graticule({
+                graticuleCtl2 = new OpenLayers.Control.Graticule({
                    labelled: true,
                    targetSize: 200
-                        }),
+                });
+                var mapOptions = {
+                      controls: [
+                        graticuleCtl2,
                        new OpenLayers.Control.LayerSwitcher(),
                        new OpenLayers.Control.PanZoomBar(),
                        new OpenLayers.Control.Navigation()
@@ -98,5 +100,12 @@
        <div id="map2" class="smallmap"></div>

        <div id="docs"></div>
+        <br style="clear:both" />
+        <ul>
+            <li><a href="#" 
+                onclick="graticuleCtl1.activate(); graticuleCtl2.activate(); return false;">Activate graticule controls</a></li>
+            <li><a href="#" 
+                onclick="graticuleCtl1.deactivate(); graticuleCtl2.deactivate(); return false;">Deactivate graticule controls</a></li>
+        </ul>
    </body>
 </html>
--- a/examples/hover-handler.html
+++ b/examples/hover-handler.html
@@ -76,7 +76,7 @@
                map = new OpenLayers.Map('map');
                var layer = new OpenLayers.Layer.WMS(
                    'OpenLayers WMS',
-                    'http://labs.metacarta.com/wms/vmap0',
+                    'http://vmap0.tiles.osgeo.org/wms/vmap0',
                    {layers: 'basic'}
                );
                map.addLayers([layer]);
--- a/examples/kml-layer.html
+++ b/examples/kml-layer.html
@@ -12,7 +12,7 @@
        function init(){
            map = new OpenLayers.Map('map');
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            map.addLayer(new OpenLayers.Layer.GML("KML", "kml/lines.kml", 
               {
--- a/examples/kml-track.html
+++ b/examples/kml-track.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers KLM Track Parsing Example</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/google.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <style>
+            .olControlAttribution {
+                bottom: 2px;
+            }
+        </style>
+        <script src="../lib/OpenLayers.js"></script>
+        <script src="kml-track.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">Parsing gx:Track in KML</h1>
+        <p id="shortdesc">
+            Demonstrates parsing of gx:Track elements from KML.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                If a KML document contains <code>&lt;gx:Track&gt;</code> 
+                elements and the extractTracks property is set true on the 
+                parer, features will be created that represent track points.
+                Each feature will have a when attribute that contains the 
+                value of the relevant <code>&lt;when&gt;</code> element from 
+                the track.
+            </p>
+            <p>
+                View the <a href="kml-track.js" target="_blank">kml-track.js</a>
+                source to see how this is done.
+        </div>
+    </body>
+</html>
--- a/examples/kml-track.js
+++ b/examples/kml-track.js
@@ -0,0 +1,40 @@
+var map;
+
+function init() {
+
+    var mercator = new OpenLayers.Projection("EPSG:900913");
+    var geographic = new OpenLayers.Projection("EPSG:4326");
+
+    map = new OpenLayers.Map({
+        div: "map",
+        projection: mercator,
+        layers: [
+            new OpenLayers.Layer.OSM(),
+            new OpenLayers.Layer.Vector("Aircraft Locations", {
+                projection: geographic,
+                strategies: [new OpenLayers.Strategy.Fixed()],
+                protocol: new OpenLayers.Protocol.HTTP({
+                    url: "kml-track.kml",
+                    format: new OpenLayers.Format.KML({
+                        extractTracks: true,
+                        trackAttributes: ["speed"]
+                    })
+                }),
+                styleMap: new OpenLayers.StyleMap({
+                    "default": new OpenLayers.Style({
+                        graphicName: "circle",
+                        pointRadius: 2,
+                        fillOpacity: 0.5,
+                        fillColor: "#ffcc66",
+                        strokeColor: "#666633",
+                        strokeWidth: 1,
+                    })
+                })
+            })
+        ],
+        center: new OpenLayers.LonLat(-93.2735, 44.8349).transform(geographic, mercator),
+        zoom: 8
+    });
+    
+};
+
--- a/examples/kml-track.kml
+++ b/examples/kml-track.kml
--- a/examples/late-render.html
+++ b/examples/late-render.html
@@ -11,7 +11,7 @@
            map = new OpenLayers.Map();
            layer = new OpenLayers.Layer.WMS(
                "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}
            );
            map.addLayer(layer);
--- a/examples/layerLoadMonitoring.html
+++ b/examples/layerLoadMonitoring.html
@@ -32,28 +32,28 @@
            map.addControl(new OpenLayers.Control.LayerSwitcher());

            buffer0 = new OpenLayers.Layer.WMS( "WMS Buffer 0",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} ,
                    { singleTile: false, buffer:0}
            );
            registerEvents(buffer0);

            buffer1 = new OpenLayers.Layer.WMS( "WMS Buffer 1",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} ,
                    { singleTile: false, buffer:1}
            );
            registerEvents(buffer1);

            buffer2 = new OpenLayers.Layer.WMS( "WMS Buffer 2",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} ,
                    { singleTile: false, buffer:2 }
            );
            registerEvents(buffer2);

            singleTileLayer = new OpenLayers.Layer.WMS( "Single Tile Layer",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} ,
                    { singleTile: true}
            );
--- a/examples/layerswitcher.html
+++ b/examples/layerswitcher.html
@@ -13,7 +13,7 @@
            map.addControl(new OpenLayers.Control.LayerSwitcher({'div':OpenLayers.Util.getElement('layerswitcher')}));

            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}, {'displayInLayerSwitcher':false} );

            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
--- a/examples/lite.html
+++ b/examples/lite.html
@@ -9,7 +9,7 @@
        function init(){
            map = new OpenLayers.Map( 'map' );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} );
            map.addLayer(layer);
            map.zoomToMaxExtent();
--- a/examples/mapserver.html
+++ b/examples/mapserver.html
@@ -13,7 +13,7 @@
        function init(){
            map = new OpenLayers.Map( 'map' );
            layer = new OpenLayers.Layer.MapServer( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'},
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'},
                    {gutter: 15});
            map.addLayer(layer);

--- a/examples/mapserver_untiled.html
+++ b/examples/mapserver_untiled.html
@@ -16,7 +16,7 @@
        window.onload = function(){
            map = new OpenLayers.Map( 'map', {maxResolution: 'auto'} );
            var layer = new OpenLayers.Layer.MapServer( "MapServer Untiled", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'}, {singleTile: true} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'}, {singleTile: true} );
            map.addLayer(layer);
            map.setCenter(new OpenLayers.LonLat(0, 0), 1);
            map.addControl( new OpenLayers.Control.LayerSwitcher() );
--- a/examples/markerResize.html
+++ b/examples/markerResize.html
@@ -11,17 +11,17 @@
        function init(){
            map = new OpenLayers.Map('map');
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
                
            map.addLayer(layer);
            var markers = new OpenLayers.Layer.Markers( "Markers" );
            map.addLayer(markers);

-            size = new OpenLayers.Size(50,50);
+            size = new OpenLayers.Size(21, 25);
            calculateOffset = function(size) {
                        return new OpenLayers.Pixel(-(size.w/2), -size.h); };
            icon = new OpenLayers.Icon(
-                'http://boston.openguides.org/markers/AQUA.png',
+                'http://www.openlayers.org/dev/img/marker.png',
                size, null, calculateOffset);
            markers.addMarker(
                new OpenLayers.Marker(new OpenLayers.LonLat(-71,40), icon));
--- a/examples/marker_shadow.png
+++ b/examples/marker_shadow.png
--- a/examples/markers.html
+++ b/examples/markers.html
@@ -11,7 +11,7 @@
            OpenLayers.ProxyHost="/proxy/?url=";
            map = new OpenLayers.Map('map');
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
                
            map.addLayer(layer);
            map.setCenter(new OpenLayers.LonLat(0, 0), 0);
@@ -22,9 +22,9 @@
            var markers = new OpenLayers.Layer.Markers( "Markers" );
            map.addLayer(markers);

-            var size = new OpenLayers.Size(10,17);
+            var size = new OpenLayers.Size(21,25);
            var offset = new OpenLayers.Pixel(-(size.w/2), -size.h);
-            var icon = new OpenLayers.Icon('http://boston.openguides.org/markers/AQUA.png',size,offset);
+            var icon = new OpenLayers.Icon('http://www.openlayers.org/dev/img/marker.png',size,offset);
            markers.addMarker(new OpenLayers.Marker(new OpenLayers.LonLat(0,0),icon));

            var halfIcon = icon.clone();
--- a/examples/markersTextLayer.html
+++ b/examples/markersTextLayer.html
@@ -11,7 +11,7 @@
            OpenLayers.ProxyHost="/proxy/?url=";
            map = new OpenLayers.Map('map');
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
                
            map.addLayer(layer);

--- a/examples/measure.html
+++ b/examples/measure.html
@@ -29,7 +29,7 @@
            map = new OpenLayers.Map('map');
            
            var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); 
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'}); 

            map.addLayers([wmsLayer]);
            map.addControl(new OpenLayers.Control.LayerSwitcher());
--- a/examples/modify-feature.html
+++ b/examples/modify-feature.html
@@ -21,7 +21,7 @@
        function init(){
            map = new OpenLayers.Map('map');
            var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); 
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'}); 
            OpenLayers.Feature.Vector.style['default']['strokeWidth'] = '2';
            vectors = new OpenLayers.Layer.Vector("Vector Layer");

--- a/examples/mouse-position.html
+++ b/examples/mouse-position.html
@@ -14,7 +14,7 @@
            map.addControl(new OpenLayers.Control.MousePosition());

            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'} );

            map.addLayers([ol_wms]);
--- a/examples/mousewheel-interval.html
+++ b/examples/mousewheel-interval.html
@@ -23,7 +23,7 @@
                new OpenLayers.Control.Attribution()
            ]} );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} );
            map.addLayer(layer);
            map.zoomToMaxExtent();
--- a/examples/multimap-mercator.html
+++ b/examples/multimap-mercator.html
@@ -12,7 +12,8 @@
    </style>


-    <script type="text/javascript" src="http://clients.multimap.com/API/maps/1.1/metacarta_04"></script>
+    <!-- multimap api key for http://(www.)openlayers.org -->
+    <script type="text/javascript" src="http://developer.multimap.com/API/maps/1.2/OA10072915821139765"></script>

    <script src="../lib/OpenLayers.js"></script>
    <script type="text/javascript">
@@ -34,11 +35,9 @@
                {'sphericalMercator': true}
            ); 
            merc = new OpenLayers.Layer.WMS("World Map",
-                                            "http://world.freemap.in/tiles/",
-                                            {'layers': 'factbook-overlay',
-                                             'format':'png'},
-                                            {'reproject': false,
-                                             'opacity': 0.4,
+                                            "http://maps.opengeo.org/geowebcache/service/wms",
+                                            {'layers': 'bluemarble'},
+                                            {'opacity': 0.4,
                                             'isBaseLayer': false,
                                             'wrapDateLine': true});

--- a/examples/multiserver.html
+++ b/examples/multiserver.html
@@ -13,8 +13,8 @@
        function init(){
            map = new OpenLayers.Map( 'map' );
            
-            var urlArray = ["http://t1.labs.metacarta.com/wms-c/Basic.py",
-                            "http://t2.labs.metacarta.com/wms-c/Basic.py"];
+            var urlArray = ["http://tilecache.osgeo.org/wms-c/Basic.py",
+                            "http://tilecache.osgeo.org/wms-c/Basic.py"];
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
                                              urlArray,
                                              {layers: 'basic'} );
--- a/examples/mvs.html
+++ b/examples/mvs.html
@@ -17,7 +17,7 @@
 function runMVS() {
    OpenLayers.ProxyHost = '/proxy/?url='; 
    if (document.location.protocol != "file:") {
-        theArgs = OpenLayers.Util.getArgs();
+        theArgs = OpenLayers.Util.getParameters();
    } else {
        theArgs = {};
        theArgs.center = "0,0";
@@ -81,7 +81,7 @@ function runMVS() {
            case 'openlayers':
                theMVS.addLayer(
                  new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                        "http://labs.metacarta.com/wms/vmap0", 
+                        "http://vmap0.tiles.osgeo.org/wms/vmap0", 
                        {layers: 'basic'} )
                  );
                break;
--- a/examples/navigation-control.html
+++ b/examples/navigation-control.html
@@ -9,7 +9,7 @@
        function init(){
            map = new OpenLayers.Map( 'map', { controls: [] });
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'} );
            map.addLayer(layer);
            nav = new OpenLayers.Control.Navigation({'zoomWheelEnabled': false});
--- a/examples/navigation-history.html
+++ b/examples/navigation-history.html
@@ -32,7 +32,7 @@
                
                var layer = new OpenLayers.Layer.WMS(
                    "OpenLayers WMS",
-                    "http://labs.metacarta.com/wms/vmap0",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
                    {layers: 'basic'}
                );
                map.addLayer(layer);
--- a/examples/navtoolbar-alwaysZoom.html
+++ b/examples/navtoolbar-alwaysZoom.html
@@ -56,7 +56,7 @@

 	            var wms = new OpenLayers.Layer.WMS(
 	                "OpenLayers WMS",
-	                "http://labs.metacarta.com/wms/vmap0",
+	                "http://vmap0.tiles.osgeo.org/wms/vmap0",
 	                {layers: 'basic'}
 	            );					  
 								
--- a/examples/navtoolbar-outsidemap.html
+++ b/examples/navtoolbar-outsidemap.html
@@ -22,7 +22,7 @@
        function init(){
            map = new OpenLayers.Map( 'map', { controls: [new OpenLayers.Control.PanZoom()] } );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            var panel = new OpenLayers.Control.NavToolbar({'div':OpenLayers.Util.getElement('paneldiv')});
            map.addControl(panel);
--- a/examples/navtoolbar.html
+++ b/examples/navtoolbar.html
@@ -18,7 +18,7 @@
        function init() {
            map = new OpenLayers.Map( 'map', { controls: [new OpenLayers.Control.PanZoom()] } );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);

            var panel = new OpenLayers.Control.NavToolbar();
--- a/examples/notile.html
+++ b/examples/notile.html
@@ -10,11 +10,11 @@
            map = new OpenLayers.Map('mapDiv', {maxResolution: 'auto'});

            var old_ol_wms = new OpenLayers.Layer.WMS.Untiled( "WMS.Untiled", 
-                "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'} );
            old_ol_wms.addOptions({isBaseLayer: true});
            
            var new_ol_wms = new OpenLayers.Layer.WMS( "WMS w/singleTile", 
-                "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}, 
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'}, 
                { singleTile: true, ratio: 1 } );
            new_ol_wms.addOptions({isBaseLayer: true});

--- a/examples/osm-google.html
+++ b/examples/osm-google.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers OSM and Google Example</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/google.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
+        <script src="../lib/OpenLayers.js"></script>
+        <script src="osm-google.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">OSM and Google Together</h1>
+        <p id="shortdesc">
+            Demonstrate use of an OSM layer and a Google layer as base layers.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                The Google(v3) layer and the OSM are both in the same projection
+                - spherical mercator - and can be used on a map together.
+                See the <a href="osm-google.js" target="_blank">
+                osm-google.js source</a> to see how this is done.
+            </p>
+        </div>
+    </body>
+</html>
--- a/examples/osm-google.js
+++ b/examples/osm-google.js
@@ -0,0 +1,28 @@
+var map;
+
+function init() {
+    map = new OpenLayers.Map({
+        div: "map",
+        projection: new OpenLayers.Projection("EPSG:900913"),
+        units: "m",
+        maxResolution: 156543.0339,
+        maxExtent: new OpenLayers.Bounds(
+            -20037508, -20037508, 20037508, 20037508.34
+        )
+    });
+    
+    var osm = new OpenLayers.Layer.OSM();            
+    var gmap = new OpenLayers.Layer.Google("Google Streets");
+    
+    map.addLayers([osm, gmap]);
+
+    map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+    map.setCenter(
+        new OpenLayers.LonLat(10.2, 48.9).transform(
+            new OpenLayers.Projection("EPSG:4326"),
+            map.getProjectionObject()
+        ), 
+        5
+    );
+}
--- a/examples/osm.html
+++ b/examples/osm.html
@@ -10,7 +10,12 @@
            map = new OpenLayers.Map( 'map');
            layer = new OpenLayers.Layer.OSM( "Simple OSM Map");
            map.addLayer(layer);
-            map.zoomToMaxExtent();
+            map.setCenter(
+                new OpenLayers.LonLat(-71.147, 42.472).transform(
+                    new OpenLayers.Projection("EPSG:4326"),
+                    map.getProjectionObject()
+                ), 12
+            );    
        }
    </script>
  </head>
--- a/examples/overviewmap.html
+++ b/examples/overviewmap.html
@@ -42,7 +42,7 @@
        
        var ol = new OpenLayers.Layer.WMS(
            "OpenLayers WMS", 
-            "http://labs.metacarta.com/wms/vmap0",
+            "http://vmap0.tiles.osgeo.org/wms/vmap0",
            {layers: 'basic'}
        );
        
@@ -75,15 +75,13 @@
        map1.addControl(new OpenLayers.Control.LayerSwitcher());
        
        // create an overview map control with the default options
-        var overview1 = new OpenLayers.Control.OverviewMap();
+        var overview1 = new OpenLayers.Control.OverviewMap({
+            maximized: true
+        });
        map1.addControl(overview1);
        
        map1.setCenter(new OpenLayers.LonLat(0, 0), 2);
        
-        // expand the overview map control
-        overview1.maximizeControl();
-        
-        
        // create the bottom map (with advanced overview map control)
        var mapOptions = {
            maxExtent: new OpenLayers.Bounds(-8242894.927728, 4965204.031195,
@@ -99,6 +97,7 @@
        
        // create an overview map control with non-default options
        var controlOptions = {
+            maximized: true,
            mapOptions: OpenLayers.Util.extend(mapOptions, {
                maxResolution: 156543.0339,
                maxExtent: new OpenLayers.Bounds(-20037508.34, -20037508.34,
@@ -111,9 +110,6 @@
        
        map2.setCenter(new OpenLayers.LonLat(-8233165.3575055, 4980298.21113769), 3);
        
-        // expand the overview map control
-        overview2.maximizeControl();
-
        </script>
    </body>
 </html>
--- a/examples/pan-zoom-panels.html
+++ b/examples/pan-zoom-panels.html
@@ -32,7 +32,7 @@
        
        var wms = new OpenLayers.Layer.WMS(
            "OpenLayers WMS",
-            "http://labs.metacarta.com/wms/vmap0",
+            "http://vmap0.tiles.osgeo.org/wms/vmap0",
            {layers: 'basic'}
        );
        map.addLayers([wms]);
--- a/examples/panel.html
+++ b/examples/panel.html
@@ -9,7 +9,7 @@
          width:  24px;
          height: 24px;
          margin: 5px;
-          background-color:red;
+          background-color:white;
        }
        
        .olControlPanel .olControlMouseDefaultsItemActive { 
@@ -60,7 +60,7 @@
        function init(){
            map = new OpenLayers.Map( 'map', { controls: [] } );
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);

            vlayer = new OpenLayers.Layer.Vector( "Editable" );
@@ -78,6 +78,12 @@
                    {title:'Draw a feature'}),
                new OpenLayers.Control.ZoomToMaxExtent({title:"Zoom to the max extent"}) 
            ]);
+            
+            nav = new OpenLayers.Control.NavigationHistory();
+            // parent control must be added to the map
+            map.addControl(nav);
+            panel.addControls([nav.next, nav.previous]);
+            
            map.addControl(panel);

            map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
--- a/examples/point-track-markers.html
+++ b/examples/point-track-markers.html
@@ -11,7 +11,7 @@
        function init(){
            map = new OpenLayers.Map('map', {maxResolution:'auto'});
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            map.setCenter(new OpenLayers.LonLat(20.22, 22.05), 9);
            map.addControl(new OpenLayers.Control.LayerSwitcher());
--- a/examples/popupMatrix.jpg
+++ b/examples/popupMatrix.jpg
--- a/examples/popups.html
+++ b/examples/popups.html
@@ -11,7 +11,7 @@
        function init(){
            map = new OpenLayers.Map('map');
            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            layer = new OpenLayers.Layer.Google( "Google" );
            map.addLayer(layer);
--- a/examples/protocol-gears.html
+++ b/examples/protocol-gears.html
@@ -31,7 +31,7 @@

            // create base layer
            var layer = new OpenLayers.Layer.WMS("OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {"layers": "basic"}
            );
            map.addLayer(layer);
--- a/examples/proxy.cgi
+++ b/examples/proxy.cgi
@@ -20,7 +20,8 @@ allowedHosts = ['www.openlayers.org', 'openlayers.org',
                'prototype.openmnnd.org', 'geo.openplans.org',
                'sigma.openplans.org', 'demo.opengeo.org',
                'www.openstreetmap.org', 'sample.azavea.com',
-                'v-swe.uni-muenster.de:8080']
+                'v-swe.uni-muenster.de:8080', 
+                'vmap0.tiles.osgeo.org']

 method = os.environ["REQUEST_METHOD"]

--- a/examples/regular-polygons.html
+++ b/examples/regular-polygons.html
@@ -41,7 +41,7 @@
            map = new OpenLayers.Map('map');
            
            var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); 
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'}); 

            var polygonLayer = new OpenLayers.Layer.Vector("Polygon Layer");

--- a/examples/resize-features.html
+++ b/examples/resize-features.html
@@ -15,7 +15,7 @@
        function init(){
            map = new OpenLayers.Map('map');
            var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            
            var style_blue = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
--- a/examples/restricted-extent.html
+++ b/examples/restricted-extent.html
@@ -17,7 +17,7 @@

            var wms = new OpenLayers.Layer.WMS(
                "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0?",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?",
                {layers: 'basic'}
            ); 

--- a/examples/rotate-features.html
+++ b/examples/rotate-features.html
@@ -15,7 +15,7 @@
        function init(){
            map = new OpenLayers.Map('map');
            var layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                    "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(layer);
            
            var style_blue = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
--- a/examples/select-feature-multilayer.html
+++ b/examples/select-feature-multilayer.html
@@ -16,7 +16,7 @@
            map = new OpenLayers.Map('map');
            var wmsLayer = new OpenLayers.Layer.WMS(
                "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}
            ); 

--- a/examples/select-feature-openpopup.html
+++ b/examples/select-feature-openpopup.html
@@ -32,7 +32,7 @@
        function init(){
            map = new OpenLayers.Map('map');
            var wmsLayer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0?", {layers: 'basic'}); 
+                "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'}); 

            var polygonLayer = new OpenLayers.Layer.Vector("Polygon Layer");

--- a/examples/select-feature.html
+++ b/examples/select-feature.html
@@ -16,7 +16,7 @@
            map = new OpenLayers.Map('map');
            var wmsLayer = new OpenLayers.Layer.WMS(
                "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}
            ); 

--- a/examples/setextent.html
+++ b/examples/setextent.html
@@ -22,7 +22,7 @@
    var map = new OpenLayers.Map('map');
    var bounds = new OpenLayers.Bounds(-45,-45, 0, 45); 
    var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-        "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+        "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
    map.addLayer(wms);
    map.zoomToExtent(bounds);
    var boxes = new OpenLayers.Layer.Boxes("boxes");
--- a/examples/sld-parser.html
+++ b/examples/sld-parser.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers SLD Parser</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
+        <link rel="stylesheet" href="style.css" type="text/css" />
+        <script src="../lib/OpenLayers.js"></script>
+        <style>
+            #input {
+                width: 90%;
+                height: 300px;
+            }
+            #output {
+                width: 90%;
+                height: 300px;
+            }
+        </style>
+    </head>
+    <body>
+        <h1 id="title">SLD Parser</h1>
+
+        <div id="shortdesc">Parsing Styled Layer Descriptor (SLD) documents with the SLD format.</div>
+
+        <textarea id="input">paste SLD here</textarea><br>
+        <input type="checkbox" id="symbolizers" checked="checked"><label for="symbolizers">Maintain multiple symbolizers and FeatureTypeStyle elements</label><br>
+        <input type="checkbox" id="array"><label for="array">Compile an array of named styles instead of an object.</label><br>
+        <input type="button" id="button" value="Parse SLD">
+
+        <div id="docs">
+            This example uses the SLD format to parse SLD documents pasted into the textarea above.  
+            A rough representation of the parsed style is shown in the textarea below.
+        </div>
+        
+        <textarea id="output"></textarea>
+        
+        <script>
+        
+            var button = document.getElementById("button");
+            var input = document.getElementById("input");
+            var output = document.getElementById("output");
+            var symbolizers = document.getElementById("symbolizers");
+            var array = document.getElementById("array");
+            
+            var json = new OpenLayers.Format.JSON();
+
+            var format, obj;
+            
+            button.onclick = function() {
+                var str = input.value;
+                format = new OpenLayers.Format.SLD({
+                    multipleSymbolizers: !!symbolizers.checked,
+                    namedLayersAsArray: !!array.checked
+                });
+                obj = format.read(str);
+                try {
+                    output.value = json.write(obj, true);
+                } catch (err) {
+                    output.value = "Trouble: " + err;
+                }
+            }
+        
+        </script>
+
+    </body>
+</html>
--- a/examples/small.jpg
+++ b/examples/small.jpg
--- a/examples/sos.html
+++ b/examples/sos.html
@@ -69,7 +69,7 @@
            getTitleForObservedProperty: function(property) {
                for (var name in this.SOSCapabilities.contents.offeringList) {
                    var offering = this.SOSCapabilities.contents.offeringList[name];
-                    if (offering.observedProperty === property) {
+                    if (offering.observedProperties[0] === property) {
                        return offering.name;
                    }
                }
@@ -127,11 +127,11 @@
                    var offering = this.SOSCapabilities.contents.offeringList[name];
                    var xml = this.obsformat.write({
                        eventTime: 'latest',
-                        resultModel: 'measurement',
+                        resultModel: 'om:Measurement',
                        responseMode: 'inline',
                        procedure: feature.attributes.id,
                        offering: name,
-                        observedProperty: offering.observedProperty,
+                        observedProperty: offering.observedProperties[0],
                        responseFormat: this.responseFormat
                    });
                    OpenLayers.Request.POST({
@@ -149,7 +149,7 @@

        function init(){
            map = new OpenLayers.Map( 'map' );
-            var baseLayer = new OpenLayers.Layer.WMS("Test Layer", "http://labs.metacarta.com/wms/vmap0?", {
+            var baseLayer = new OpenLayers.Layer.WMS("Test Layer", "http://vmap0.tiles.osgeo.org/wms/vmap0?", {
                layers: "basic"}, {singleTile: true});

            var sos = new OpenLayers.SOSClient({map: map, url: 'http://v-swe.uni-muenster.de:8080/WeatherSOS/sos?'});
--- a/examples/strategy-cluster-threshold.html
+++ b/examples/strategy-cluster-threshold.html
@@ -34,9 +34,9 @@
            function init() {
                map = new OpenLayers.Map('map');
                var base = new OpenLayers.Layer.WMS("OpenLayers WMS", 
-                    ["http://t3.labs.metacarta.com/wms-c/Basic.py",
-                     "http://t2.labs.metacarta.com/wms-c/Basic.py",
-                     "http://t1.labs.metacarta.com/wms-c/Basic.py"], 
+                    ["http://t3.tilecache.osgeo.org/wms-c/Basic.py",
+                     "http://t2.tilecache.osgeo.org/wms-c/Basic.py",
+                     "http://t1.tilecache.osgeo.org/wms-c/Basic.py"], 
                    {layers: 'satellite'}
                );

--- a/examples/style-rules.js
+++ b/examples/style-rules.js
@@ -5,7 +5,7 @@ function init() {

    var wms = new OpenLayers.Layer.WMS(
        "OpenLayers WMS",
-        "http://labs.metacarta.com/wms/vmap0",
+        "http://vmap0.tiles.osgeo.org/wms/vmap0",
        {layers: "basic"}
    );
    
--- a/examples/stylemap.html
+++ b/examples/stylemap.html
@@ -11,7 +11,7 @@
            map = new OpenLayers.Map('map');
            var wms = new OpenLayers.Layer.WMS(
                "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}
            );
            
--- a/examples/styles-context.html
+++ b/examples/styles-context.html
@@ -10,7 +10,7 @@
        function init(){
            map = new OpenLayers.Map('map', {maxResolution:'auto'});
            var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
+                "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers: 'basic'} );
            map.addLayer(wms);
            map.setCenter(new OpenLayers.LonLat(0, 0), 0);
            
--- a/examples/styles-rotation.html
+++ b/examples/styles-rotation.html
@@ -13,7 +13,7 @@
            map = new OpenLayers.Map('map');
            var wms = new OpenLayers.Layer.WMS(
                "OpenLayers WMS", 
-                "http://labs.metacarta.com/wms/vmap0",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
                {layers: 'basic'}
            );

--- a/Show More
+++ b/Show More