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

apidoc_config/Menu.txt

@@ -74,6 +74,7 @@ Group: OpenLayers  {
       File: DrawFeature  (no auto-title, OpenLayers/Control/DrawFeature.js)
       File: EditingToolbar  (no auto-title, OpenLayers/Control/EditingToolbar.js)
       File: GetFeature  (no auto-title, OpenLayers/Control/GetFeature.js)
+      File: Graticule  (OpenLayers/Control/Graticule.js)
       File: KeyboardDefaults  (no auto-title, OpenLayers/Control/KeyboardDefaults.js)
       File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js)
       File: Measure  (no auto-title, OpenLayers/Control/Measure.js)
@@ -96,6 +97,7 @@ Group: OpenLayers  {
       File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js)
       File: Snapping  (no auto-title, OpenLayers/Control/Snapping.js)
       File: Split  (no auto-title, OpenLayers/Control/Split.js)
+      File: WMSGetFeatureInfo  (OpenLayers/Control/WMSGetFeatureInfo.js)
       File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js)
       File: ZoomIn  (no auto-title, OpenLayers/Control/ZoomIn.js)
       File: ZoomOut  (no auto-title, OpenLayers/Control/ZoomOut.js)
@@ -124,6 +126,13 @@ Group: OpenLayers  {
    Group: Format  {
 
       File: Format  (no auto-title, OpenLayers/Format.js)
+      File: ArcXML  (no auto-title, OpenLayers/Format/ArcXML.js)
+      File: ArcXML.Features  (no auto-title, OpenLayers/Format/ArcXML/Features.js)
+      File: Atom  (no auto-title, OpenLayers/Format/Atom.js)
+      File: CSWGetDomain.DEFAULTS  (no auto-title, OpenLayers/Format/CSWGetDomain.js)
+      File: CSWGetDomain.v2_0_2  (no auto-title, OpenLayers/Format/CSWGetDomain/v2_0_2.js)
+      File: CSWGetRecords.DEFAULTS  (no auto-title, OpenLayers/Format/CSWGetRecords.js)
+      File: CSWGetRecords.v2_0_2  (no auto-title, OpenLayers/Format/CSWGetRecords/v2_0_2.js)
 
       Group: Filter  {
 
@@ -133,6 +142,9 @@ Group: OpenLayers  {
          File: v1_1_0  (OpenLayers/Format/Filter/v1_1_0.js)
          }  # Group: Filter
 
+      File: GeoJSON  (no auto-title, OpenLayers/Format/GeoJSON.js)
+      File: GeoRSS  (no auto-title, OpenLayers/Format/GeoRSS.js)
+
       Group: GML  {
 
          File: GML  (no auto-title, OpenLayers/Format/GML.js)
@@ -141,6 +153,12 @@ Group: OpenLayers  {
          File: v3  (no auto-title, OpenLayers/Format/GML/v3.js)
          }  # Group: GML
 
+      File: GPX  (no auto-title, OpenLayers/Format/GPX.js)
+      File: JSON  (no auto-title, OpenLayers/Format/JSON.js)
+      File: KML  (no auto-title, OpenLayers/Format/KML.js)
+      File: OSM  (no auto-title, OpenLayers/Format/OSM.js)
+      File: OWSCommon.v1_1_0  (OpenLayers/Format/OWSCommon/v1_1_0.js)
+
       Group: SLD  {
 
          File: SLD  (no auto-title, OpenLayers/Format/SLD.js)
@@ -148,6 +166,32 @@ Group: OpenLayers  {
          File: v1_0_0  (no auto-title, OpenLayers/Format/SLD/v1_0_0.js)
          }  # Group: SLD
 
+      File: SOSCapabilities  (OpenLayers/Format/SOSCapabilities.js)
+      File: SOSCapabilities.v1_0_0  (OpenLayers/Format/SOSCapabilities/v1_0_0.js)
+      File: SOSGetObservation  (OpenLayers/Format/SOSGetObservation.js)
+      File: Text  (no auto-title, OpenLayers/Format/Text.js)
+      File: WFS  (no auto-title, OpenLayers/Format/WFS.js)
+
+      Group: WFSCapabilities  {
+
+         File: WFSCapabilities  (no auto-title, OpenLayers/Format/WFSCapabilities.js)
+         File: v1  (no auto-title, OpenLayers/Format/WFSCapabilities/v1.js)
+         File: v1_0_0  (no auto-title, OpenLayers/Format/WFSCapabilities/v1_0_0.js)
+         File: v1_1_0  (no auto-title, OpenLayers/Format/WFSCapabilities/v1_1_0.js)
+         }  # Group: WFSCapabilities
+
+      File: WFSDescribeFeatureType  (no auto-title, OpenLayers/Format/WFSDescribeFeatureType.js)
+
+      Group: WFST  {
+
+         File: WFST  (no auto-title, OpenLayers/Format/WFST.js)
+         File: v1  (OpenLayers/Format/WFST/v1.js)
+         File: v1_0_0  (OpenLayers/Format/WFST/v1_0_0.js)
+         File: v1_1_0  (OpenLayers/Format/WFST/v1_1_0.js)
+         }  # Group: WFST
+
+      File: WKT  (no auto-title, OpenLayers/Format/WKT.js)
+
       Group: WMC  {
 
          File: WMC  (no auto-title, OpenLayers/Format/WMC.js)
@@ -156,33 +200,25 @@ Group: OpenLayers  {
          File: v1_1_0  (no auto-title, OpenLayers/Format/WMC/v1_1_0.js)
          }  # Group: WMC
 
-      Group: Format  {
+      Group: WMSCapabilities  {
 
-         File: GeoJSON  (no auto-title, OpenLayers/Format/GeoJSON.js)
+         File: WMSCapabilities  (no auto-title, OpenLayers/Format/WMSCapabilities.js)
-         File: GeoRSS  (no auto-title, OpenLayers/Format/GeoRSS.js)
+         File: v1  (no auto-title, OpenLayers/Format/WMSCapabilities/v1.js)
-         File: GPX  (no auto-title, OpenLayers/Format/GPX.js)
+         File: v1_1  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_1.js)
-         File: JSON  (no auto-title, OpenLayers/Format/JSON.js)
+         File: v1_1_0  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_1_0.js)
-         File: KML  (no auto-title, OpenLayers/Format/KML.js)
+         File: v1_1_1  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_1_1.js)
-         File: OSM  (no auto-title, OpenLayers/Format/OSM.js)
+         File: v1_3  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_3.js)
-         File: Text  (no auto-title, OpenLayers/Format/Text.js)
+         File: v1_3_0  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_3_0.js)
-         File: WFS  (no auto-title, OpenLayers/Format/WFS.js)
+         }  # Group: WMSCapabilities
-         File: WFSDescribeFeatureType  (OpenLayers/Format/WFSDescribeFeatureType.js)
 
-         Group: WFST  {
+      Group: WMSDescribeLayer  {
 
-            File: WFST  (no auto-title, OpenLayers/Format/WFST.js)
+         File: WMSDescribeLayer  (no auto-title, OpenLayers/Format/WMSDescribeLayer.js)
-            File: v1  (OpenLayers/Format/WFST/v1.js)
+         File: v1_1  (no auto-title, OpenLayers/Format/WMSDescribeLayer/v1_1.js)
-            File: v1_0_0  (OpenLayers/Format/WFST/v1_0_0.js)
+         }  # Group: WMSDescribeLayer
-            File: v1_1_0  (OpenLayers/Format/WFST/v1_1_0.js)
-            }  # Group: WFST
-
-         File: WKT  (no auto-title, OpenLayers/Format/WKT.js)
-         File: WMSDescribeLayer  (OpenLayers/Format/WMSDescribeLayer.js)
-         File: WMSDescribeLayer.v1_1  (OpenLayers/Format/WMSDescribeLayer/v1_1.js)
-         File: WMSGetFeatureInfo  (OpenLayers/Format/WMSGetFeatureInfo.js)
-         File: XML  (no auto-title, OpenLayers/Format/XML.js)
-         }  # Group: Format
 
+      File: WMSGetFeatureInfo  (no auto-title, OpenLayers/Format/WMSGetFeatureInfo.js)
+      File: XML  (no auto-title, OpenLayers/Format/XML.js)
       }  # Group: Format
 
    Group: Geometry  {
@@ -221,6 +257,10 @@ Group: OpenLayers  {
    Group: Lang  {
 
       File: Lang  (no auto-title, OpenLayers/Lang.js)
+      File: ar  (no auto-title, OpenLayers/Lang/ar.js)
+      File: be-tarask  (no auto-title, OpenLayers/Lang/be-tarask.js)
+      File: bg  (no auto-title, OpenLayers/Lang/bg.js)
+      File: br  (no auto-title, OpenLayers/Lang/br.js)
       File: ca  (no auto-title, OpenLayers/Lang/ca.js)
       File: cs-CZ  (no auto-title, OpenLayers/Lang/cs-CZ.js)
       File: da-DK  (no auto-title, OpenLayers/Lang/da-DK.js)
@@ -228,12 +268,35 @@ Group: OpenLayers  {
       File: en  (no auto-title, OpenLayers/Lang/en.js)
       File: en-CA  (no auto-title, OpenLayers/Lang/en-CA.js)
       File: es  (no auto-title, OpenLayers/Lang/es.js)
+      File: el  (no auto-title, OpenLayers/Lang/el.js)
+      File: fi  (no auto-title, OpenLayers/Lang/fi.js)
       File: fr  (no auto-title, OpenLayers/Lang/fr.js)
+      File: fur  (no auto-title, OpenLayers/Lang/fur.js)
+      File: gl  (no auto-title, OpenLayers/Lang/gl.js)
+      File: gsw  (no auto-title, OpenLayers/Lang/gsw.js)
+      File: hr  (no auto-title, OpenLayers/Lang/hr.js)
+      File: hsb  (no auto-title, OpenLayers/Lang/hsb.js)
+      File: hu  (no auto-title, OpenLayers/Lang/hu.js)
+      File: ia  (no auto-title, OpenLayers/Lang/ia.js)
+      File: id  (no auto-title, OpenLayers/Lang/id.js)
+      File: io  (no auto-title, OpenLayers/Lang/io.js)
+      File: is  (no auto-title, OpenLayers/Lang/is.js)
       File: it  (no auto-title, OpenLayers/Lang/it.js)
+      File: ja  (no auto-title, OpenLayers/Lang/ja.js)
+      File: km  (no auto-title, OpenLayers/Lang/km.js)
+      File: ksh  (no auto-title, OpenLayers/Lang/ksh.js)
+      File: nds  (no auto-title, OpenLayers/Lang/nds.js)
       File: nb  (no auto-title, OpenLayers/Lang/nb.js)
       File: nl  (no auto-title, OpenLayers/Lang/nl.js)
+      File: nn  (no auto-title, OpenLayers/Lang/nn.js)
+      File: oc  (no auto-title, OpenLayers/Lang/oc.js)
+      File: pt  (no auto-title, OpenLayers/Lang/pt.js)
       File: pt-BR  (no auto-title, OpenLayers/Lang/pt-BR.js)
+      File: ru  (no auto-title, OpenLayers/Lang/ru.js)
+      File: sk  (no auto-title, OpenLayers/Lang/sk.js)
       File: sv-SE  (no auto-title, OpenLayers/Lang/sv-SE.js)
+      File: te  (no auto-title, OpenLayers/Lang/te.js)
+      File: vi  (no auto-title, OpenLayers/Lang/vi.js)
       File: zh-CN  (no auto-title, OpenLayers/Lang/zh-CN.js)
       File: zh-TW  (no auto-title, OpenLayers/Lang/zh-TW.js)
       }  # Group: Lang
@@ -242,6 +305,7 @@ Group: OpenLayers  {
 
       File: Layer  (no auto-title, OpenLayers/Layer.js)
       File: ArcGIS93Rest  (no auto-title, OpenLayers/Layer/ArcGIS93Rest.js)
+      File: ArcIMS  (no auto-title, OpenLayers/Layer/ArcIMS.js)
       File: Boxes  (no auto-title, OpenLayers/Layer/Boxes.js)
       File: EventPane  (no auto-title, OpenLayers/Layer/EventPane.js)
       File: FixedZoomLevels  (no auto-title, OpenLayers/Layer/FixedZoomLevels.js)
@@ -264,13 +328,15 @@ Group: OpenLayers  {
       File: TileCache  (no auto-title, OpenLayers/Layer/TileCache.js)
       File: TMS  (no auto-title, OpenLayers/Layer/TMS.js)
       File: Vector  (no auto-title, OpenLayers/Layer/Vector.js)
-      File: RootContainer  (OpenLayers/Layer/Vector/RootContainer.js)
+      File: Vector.RootContainer  (no auto-title, OpenLayers/Layer/Vector/RootContainer.js)
       File: VirtualEarth  (no auto-title, OpenLayers/Layer/VirtualEarth.js)
       File: WFS  (no auto-title, OpenLayers/Layer/WFS.js)
       File: WMS  (no auto-title, OpenLayers/Layer/WMS.js)
       File: WMS.Untiled  (no auto-title, OpenLayers/Layer/WMS/Untiled.js)
+      File: WMS.Post  (no auto-title, OpenLayers/Layer/WMS/Post.js)
       File: WorldWind  (no auto-title, OpenLayers/Layer/WorldWind.js)
       File: Yahoo  (no auto-title, OpenLayers/Layer/Yahoo.js)
+      File: XYZ  (no auto-title, OpenLayers/Layer/XYZ.js)
       }  # Group: Layer
 
    File: Map  (no auto-title, OpenLayers/Map.js)
@@ -306,9 +372,9 @@ Group: OpenLayers  {
       Group: WFS  {
 
          File: WFS  (no auto-title, OpenLayers/Protocol/WFS.js)
-         File: v1  (OpenLayers/Protocol/WFS/v1.js)
+         File: v1  (no auto-title, OpenLayers/Protocol/WFS/v1.js)
-         File: v1_0_0  (OpenLayers/Protocol/WFS/v1_0_0.js)
+         File: v1_0_0  (no auto-title, OpenLayers/Protocol/WFS/v1_0_0.js)
-         File: v1_1_0  (OpenLayers/Protocol/WFS/v1_1_0.js)
+         File: v1_1_0  (no auto-title, OpenLayers/Protocol/WFS/v1_1_0.js)
          }  # Group: WFS
 
       }  # Group: Protocol
@@ -337,6 +403,7 @@ Group: OpenLayers  {
       File: Cluster  (no auto-title, OpenLayers/Strategy/Cluster.js)
       File: Fixed  (no auto-title, OpenLayers/Strategy/Fixed.js)
       File: Paging  (no auto-title, OpenLayers/Strategy/Paging.js)
+      File: Refresh  (OpenLayers/Strategy/Refresh.js)
       File: Save  (OpenLayers/Strategy/Save.js)
       }  # Group: Strategy
 
@@ -348,6 +415,7 @@ Group: OpenLayers  {
       File: Tile  (no auto-title, OpenLayers/Tile.js)
       File: Image  (no auto-title, OpenLayers/Tile/Image.js)
       File: WFS  (no auto-title, OpenLayers/Tile/WFS.js)
+      File: IFrame  (OpenLayers/Tile/Image/IFrame.js)
       }  # Group: Tile
 
    File: Tween  (no auto-title, OpenLayers/Tween.js)

build/build.py

@@ -4,47 +4,51 @@ import sys
 sys.path.append("../tools")
 import mergejs
 
-have_compressor = None
+def build():
-try:
+    have_compressor = None
-    import jsmin
-    have_compressor = "jsmin"
-except ImportError:
     try:
-        import minimize
+        import jsmin
-        have_compressor = "minimize"
+        have_compressor = "jsmin"
-    except Exception, E:
+    except ImportError:
-        print E
+        try:
-        pass
+            import minimize
+            have_compressor = "minimize"
+        except Exception, E:
+            print E
+            pass
 
-sourceDirectory = "../lib"
+    sourceDirectory = "../lib"
-configFilename = "full.cfg"
+    configFilename = "full.cfg"
-outputFilename = "OpenLayers.js"
+    outputFilename = "OpenLayers.js"
 
-if len(sys.argv) > 1:
+    if len(sys.argv) > 1:
-    configFilename = sys.argv[1]
+        configFilename = sys.argv[1]
-    extension = configFilename[-4:]
+        extension = configFilename[-4:]
 
-    if extension  != ".cfg":
+        if extension  != ".cfg":
-        configFilename = sys.argv[1] + ".cfg"
+            configFilename = sys.argv[1] + ".cfg"
 
-if len(sys.argv) > 2:
+    if len(sys.argv) > 2:
-    outputFilename = sys.argv[2]
+        outputFilename = sys.argv[2]
 
-print "Merging libraries."
+    print "Merging libraries."
-merged = mergejs.run(sourceDirectory, None, configFilename)
+    merged = mergejs.run(sourceDirectory, None, configFilename)
-if have_compressor == "jsmin":
+    if have_compressor == "jsmin":
-    print "Compressing using jsmin."
+        print "Compressing using jsmin."
-    minimized = jsmin.jsmin(merged)
+        minimized = jsmin.jsmin(merged)
-elif have_compressor == "minimize":
+    elif have_compressor == "minimize":
-    print "Compressing using minimize."
+        print "Compressing using minimize."
-    minimized = minimize.minimize(merged)
+        minimized = minimize.minimize(merged)
-else: # fallback
+    else: # fallback
-    print "Not compressing."
+        print "Not compressing."
-    minimized = merged 
+        minimized = merged 
-print "Adding license file."
+    print "Adding license file."
-minimized = file("license.txt").read() + minimized
+    minimized = file("license.txt").read() + minimized
 
-print "Writing to %s." % outputFilename
+    print "Writing to %s." % outputFilename
-file(outputFilename, "w").write(minimized)
+    file(outputFilename, "w").write(minimized)
 
-print "Done."
+    print "Done."
+
+if __name__ == '__main__':
+  build()

build/license.txt

@@ -2,8 +2,8 @@
 
   OpenLayers.js -- OpenLayers Map Viewer Library
 
-  Copyright 2005-2008 MetaCarta, Inc., released under the Clear BSD license.
+  Copyright 2005-2010 OpenLayers Contributors, released under the Clear BSD
-  Please see http://svn.openlayers.org/trunk/openlayers/license.txt
+  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:

doc_config/Menu.txt

@@ -74,6 +74,7 @@ Group: OpenLayers  {
       File: DrawFeature  (no auto-title, OpenLayers/Control/DrawFeature.js)
       File: EditingToolbar  (no auto-title, OpenLayers/Control/EditingToolbar.js)
       File: GetFeature  (no auto-title, OpenLayers/Control/GetFeature.js)
+      File: Graticule  (OpenLayers/Control/Graticule.js)
       File: KeyboardDefaults  (no auto-title, OpenLayers/Control/KeyboardDefaults.js)
       File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js)
       File: Measure  (no auto-title, OpenLayers/Control/Measure.js)
@@ -96,6 +97,7 @@ Group: OpenLayers  {
       File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js)
       File: Snapping  (no auto-title, OpenLayers/Control/Snapping.js)
       File: Split  (no auto-title, OpenLayers/Control/Split.js)
+      File: WMSGetFeatureInfo  (OpenLayers/Control/WMSGetFeatureInfo.js)
       File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js)
       File: ZoomIn  (no auto-title, OpenLayers/Control/ZoomIn.js)
       File: ZoomOut  (no auto-title, OpenLayers/Control/ZoomOut.js)
@@ -124,6 +126,13 @@ Group: OpenLayers  {
    Group: Format  {
 
       File: Format  (no auto-title, OpenLayers/Format.js)
+      File: ArcXML  (no auto-title, OpenLayers/Format/ArcXML.js)
+      File: ArcXML.Features  (no auto-title, OpenLayers/Format/ArcXML/Features.js)
+      File: Atom  (no auto-title, OpenLayers/Format/Atom.js)
+      File: CSWGetDomain.DEFAULTS  (no auto-title, OpenLayers/Format/CSWGetDomain.js)
+      File: CSWGetDomain.v2_0_2  (no auto-title, OpenLayers/Format/CSWGetDomain/v2_0_2.js)
+      File: CSWGetRecords.DEFAULTS  (no auto-title, OpenLayers/Format/CSWGetRecords.js)
+      File: CSWGetRecords.v2_0_2  (no auto-title, OpenLayers/Format/CSWGetRecords/v2_0_2.js)
 
       Group: Filter  {
 
@@ -133,6 +142,9 @@ Group: OpenLayers  {
          File: v1_1_0  (OpenLayers/Format/Filter/v1_1_0.js)
          }  # Group: Filter
 
+      File: GeoJSON  (no auto-title, OpenLayers/Format/GeoJSON.js)
+      File: GeoRSS  (no auto-title, OpenLayers/Format/GeoRSS.js)
+
       Group: GML  {
 
          File: GML  (no auto-title, OpenLayers/Format/GML.js)
@@ -141,6 +153,12 @@ Group: OpenLayers  {
          File: v3  (no auto-title, OpenLayers/Format/GML/v3.js)
          }  # Group: GML
 
+      File: GPX  (no auto-title, OpenLayers/Format/GPX.js)
+      File: JSON  (no auto-title, OpenLayers/Format/JSON.js)
+      File: KML  (no auto-title, OpenLayers/Format/KML.js)
+      File: OSM  (no auto-title, OpenLayers/Format/OSM.js)
+      File: OWSCommon.v1_1_0  (OpenLayers/Format/OWSCommon/v1_1_0.js)
+
       Group: SLD  {
 
          File: SLD  (no auto-title, OpenLayers/Format/SLD.js)
@@ -148,6 +166,32 @@ Group: OpenLayers  {
          File: v1_0_0  (no auto-title, OpenLayers/Format/SLD/v1_0_0.js)
          }  # Group: SLD
 
+      File: SOSCapabilities  (OpenLayers/Format/SOSCapabilities.js)
+      File: SOSCapabilities.v1_0_0  (OpenLayers/Format/SOSCapabilities/v1_0_0.js)
+      File: SOSGetObservation  (OpenLayers/Format/SOSGetObservation.js)
+      File: Text  (no auto-title, OpenLayers/Format/Text.js)
+      File: WFS  (no auto-title, OpenLayers/Format/WFS.js)
+
+      Group: WFSCapabilities  {
+
+         File: WFSCapabilities  (no auto-title, OpenLayers/Format/WFSCapabilities.js)
+         File: v1  (no auto-title, OpenLayers/Format/WFSCapabilities/v1.js)
+         File: v1_0_0  (no auto-title, OpenLayers/Format/WFSCapabilities/v1_0_0.js)
+         File: v1_1_0  (no auto-title, OpenLayers/Format/WFSCapabilities/v1_1_0.js)
+         }  # Group: WFSCapabilities
+
+      File: WFSDescribeFeatureType  (no auto-title, OpenLayers/Format/WFSDescribeFeatureType.js)
+
+      Group: WFST  {
+
+         File: WFST  (no auto-title, OpenLayers/Format/WFST.js)
+         File: v1  (OpenLayers/Format/WFST/v1.js)
+         File: v1_0_0  (OpenLayers/Format/WFST/v1_0_0.js)
+         File: v1_1_0  (OpenLayers/Format/WFST/v1_1_0.js)
+         }  # Group: WFST
+
+      File: WKT  (no auto-title, OpenLayers/Format/WKT.js)
+
       Group: WMC  {
 
          File: WMC  (no auto-title, OpenLayers/Format/WMC.js)
@@ -156,33 +200,25 @@ Group: OpenLayers  {
          File: v1_1_0  (no auto-title, OpenLayers/Format/WMC/v1_1_0.js)
          }  # Group: WMC
 
-      Group: Format  {
+      Group: WMSCapabilities  {
 
-         File: GeoJSON  (no auto-title, OpenLayers/Format/GeoJSON.js)
+         File: WMSCapabilities  (no auto-title, OpenLayers/Format/WMSCapabilities.js)
-         File: GeoRSS  (no auto-title, OpenLayers/Format/GeoRSS.js)
+         File: v1  (no auto-title, OpenLayers/Format/WMSCapabilities/v1.js)
-         File: GPX  (no auto-title, OpenLayers/Format/GPX.js)
+         File: v1_1  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_1.js)
-         File: JSON  (no auto-title, OpenLayers/Format/JSON.js)
+         File: v1_1_0  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_1_0.js)
-         File: KML  (no auto-title, OpenLayers/Format/KML.js)
+         File: v1_1_1  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_1_1.js)
-         File: OSM  (no auto-title, OpenLayers/Format/OSM.js)
+         File: v1_3  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_3.js)
-         File: Text  (no auto-title, OpenLayers/Format/Text.js)
+         File: v1_3_0  (no auto-title, OpenLayers/Format/WMSCapabilities/v1_3_0.js)
-         File: WFS  (no auto-title, OpenLayers/Format/WFS.js)
+         }  # Group: WMSCapabilities
-         File: WFSDescribeFeatureType.js  (OpenLayers/Format/WFSDescribeFeatureType.js)
 
-         Group: WFST  {
+      Group: WMSDescribeLayer  {
 
-            File: WFST  (no auto-title, OpenLayers/Format/WFST.js)
+         File: WMSDescribeLayer  (no auto-title, OpenLayers/Format/WMSDescribeLayer.js)
-            File: v1  (OpenLayers/Format/WFST/v1.js)
+         File: v1_1  (no auto-title, OpenLayers/Format/WMSDescribeLayer/v1_1.js)
-            File: v1_0_0  (OpenLayers/Format/WFST/v1_0_0.js)
+         }  # Group: WMSDescribeLayer
-            File: v1_1_0  (OpenLayers/Format/WFST/v1_1_0.js)
-            }  # Group: WFST
-
-         File: WKT  (no auto-title, OpenLayers/Format/WKT.js)
-         File: WMSDescribeLayer  (OpenLayers/Format/WMSDescribeLayer.js)
-         File: WMSDescribeLayer.v1_1  (OpenLayers/Format/WMSDescribeLayer/v1_1.js)
-         File: WMSGetFeatureInfo  (OpenLayers/Format/WMSGetFeatureInfo.js)
-         File: XML  (no auto-title, OpenLayers/Format/XML.js)
-         }  # Group: Format
 
+      File: WMSGetFeatureInfo  (no auto-title, OpenLayers/Format/WMSGetFeatureInfo.js)
+      File: XML  (no auto-title, OpenLayers/Format/XML.js)
       }  # Group: Format
 
    Group: Geometry  {
@@ -221,6 +257,10 @@ Group: OpenLayers  {
    Group: Lang  {
 
       File: Lang  (no auto-title, OpenLayers/Lang.js)
+      File: ar  (no auto-title, OpenLayers/Lang/ar.js)
+      File: be-tarask  (no auto-title, OpenLayers/Lang/be-tarask.js)
+      File: bg  (no auto-title, OpenLayers/Lang/bg.js)
+      File: br  (no auto-title, OpenLayers/Lang/br.js)
       File: ca  (no auto-title, OpenLayers/Lang/ca.js)
       File: cs-CZ  (no auto-title, OpenLayers/Lang/cs-CZ.js)
       File: da-DK  (no auto-title, OpenLayers/Lang/da-DK.js)
@@ -228,12 +268,35 @@ Group: OpenLayers  {
       File: en  (no auto-title, OpenLayers/Lang/en.js)
       File: en-CA  (no auto-title, OpenLayers/Lang/en-CA.js)
       File: es  (no auto-title, OpenLayers/Lang/es.js)
+      File: el  (no auto-title, OpenLayers/Lang/el.js)
+      File: fi  (no auto-title, OpenLayers/Lang/fi.js)
       File: fr  (no auto-title, OpenLayers/Lang/fr.js)
+      File: fur  (no auto-title, OpenLayers/Lang/fur.js)
+      File: gl  (no auto-title, OpenLayers/Lang/gl.js)
+      File: gsw  (no auto-title, OpenLayers/Lang/gsw.js)
+      File: hr  (no auto-title, OpenLayers/Lang/hr.js)
+      File: hsb  (no auto-title, OpenLayers/Lang/hsb.js)
+      File: hu  (no auto-title, OpenLayers/Lang/hu.js)
+      File: ia  (no auto-title, OpenLayers/Lang/ia.js)
+      File: id  (no auto-title, OpenLayers/Lang/id.js)
+      File: io  (no auto-title, OpenLayers/Lang/io.js)
+      File: is  (no auto-title, OpenLayers/Lang/is.js)
       File: it  (no auto-title, OpenLayers/Lang/it.js)
+      File: ja  (no auto-title, OpenLayers/Lang/ja.js)
+      File: km  (no auto-title, OpenLayers/Lang/km.js)
+      File: ksh  (no auto-title, OpenLayers/Lang/ksh.js)
+      File: nds  (no auto-title, OpenLayers/Lang/nds.js)
       File: nb  (no auto-title, OpenLayers/Lang/nb.js)
       File: nl  (no auto-title, OpenLayers/Lang/nl.js)
+      File: nn  (no auto-title, OpenLayers/Lang/nn.js)
+      File: oc  (no auto-title, OpenLayers/Lang/oc.js)
+      File: pt  (no auto-title, OpenLayers/Lang/pt.js)
       File: pt-BR  (no auto-title, OpenLayers/Lang/pt-BR.js)
+      File: ru  (no auto-title, OpenLayers/Lang/ru.js)
+      File: sk  (no auto-title, OpenLayers/Lang/sk.js)
       File: sv-SE  (no auto-title, OpenLayers/Lang/sv-SE.js)
+      File: te  (no auto-title, OpenLayers/Lang/te.js)
+      File: vi  (no auto-title, OpenLayers/Lang/vi.js)
       File: zh-CN  (no auto-title, OpenLayers/Lang/zh-CN.js)
       File: zh-TW  (no auto-title, OpenLayers/Lang/zh-TW.js)
       }  # Group: Lang
@@ -242,6 +305,7 @@ Group: OpenLayers  {
 
       File: Layer  (no auto-title, OpenLayers/Layer.js)
       File: ArcGIS93Rest  (no auto-title, OpenLayers/Layer/ArcGIS93Rest.js)
+      File: ArcIMS  (no auto-title, OpenLayers/Layer/ArcIMS.js)
       File: Boxes  (no auto-title, OpenLayers/Layer/Boxes.js)
       File: EventPane  (no auto-title, OpenLayers/Layer/EventPane.js)
       File: FixedZoomLevels  (no auto-title, OpenLayers/Layer/FixedZoomLevels.js)
@@ -264,13 +328,15 @@ Group: OpenLayers  {
       File: TileCache  (no auto-title, OpenLayers/Layer/TileCache.js)
       File: TMS  (no auto-title, OpenLayers/Layer/TMS.js)
       File: Vector  (no auto-title, OpenLayers/Layer/Vector.js)
-      File: RootContainer  (OpenLayers/Layer/Vector/RootContainer.js)
+      File: Vector.RootContainer  (no auto-title, OpenLayers/Layer/Vector/RootContainer.js)
       File: VirtualEarth  (no auto-title, OpenLayers/Layer/VirtualEarth.js)
       File: WFS  (no auto-title, OpenLayers/Layer/WFS.js)
       File: WMS  (no auto-title, OpenLayers/Layer/WMS.js)
       File: WMS.Untiled  (no auto-title, OpenLayers/Layer/WMS/Untiled.js)
+      File: WMS.Post  (no auto-title, OpenLayers/Layer/WMS/Post.js)
       File: WorldWind  (no auto-title, OpenLayers/Layer/WorldWind.js)
       File: Yahoo  (no auto-title, OpenLayers/Layer/Yahoo.js)
+      File: XYZ  (no auto-title, OpenLayers/Layer/XYZ.js)
       }  # Group: Layer
 
    File: Map  (no auto-title, OpenLayers/Map.js)
@@ -306,9 +372,9 @@ Group: OpenLayers  {
       Group: WFS  {
 
          File: WFS  (no auto-title, OpenLayers/Protocol/WFS.js)
-         File: v1  (OpenLayers/Protocol/WFS/v1.js)
+         File: v1  (no auto-title, OpenLayers/Protocol/WFS/v1.js)
-         File: v1_0_0  (OpenLayers/Protocol/WFS/v1_0_0.js)
+         File: v1_0_0  (no auto-title, OpenLayers/Protocol/WFS/v1_0_0.js)
-         File: v1_1_0  (OpenLayers/Protocol/WFS/v1_1_0.js)
+         File: v1_1_0  (no auto-title, OpenLayers/Protocol/WFS/v1_1_0.js)
          }  # Group: WFS
 
       }  # Group: Protocol
@@ -337,6 +403,7 @@ Group: OpenLayers  {
       File: Cluster  (no auto-title, OpenLayers/Strategy/Cluster.js)
       File: Fixed  (no auto-title, OpenLayers/Strategy/Fixed.js)
       File: Paging  (no auto-title, OpenLayers/Strategy/Paging.js)
+      File: Refresh  (OpenLayers/Strategy/Refresh.js)
       File: Save  (OpenLayers/Strategy/Save.js)
       }  # Group: Strategy
 
@@ -348,6 +415,7 @@ Group: OpenLayers  {
       File: Tile  (no auto-title, OpenLayers/Tile.js)
       File: Image  (no auto-title, OpenLayers/Tile/Image.js)
       File: WFS  (no auto-title, OpenLayers/Tile/WFS.js)
+      File: IFrame  (OpenLayers/Tile/Image/IFrame.js)
       }  # Group: Tile
 
    File: Tween  (no auto-title, OpenLayers/Tween.js)

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>

examples/WMSPost.html

@@ -0,0 +1,175 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>OpenLayers Basic WMS Example via HTTP-POST protocol</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>
+    <script type="text/javascript">
+        var map;
+
+        function init(){
+            var sld = '<StyledLayerDescriptor version="1.0.0">';
+                sld+= '<NamedLayer>';
+                sld+= '<Name>topp:tasmania_roads</Name>';
+                sld+= '<UserStyle>';
+                sld+= '<IsDefault>1</IsDefault>';
+                sld+= '<FeatureTypeStyle>';
+                sld+= '<Rule>';
+                sld+= '<LineSymbolizer>';
+                sld+= '<Stroke>';
+                sld+= '<CssParameter name="stroke">';
+                sld+= '<Literal>#787878</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '<CssParameter name="stroke-width">';
+                sld+= '<Literal>2</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '</Stroke>';
+                sld+= '</LineSymbolizer>';
+                sld+= '</Rule>';
+                sld+= '</FeatureTypeStyle>';
+                sld+= '</UserStyle>';
+                sld+= '</NamedLayer>';
+
+                sld+= '<NamedLayer>';
+                sld+= '<Name>topp:tasmania_water_bodies</Name>';
+                sld+= '<UserStyle>';
+                sld+= '<IsDefault>1</IsDefault>';
+                sld+= '<FeatureTypeStyle>';
+                sld+= '<Rule>';
+                sld+= '<LineSymbolizer>';
+                sld+= '<Stroke>';
+                sld+= '<CssParameter name="stroke">';
+                sld+= '<Literal>#4F94CD</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '<CssParameter name="stroke-width">';
+                sld+= '<Literal>3</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '</Stroke>';
+                sld+= '</LineSymbolizer>';
+                sld+= '<PolygonSymbolizer>';
+                sld+= '<Fill>';
+                sld+= '<CssParameter name="fill">';
+                sld+= '<Literal>#63B8FF</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '</Fill>';
+                sld+= '</PolygonSymbolizer>';
+                sld+= '</Rule>';
+                sld+= '</FeatureTypeStyle>';
+                sld+= '</UserStyle>';
+                sld+= '</NamedLayer>';
+
+                sld+= '<NamedLayer>';
+                sld+= '<Name>topp:tasmania_cities</Name>';
+                sld+= '<UserStyle>';
+                sld+= '<IsDefault>1</IsDefault>';
+                sld+= '<FeatureTypeStyle>';
+                sld+= '<Rule>';
+                sld+= '<PointSymbolizer>';
+                sld+= '<Graphic>';
+                sld+= '<Mark>';
+                sld+= '<WellKnownName>cross</WellKnownName>';
+                sld+= '<Fill>';
+                sld+= '<CssParameter name="fill">';
+                sld+= '<Literal>#00FF00</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '</Fill>';
+                sld+= '</Mark>';
+                sld+= '<Size>15</Size>';
+                sld+= '</Graphic>';
+                sld+= '</PointSymbolizer>';
+                sld+= '<TextSymbolizer>';
+                sld+= '<Label><PropertyName>CITY_NAME</PropertyName></Label>';
+                sld+= '<Font>';
+                sld+= '<SvgParameter name="font-size">15</SvgParameter>';
+                sld+= '</Font>';
+                sld+= '</TextSymbolizer>';
+                sld+= '</Rule>';
+                sld+= '</FeatureTypeStyle>';
+                sld+= '</UserStyle>';
+                sld+= '</NamedLayer>';
+
+                sld+= '<NamedLayer>';
+                sld+= '<Name>topp:tasmania_state_boundaries</Name>';
+                sld+= '<UserStyle>';
+                sld+= '<IsDefault>1</IsDefault>';
+                sld+= '<FeatureTypeStyle>';
+                sld+= '<Rule>';
+                sld+= '<PolygonSymbolizer>';
+                sld+= '<Fill>';
+                sld+= '<CssParameter name="fill">';
+                sld+= '<Literal>#8B8989</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '<CssParameter name="fill-opacity">';
+                sld+= '<Literal>0.2</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '</Fill>';
+                sld+= '<Stroke>';
+                sld+= '<CssParameter name="stroke">';
+                sld+= '<Literal>#FF4040</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '<CssParameter name="stroke-width">';
+                sld+= '<Literal>2</Literal>';
+                sld+= '</CssParameter>';
+                sld+= '</Stroke>';
+                sld+= '</PolygonSymbolizer>';
+                sld+= '</Rule>';
+                sld+= '</FeatureTypeStyle>';
+                sld+= '</UserStyle>';
+                sld+= '</NamedLayer>';
+
+                sld+= '</StyledLayerDescriptor>';
+
+            map = new OpenLayers.Map('map');
+            map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+            var layer = new OpenLayers.Layer.WMS(
+                "OpenLayers WMS",
+                "http://vmap0.tiles.osgeo.org/wms/vmap0",
+                {
+                    layers: 'basic'
+                }
+            );
+
+            var rcbw = new OpenLayers.Layer.WMS.Post("Roads, Cities, Boundaries, Water",
+                "http://demo.opengeo.org/geoserver/wms", 
+                {
+                    'layers': 'topp:tasmania_roads,topp:tasmania_water_bodies,topp:tasmania_state_boundaries,topp:tasmania_cities',
+                    transparent: true,
+                    format: 'image/jpeg',
+                    sld_body: sld
+                },
+                {
+                    isBaseLayer: false,
+                    unsupportedBrowsers: []
+                }
+            );
+            map.addLayers([layer, rcbw]);
+            map.setCenter(new OpenLayers.LonLat(146.65748632815,-42.230763671875), 7);
+        }
+    </script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">Basic WMS Example via HTTP-POST protocol with a large SLD
+    included</h1>
+
+    <div id="tags"></div>
+
+    <div id="shortdesc">Creating a WMS layer with a large SLD in the sld_body</div>
+
+    <div id="map" style="width: 512; height: 256; border: 1px solid red;"></div>
+
+    <div id="docs">
+        This example uses a large SLD created on the client side to style a WMS
+        layer.  This example uses a WMS.Post layer which transfers data via the
+        HTTP-POST protocol. <br>
+        NOTE: Opera is not able to display transparent tiles with this layer,
+        and in some Firefox browsers can appear ugly viewport-shaking effects
+        while dragging arround. Use the 'unsupportedBrowsers' property to
+        control which browsers should use plain image tiles (like Layer.WMS)
+        instead. The default setting (["mozilla", "firefox", "opera"])
+        excludes problematic browsers without removing the ability to use long
+        request parameters, because all these browsers support long urls via
+        GET.
+    </div>
+  </body>
+</html>

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);

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>

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();
+
+}

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();

examples/arcims-thematic.html

@@ -44,7 +44,7 @@
             
             layer = new OpenLayers.Layer.ArcIMS(
                 "Global Sample Map",
-                "http://sample.avencia.com/servlet/com.esri.esrimap.Esrimap",
+                "http://sample.azavea.com/servlet/com.esri.esrimap.Esrimap",
                 options
             );
             map.addLayer(layer);

examples/arcims.html

@@ -21,7 +21,7 @@
             };
             
             layer = new OpenLayers.Layer.ArcIMS( "Global Sample Map",
-                    "http://sample.avencia.com/servlet/com.esri.esrimap.Esrimap", options );
+                    "http://sample.azavea.com/servlet/com.esri.esrimap.Esrimap", options );
             map.addLayer(layer);
 
             map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);

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'},
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0?", {layers: 'basic'},
-                    {'attribution': 'Provided by <a href="http://labs.metacarta.com/">MetaCarta</a>'});
+                    {'attribution': 'Provided by OSGeo'});
 
                 var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
                     "http://t1.hypercube.telascience.org/cgi-bin/landsat7", 

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 url = 'http://www.openlayers.org/dev/img/marker.png';
-                var sz = new OpenLayers.Size(10, 17);
+                var sz = new OpenLayers.Size(21, 25);
                 var calculateOffset = function(size) {
                                     return new OpenLayers.Pixel(-(size.w/2), -size.h);
                                  };

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'}
                 );
 

