How to overlay the osm with the wms layer of geoserver

.gitignore

@@ -0,0 +1 @@
+*.pyc

apidoc_config/Menu.txt

@@ -79,9 +79,7 @@ Group: OpenLayers  {
       File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js)
       File: Measure  (no auto-title, OpenLayers/Control/Measure.js)
       File: ModifyFeature  (no auto-title, OpenLayers/Control/ModifyFeature.js)
-      File: MouseDefaults  (no auto-title, OpenLayers/Control/MouseDefaults.js)
       File: MousePosition  (no auto-title, OpenLayers/Control/MousePosition.js)
-      File: MouseToolbar  (no auto-title, OpenLayers/Control/MouseToolbar.js)
       File: Navigation  (no auto-title, OpenLayers/Control/Navigation.js)
       File: NavigationHistory  (no auto-title, OpenLayers/Control/NavigationHistory.js)
       File: NavToolbar  (no auto-title, OpenLayers/Control/NavToolbar.js)
@@ -319,7 +317,6 @@ Group: OpenLayers  {
       File: KaMapCache  (no auto-title, OpenLayers/Layer/KaMapCache.js)
       File: MapGuide  (no auto-title, OpenLayers/Layer/MapGuide.js)
       File: MapServer  (no auto-title, OpenLayers/Layer/MapServer.js)
-      File: MapServer.Untiled  (no auto-title, OpenLayers/Layer/MapServer/Untiled.js)
       File: Markers  (no auto-title, OpenLayers/Layer/Markers.js)
       File: MultiMap  (no auto-title, OpenLayers/Layer/MultiMap.js)
       File: PointTrack  (no auto-title, OpenLayers/Layer/PointTrack.js)
@@ -330,9 +327,7 @@ Group: OpenLayers  {
       File: Vector  (no auto-title, OpenLayers/Layer/Vector.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)

authors.txt

@@ -1,12 +1,12 @@
 ahocevar = ahocevar <[email protected]>
-bartvde = bartvde <USER@DOMAIN>
+bartvde = bartvde <[email protected]>
 crschmidt = crschmidt <[email protected]>
 elemoine = Éric Lemoine <[email protected]>
 euzuro = euzuro <USER@DOMAIN>
 follower = follower <USER@DOMAIN>
 fredj = Frédéric Junod <[email protected]>
 jrf = jrf <USER@DOMAIN>
-pagameba = pagameba <USER@DOMAIN>
-pgiraud = pgiraud <USER@DOMAIN>
-sderle = sderle <USER@DOMAIN>
-tschaub = tschaub <[email protected]>
+pagameba = Paul Spencer <[email protected]>
+pgiraud = pgiraud <[email protected]>
+sderle = Schuyler Erle <[email protected]>
+tschaub = Tim Schaub <[email protected]>

build/build.py

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

doc/customization

@@ -4,10 +4,6 @@ Customizing OpenLayers
 OpenLayers is designed to fit many needs -- fitting in alongside all kinds of
 various applications which are currently in use. 
 
-Currently, OpenLayers supports a 'theme' option when creating a map. This 
-theme option allows you to specify the location of a CSS theme which should
-be included.
-
 A default theme is available as an example in the theme/ directory: the setup
 is:
 

doc_config/Menu.txt

@@ -79,9 +79,7 @@ Group: OpenLayers  {
       File: LayerSwitcher  (no auto-title, OpenLayers/Control/LayerSwitcher.js)
       File: Measure  (no auto-title, OpenLayers/Control/Measure.js)
       File: ModifyFeature  (no auto-title, OpenLayers/Control/ModifyFeature.js)
-      File: MouseDefaults  (no auto-title, OpenLayers/Control/MouseDefaults.js)
       File: MousePosition  (no auto-title, OpenLayers/Control/MousePosition.js)
-      File: MouseToolbar  (no auto-title, OpenLayers/Control/MouseToolbar.js)
       File: Navigation  (no auto-title, OpenLayers/Control/Navigation.js)
       File: NavigationHistory  (no auto-title, OpenLayers/Control/NavigationHistory.js)
       File: NavToolbar  (no auto-title, OpenLayers/Control/NavToolbar.js)
@@ -319,7 +317,6 @@ Group: OpenLayers  {
       File: KaMapCache  (no auto-title, OpenLayers/Layer/KaMapCache.js)
       File: MapGuide  (no auto-title, OpenLayers/Layer/MapGuide.js)
       File: MapServer  (no auto-title, OpenLayers/Layer/MapServer.js)
-      File: MapServer.Untiled  (no auto-title, OpenLayers/Layer/MapServer/Untiled.js)
       File: Markers  (no auto-title, OpenLayers/Layer/Markers.js)
       File: MultiMap  (no auto-title, OpenLayers/Layer/MultiMap.js)
       File: PointTrack  (no auto-title, OpenLayers/Layer/PointTrack.js)
@@ -330,9 +327,7 @@ Group: OpenLayers  {
       File: Vector  (no auto-title, OpenLayers/Layer/Vector.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)

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/baseLayers.html

@@ -53,8 +53,8 @@
             }
 
             function add() {
-                var url = 'http://boston.openguides.org/markers/AQUA.png';
-                var sz = new OpenLayers.Size(10, 17);
+                var url = 'http://www.openlayers.org/dev/img/marker.png';
+                var sz = new OpenLayers.Size(21, 25);
                 var calculateOffset = function(size) {
                                     return new OpenLayers.Pixel(-(size.w/2), -size.h);
                                  };

examples/custom-control-point.html

@@ -11,7 +11,7 @@
         var map, layer;
 
         function init(){
-            map = new OpenLayers.Map( $('map') );
+            map = new OpenLayers.Map('map');
 
             layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
                     "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
@@ -20,7 +20,7 @@
             OpenLayers.Util.extend(control, {
                 draw: function () {
                     // this Handler.Point will intercept the shift-mousedown
-                    // before Control.MouseDefault gets to see it
+                    // before Control.Navigation gets to see it
                     this.point = new OpenLayers.Handler.Point( control,
                         {"done": this.notice},
                         {keyMask: OpenLayers.Handler.MOD_SHIFT});

examples/custom-control.html

@@ -19,7 +19,7 @@
                 OpenLayers.Util.extend(control, {
                     draw: function () {
                         // this Handler.Box will intercept the shift-mousedown
-                        // before Control.MouseDefault gets to see it
+                        // before Control.Navigation gets to see it
                         this.box = new OpenLayers.Handler.Box( control,
                             {"done": this.notice},
                             {keyMask: OpenLayers.Handler.MOD_SHIFT});

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>