examples/bing.html

@@ -0,0 +1,49 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>OpenLayers Bing Example</title>
+    <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
+    <link rel="stylesheet" href="style.css" type="text/css" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <script src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2&mkt=en-us"></script>
+
+    <script src="../lib/OpenLayers.js"></script>
+    <script>
+
+        var map;
+
+        function init(){
+            map = new OpenLayers.Map("map");
+            map.addControl(new OpenLayers.Control.LayerSwitcher());
+
+            var shaded = new OpenLayers.Layer.VirtualEarth("Shaded", {
+                type: VEMapStyle.Shaded
+            });
+            var hybrid = new OpenLayers.Layer.VirtualEarth("Hybrid", {
+                type: VEMapStyle.Hybrid
+            });
+            var aerial = new OpenLayers.Layer.VirtualEarth("Aerial", {
+                type: VEMapStyle.Aerial
+            });
+
+            map.addLayers([shaded, hybrid, aerial]);
+
+            map.setCenter(new OpenLayers.LonLat(-110, 45), 3);
+        }
+
+    </script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">Bing Example</h1>
+
+    <div id="tags"></div>
+
+    <p id="shortdesc">
+        Demonstrates the use of Bing layers.
+    </p>
+
+    <div id="map" class="smallmap"></div>
+    <div id="docs">This example demonstrates the ability to create layers using tiles from Bing maps.</div>
+  </body>
+</html>
+
+

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" );
     

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" );
     

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 = {

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())

examples/canvas.html

@@ -0,0 +1,28 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>Canvas Renderer Example</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>
+        <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>
+        <script src="canvas.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">Canvas Renderer Example</h1>
+        <p id="shortdesc">
+            Demonstrates the use of the canvas renderer with a vector layer.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                This example shows a vector layer that uses the Canvas renderer
+                where available. The order of the renderers given in the layer
+                options is used to locate the first available renderer.
+            </p>
+            <p>
+                See the <a href="canvas.js" target="_blank">canvas.js source</a>
+                to see how this is done.
+            </p> 
+        </div>
+    </body>
+</html>

examples/canvas.js

@@ -0,0 +1,62 @@
+var map, layer, styleMap;
+OpenLayers.ProxyHost = "proxy.cgi?url=";
+
+function init() {
+    map = new OpenLayers.Map({
+        div: "map",
+        projection: new OpenLayers.Projection("EPSG:900913"),
+        displayProjection: new OpenLayers.Projection("EPSG:4326"),
+        units: "m",
+        maxResolution: 156543.0339,
+        maxExtent: new OpenLayers.Bounds(
+            -20037508, -20037508, 20037508, 20037508
+        )
+    });
+
+    var g = new OpenLayers.Layer.Google("Google Layer", {
+        sphericalMercator: true
+    });
+    map.addLayers([g]);
+
+    // prepare to style the data
+    styleMap = new OpenLayers.StyleMap({
+        strokeColor: "black",
+        strokeWidth: 2,
+        strokeOpacity: 0.5,
+        fillOpacity: 0.2
+    });
+
+    // create a color table for state FIPS code
+    var colors = ["red", "orange", "yellow", "green", "blue", "purple"];
+    var code, fips = {};
+    for(var i=1; i<=66; ++i) {
+        code = "0" + i;
+        code = code.substring(code.length - 2);
+        fips[code] = {fillColor: colors[i % colors.length]};
+    }
+    // add unique value rules with your color lookup
+    styleMap.addUniqueValueRules("default", "STATE_FIPS", fips);
+    
+    // create a vector layer using the canvas renderer (where available)
+    var wfs = new OpenLayers.Layer.Vector("States", {
+        strategies: [new OpenLayers.Strategy.BBOX()],
+        protocol: new OpenLayers.Protocol.WFS({
+            version: "1.1.0",
+            srsName: "EPSG:900913",
+            url:  "http://demo.opengeo.org/geoserver/wfs",
+            featureType: "states",
+            featureNS: "http://www.openplans.org/topp"
+        }),
+        styleMap: styleMap,
+        renderers: ["Canvas", "SVG", "VML"]
+    });
+    map.addLayer(wfs);
+
+    // if you want to use Geographic coords, transform to ESPG:900913
+    var ddBounds = new OpenLayers.Bounds(
+        -73.839111,40.287907,-68.214111,44.441624
+    );
+    map.zoomToExtent(
+        ddBounds.transform(map.displayProjection, map.getProjectionObject())
+    );
+}

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]);

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", 

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", 

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, {

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, {

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);

examples/document-drag.html

@@ -0,0 +1,37 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>OpenLayers Document Drag Example</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>
+    <script type="text/javascript">
+        var map, layer;
+        function init(){
+            map = new OpenLayers.Map( 'map', {controls: [
+                new OpenLayers.Control.Navigation({documentDrag: true}),
+                new OpenLayers.Control.PanZoom(),
+                new OpenLayers.Control.ArgParser(),
+                new OpenLayers.Control.Attribution()
+            ]} );
+            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
+                    {layers: 'basic'} );
+            map.addLayer(layer);
+            map.zoomToMaxExtent();
+        }
+    </script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">OpenLayers Document Drag Example</h1>
+
+    <div id="tags"></div>
+
+    <div id="shortdesc">Keep on dragging even when the mouse cursor moves outside of the map</div>
+
+    <div id="map" class="smallmap"></div>
+
+    <div id="docs">
+        This example shows how to make a map draggable outside of the map itself.
+    </div>
+  </body>
+</html>

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));

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");
 

examples/draw-feature.html

@@ -11,16 +11,20 @@
             p {
                 width: 512px;
             }
+
+            /* avoid pink tiles */
+            .olImageLoadError {
+                background-color: transparent !important;
+            }
         </style>
         <script src="../lib/OpenLayers.js"></script>
         <script type="text/javascript">
             var map, drawControls;
-            OpenLayers.Util.onImageLoadErrorColor = "transparent";
             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 pointLayer = new OpenLayers.Layer.Vector("Point Layer");
                 var lineLayer = new OpenLayers.Layer.Vector("Line Layer");

examples/dynamic-text-layer.html

@@ -0,0 +1,90 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>OpenLayers Vector Behavior Example</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>
+        <script type="text/javascript">
+            var map;
+        
+            function init(){
+                map = new OpenLayers.Map('map');
+                var wms = new OpenLayers.Layer.WMS(
+                    "OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0",
+                    {layers: 'basic'}
+                );
+
+                var layer = new OpenLayers.Layer.Vector("POIs", {
+                    strategies: [new OpenLayers.Strategy.BBOX({resFactor: 1.1})],
+                    protocol: new OpenLayers.Protocol.HTTP({
+                        url: "textfile.txt",
+                        format: new OpenLayers.Format.Text()
+                    })
+                });
+
+                map.addLayers([wms, layer]);
+                map.zoomToMaxExtent();
+
+                // Interaction; not needed for initial display.
+                selectControl = new OpenLayers.Control.SelectFeature(layer);
+                map.addControl(selectControl);
+                selectControl.activate();
+                layer.events.on({
+                    'featureselected': onFeatureSelect,
+                    'featureunselected': onFeatureUnselect
+                });
+            }
+             
+
+            // Needed only for interaction, not for the display.
+            function onPopupClose(evt) {
+                // 'this' is the popup.
+                selectControl.unselect(this.feature);
+            }
+            function onFeatureSelect(evt) {
+                feature = evt.feature;
+                popup = new OpenLayers.Popup.FramedCloud("featurePopup",
+                                         feature.geometry.getBounds().getCenterLonLat(),
+                                         new OpenLayers.Size(100,100),
+                                         "<h2>"+feature.attributes.title + "</h2>" +
+                                         feature.attributes.description,
+                                         null, true, onPopupClose);
+                feature.popup = popup;
+                popup.feature = feature;
+                map.addPopup(popup);
+            }
+            function onFeatureUnselect(evt) {
+                feature = evt.feature;
+                if (feature.popup) {
+                    popup.feature = null;
+                    map.removePopup(feature.popup);
+                    feature.popup.destroy();
+                    feature.popup = null;
+                }
+            }
+        </script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">Dynamic POIs via a Text Layer</h1>
+        <p id="shortdesc">
+           Loading dynamic data from a text file. 
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            The vector layer shown uses the BBOX strategy, the HTTP protocol,
+            and the Text format.
+            This setup appends "?bbox=west,south,east,north" to every
+            request. This allows you to configure the location as something
+            like 'textfile.php', and take the '?bbox=' parameter to select
+            data from a database or the like.
+<br /><br />
+            There is nothing about this example that limits it to text files;
+            you can do the same thing with KML, GeoJSON, etc.
+            <br /><br />
+            This is an alternative to something like the <a href="http://wiki.openstreetmap.org/index.php/OpenLayers_Dynamic_POI">OpenStreetMap "Dynamic POI"</a> example. The Layer is a standard vector layer, and interaction can be
+            configured via the SelectFeature control, as you can see in the 
+            latter half of the code, which allows you to open a popup when
+            a feature is selected.
+        </div>
+    </body>
+</html>

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);

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', {

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(

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'}
             );
 
@@ -26,16 +26,15 @@
             );
 
             var dm_wms = new OpenLayers.Layer.WMS(
-                "DM Solutions Demo",
+                "Canadian Data",
                 "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap",
                 {
                     layers: "bathymetry,land_fn,park,drain_fn,drainage," +
                             "prov_bound,fedlimit,rail,road,popplace",
-                    transparent: "true", format: "image/png"},
+                    transparent: "true",
-                {
+                    format: "image/png"
-                    minResolution: 0.17578125,
+                },
-                    maxResolution: 0.703125
+                {isBaseLayer: false, visibility: false}
-                }
             );
 
             map.addLayers([ol_wms, jpl_wms, dm_wms]);

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>

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;
+    }
+}
+

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]);

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", 

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);

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);

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());

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());

examples/getfeature-wfs.html

@@ -60,18 +60,21 @@
 </div>
 
 <p id="shortdesc">
-    Shows how to use the GetFeature control to select features from a
+    Shows how to use the GetFeature control to select features from a WMS layer.
-    WMS layer.  Click or drag a box to select features, use the Shift key to
-    add features to the selection, use the Ctrl key to toggle a feature's
-    selected status.  Note that this control also has a hover option, which is
-    enabled in this example.  This gives you a visual feedback by loading the
-    feature underneath the mouse pointer from the WFS, but causes a lot of
-    GetFeature requests to be issued.
 </p>
 
 <div id="map" class="smallmap"></div>
 
-<div id="docs"></div>
+<div id="docs">
+    <p>
+        Click or drag a box to select features, use the Shift key to add
+        features to the selection, use the Ctrl key to toggle a feature's
+        selected status. Note that this control also has a hover option, which
+        is enabled in this example. This gives you a visual feedback by loading
+        the feature underneath the mouse pointer from the WFS, but causes a lot
+        of GetFeature requests to be issued.
+    </p>
+</div>
   </body>
 </html>
 

examples/getfeatureinfo-control.html

@@ -37,7 +37,6 @@
             text-align:left;
             font-size:100%;
             font-weight:bold;
-            text-transform:uppercase;
             padding:.2em .2em;
 	}
 

examples/getfeatureinfo-popup.html

@@ -0,0 +1,90 @@
+<html>
+  <head>
+    <title>GetFeatureInfo Popup</title>
+    <script src="../lib/OpenLayers.js"></script>
+    <link rel="stylesheet" href="../theme/default/style.css" type="text/css" />
+    <link rel="stylesheet" href="style.css" type="text/css" />
+    <script>
+    OpenLayers.ProxyHost = "proxy.cgi?url=";
+    
+    var map, info;
+    
+    function load() {
+        map = new OpenLayers.Map({
+            div: "map",
+            maxExtent: new OpenLayers.Bounds(143.834,-43.648,148.479,-39.573)
+        });
+
+        var political = new OpenLayers.Layer.WMS("State Boundaries",
+            "http://demo.opengeo.org/geoserver/wms", 
+            {'layers': 'topp:tasmania_state_boundaries', transparent: true, format: 'image/gif'},
+            {isBaseLayer: true}
+        );
+
+        var roads = new OpenLayers.Layer.WMS("Roads",
+            "http://demo.opengeo.org/geoserver/wms", 
+            {'layers': 'topp:tasmania_roads', transparent: true, format: 'image/gif'},
+            {isBaseLayer: false}
+        );
+
+        var cities = new OpenLayers.Layer.WMS("Cities",
+            "http://demo.opengeo.org/geoserver/wms", 
+            {'layers': 'topp:tasmania_cities', transparent: true, format: 'image/gif'},
+            {isBaseLayer: false}
+        );
+
+        var water = new OpenLayers.Layer.WMS("Bodies of Water",
+            "http://demo.opengeo.org/geoserver/wms", 
+            {'layers': 'topp:tasmania_water_bodies', transparent: true, format: 'image/gif'},
+            {isBaseLayer: false}
+        );
+
+        var highlight = new OpenLayers.Layer.Vector("Highlighted Features", {
+            displayInLayerSwitcher: false, 
+            isBaseLayer: false 
+        });
+        
+        map.addLayers([political, roads, cities, water, highlight]); 
+
+        info = new OpenLayers.Control.WMSGetFeatureInfo({
+            url: 'http://demo.opengeo.org/geoserver/wms', 
+            title: 'Identify features by clicking',
+            queryVisible: true,
+            eventListeners: {
+                getfeatureinfo: function(event) {
+                    map.addPopup(new OpenLayers.Popup.FramedCloud(
+                        "chicken", 
+                        map.getLonLatFromPixel(event.xy),
+                        null,
+                        event.text,
+                        null,
+                        true
+                    ));
+                }
+            }
+        });
+        map.addControl(info);
+        info.activate();
+
+        map.addControl(new OpenLayers.Control.LayerSwitcher());
+        map.zoomToMaxExtent();
+    }
+
+  </script>
+  </head>
+  <body onload="load()">
+      <h1 id="title">Feature Info in Popup</h1>
+
+      <div id="tags"></div>
+
+      <p id="shortdesc">
+        Demonstrates the WMSGetFeatureInfo control for fetching information
+        about a position from WMS (via GetFeatureInfo request).  Results
+        are displayed in a popup.
+      </p>
+
+      <div id="map" class="smallmap"></div>
+
+    <div id="docs"></div>
+  </body>
+</html>

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"));

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>

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);
+}

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>

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);
+}

examples/google.html

@@ -28,7 +28,7 @@
             );
             var gsat = new OpenLayers.Layer.Google(
                 "Google Satellite",
-                {type: G_SATELLITE_MAP, numZoomLevels: 20}
+                {type: G_SATELLITE_MAP, numZoomLevels: 22}
             );
 
 
@@ -56,7 +56,7 @@
         it is best to simply set your application to use the string "v=2" in
         the request, rather than tying your application to an explicit version.</p>
      <p>
-       In order to position the Google attribution div in the default ocation,
+       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>

examples/graphic-name.html

@@ -8,7 +8,7 @@
         // user custom graphicname
         
         OpenLayers.Renderer.symbol.lightning = [0,0, 4,2, 6,0, 10,5, 6,3, 4,5, 0,0];
-        OpenLayers.Renderer.symbol.rectangle = [0,0, 10,0, 10,4, 0,4, 0,0];
+        OpenLayers.Renderer.symbol.rectangle = [0,0, 4,0, 4,10, 0,10, 0,0];
             
         var map;
 
@@ -48,7 +48,8 @@
                 },
                 "select": {
                     pointRadius: 20,
-                    fillOpacity: 1
+                    fillOpacity: 1,
+                    rotation: 45
                 }
             });
 

examples/graticule.html

@@ -0,0 +1,111 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+    <head>
+        <title>OpenLayers Graticule Example</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">
+            #map {
+                width: 600px;
+                height: 300px;
+                border: 1px solid black;
+                float:left;
+            }
+            #map2 {
+                width: 400px;
+                height: 400px;
+                border: 1px solid black;
+                float:left;
+            }
+        </style>
+        <script src="../lib/OpenLayers.js"></script>
+        <script src="http://proj4js.org/lib/proj4js-compressed.js"></script>
+        <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: [
+                      graticuleCtl1,
+                      new OpenLayers.Control.LayerSwitcher(),
+                      new OpenLayers.Control.PanZoomBar(),
+                      new OpenLayers.Control.Navigation()
+                      ]
+                });
+
+                var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
+                    {layers: 'basic'}, {wrapDateLine: true} );
+
+                map1.addLayers([ol_wms]);
+                if (!map1.getCenter()) map1.zoomToMaxExtent();
+            };
+            
+            function initProjected(){
+                var extent = new OpenLayers.Bounds(-2200000,-712631,3072800,3840000);
+                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()
+                      ],
+                      //scales: tempScales,
+                      maxExtent: extent,
+                      maxResolution: 50000,
+                      units: 'm',
+                      projection: 'EPSG:42304'
+                };
+                map2 = new OpenLayers.Map('map2', mapOptions);
+
+                var dm_wms = new OpenLayers.Layer.WMS( "DM Solutions Demo",
+                  "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap", {
+                     layers: "bathymetry",
+                     format: "image/png"
+                  },{
+                      singleTile: true
+                  });
+
+                map2.addLayers([dm_wms]);
+                if (!map2.getCenter()) map2.zoomToExtent(extent);
+            }
+        </script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">Graticule Example</h1>
+
+        <div id="tags">
+        </div>
+
+        <p id="shortdesc">
+            Adds a Graticule control to the map to display a grid of 
+            latitude and longitude. 
+        </p>
+
+        <div id="map" class="smallmap"></div>
+        <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>

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]);

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", 
                {

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>

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
+    });
+    
+};
+

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);

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}
             );

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",
@@ -44,7 +44,7 @@
         Demonstrates the use of the LayerSwitcher outside of the OpenLayers window.
     </p>
 
-    <div id="layerswitcher"></div>
+    <div id="layerswitcher" class="olControlLayerSwitcher"></div>
     <div id="map" class="smallmap"></div>
     <div id="docs">
       <p>This demonstrates use of the LayerSwitcher outside the map div. It also shows use

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();

examples/mapguide.html

@@ -84,6 +84,7 @@
             
           var options = {
               isBaseLayer: true,
+              transitionEffect: "resize",
               buffer: 1,
               useOverlay: false,
               useAsyncOverlay: false,
@@ -125,7 +126,7 @@
             layer = new OpenLayers.Layer.MapGuide( "MapGuide OS Overlay layer", url, params, options );
             map.addLayer(layer);
             */
-            map.addControl(new OpenLayers.Control.LayerSwitcher({'div':OpenLayers.Util.getElement('layerswitcher')}));
+            map.addControl(new OpenLayers.Control.LayerSwitcher());
             map.zoomToMaxExtent();
     }
     </script>
@@ -144,7 +145,6 @@
     
     <div id="map" class="smallmap"></div>
     <div id="map2">
-      <div id="layerswitcher"></div>
     </div>
   </body>
 </html>

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);
 
@@ -24,7 +24,7 @@
     </script>
   </head>
   <body onload="init()">
-    <div id="title">MapServer Layer</div>
+    <h1 id="title">MapServer Layer</h1>
     <div id="tags"></div>
     <div id="shortdesc">Shows MapServer Layer</div>
     <div id="map" class="smallmap"></div>

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() );
@@ -24,7 +24,7 @@
     </script>
   </head>
   <body>
-    <div id="title">MapServer Single Tile Mode</div>
+    <h1 id="title">MapServer Single Tile Mode</h1>
     <div id="tags"></div>
     <div id="shortdesc">Shows single tile MapServer Layer</div>
     <div id="map" class="smallmap"></div>

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));
@@ -39,7 +39,7 @@
     </script>
   </head>
   <body onload="init()">
-    <div id="title">Resize a Marker</div>
+    <h1 id="title">Resize a Marker</h1>
     <div id="tags"></div>
     <div id="shortdesc">Dynamically resize a marker</div>
     <div id="map" class="smallmap"></div>

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();
@@ -42,7 +42,7 @@
     </script>
   </head>
   <body onload="init()">
-    <div id="title">Markers Layer Example</div>
+    <h1 id="title">Markers Layer Example</h1>
     <div id="tags"></div>
     <div id="shortdesc">Show markers layer with different markers</div>
     <div id="map" class="smallmap"></div>

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);
 

examples/measure.html

@@ -16,16 +16,20 @@
         #output {
             float: right;
         }
+
+        /* avoid pink tiles */
+        .olImageLoadError {
+            background-color: transparent !important;
+        }
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
         var map, measureControls;
-        OpenLayers.Util.onImageLoadErrorColor = "transparent";
         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'}); 
 
             map.addLayers([wmsLayer]);
             map.addControl(new OpenLayers.Control.LayerSwitcher());

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");
 

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]);
@@ -28,7 +28,7 @@
     </script>
   </head>
   <body onload="init()">
-    <h3 id="title">MousePosition Control</h3>
+    <h1 id="title">MousePosition Control</h1>
     <p id="shortdesc">
       Use the MousePosition Control to display the coordinates of the cursor
       inside or outside the map div.

examples/mousewheel-interval.html

@@ -0,0 +1,57 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>OpenLayers Mousewheel Interval Example</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>
+    <script type="text/javascript">
+        var map, layer;
+
+        function setCumulative() {
+            var nav = map.getControlsByClass("OpenLayers.Control.Navigation")[0];
+            var cumulative = document.getElementById("cumulative");
+            nav.handlers.wheel.cumulative = cumulative.checked;
+        }
+
+        function init(){
+            map = new OpenLayers.Map( 'map', {controls: [
+                new OpenLayers.Control.Navigation(
+                    {mouseWheelOptions: {interval: 100}}
+                ),
+                new OpenLayers.Control.PanZoom(),
+                new OpenLayers.Control.ArgParser(),
+                new OpenLayers.Control.Attribution()
+            ]} );
+            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
+                    "http://vmap0.tiles.osgeo.org/wms/vmap0",
+                    {layers: 'basic'} );
+            map.addLayer(layer);
+            map.zoomToMaxExtent();
+        }
+    </script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">OpenLayers Mousewheel Interval Example</h1>
+
+    <div id="tags"></div>
+
+    <div id="shortdesc">Let OpenLayers send less tile requests to the server when wheel-zooming.</div>
+
+    <div id="map" class="smallmap"></div>
+
+    <div id="docs">
+        <p>This example shows how to configure the Navigation control to use 
+        the mousewheel in a less server resource consuming way: as long as you
+        spin the mousewheel, no request will be sent to the server. Instead,
+        the zoomlevel delta will be recorded. After a delay (in this example
+        100ms), a zoom action with the cumulated delta will be performed.</p>
+        <div>
+          <input id="cumulative" type="checkbox" checked="checked"
+                 onchange="setCumulative()"/>
+          <label for="cumulative">Cumulative mode. If this mode is deactivated, 
+            only one zoom event will be performed after the delay.</label>
+        </div>
+
+    </div>
+  </body>
+</html>

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/",
+                                            "http://maps.opengeo.org/geowebcache/service/wms",
-                                            {'layers': 'factbook-overlay',
+                                            {'layers': 'bluemarble'},
-                                             'format':'png'},
+                                            {'opacity': 0.4,
-                                            {'reproject': false,
-                                             'opacity': 0.4,
                                              'isBaseLayer': false,
                                              'wrapDateLine': true});
 
@@ -54,7 +53,7 @@
     </script>
   </head>
   <body onload="init()">
-    <h3 id="title">MultiMap Mercator Example</h3>
+    <h1 id="title">MultiMap Mercator Example</h1>
     <p id="shortdesc">
       This sphericalMercator example using multimap demonstrates that the
       multimap layer does not fully support the sphericalMercator projection at

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",
+            var urlArray = ["http://tilecache.osgeo.org/wms-c/Basic.py",
-                            "http://t2.labs.metacarta.com/wms-c/Basic.py"];
+                            "http://tilecache.osgeo.org/wms-c/Basic.py"];
             layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
                                               urlArray,
                                               {layers: 'basic'} );

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;

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});

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);

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'}
 	            );					  
 								

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);

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();
@@ -29,7 +29,7 @@
     </script>
   </head>
   <body onload="init()">
-    <h3 id="title">NavToolbar Demo</h3>
+    <h1 id="title">NavToolbar Demo</h1>
     <p id="shortdesc">
        Demo the NavToolbar, a subclass of Control.Panel which shows icons for
        navigation.

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});
 

examples/openmnnd.html

@@ -1,155 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>OpenLayers: OpenMNND</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>
-    <script type="text/javascript">
-        var map, layer;
-
-        function init(){
-            OpenLayers.ProxyHost="/proxy/?url=";
-            map = new OpenLayers.Map('map', {'maxResolution':'auto', maxExtent: new OpenLayers.Bounds(-203349.72008129774,4816309.33,1154786.8041952979,5472346.5), projection: 'EPSG:26915' } );
-            layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
-                    ["http://geoint.lmic.state.mn.us/cgi-bin/wms"], {layers: 'fsa'} );
-            map.addLayer(layer);
-
-
-            wfs_url = "http://prototype.openmnnd.org/cgi-bin/mapserv.exe?map=openmnndwfs/openmnndwfs.map";
-            wms = new OpenLayers.Layer.WMS("Minnesota Parcels (WMS)", wfs_url, {'layers':'streams', 'transparent': true, 'format':'image/gif'});
-
-            map.addLayer(wms);
-
-            wfs = new OpenLayers.Layer.WFS("Minnesota Streams (WFS)", wfs_url, {'typename':'streams'}, {ratio:1.25, minZoomLevel:4, style: OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default'])});
-
-            // preFeatureInsert can be used to set style before the feature is drawn
-            wfs.preFeatureInsert= function(feature) { feature.style.strokeWidth="3"; feature.style.strokeColor="blue";
-            }
-            wfs.onFeatureInsert = function(feature) {
-              OpenLayers.Util.getElement('stream_features').innerHTML = feature.layer.features.length;
-            }
-            map.addLayer(wfs);
-
-            // Or a style can be set on the layer.
-            pwfsstyle = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
-            OpenLayers.Util.extend(pwfsstyle, {'fillColor': 'green'});
-
-            pwfs = new OpenLayers.Layer.WFS("Minnesota Plat (WFS)", wfs_url,
-              {'typename':'plat'},
-              {
-               ratio:1.25,
-               minZoomLevel:8,
-               extractAttributes: true,
-               style: pwfsstyle
-              });
-
-            pwfs.onFeatureInsert= function(feature) {
-              OpenLayers.Util.getElement('plat_features').innerHTML = feature.layer.features.length;
-            }
-            map.addLayer(pwfs);
-
-            rstyle = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
-            OpenLayers.Util.extend(rstyle, {'strokeColor': 'white', strokeWidth: "4"});
-            rwfs = new OpenLayers.Layer.WFS("Minnesota Roads (WFS)", wfs_url, {'typename':'roads'},
-              {ratio:1.25, minZoomLevel:7, extractAttributes: true, style:rstyle});
-
-            rwfs.onFeatureInsert= function(feature) {
-              OpenLayers.Util.getElement('road_features').innerHTML = feature.layer.features.length;
-            }
-
-            map.addLayer(rwfs);
-
-            map.events.register('moveend', null, function() {
-                OpenLayers.Util.getElement('stream_features').innerHTML = "0";
-                OpenLayers.Util.getElement('road_features').innerHTML = "0";
-                OpenLayers.Util.getElement('plat_features').innerHTML = "0";
-            });
-
-            var ls = new OpenLayers.Control.LayerSwitcher();
-            map.addControl(ls);
-
-            drawControls = {
-                selectPlat: new OpenLayers.Control.SelectFeature(pwfs, {callbacks: {'up':feature_info,'over':feature_info_hover}}),
-                selectRoad: new OpenLayers.Control.SelectFeature(rwfs, {callbacks: {'up':feature_info,'over':feature_info_hover}})
-            };
-
-            for(var key in drawControls) {
-                map.addControl(drawControls[key]);
-            }
-            drawControls.selectPlat.activate();
-
-            map.zoomToExtent(new OpenLayers.Bounds(303232.550864,5082911.694856,305885.161263,5084486.682281));
-        }
-
-        function toggleControl(element) {
-            for(key in drawControls) {
-                var control = drawControls[key];
-                if(element.value == key && element.checked) {
-                    control.activate();
-                } else {
-                    control.deactivate();
-                }
-            }
-        }
-        var displayedFeature = null;
-        function feature_info_hover(feature) {
-            if (displayedFeature != feature &&
-               (!feature.layer.selectedFeatures.length ||
-               (feature.layer.selectedFeatures[0] == feature))) {
-            feature_info(feature);
-            displayedFeature = feature;
-           }
-        }
-        function feature_info(feature) {
-            var html = "<ul>";
-            for(var i in feature.attributes)
-               html += "<li><b>" + i + "</b>: "+  feature.attributes[i] + "</li>";
-            html += "</ul>";
-            OpenLayers.Util.getElement('feature_info').innerHTML = html;
-        }
-    </script>
-  </head>
-  <body onload="init()">
-    <h1 id="title">OpenMNND WFS</h1>
-    <p id="shortdesc">This example shows the use of a WFS service rendered using the OpenLayers vector library.</p>
-    <div id="map" class="smallmap"></div>
-    <div id="docs">
-            <p>
-            This is an example that shows rendering a WFS service using OpenLayer vectors in the browser. The OpenLayers code will download the GML
-            from the WFS service for each layer, parse it and create features using the OL vector library to draw the features on the map. For
-            more information on the vector library, please visit <a href="http://trac.openlayers.org/wiki/Documentation/VectorSupport">vector support wiki</a>.
-            In this example there are 4 layers shown on the map.  The base layer and parcel layer are created from a WMS service using the OpenLayers.Layer.WMS object.
-            The streams, roads, and plat layers are drawn from a WFS service using the OpenLayers.Layer.WFS object.
-            </p>
-
-            <p>
-            Rendering WFS layers into vectors is possible, but you need to be cautions when showing the features on the map.  Testing has shown that when
-            you renderer more than 200 vectors in the browser the performance decreases dramatically.  Also features that have a lot of vertices
-            can cause performance issues. In this example the parcel layer is rendered as a WMS layer because at the time of developing this example
-            there where a handful of features that had too many vertices to render without killing the browser resources.
-
-            There are a number of properties that can be set for each WFS layer, such color and line weight using style properties such as strokeColor and strokeWidth.
-            You can also get feature attributes from the WFS services using the extractAttribute property.  View the source to see the example code.
-            </p>
-    </div>
-    <div id="info">
-      <ul>
-        <li>Streams: Feature Count <span id="stream_features">0</span></li>
-        <li>Plat: Feature Count <span id="plat_features">0</span></li>
-        <li>Roads: Feature Count <span id="road_features">0</span></li>
-      </ul>
-      <div id="feature_info">
-      </div>
-      <ul>
-        <li>
-            <input type="radio" name="type" value="selectRoad" id="selectToggle" onclick="toggleControl(this);"  />
-            <label for="selectToggle">select road</label>
-        </li>
-        <li>
-            <input type="radio" name="type" value="selectPlat" id="selectToggle" onclick="toggleControl(this);" checked=checked />
-            <label for="selectToggle">select polygon</label>
-        </li>
-    </ul>
-    </div>
-  </body>
-</html>

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>

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
+    );
+}

examples/osm.html

@@ -0,0 +1,35 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>OpenLayers Basic Single WMS Example</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>
+    <script type="text/javascript">
+        var map, layer;
+        function init(){
+            map = new OpenLayers.Map( 'map');
+            layer = new OpenLayers.Layer.OSM( "Simple OSM Map");
+            map.addLayer(layer);
+            map.setCenter(
+                new OpenLayers.LonLat(-71.147, 42.472).transform(
+                    new OpenLayers.Projection("EPSG:4326"),
+                    map.getProjectionObject()
+                ), 12
+            );    
+        }
+    </script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">Basic OSM Example</h1>
+
+    <div id="tags"></div>
+
+    <div id="shortdesc">Show a Simple OSM Map</div>
+
+    <div id="map" class="smallmap"></div>
+
+    <div id="docs">
+        This example shows a very simple OSM layout with minimal controls. 
+    </div>
+  </body>
+</html>

examples/outOfRangeMarkers.html

@@ -50,7 +50,7 @@
 
 
  <body onload="init()">
-    <h3 id="title">Using maxResolution to control overlays</h3>
+    <h1 id="title">Using maxResolution to control overlays</h1>
     <p id="shortdesc">
       See how to control the maximum resolution for a markers layer, 
       causing it to not be displayed beyond a certain point.

examples/overviewmap.html

@@ -32,17 +32,17 @@
         <div id="map2"></div>
         <p>The second map has an overview map control that is created with
         non-default options.  In this case, the mapOptions property of the
-        control has been set to use non-default projection related properties.
+        control has been set to use non-default projection related properties,
-        In addition, any other properties of the overview map control can be
+        and the layers property has been set to use a layer different from the main
+        map. In addition, any other properties of the overview map control can be
         set in this way.</p>
         <script defer="defer" type="text/javascript">
         
-        // create the top map (with default overview map control)
+        // set up some layers
-        var map1 = new OpenLayers.Map('map1');
         
         var ol = new OpenLayers.Layer.WMS(
             "OpenLayers WMS", 
-            "http://labs.metacarta.com/wms/vmap0",
+            "http://vmap0.tiles.osgeo.org/wms/vmap0",
             {layers: 'basic'}
         );
         
@@ -52,54 +52,64 @@
             {layers: "landsat7"}
         );
         
+        // A clone of the above layer that we will use as overview for map2.
+        // We need to clone jpl before the it gets added to a map, so the
+        // clone can have its own maxExtent and maxResolution instead of
+        // getting these settings initialized from map1.
+        var jplOverview = jpl.clone();
+        
+        // A more detailled layer of Manhattan for map2
+        var ny = new OpenLayers.Layer.WMS(
+            "Manhattan", 
+            "http://demo.opengeo.org/geoserver/wms",
+            {
+                layers: 'tiger-ny', 
+                format: 'image/png'
+            }
+        );
+        
+        // create the top map (with default overview map control)
+        var map1 = new OpenLayers.Map('map1');
+        
         map1.addLayers([ol, jpl]);
         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(33861, 717605, 330846, 1019656), 
+            maxExtent: new OpenLayers.Bounds(-8242894.927728, 4965204.031195,
-            maxResolution: 296985/1024,
+                    -8227290.161511, 4994963.723637), 
-            projection: "EPSG:2805",
+            maxResolution: 116.24879860156216,
+            projection: "EPSG:900913",
             units: "m"
         };
 
         var map2 = new OpenLayers.Map('map2', mapOptions);
         
-        var bos = new OpenLayers.Layer.WMS(
+        map2.addLayers([ny]);
-            "Boston", 
-            "http://boston.freemap.in/cgi-bin/mapserv",
-            {
-                map: '/www/freemap.in/boston/map/gmaps.map', 
-                layers: 'border,water,roads,rapid_transit,buildings', 
-                format: 'png'
-            }
-        );
-        
-        map2.addLayers([bos]);
-        map2.addControl(new OpenLayers.Control.LayerSwitcher());
         
         // create an overview map control with non-default options
         var controlOptions = {
-            mapOptions: mapOptions
+            maximized: true,
+            mapOptions: OpenLayers.Util.extend(mapOptions, {
+                maxResolution: 156543.0339,
+                maxExtent: new OpenLayers.Bounds(-20037508.34, -20037508.34,
+                                     20037508.34, 20037508.34)
+            }),
+            layers: [jplOverview]
         }
         var overview2 = new OpenLayers.Control.OverviewMap(controlOptions);
         map2.addControl(overview2);
         
-        map2.setCenter(new OpenLayers.LonLat(182500, 868500), 3);
+        map2.setCenter(new OpenLayers.LonLat(-8233165.3575055, 4980298.21113769), 3);
         
-        // expand the overview map control
-        overview2.maximizeControl();
-
         </script>
     </body>
 </html>

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]);
@@ -40,6 +40,41 @@
         map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
     }
     </script>
+    <style type="text/css">
+        .olControlPanPanel {
+             width: 100%;
+             height: 100%;
+             left: 0;
+             top: 0;
+        }
+        .olControlPanPanel .olControlPanNorthItemInactive {
+             left: 50%;
+             margin-left: -9px;
+             top: 0;
+        }
+        .olControlPanPanel .olControlPanSouthItemInactive {
+             left: 50%;
+             margin-left: -9px;
+             top: auto;
+             bottom: 0;
+        }
+        .olControlPanPanel .olControlPanWestItemInactive {
+             top: 50%;
+             margin-top: -9px;
+             left: 0;
+        }
+        .olControlPanPanel .olControlPanEastItemInactive {
+             top: 50%;
+             margin-top: -9px;
+             left: auto;
+             right: 0;
+        }
+       .olControlZoomPanel {
+             left: auto;
+             right: 23px;
+             top: 8px;
+       } 
+    </style>
 </head>
 <body onload='init();'>
     <h1 id="title">Pan and Zoom Panels</h1>

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);
@@ -85,7 +91,7 @@
     </script>
   </head>
   <body onload="init()">
-    <h3 id="title">Custom Control.Panel</h3>
+    <h1 id="title">Custom Control.Panel</h1>
     <p id="shortdesc">
       Create a custom control.panel, styled entirely with
       CSS, and add your own controls to it.

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());

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);

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);

examples/proxy.cgi

@@ -19,7 +19,9 @@ allowedHosts = ['www.openlayers.org', 'openlayers.org',
                 'labs.metacarta.com', 'world.freemap.in', 
                 'prototype.openmnnd.org', 'geo.openplans.org',
                 'sigma.openplans.org', 'demo.opengeo.org',
-                'www.openstreetmap.org', 'sample.avencia.com']
+                'www.openstreetmap.org', 'sample.azavea.com',
+                'v-swe.uni-muenster.de:8080', 
+                'vmap0.tiles.osgeo.org']
 
 method = os.environ["REQUEST_METHOD"]
 

examples/regular-polygons.html

@@ -28,16 +28,20 @@
             margin-left: 15em;
             position: absolute;
         }
+
+        /* avoid pink tiles */
+        .olImageLoadError {
+            background-color: transparent !important;
+        }
     </style>
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
         var map, polygonControl;
-        OpenLayers.Util.onImageLoadErrorColor = "transparent";
         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");
 
@@ -68,7 +72,7 @@
     </script>
   </head>
   <body onload="init()">
-    <h2 id="title">OpenLayers Regular Polygon Example</h2>
+    <h1 id="title">OpenLayers Regular Polygon Example</h1>
     <p id="shortdesc">
       Shows how to use the RegularPolygon handler to draw features with
       different numbers of sides.

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']);
@@ -79,7 +79,7 @@
     </script>
   </head>
   <body onload="init()">
-    <h3 id="title">Resize Features Programatically</h3>
+    <h1 id="title">Resize Features Programatically</h1>
     <p id="shortdesc">
       Demonstration of how to use the geometry resize methods to
       change feature sizes programatically.