set VERSION_NUMBER to 2.13 final

Whenever we run tests *with* the tileManager, we cannot inspect any grid...(r=@ahocevar)

apidoc_config/Menu.txt

@@ -379,7 +379,6 @@ Group: OpenLayers  {
 
       File: Popup  (no auto-title, OpenLayers/Popup.js)
       File: Anchored  (no auto-title, OpenLayers/Popup/Anchored.js)
-      File: AnchoredBubble  (no auto-title, OpenLayers/Popup/AnchoredBubble.js)
       File: Framed  (no auto-title, OpenLayers/Popup/Framed.js)
       File: FramedCloud  (no auto-title, OpenLayers/Popup/FramedCloud.js)
       }  # Group: Popup

build/build.py

@@ -32,6 +32,13 @@ def build(config_file = None, output_file = None, options = None):
     except ImportError:
         print "No minimize"
 
+    try:
+        import uglify_js
+        uglify_js.check_available()
+        have_compressor.append("uglify-js")
+    except Exception, E:
+        print "No uglify-js (%s)" % E
+
     use_compressor = None
     if options.compressor and options.compressor in have_compressor:
         use_compressor = options.compressor
@@ -52,7 +59,7 @@ def build(config_file = None, output_file = None, options = None):
 
     print "Merging libraries."
     try:
-        if use_compressor == "closure":
+        if use_compressor == "closure" or use_compressor == 'uglify-js':
             sourceFiles = mergejs.getNames(sourceDirectory, configFilename)
         else:
             merged = mergejs.run(sourceDirectory, None, configFilename)
@@ -60,6 +67,15 @@ def build(config_file = None, output_file = None, options = None):
         print "\nAbnormal termination."
         sys.exit("ERROR: %s" % E)
 
+    if options.amdname:
+        options.amdname = "'" + options.amdname + "',"
+    else:
+        options.amdname = ""
+        
+    if options.amd == 'pre':
+        print "\nAdding AMD function."
+        merged = "define(%sfunction(){%sreturn OpenLayers;});" % (options.amdname, merged)
+    
     print "Compressing using %s" % use_compressor
     if use_compressor == "jsmin":
         minimized = jsmin.jsmin(merged)
@@ -98,9 +114,25 @@ def build(config_file = None, output_file = None, options = None):
             print "\nAbnormal termination due to compilation errors." 
             sys.exit("ERROR: Closure Compilation failed! See compilation errors.") 
         print "Closure Compilation has completed successfully."
+    elif use_compressor == "uglify-js":
+        minimized = uglify_js.compile(sourceFiles)
+        if minimized is None:
+            print "\nAbnormal termination due to compilation errors."
+            sys.exit("ERROR: Uglify JS compilation failed! See compilation errors.")
+
+        print "Uglify JS compilation has completed successfully."
+
     else: # fallback
         minimized = merged 
 
+    if options.amd == 'post':
+        print "\nAdding AMD function."
+        minimized = "define(%sfunction(){%sreturn OpenLayers;});" % (options.amdname, minimized)
+    
+    if options.status:
+        print "\nAdding status file."
+        minimized = "// status: " + file(options.status).read() + minimized
+    
     print "\nAdding license file."
     minimized = file("license.txt").read() + minimized
 
@@ -111,7 +143,10 @@ def build(config_file = None, output_file = None, options = None):
 
 if __name__ == '__main__':
   opt = optparse.OptionParser(usage="%s [options] [config_file] [output_file]\n  Default config_file is 'full.cfg', Default output_file is 'OpenLayers.js'")
-  opt.add_option("-c", "--compressor", dest="compressor", help="compression method: one of 'jsmin', 'minimize', 'closure_ws', 'closure', or 'none'", default="jsmin")
+  opt.add_option("-c", "--compressor", dest="compressor", help="compression method: one of 'jsmin' (default), 'minimize', 'closure_ws', 'closure', or 'none'", default="jsmin")
+  opt.add_option("-s", "--status", dest="status", help="name of a file whose contents will be added as a comment at the front of the output file. For example, when building from a git repo, you can save the output of 'git describe --tags' in this file. Default is no file.", default=False)
+  opt.add_option("--amd", dest="amd", help="output should be AMD module; wrap merged files in define function; can be either 'pre' (before compilation) or 'post' (after compilation). Wrapping the OpenLayers var in a function means the filesize can be reduced by the closure compiler using 'pre', but be aware that a few functions depend on the OpenLayers variable being present. Either option can be used with jsmin or minimize compression. Default false, not AMD.", default=False)
+  opt.add_option("--amdname", dest="amdname", help="only useful with amd option. Name of AMD module. Default no name, anonymous module.", default=False)
   (options, args) = opt.parse_args()
   if not len(args):
     build(options=options)

build/license.txt

@@ -2,14 +2,14 @@
 
   OpenLayers.js -- OpenLayers Map Viewer Library
 
-  Copyright 2005-2011 OpenLayers Contributors, released under the FreeBSD
+  Copyright (c) 2006-2013 by OpenLayers Contributors
-  license. Please see http://svn.openlayers.org/trunk/openlayers/license.txt
+  Published under the 2-clause BSD license.
-  for the full text of the license.
+  See http://openlayers.org/dev/license.txt for the full text of the license, and http://openlayers.org/dev/authors.txt for full list of contributors.
 
   Includes compressed code under the following licenses:
 
-  (For uncompressed versions of the code used please see the
+  (For uncompressed versions of the code used, please see the
-  OpenLayers SVN repository: <http://openlayers.org/>)
+  OpenLayers Github repository: <https://github.com/openlayers/openlayers>)
 
 */
 

build/mobile.cfg

@@ -29,6 +29,7 @@ OpenLayers/Protocol/HTTP.js
 OpenLayers/Protocol/WFS.js
 OpenLayers/Protocol/WFS/v1_0_0.js
 OpenLayers/Strategy/Fixed.js
+OpenLayers/TileManager.js
 
 [exclude]
 

build/tests.cfg

@@ -7,4 +7,5 @@
 [include]
 
 [exclude]
+Firebug
 OpenLayers.js

doc/customization

@@ -1,49 +0,0 @@
-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:
-
- * theme/
- * theme/default/
- * theme/default/style.css
- * theme/default/img/
-
-Currently, the OpenLayers code does not support class names, and therefore,
-it is not possible to control many aspects of OpenLayers code with CSS 
-classes. However, with this framework in place, we expect to invest time 
-to make existing features and new features use the CSS theming framework
-where apropriate. 
-
-
-Class Naming
-============
-Elements should have class names which are descriptive of the Javascript
-class from which they come. For example, the main layer switcher element
-in the OpenLayers.Control.LayerSwitcher would be classed:
-
-  olControlLayerSwitcher
-
-This would allow users to add to their style.css class in their theme,
-changing, for example: 
-
-::
-  
-  .olControlLayerSwitcher input {
-    width:10px;
-  }
-
-Sub elements of a particular control can add to the class name:
-
-::
-
-  .olControlLayerSwitcherBaseLabel {
-      color: red;
-  }

doc/readme.txt

@@ -1,7 +0,0 @@
-Automatically generated OpenLayers API documentation is online:
-
-  http://dev.openlayers.org/apidocs
-
-More information on documentation is available from:
-
-  http://trac.openlayers.org/wiki/Documentation

doc_config/Menu.txt

@@ -379,7 +379,6 @@ Group: OpenLayers  {
 
       File: Popup  (no auto-title, OpenLayers/Popup.js)
       File: Anchored  (no auto-title, OpenLayers/Popup/Anchored.js)
-      File: AnchoredBubble  (no auto-title, OpenLayers/Popup/AnchoredBubble.js)
       File: Framed  (no auto-title, OpenLayers/Popup/Framed.js)
       File: FramedCloud  (no auto-title, OpenLayers/Popup/FramedCloud.js)
       }  # Group: Popup

examples/WMSDescribeLayerParser.html

@@ -12,11 +12,12 @@
           format = new OpenLayers.Format.WMSDescribeLayer();
           html = "<br>";
           resp = format.read(req.responseText);
-          for(var i = 0; i < resp.length; i++) {
+          var layerDescriptions = resp.layerDescriptions;
-            html += "Layer: typeName: "+ resp[i].typeName+",";
+          for(var i = 0; i < layerDescriptions.length; i++) {
+            html += "Layer: typeName: "+layerDescriptions[i].typeName+",";
                 html += "<ul>";
-                html += "<li>owsURL: "+resp[i].owsURL+"</li>";
+                html += "<li>owsURL: "+layerDescriptions[i].owsURL+"</li>";
-                html += "<li>owsType: "+resp[i].owsType+"</li>";
+                html += "<li>owsType: "+layerDescriptions[i].owsType+"</li>";
                 html += "</ul>"
           }
           document.getElementById('output').innerHTML = html;

examples/all-overlays-google.html

@@ -6,9 +6,8 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
         <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?v=3.6&amp;sensor=false"></script>
+        <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
         <script src="../lib/OpenLayers.js"></script>
         <script src="all-overlays-google.js"></script>
     </head>

examples/bing-tiles.js

@@ -23,7 +23,9 @@ var hybrid = new OpenLayers.Layer.Bing({
 
 map.addLayers([road, aerial, hybrid]);
 map.addControl(new OpenLayers.Control.LayerSwitcher());
+// Zoom level numbering depends on metadata from Bing, which is not yet loaded.
+var zoom = map.getZoomForResolution(76.43702827453613);
 map.setCenter(new OpenLayers.LonLat(-71.147, 42.472).transform(
     new OpenLayers.Projection("EPSG:4326"),
     map.getProjectionObject()
-), 11);
+), zoom);

examples/bootstrap.html

@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Bootstraped OpenLayers</title>
+    <link rel="stylesheet" href="../theme/default/style.css">
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        body {
+            padding-top: 60px;
+            padding-bottom: 40px;
+        }
+        #map {
+            height: 350px;
+            background-color: #eee;
+        }
+        .olControlAttribution {
+            bottom: 3px;
+            left: 10px;
+            line-height: 9px;
+            font-size: 9px;
+            color: #ccc;
+        }
+    </style>
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.2.1/css/bootstrap-responsive.min.css" rel="stylesheet">
+</head>
+<body>
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="navbar-inner">
+            <div class="container-fluid">
+                <a class="brand" href="/">openlayers.org</a>
+                <ul class="nav">
+                    <li>
+                        <a href="./">
+                            <i class="icon-globe icon-white"></i> examples
+                        </a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <div class="container-fluid" ng-controller="AlertsCtrl">
+        <div class="row-fluid">
+            <div class="span7">
+                <div id="map"></div>
+            </div>
+            <div class="span5">
+                <h4>OpenLayers and Bootstrap</h4>
+                <p>
+                    This example demonstrates an OpenLayers map in a fluid 
+                    layout using Bootstrap CSS.
+                </p>
+                <p>
+                    Note that the OpenLayers stylesheet is loaded before 
+                    Bootstrap.  The Bootstrap CSS sets the maximum width for
+                    images to be 100% (of their containing element).
+                </p>
+<pre><code>img {
+    max-width: 100%;
+}
+</code></pre>
+                <p>
+                    This causes problems for images that you might want to be
+                    bigger than their containing element (e.g. big tile in small
+                    map viewport).  To overcome this, the OpenLayers CSS
+                    overrides this <code>max-width</code> setting.  If you are 
+                    not loading the OpenLayers default CSS or are having trouble 
+                    with tile sizing and Bootstrap, add the following to your
+                    markup:
+                </p>
+<pre><code>&lt;style>
+    img.olTileImage {
+        max-width: none;
+    }
+&lt;/style></code></pre>
+            </div>
+        </div>
+    </div>
+    <script src="../lib/OpenLayers.js"></script>
+    <script src="bootstrap.js"></script>
+</body>
+</html>

examples/bootstrap.js

@@ -0,0 +1,31 @@
+var map = new OpenLayers.Map({
+    div: "map",
+    projection: "EPSG:900913",
+    layers: [
+        new OpenLayers.Layer.XYZ(
+            "Imagery",
+            [
+                "http://oatile1.mqcdn.com/naip/${z}/${x}/${y}.png",
+                "http://oatile2.mqcdn.com/naip/${z}/${x}/${y}.png",
+                "http://oatile3.mqcdn.com/naip/${z}/${x}/${y}.png",
+                "http://oatile4.mqcdn.com/naip/${z}/${x}/${y}.png"
+            ],
+            {
+                attribution: "Tiles Courtesy of <a href='http://open.mapquest.co.uk/' target='_blank'>MapQuest</a>. Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency. <img src='http://developer.mapquest.com/content/osm/mq_logo.png' border='0'>",
+                transitionEffect: "resize",
+                wrapDateLine: true
+            }
+        )
+    ],
+    controls: [
+        new OpenLayers.Control.Navigation({
+            dragPanOptions: {
+                enableKinetic: true
+            }
+        }),
+        new OpenLayers.Control.Zoom(),
+        new OpenLayers.Control.Attribution()
+    ],
+    center: [0, 0],
+    zoom: 1
+});

examples/cache-write.js

@@ -8,13 +8,10 @@ function init() {
         div: "map",
         projection: "EPSG:900913",
         layers: [
-            new OpenLayers.Layer.WMS("OSGeo", "http://vmap0.tiles.osgeo.org/wms/vmap0", {
+            new OpenLayers.Layer.WMS(
-                layers: "basic"
+                "OSGeo", "http://vmap0.tiles.osgeo.org/wms/vmap0",
-            }, {
+                {layers: "basic"}
-                eventListeners: {
+            )
-                    tileloaded: updateStatus
-                }
-            })
         ],
         center: [0, 0],
         zoom: 1
@@ -38,6 +35,7 @@ function init() {
     };
 
     // update the number of cached tiles and detect local storage support
+    map.layers[0].events.on({'tileloaded': updateStatus});
     function updateStatus() {
         if (window.localStorage) {
             status.innerHTML = localStorage.length + " entries in cache.";

examples/cartodb-geojson.html

@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Reading Features From CartoDB using GeoJSON</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+    <link rel="stylesheet" href="style.css" type="text/css">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <script src="../lib/OpenLayers.js"></script>
+  </head>
+  <body>
+    <h1 id="title">Reading Features From CartoDB using GeoJSON</h1>
+    <div id="tags">
+      protocol, script, cartodb
+    </div>
+    <p id="shortdesc">
+      Demonstrates how to load features on OpenLayers using CartoDB SQL API.
+    </p>
+    <div id="map" class="smallmap"></div>
+    <div id="docs">
+      <p>
+        <a href="http://cartodb.com/">CartoDB</a> is an Open Source
+        Geopatial Database on the cloud. It allows you to import your
+        data in shapefiles, KML, OpenStreeMap files, CSV, etc. and
+        then analyze and visualize it. Internally CartoDB uses PostGIS
+        2.0 so all functionality in PostGIS can be used straight
+        away. CartoDB exposes two APIS. One
+        to <a href="http://developers.cartodb.com/documentation/cartodb-apis.html#maps_api">generate maps</a> 
+	as tiles with interactivity, and another <a href="http://developers.cartodb.com/documentation/cartodb-apis.html#sql_api">SQL API</a> 
+	to retrieve vector data using among other formats, GeoJSON. In
+        this example we do a very simple query to obtain all protected
+        areas in Costa Rica from a public table. You can adapt the SQL
+        to include where clauses or complicate geospatial queries.
+      </p>
+      <p>
+        View the source code of this page to see how this is done. And
+        check the table on CartoDB
+        for <a href="https://examples.cartodb.com/tables/costa_rica_pa/public#/map">Protected Areas in Costa Rica</a>
+      </p>
+    </div>
+    <script>
+        var map = new OpenLayers.Map({
+            div: "map",
+            layers: [
+                new OpenLayers.Layer.OSM(),
+                new OpenLayers.Layer.Vector("Vectors", {
+                    projection: new OpenLayers.Projection("EPSG:4326"),
+                    strategies: [new OpenLayers.Strategy.Fixed()],
+                    protocol: new OpenLayers.Protocol.Script({
+                        url: "http://examples.cartodb.com/api/v2/sql",
+                        params: {
+			    q: "select * from costa_rica_pa LIMIT 50",
+			    format: "geojson"
+			},
+                        format: new OpenLayers.Format.GeoJSON({
+                            ignoreExtraDims: true
+                        }),
+                        callbackKey: "callback"
+                    }),
+                    eventListeners: {
+                        "featuresadded": function() {
+                            this.map.zoomToExtent(this.getDataExtent());
+                        }
+                    }
+                })
+            ]
+        });
+    </script>
+  </body>
+</html>

examples/click.html

@@ -34,7 +34,7 @@
                 }, 
 
                 trigger: function(e) {
-                    var lonlat = map.getLonLatFromViewPortPx(e.xy);
+                    var lonlat = map.getLonLatFromPixel(e.xy);
                     alert("You clicked near " + lonlat.lat + " N, " +
                                               + lonlat.lon + " E");
                 }
@@ -75,7 +75,7 @@
 
         <p id="shortdesc">
             This example shows the use of the click handler and 
-            getLonLatFromViewPortPx functions to trigger events on mouse click. 
+            getLonLatFromPixel functions to trigger events on mouse click. 
         </p>
 
         <div id="map" class="smallmap"></div>

examples/editing-methods.js

@@ -20,7 +20,7 @@ map.addControl(draw);
 draw.activate();
 
 // handle clicks on method links
-$("insertXY").onclick = function() {
+document.getElementById("insertXY").onclick = function() {
     var values = parseInput(
         window.prompt(
             "Enter map coordinates for new point (e.g. '-111, 46')", "x, y"
@@ -30,7 +30,7 @@ $("insertXY").onclick = function() {
         draw.insertXY(values[0], values[1]);
     }
 };
-$("insertDeltaXY").onclick = function() {
+document.getElementById("insertDeltaXY").onclick = function() {
     var values = parseInput(
         window.prompt(
             "Enter offset values for new point (e.g. '15, -10')", "dx, dy"
@@ -40,7 +40,7 @@ $("insertDeltaXY").onclick = function() {
         draw.insertDeltaXY(values[0], values[1]);
     }
 };
-$("insertDirectionLength").onclick = function() {
+document.getElementById("insertDirectionLength").onclick = function() {
     var values = parseInput(
         window.prompt(
             "Enter direction and length offset values for new point (e.g. '-45, 10')", "direction, length"
@@ -50,7 +50,7 @@ $("insertDirectionLength").onclick = function() {
         draw.insertDirectionLength(values[0], values[1]);
     }
 };
-$("insertDeflectionLength").onclick = function() {
+document.getElementById("insertDeflectionLength").onclick = function() {
     var values = parseInput(
         window.prompt(
             "Enter deflection and length offset values for new point (e.g. '15, 20')", "deflection, length"
@@ -60,10 +60,10 @@ $("insertDeflectionLength").onclick = function() {
         draw.insertDeflectionLength(values[0], values[1]);
     }
 };
-$("cancel").onclick = function() {
+document.getElementById("cancel").onclick = function() {
     draw.cancel();
 };
-$("finishSketch").onclick = function() {
+document.getElementById("finishSketch").onclick = function() {
     draw.finishSketch();
 };
 

examples/feature-events.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <title>OpenLayers Feature Events 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">
+    #result {
+        height: 60px;
+        width: 514px;
+        font-size: smaller;
+        overflow: auto;
+        margin-top: 5px;
+    }
+    </style>
+  </head>
+  <body>
+    <h1 id="title">Feature Events Example</h1>
+
+    <div id="tags">
+        feature, select, hover
+    </div>
+
+    <div id="shortdesc">Feature hover and click events</div>
+
+    <div id="map" class="smallmap"></div>
+    <div id="docs">
+        <p id="result">Hover over or click features on the map.</p>
+
+        <p>This example shows how to use the 'featureclick', 'nofeatureclick',
+            'featureover' and 'featureout' events to make features interactive.
+            Look at the <a href="feature-events.js">feature-events.js</a> source
+            code to see how this is done.</p>
+        
+        <p>Note that these events can be registered both on the map and on
+            individual layers. If many layers need to be observed, it is
+            recommended to register listeners once on the map for performance
+            reasons.</p>
+    </div>
+    <script src="../lib/OpenLayers.js"></script>
+    <script src="feature-events.js"></script>
+  </body>
+</html>

examples/feature-events.js

@@ -0,0 +1,67 @@
+var layerListeners = {
+    featureclick: function(e) {
+        log(e.object.name + " says: " + e.feature.id + " clicked.");
+        return false;
+    },
+    nofeatureclick: function(e) {
+        log(e.object.name + " says: No feature clicked.");
+    }
+};
+
+var style = new OpenLayers.StyleMap({
+    'default': OpenLayers.Util.applyDefaults(
+        {label: "${l}", pointRadius: 10},
+        OpenLayers.Feature.Vector.style["default"]
+    ),
+    'select': OpenLayers.Util.applyDefaults(
+        {pointRadius: 10},
+        OpenLayers.Feature.Vector.style.select
+    )
+});
+var layer1 = new OpenLayers.Layer.Vector("Layer 1", {
+    styleMap: style,
+    eventListeners: layerListeners
+});
+layer1.addFeatures([
+    new OpenLayers.Feature.Vector(OpenLayers.Geometry.fromWKT("POINT(-1 -1)"), {l:1}),
+    new OpenLayers.Feature.Vector(OpenLayers.Geometry.fromWKT("POINT(1 1)"), {l:1})
+]);
+var layer2 = new OpenLayers.Layer.Vector("Layer 2", {
+    styleMap: style,
+    eventListeners: layerListeners
+});
+layer2.addFeatures([
+    new OpenLayers.Feature.Vector(OpenLayers.Geometry.fromWKT("POINT(-1 1)"), {l:2}),
+    new OpenLayers.Feature.Vector(OpenLayers.Geometry.fromWKT("POINT(1 -1)"), {l:2})
+]);
+
+var map = new OpenLayers.Map({
+    div: "map",
+    allOverlays: true,
+    layers: [layer1, layer2],
+    zoom: 6,
+    center: [0, 0],
+    eventListeners: {
+        featureover: function(e) {
+            e.feature.renderIntent = "select";
+            e.feature.layer.drawFeature(e.feature);
+            log("Map says: Pointer entered " + e.feature.id + " on " + e.feature.layer.name);
+        },
+        featureout: function(e) {
+            e.feature.renderIntent = "default";
+            e.feature.layer.drawFeature(e.feature);
+            log("Map says: Pointer left " + e.feature.id + " on " + e.feature.layer.name);
+        },
+        featureclick: function(e) {
+            log("Map says: " + e.feature.id + " clicked on " + e.feature.layer.name);
+        }
+    }
+});
+
+function log(msg) {
+    if (!log.timer) {
+        result.innerHTML = "";
+        log.timer = window.setTimeout(function() {delete log.timer;}, 100);
+    }
+    result.innerHTML += msg + "<br>";
+}

examples/fullScreen.js

@@ -1,18 +1,8 @@
-var urls = [
-    "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
-    "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
-    "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
-];
-
 var map = new OpenLayers.Map({
     div: "map",
     layers: [
-        new OpenLayers.Layer.XYZ("OSM (with buffer)", urls, {
+        new OpenLayers.Layer.OSM("OSM (without buffer)"),
-            transitionEffect: "resize", buffer: 2, sphericalMercator: true
+        new OpenLayers.Layer.OSM("OSM (with buffer)", null, {buffer: 2})
-        }),
-        new OpenLayers.Layer.XYZ("OSM (without buffer)", urls, {
-            transitionEffect: "resize", buffer: 0, sphericalMercator: true
-        })
     ],
     controls: [
         new OpenLayers.Control.Navigation({

examples/fusiontables.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenLayers Example For Reading Features From Google Fusion Tables</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <script src="../lib/OpenLayers.js"></script>
+    </head>
+    <body>
+        <h1 id="title">Reading Features From A Google Fusion Tables Table</h1>
+        <div id="tags">
+            protocol, script, fusion tables
+        </div>
+        <p id="shortdesc">
+            Demonstrates how, with a custom read method, the script protocol and GeoJSON format can be used to read features stored in a table on Google Fusion Tables.
+        </p>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                Google Fusion Tables can be used to store features, and access them using SQL-type commands over HTTP. Tables are accessed using an authorization key; create/update/delete of tables requires an OAuth2 token, but tables can be public, in which case a simple apikey is all that's needed to read them. Geometries can be stored in Location columns in KML format, but the default output is a JSON object with the geometry as GeoJSON. With a custom read method, this example parses the geometry for each row, storing the other columns as feature attributes. You can of course add a 'where' clause to the SQL statement or change the column names to limit the data retrieved. Point geometries can also be stored in Latitude/Longitude columns, and the script could easily be modified to use those instead.
+            </p>
+            <p>
+                View the <a href="fusiontables.js" target="_blank">fusiontables.js</a>
+                source to see how this is done. You will need to get your own apikey from <a href="https://code.google.com/apis/console">Google's API Console</a> for this to function on your domain.
+            </p>
+            <p>
+                <a href="https://www.google.com/fusiontables/DataSource?docid=1g5DrXcdotCiO_yffkdW0zhuJk0a1i80SPvERHI8">Table used</a>. <a href="https://developers.google.com/fusiontables/docs/v1/using">Fusion Tables Developers Guide</a>
+            </p>
+        </div>
+        <script src="fusiontables.js"></script>
+    </body>
+</html>

examples/fusiontables.js

@@ -0,0 +1,51 @@
+// change this to your api key
+var apikey = "AIzaSyD_1zzMAoZjuP-m4LyhieuYmqiVJTEajyI";
+
+var map = new OpenLayers.Map({
+    div: "map",
+    layers: [
+        new OpenLayers.Layer.OSM(),
+        new OpenLayers.Layer.Vector("Vectors", {
+            projection: new OpenLayers.Projection("EPSG:4326"),
+            strategies: [new OpenLayers.Strategy.Fixed()],
+            protocol: new OpenLayers.Protocol.Script({
+                url: "https://www.googleapis.com/fusiontables/v1/query",
+                params: {
+                    sql: "select * from 1g5DrXcdotCiO_yffkdW0zhuJk0a1i80SPvERHI8",
+                    key: apikey
+                },
+                format: new OpenLayers.Format.GeoJSON({
+                    ignoreExtraDims: true,
+                    read: function(json) {
+                        var row, feature, atts = {}, features = [];
+                        var cols = json.columns; // column names
+                        for (var i = 0; i < json.rows.length; i++) {
+                            row = json.rows[i];
+                            feature = new OpenLayers.Feature.Vector();
+                            atts = {};
+                            for (var j = 0; j < row.length; j++) {
+                                // 'location's are json objects, other types are strings
+                                if (typeof row[j] === "object") {
+                                    feature.geometry = this.parseGeometry(row[j].geometry);
+                                } else {
+                                    atts[cols[j]] = row[j];
+                                }
+                            }
+                            feature.attributes = atts;
+                            // if no geometry, not much point in continuing with this row
+                            if (feature.geometry) {
+                                features.push(feature);
+                            }
+                        }
+                        return features;
+                    }
+                })
+            }),
+            eventListeners: {
+                "featuresadded": function () {
+                    this.map.zoomToExtent(this.getDataExtent());
+                }
+            }
+        })
+    ]
+});

examples/game-accel-ball.html

@@ -35,7 +35,7 @@
         function init() {
             map = new OpenLayers.Map( 'map', 
                 {
-                 'maxExtent': new OpenLayers.Bounds(0, 0, $("map").clientWidth, $("map").clientHeight), 
+                 'maxExtent': new OpenLayers.Bounds(0, 0, document.getElementById("map").clientWidth, document.getElementById("map").clientHeight), 
                  controls: [], 
                  maxResolution: 'auto'} 
             );

examples/geojson-reprojected.html

@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <title>OpenLayers GeoJSON Reprojected 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">
+    .olControlAttribution {
+        left: 2px;
+        right: inherit;
+        bottom: 3px;
+        line-height: 11px;
+    }
+    </style>
+  </head>
+  <body>
+    <h1 id="title">GeoJSON Reprojected</h1>
+
+    <div id="tags">
+        geojson, bing, projection
+    </div>
+
+    <div id="shortdesc">Display GeoJSON data over Bing tiles</div>
+
+    <div id="map" class="smallmap"></div>
+
+    <div id="docs">
+        <p>This example demonstrates the use of GeoJSON over Bing tiles.  The
+        GeoJSON vector data is in geographic coordinates (EPSG:4326).  The Bing
+        tiles are in a spherical mercator projection (EPSG:900913).  By setting
+        the <code>projection</code> property of the GeoJSON layer to the source
+        projection (EPSG:4326), the features are properly displayed over the
+        base layer.  In general, the map projection determines how raster or
+        vector data is displayed.  The layer projection corresponds to the
+        projection of the data source.
+        <p>See the
+        <a target="_blank" href="geojson-reprojected.js">geojson-reprojected.js</a>
+        source for details on how this is done.</p>
+    </div>
+    <script src="../lib/OpenLayers.js"></script>
+    <script src="geojson-reprojected.js"></script>
+  </body>
+</html>

examples/geojson-reprojected.js

@@ -0,0 +1,27 @@
+// API key for http://openlayers.org. Please get your own at
+// http://bingmapsportal.com/ and use that instead.
+var apiKey = "AqTGBsziZHIJYYxgivLBf0hVdrAk9mWO5cQcb8Yux8sW5M8c8opEC2lZqKR1ZZXf";
+
+var hybrid = new OpenLayers.Layer.Bing({
+    key: apiKey,
+    type: "AerialWithLabels",
+    name: "Bing Aerial With Labels"
+});
+
+var vector = new OpenLayers.Layer.Vector("GeoJSON", {
+    projection: "EPSG:4326",
+    strategies: [new OpenLayers.Strategy.Fixed()],
+    protocol: new OpenLayers.Protocol.HTTP({
+        url: "geojson-reprojected.json",
+        format: new OpenLayers.Format.GeoJSON()
+    })
+});
+
+var center = new OpenLayers.LonLat(-109.6, 46.7).transform("EPSG:4326", "EPSG:900913");
+
+var map = new OpenLayers.Map({
+    div: "map",
+    layers: [hybrid, vector],
+    center: center,
+    zoom: 4
+});

examples/geojson-reprojected.json

@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"type":"Feature","id":"USA-MT","properties":{"fips":"30","name":"Montana"},"geometry":{"type":"Polygon","coordinates":[[[-104.047534,49.000239],[-104.042057,47.861036],[-104.047534,45.944106],[-104.042057,44.996596],[-104.058488,44.996596],[-105.91517,45.002073],[-109.080842,45.002073],[-111.05254,45.002073],[-111.047063,44.476286],[-111.227803,44.580348],[-111.386634,44.75561],[-111.616665,44.547487],[-111.819312,44.509148],[-111.868605,44.563917],[-112.104113,44.520102],[-112.241036,44.569394],[-112.471068,44.481763],[-112.783254,44.48724],[-112.887315,44.394132],[-113.002331,44.448902],[-113.133778,44.772041],[-113.341901,44.782995],[-113.456917,44.865149],[-113.45144,45.056842],[-113.571933,45.128042],[-113.736241,45.330689],[-113.834826,45.522382],[-113.807441,45.604536],[-113.98818,45.703121],[-114.086765,45.593582],[-114.333228,45.456659],[-114.546828,45.560721],[-114.497536,45.670259],[-114.568736,45.774321],[-114.387997,45.88386],[-114.492059,46.037214],[-114.464674,46.272723],[-114.322274,46.645155],[-114.612552,46.639678],[-114.623506,46.705401],[-114.886399,46.809463],[-114.930214,46.919002],[-115.302646,47.187372],[-115.324554,47.258572],[-115.527201,47.302388],[-115.718894,47.42288],[-115.724371,47.696727],[-116.04751,47.976051],[-116.04751,49.000239],[-111.50165,48.994762],[-109.453274,49.000239],[-104.047534,49.000239]]]}}]}

examples/geolocation.js

@@ -92,16 +92,15 @@ geolocate.events.register("locationupdated",geolocate,function(e) {
 geolocate.events.register("locationfailed",this,function() {
     OpenLayers.Console.log('Location detection failed');
 });
-
+document.getElementById('locate').onclick = function() {
-$('locate').onclick = function() {
     vector.removeAllFeatures();
     geolocate.deactivate();
-    $('track').checked = false;
+    document.getElementById('track').checked = false;
     geolocate.watch = false;
     firstGeolocation = true;
     geolocate.activate();
 };
-$('track').onclick = function() {
+document.getElementById('track').onclick = function() {
     vector.removeAllFeatures();
     geolocate.deactivate();
     if (this.checked) {
@@ -110,4 +109,4 @@ $('track').onclick = function() {
         geolocate.activate();
     }
 };
-$('track').checked = false;
+document.getElementById('track').checked = false;

examples/getfeatureinfo-control.html

@@ -48,7 +48,6 @@
     </style>
     <script defer="defer" type="text/javascript">
     OpenLayers.ProxyHost = "proxy.cgi?url=";
-    
     var map, infocontrols, water, highlightlayer;
     
     function load() {
@@ -125,7 +124,7 @@
              highlightLayer.addFeatures(evt.features);
              highlightLayer.redraw();
         } else {
-            $('responseText').innerHTML = evt.text;
+            document.getElementById('responseText').innerHTML = evt.text;
         }
     }
 

examples/google-v3-alloverlays.html

@@ -6,9 +6,8 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
         <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?v=3.6&amp;sensor=false"></script>
+        <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
         <script src="../lib/OpenLayers.js"></script>
         <script src="google-v3-alloverlays.js"></script>
     </head>

examples/google-v3.html

@@ -6,9 +6,8 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
         <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?v=3.6&amp;sensor=false"></script>
+        <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
         <script src="../lib/OpenLayers.js"></script>
         <script src="google-v3.js"></script>
     </head>
@@ -30,10 +29,6 @@
                 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>

examples/google-v3.js

@@ -1,35 +1,34 @@
 var map;
 
 function init() {
-    map = new OpenLayers.Map('map');
+    map = new OpenLayers.Map('map', {
+        projection: 'EPSG:3857',
+        layers: [
+            new OpenLayers.Layer.Google(
+                "Google Physical",
+                {type: google.maps.MapTypeId.TERRAIN}
+            ),
+            new OpenLayers.Layer.Google(
+                "Google Streets", // the default
+                {numZoomLevels: 20}
+            ),
+            new OpenLayers.Layer.Google(
+                "Google Hybrid",
+                {type: google.maps.MapTypeId.HYBRID, numZoomLevels: 20}
+            ),
+            new OpenLayers.Layer.Google(
+                "Google Satellite",
+                {type: google.maps.MapTypeId.SATELLITE, numZoomLevels: 22}
+            )
+        ],
+        center: new OpenLayers.LonLat(10.2, 48.9)
+            // Google.v3 uses web mercator as projection, so we have to
+            // transform our coordinates
+            .transform('EPSG:4326', 'EPSG:3857'),
+        zoom: 5
+    });
     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);
-    
     // add behavior to html
     var animate = document.getElementById("animate");
     animate.onclick = function() {

examples/graticule.html

@@ -93,7 +93,7 @@
         <h1 id="title">Graticule Example</h1>
 
         <div id="tags">
-          graticule, grid
+          graticule, grid, projection, proj4js, reproject, transform
         </div>
 
         <p id="shortdesc">

examples/highlight-feature.html

@@ -68,8 +68,6 @@
             highlightCtrl.activate();
             selectCtrl.activate();
 
-            map.addControl(new OpenLayers.Control.EditingToolbar(vectors));
-
             map.setCenter(new OpenLayers.LonLat(0, 0), 1);
 
         }

examples/image-layer.html

@@ -19,14 +19,12 @@
         function init(){
             map = new OpenLayers.Map('map');
 
-            var options = {numZoomLevels: 3};
-
             var graphic = new OpenLayers.Layer.Image(
                 'City Lights',
-                'http://earthtrends.wri.org/images/maps/4_m_citylights_lg.gif',
+                'data/4_m_citylights_lg.gif',
                 new OpenLayers.Bounds(-180, -88.759, 180, 88.759),
                 new OpenLayers.Size(580, 288),
-                options
+                {numZoomLevels: 3}
             );
             
             graphic.events.on({
@@ -38,9 +36,12 @@
                 }
             });
 
-            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",
+            var jpl_wms = new OpenLayers.Layer.WMS(
-                "http://t1.hypercube.telascience.org/cgi-bin/landsat7", 
+                "Global Imagery",
-                {layers: "landsat7"}, options);
+                "http://demo.opengeo.org/geoserver/wms",
+                {layers: "bluemarble"},
+                {maxExtent: [-160, -88.759, 160, 88.759], numZoomLevels: 3}
+            );
 
             map.addLayers([graphic, jpl_wms]);
             map.addControl(new OpenLayers.Control.LayerSwitcher());

examples/kml-pointtrack.js

@@ -29,12 +29,13 @@ function init() {
                         var fid, points = [], feature;
                         for (var i=0, len=e.features.length; i<len; i++) {
                             feature = e.features[i];
-                            if (feature.fid !== fid || i === len-1) {
+                            if ((fid && feature.fid !== fid) || i === len-1) {
-                                fid = feature.fid;
                                 this.addNodes(points, {silent: true});
                                 points = [];
+                            } else {
+                                points.push(feature);
                             }
-                            points.push(feature);
+                            fid = feature.fid;
                         }
                         return false;
                     }

examples/light-basic.js

@@ -57,6 +57,7 @@ function init() {
 
     // create the select feature control
     var selector = new OpenLayers.Control.SelectFeature(vector,{
+        hover:true,
         autoActivate:true
     }); 
     

examples/mapbox.html

@@ -7,49 +7,6 @@
         <title>OpenLayers MapBox Example</title>
         <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
         <link rel="stylesheet" href="style.css" type="text/css">
-        <style>
-            .olControlAttribution {
-                bottom: 5px;
-                font-size: 9px;
-            }
-            div.olControlZoomPanel {
-                top: 10px;
-                left: 10px;
-            }
-            div.olControlZoomPanel .olControlZoomInItemInactive,
-            div.olControlZoomPanel .olControlZoomOutItemInactive {
-                background: rgba(0, 0, 0, 0.2);
-                position: absolute;
-            }
-            div.olControlZoomPanel .olControlZoomInItemInactive {
-                border-radius: 3px 3px 0 0;
-            }
-            div.olControlZoomPanel .olControlZoomOutItemInactive {
-                border-radius: 0 0 3px 3px ;
-                top: 20px;
-            }
-            div.olControlZoomPanel div:hover {
-                background: rgba(0, 0, 0, 0.5);
-            }
-            div.olControlZoomPanel .olControlZoomOutItemInactive:after ,
-            div.olControlZoomPanel .olControlZoomInItemInactive:after {
-                font-weight: bold;
-                content: '+';
-                font-size: 18px;
-                padding: 0 2px;
-                z-index: 2000;
-                color: #fff;
-                line-height: 1em;
-            }
-            div.olControlZoomPanel .olControlZoomOutItemInactive:after {
-                content: '–';
-                line-height: 0.9em;
-                padding: 0 5px;
-            }
-            div.olControlZoomPanel .olControlZoomToMaxExtentItemInactive {
-                display: none;
-            }
-        </style>
     </head>
     <body>
         <h1 id="title">Basic MapBox OSM Example</h1>

examples/mapbox.js

@@ -1,34 +1,21 @@
-var streets = new OpenLayers.Layer.XYZ(
+var earth = new OpenLayers.Layer.XYZ(
-    "MapBox Streets",
+    "Natural Earth",
     [
-        "http://a.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png",
+        "http://a.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy/${z}/${x}/${y}.png",
-        "http://b.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png",
+        "http://b.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy/${z}/${x}/${y}.png",
-        "http://c.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png",
+        "http://c.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy/${z}/${x}/${y}.png",
-        "http://d.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png"
+        "http://d.tiles.mapbox.com/v3/mapbox.natural-earth-hypso-bathy/${z}/${x}/${y}.png"
     ], {
-        attribution: "Tiles © <a href='http://mapbox.com/'>MapBox</a> | " + 
+        attribution: "Tiles &copy; <a href='http://mapbox.com/'>MapBox</a>",
-            "Data © <a href='http://www.openstreetmap.org/'>OpenStreetMap</a> " +
-            "and contributors, CC-BY-SA",
         sphericalMercator: true,
-        transitionEffect: "resize",
+        wrapDateLine: true,
-        buffer: 1,
+        numZoomLevels: 5
-        numZoomLevels: 16
     }
 );
 
 var map = new OpenLayers.Map({
     div: "map",
-    layers: [streets],
+    layers: [earth],
-    controls: [
-        new OpenLayers.Control.Attribution(),
-        new OpenLayers.Control.Navigation({
-            dragPanOptions: {
-                enableKinetic: true
-            }
-        }),
-        new OpenLayers.Control.ZoomPanel(),
-        new OpenLayers.Control.Permalink({anchor: true})
-    ],
     center: [0, 0],
     zoom: 1
 });

examples/mapquest.html

@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <title>OpenLayers MapQuest Demo</title>
+    <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+    <link rel="stylesheet" href="style.css" type="text/css">
+</head>
+<body>
+    <h1 id="title">OpenLayers with MapQuest Tiles</h1>
+    <div id="shortdesc">
+        This example demonstrates the use of MapQuest tiles with OpenLayers.
+    </div>
+    <div id="tags">
+        MapQuest, OSM, XYZ
+    </div>
+    <div id="map" class="smallmap"></div>
+    <div id="docs">
+        <p>
+        See the <a href="mapquest.js" target="_blank">mapquest.js source</a> for 
+        detail on using MapQuest tiles in OpenLayers.
+        </p>
+    </div>
+    <script src="../lib/OpenLayers.js"></script>
+    <script src="mapquest.js"></script>
+</body>

examples/mapquest.js

@@ -0,0 +1,36 @@
+var map = new OpenLayers.Map({
+    div: "map",
+    projection: "EPSG:900913",
+    layers: [
+        new OpenLayers.Layer.XYZ(
+            "OpenStreetMap", 
+            [
+                "http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+                "http://otile2.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+                "http://otile3.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
+                "http://otile4.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
+            ],
+            {
+                attribution: "Data, imagery and map information provided by <a href='http://www.mapquest.com/'  target='_blank'>MapQuest</a>, <a href='http://www.openstreetmap.org/' target='_blank'>Open Street Map</a> and contributors, <a href='http://creativecommons.org/licenses/by-sa/2.0/' target='_blank'>CC-BY-SA</a>  <img src='http://developer.mapquest.com/content/osm/mq_logo.png' border='0'>",
+                transitionEffect: "resize"
+            }
+        ),
+        new OpenLayers.Layer.XYZ(
+            "Imagery",
+            [
+                "http://otile1.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.png",
+                "http://otile2.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.png",
+                "http://otile3.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.png",
+                "http://otile4.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.png"
+            ],
+            {
+                attribution: "Tiles Courtesy of <a href='http://open.mapquest.co.uk/' target='_blank'>MapQuest</a>. Portions Courtesy NASA/JPL-Caltech and U.S. Depart. of Agriculture, Farm Service Agency. <img src='http://developer.mapquest.com/content/osm/mq_logo.png' border='0'>",
+                transitionEffect: "resize"
+            }
+        )
+    ],
+    center: [0, 0],
+    zoom: 1
+});
+
+map.addControl(new OpenLayers.Control.LayerSwitcher());

examples/marker-shadow.html

@@ -99,7 +99,7 @@
                 
                 var pixel = new OpenLayers.Pixel(center.x + x, center.y + y);
                 
-                var lonLat = map.getLonLatFromViewPortPx(pixel);
+                var lonLat = map.getLonLatFromPixel(pixel);
                 features.push(
                     new OpenLayers.Feature.Vector(
                         new OpenLayers.Geometry.Point(lonLat.lon, lonLat.lat)

examples/mobile-drawing.html

@@ -5,7 +5,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
         <meta name="apple-mobile-web-app-capable" content="yes">
-        <link rel="stylesheet" href="style.mobile.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/style.mobile.css" type="text/css">
         <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
         <script src="../lib/OpenLayers.js?mobile"></script>
         <script src="mobile-drawing.js"></script>

examples/mobile-drawing.js

@@ -5,7 +5,15 @@ function init() {
         styleMap: new OpenLayers.StyleMap({
             temporary: OpenLayers.Util.applyDefaults({
                 pointRadius: 16
-            }, OpenLayers.Feature.Vector.style.temporary)
+            }, OpenLayers.Feature.Vector.style.temporary),
+            'default': OpenLayers.Util.applyDefaults({
+                pointRadius: 16,
+                strokeWidth: 3,
+            }, OpenLayers.Feature.Vector.style['default']),
+            select: OpenLayers.Util.applyDefaults({
+                pointRadius: 16,
+                strokeWidth: 3
+            }, OpenLayers.Feature.Vector.style.select)
         })
     });
 

examples/mobile-jq.html

@@ -8,7 +8,7 @@
         <link rel="stylesheet" href="http://code.jquery.com/mobile/1.0/jquery.mobile-1.0.min.css">
         <script src="http://code.jquery.com/jquery-1.6.4.min.js"></script>
         <script src="http://code.jquery.com/mobile/1.0.1/jquery.mobile-1.0.1.min.js"></script>
-        <link rel="stylesheet" href="style.mobile.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/style.mobile.css" type="text/css">
         <link rel="stylesheet" href="style.mobile-jq.css" type="text/css">
         <script src="../lib/OpenLayers.js?mobile"></script>
         <script src="mobile-base.js"></script>

examples/mobile-jq.js

@@ -3,101 +3,108 @@ window.location.replace(window.location.href.split("#")[0] + "#mappage");
 
 var selectedFeature = null;
 
-$(document).ready(function() {
+// fix height of content
+function fixContentHeight() {
+    var footer = $("div[data-role='footer']:visible"),
+        content = $("div[data-role='content']:visible:visible"),
+        viewHeight = $(window).height(),
+        contentHeight = viewHeight - footer.outerHeight();
 
-    // fix height of content
+    if ((content.outerHeight() + footer.outerHeight()) !== viewHeight) {
-    function fixContentHeight() {
+        contentHeight -= (content.outerHeight() - content.height() + 1);
-        var footer = $("div[data-role='footer']:visible"),
+        content.height(contentHeight);
-            content = $("div[data-role='content']:visible:visible"),
-            viewHeight = $(window).height(),
-            contentHeight = viewHeight - footer.outerHeight();
-
-        if ((content.outerHeight() + footer.outerHeight()) !== viewHeight) {
-            contentHeight -= (content.outerHeight() - content.height() + 1);
-            content.height(contentHeight);
-        }
-
-        if (window.map && window.map instanceof OpenLayers.Map) {
-            map.updateSize();
-        } else {
-            // initialize map
-            init(function(feature) { 
-                selectedFeature = feature; 
-                $.mobile.changePage("#popup", "pop"); 
-            });
-            initLayerList();
-        }
     }
-    $(window).bind("orientationchange resize pageshow", fixContentHeight);
-    document.body.onload = fixContentHeight;
 
-    // Map zoom  
+    if (window.map && window.map instanceof OpenLayers.Map) {
-    $("#plus").click(function(){
+        map.updateSize();
-        map.zoomIn();
+    } else {
-    });
+        // initialize map
-    $("#minus").click(function(){
+        init(function(feature) { 
-        map.zoomOut();
+            selectedFeature = feature; 
-    });
+            $.mobile.changePage("#popup", "pop"); 
-    $("#locate").click(function(){
-        var control = map.getControlsBy("id", "locate-control")[0];
-        if (control.active) {
-            control.getCurrentLocation();
-        } else {
-            control.activate();
-        }
-    });
-    
-    $('#popup').live('pageshow',function(event, ui){
-        var li = "";
-        for(var attr in selectedFeature.attributes){
-            li += "<li><div style='width:25%;float:left'>" + attr + "</div><div style='width:75%;float:right'>" 
-            + selectedFeature.attributes[attr] + "</div></li>";
-        }
-        $("ul#details-list").empty().append(li).listview("refresh");
-    });
-
-    $('#searchpage').live('pageshow',function(event, ui){
-        $('#query').bind('change', function(e){
-            $('#search_results').empty();
-            if ($('#query')[0].value === '') {
-                return;
-            }
-            $.mobile.showPageLoadingMsg();
-
-            // Prevent form send
-            e.preventDefault();
-
-            var searchUrl = 'http://ws.geonames.org/searchJSON?featureClass=P&maxRows=10';
-            searchUrl += '&name_startsWith=' + $('#query')[0].value;
-            $.getJSON(searchUrl, function(data) {
-                $.each(data.geonames, function() {
-                    var place = this;
-                    $('<li>')
-                        .hide()
-                        .append($('<h2 />', {
-                            text: place.name
-                        }))
-                        .append($('<p />', {
-                            html: '<b>' + place.countryName + '</b> ' + place.fcodeName
-                        }))
-                        .appendTo('#search_results')
-                        .click(function() {
-                            $.mobile.changePage('#mappage');
-                            var lonlat = new OpenLayers.LonLat(place.lng, place.lat);
-                            map.setCenter(lonlat.transform(gg, sm), 10);
-                        })
-                        .show();
-                });
-                $('#search_results').listview('refresh');
-                $.mobile.hidePageLoadingMsg();
-            });
         });
-        // only listen to the first event triggered
+        initLayerList();
-        $('#searchpage').die('pageshow', arguments.callee);
+    }
-    });
+}
 
+// one-time initialisation of button handlers 
+
+$("#plus").live('click', function(){
+    map.zoomIn();
 });
 
+$("#minus").live('click', function(){
+    map.zoomOut();
+});
+
+$("#locate").live('click',function(){
+    var control = map.getControlsBy("id", "locate-control")[0];
+    if (control.active) {
+        control.getCurrentLocation();
+    } else {
+        control.activate();
+    }
+});
+
+//fix the content height AFTER jQuery Mobile has rendered the map page
+$('#mappage').live('pageshow',function (){
+    fixContentHeight();
+});
+    
+$(window).bind("orientationchange resize pageshow", fixContentHeight);
+
+
+
+$('#popup').live('pageshow',function(event, ui){
+    var li = "";
+    for(var attr in selectedFeature.attributes){
+        li += "<li><div style='width:25%;float:left'>" + attr + "</div><div style='width:75%;float:right'>" 
+        + selectedFeature.attributes[attr] + "</div></li>";
+    }
+    $("ul#details-list").empty().append(li).listview("refresh");
+});
+
+$('#searchpage').live('pageshow',function(event, ui){
+    $('#query').bind('change', function(e){
+        $('#search_results').empty();
+        if ($('#query')[0].value === '') {
+            return;
+        }
+        $.mobile.showPageLoadingMsg();
+
+        // Prevent form send
+        e.preventDefault();
+
+        var searchUrl = 'http://ws.geonames.org/searchJSON?featureClass=P&maxRows=10';
+        searchUrl += '&name_startsWith=' + $('#query')[0].value;
+        $.getJSON(searchUrl, function(data) {
+            $.each(data.geonames, function() {
+                var place = this;
+                $('<li>')
+                    .hide()
+                    .append($('<h2 />', {
+                        text: place.name
+                    }))
+                    .append($('<p />', {
+                        html: '<b>' + place.countryName + '</b> ' + place.fcodeName
+                    }))
+                    .appendTo('#search_results')
+                    .click(function() {
+                        $.mobile.changePage('#mappage');
+                        var lonlat = new OpenLayers.LonLat(place.lng, place.lat);
+                        map.setCenter(lonlat.transform(gg, sm), 10);
+                    })
+                    .show();
+            });
+            $('#search_results').listview('refresh');
+            $.mobile.hidePageLoadingMsg();
+        });
+    });
+    // only listen to the first event triggered
+    $('#searchpage').die('pageshow', arguments.callee);
+});
+
+
 function initLayerList() {
     $('#layerspage').page();
     $('<li>', {

examples/mobile-layers.html

@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <link rel="stylesheet" href="style.mobile.css" type="text/css">
+    <link rel="stylesheet" href="../theme/default/style.mobile.css" type="text/css">
     <script src="../lib/OpenLayers.js?mobile"></script>
     <script src="mobile-layers.js"></script>
     <style>

examples/mobile-navigation.html

@@ -6,7 +6,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <title>Mobile Navigation Example</title>
     <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
-    <link rel="stylesheet" href="style.mobile.css" type="text/css" />
+    <link rel="stylesheet" href="../theme/default/style.mobile.css" type="text/css" />
     <link rel="stylesheet" href="style.css" type="text/css">
     <script type="text/javascript" src="../lib/OpenLayers.js?mobile"></script>
     <script type="text/javascript" src="mobile-navigation.js"></script>

examples/mobile-sencha.html

@@ -6,7 +6,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
         <title>OpenLayers with Sencha Touch</title>
         <script src="../lib/OpenLayers.js?mobile"></script>
-        <link rel="stylesheet" href="style.mobile.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/style.mobile.css" type="text/css">
         <link rel="stylesheet" href="http://cdn.sencha.io/touch/1.1.0/resources/css/sencha-touch.css">
         <script src="http://cdn.sencha.io/touch/1.1.0/sencha-touch.js"></script>
         <script src="mobile-sencha.js"></script>

examples/mobile-wmts-vienna.css

@@ -5,16 +5,55 @@ html, body, #map {
 }
 #map {
     cursor: move;
+    background-color: #CCCCCC;
+    /* no highlighting of the map area when tapping the map on touch devices */
+    -webkit-tap-highlight-color: transparent;
 }
 #title, #tags, #shortdesc {
     display: none;
 }
+div.olMapViewport {
+    -ms-touch-action: none;
+}
+
+/* Turn on GPU support where available */
 .olTileImage {
+    -webkit-transform: translateZ(0);
+    -moz-transform: translateZ(0);
+    -o-transform: translateZ(0);
+    -ms-transform: translateZ(0);
+    transform: translateZ(0);
+    -webkit-backface-visibility: hidden;
+    -moz-backface-visibility: hidden;
+    -ms-backface-visibility: hidden;
+    backface-visibility: hidden;
+    -webkit-perspective: 1000;
+    -moz-perspective: 1000;
+    -ms-perspective: 1000;
+    perspective: 1000;
+}
+
+/* Tile fade animation */
+.olLayerGrid .olTileImage {
     -webkit-transition: opacity 0.2s linear;
     -moz-transition: opacity 0.2s linear;
     -o-transition: opacity 0.2s linear;
     transition: opacity 0.2s linear;
 }
+
+/* Zoom Box */
+.olHandlerBoxZoomBox {
+    border: 2px solid red;
+    position: absolute;
+    background-color: white;
+    opacity: 0.50;
+    font-size: 1px;
+    filter: alpha(opacity=50);
+}
+.olDrawBox {
+    cursor: crosshair;
+}
+
 div.olControlAttribution {
     position: absolute;
     font-size: 10px;
@@ -163,4 +202,4 @@ div.layerPanel div.mapButtonItemActive:after {
 div.layerPanel div.mapButtonItemInactive,
 div.layerPanel div.mapButtonItemActive {
     margin-left: 1px;
-}
+}

examples/mobile-wmts-vienna.js

@@ -46,49 +46,53 @@ var map;
     
     // Geolocate control for the Locate button - the locationupdated handler
     // draws a cross at the location and a circle showing the accuracy radius.
-    zoomPanel.addControls([
+    var geolocate = new OpenLayers.Control.Geolocate({
-        new OpenLayers.Control.Geolocate({
+        type: OpenLayers.Control.TYPE_TOGGLE,
-            type: OpenLayers.Control.TYPE_TOGGLE,
+        bind: false,
-            geolocationOptions: {
+        watch: true,
-                enableHighAccuracy: false,
+        geolocationOptions: {
-                maximumAge: 0,
+            enableHighAccuracy: false,
-                timeout: 7000
+            maximumAge: 0,
+            timeout: 7000
+        },
+        eventListeners: {
+            activate: function() {
+                map.addLayer(vector);
             },
-            eventListeners: {
+            deactivate: function() {
-                activate: function() {
+                map.removeLayer(vector);
-                    map.addLayer(vector);
+                vector.removeAllFeatures();
-                },
+            },
-                deactivate: function() {
+            locationupdated: function(e) {
-                    map.removeLayer(vector);
+                vector.removeAllFeatures();
-                    vector.removeAllFeatures();
+                vector.addFeatures([
-                },
+                    new OpenLayers.Feature.Vector(e.point, null, {
-                locationupdated: function(e) {
+                        graphicName: 'cross',
-                    vector.removeAllFeatures();
+                        strokeColor: '#f00',
-                    vector.addFeatures([
+                        strokeWidth: 2,
-                        new OpenLayers.Feature.Vector(e.point, null, {
+                        fillOpacity: 0,
-                            graphicName: 'cross',
+                        pointRadius: 10
+                    }),
+                    new OpenLayers.Feature.Vector(
+                        OpenLayers.Geometry.Polygon.createRegularPolygon(
+                            new OpenLayers.Geometry.Point(e.point.x, e.point.y),
+                            e.position.coords.accuracy / 2, 50, 0
+                        ), null, {
+                            fillOpacity: 0.1,
+                            fillColor: '#000',
                             strokeColor: '#f00',
-                            strokeWidth: 2,
+                            strokeOpacity: 0.6
-                            fillOpacity: 0,
+                        }
-                            pointRadius: 10
+                    )
-                        }),
+                ]);
-                        new OpenLayers.Feature.Vector(
+                map.zoomToExtent(vector.getDataExtent());
-                            OpenLayers.Geometry.Polygon.createRegularPolygon(
-                                new OpenLayers.Geometry.Point(e.point.x, e.point.y),
-                                e.position.coords.accuracy / 2, 50, 0
-                            ), null, {
-                                fillOpacity: 0.1,
-                                fillColor: '#000',
-                                strokeColor: '#f00',
-                                strokeOpacity: 0.6
-                            }
-                        )
-                    ]);
-                    map.zoomToExtent(vector.getDataExtent());
-                }
             }
-        })
+        }
-    ]);
+    });
+    zoomPanel.addControls([geolocate]);
+
+    // Fallback layer when outside Vienna
+    var osm = new OpenLayers.Layer.OSM();
 
     // Map with navigation controls optimized for touch devices
     map = new OpenLayers.Map({
@@ -96,22 +100,10 @@ var map;
         theme: null,
         projection: "EPSG:3857",
         units: "m",
-        maxExtent: [-20037508.34, -20037508.34, 20037508.34, 20037508.34],
+        maxResolution: 38.21851413574219,
-        maxResolution: 156543.0339,
+        numZoomLevels: 8,
-        numZoomLevels: 20,
         controls: [
-            new OpenLayers.Control.Navigation({
+            new OpenLayers.Control.Navigation(),
-                mouseWheelOptions: {
-                    cumulative: false,
-                    interval: 20
-                },
-                dragPanOptions: {
-                    enableKinetic: {
-                        deceleration: 0.02
-                    }
-                },
-                zoomBoxEnabled: false
-            }),
             new OpenLayers.Control.Attribution(),
             zoomPanel,
             layerPanel
@@ -121,6 +113,15 @@ var map;
                 // update anchor for permalinks
                 var ctr = map.getCenter();
                 window.location.hash = "x="+ctr.lon+"&y="+ctr.lat+"&z="+map.getZoom();
+                // switch to OSM when outside Vienna
+                if (!map.getExtent().intersectsBounds(fmzk.tileFullExtent)) {
+                    if (map.baseLayer !== osm) {
+                        map.addLayer(osm);
+                        map.setBaseLayer(osm);
+                    }
+                } else if (map.baseLayer === osm) {
+                    map.removeLayer(osm);
+                }
             }
         }
     });
@@ -130,6 +131,14 @@ var map;
     // Vector layer for the location cross and circle
     var vector = new OpenLayers.Layer.Vector("Vector Layer");
 
+    // Defaults for the WMTS layers
+    var defaults = {
+        zoomOffset: 12,
+        requestEncoding: "REST",
+        matrixSet: "google3857",
+        attribution: 'Datenquelle: Stadt Wien - <a href="http://data.wien.gv.at">data.wien.gv.at</a>'
+    };
+
     // The WMTS layers we're going to add
     var fmzk, aerial, labels;
     
@@ -149,21 +158,16 @@ var map;
         url: "http://maps.wien.gv.at/wmts/1.0.0/WMTSCapabilities.xml",
         success: function(request) {
             var format = new OpenLayers.Format.WMTSCapabilities();
-            var defaults = {
-                requestEncoding: "REST",
-                matrixSet: "google3857",
-                attribution: 'Datenquelle: Stadt Wien - <a href="http://data.wien.gv.at">data.wien.gv.at</a>'
-            };
             var doc = request.responseText,
                 caps = format.read(doc);
             fmzk = format.createLayer(caps, OpenLayers.Util.applyDefaults(
-                {layer:"fmzk", requestEncoding:"REST", transitionEffect:"resize"}, defaults
+                {layer:"fmzk"}, defaults
             ));
             aerial = format.createLayer(caps, OpenLayers.Util.applyDefaults(
-                {layer:"lb", requestEncoding:"REST", transitionEffect:"resize"}, defaults
+                {layer:"lb"}, defaults
             ));
             labels = format.createLayer(caps, OpenLayers.Util.applyDefaults(
-                {layer:"beschriftung", requestEncoding:"REST", isBaseLayer: false},
+                {layer:"beschriftung", isBaseLayer: false, transitionEffect: 'map-resize'},
                 defaults
             ));
             map.addLayers([fmzk, aerial, labels]);
@@ -177,32 +181,43 @@ var map;
     // and create layers" block above.
     /*
     var extent = new OpenLayers.Bounds(1799448.394855, 6124949.74777, 1848250.442089, 6162571.828177);
-    var defaults = {
+    defaults.tileFullExtent = extent;
-        requestEncoding: "REST",
-        matrixSet: "google3857",
-        tileFullExtent: extent,
-        attribution: 'Datenquelle: Stadt Wien - <a href="http://data.wien.gv.at">data.wien.gv.at</a>'
-    };
     fmzk = new OpenLayers.Layer.WMTS(OpenLayers.Util.applyDefaults({
-        url: "http://www.wien.gv.at/wmts/fmzk/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+        url: [
+            "http://maps.wien.gv.at/wmts/fmzk/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps1.wien.gv.at/wmts/fmzk/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps2.wien.gv.at/wmts/fmzk/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps3.wien.gv.at/wmts/fmzk/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps4.wien.gv.at/wmts/fmzk/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg"
+        ],
         layer: "fmzk",
-        style: "pastell",
+        style: "pastell"
-        transitionEffect: "resize"
     },
     defaults));
     aerial = new OpenLayers.Layer.WMTS(OpenLayers.Util.applyDefaults({
-        url: "http://www.wien.gv.at/wmts/lb/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+        url: [
+            "http://maps.wien.gv.at/wmts/lb/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps1.wien.gv.at/wmts/lb/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps2.wien.gv.at/wmts/lb/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps3.wien.gv.at/wmts/lb/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg",
+            "http://maps4.wien.gv.at/wmts/lb/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.jpeg"
+        ],
         layer: "lb",
-        style: "farbe",
+        style: "farbe"
-        transitionEffect: "resize"
     },
     defaults));
     labels = new OpenLayers.Layer.WMTS(OpenLayers.Util.applyDefaults({
-        url: "http://www.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png",
+        url: [
+            "http://maps.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png",
+            "http://maps1.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png",
+            "http://maps2.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png",
+            "http://maps3.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png",
+            "http://maps4.wien.gv.at/wmts/beschriftung/{Style}/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png"
+        ],
         layer: "beschriftung",
         style: "normal",
-        transitionEffect: null,
+        isBaseLayer: false,
-        isBaseLayer: false
+        transitionEffect: 'map-resize'
     },
     defaults));
     map.addLayers([fmzk, aerial, labels]);

examples/mobile.html

@@ -5,7 +5,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
         <meta name="apple-mobile-web-app-capable" content="yes">
-        <link rel="stylesheet" href="style.mobile.css" type="text/css">
+        <link rel="stylesheet" href="../theme/default/style.mobile.css" type="text/css">
         <script src="../lib/OpenLayers.js?mobile"></script>
         <script src="mobile.js"></script>
         <style>

examples/mouse-position.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" debug="true">
+<html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -7,41 +7,61 @@
     <title>MousePosition Control</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="../lib/OpenLayers.js" type="text/javascript"></script>
     <script type="text/javascript">
         var map;
         function init(){
             var map = new OpenLayers.Map('map');
 
-            map.addControl(new OpenLayers.Control.MousePosition());
+            map.addControl(
+                new OpenLayers.Control.MousePosition({
+                    prefix: '<a target="_blank" ' +
+                        'href="http://spatialreference.org/ref/epsg/4326/">' +
+                        'EPSG:4326</a> coordinates: ',
+                    separator: ' | ',
+                    numDigits: 2,
+                    emptyString: 'Mouse is not over map.'
+                })
+            );
 
-            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
+            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
                 "http://vmap0.tiles.osgeo.org/wms/vmap0",
                 {layers: 'basic'} );
 
             map.addLayers([ol_wms]);
-            if (!map.getCenter()) map.zoomToMaxExtent();
+            if (!map.getCenter()) {
+                map.zoomToMaxExtent();
+            }
             
-            map.events.register("mousemove", map, function(e) { 
+            map.events.register("mousemove", map, function(e) {
                 var position = this.events.getMousePosition(e);
                 OpenLayers.Util.getElement("coords").innerHTML = position;
             });
         }
     </script>
   </head>
-  <body onload="init()">
+  <body onload="init();">
     <h1 id="title">MousePosition Control</h1>
     <div id="tags">
-        coordinate
+      coordinate
     </div>
     <p id="shortdesc">
       Use the MousePosition Control to display the coordinates of the cursor
       inside or outside the map div.
     </p>  
     <div id="map" class="smallmap"></div>
-    <div id="coords"></div>
+    <div id="coords" style="height: 1.5em;"></div>
-    <p>Moving your mouse to the upper left corner of this map should return
+    <p>
-    'x=0,y=0' -- in the past, it didn't in IE. If it returns 2,2, consider it a
+      This example also shows how to use the the "prefix", "separator" and
-    bug, and report it.</p> 
+      "numDigits" options to customize the output of the MousePosition-Control.
+      By also setting the "emptyString"-property, the contents of the controls
+      element are resetted to the given string when the mouse isn't above the
+      map.
+    </p>
+    <p>
+      Moving your mouse to the upper left corner of this map should return
+      'x=0,y=0' (pixel coordinates) -- in the past, it didn't in IE. If it
+      returns 'x=2,y=2', consider it a bug, and report it.
+    </p>
   </body>
 </html>

examples/ordering.html

@@ -73,7 +73,7 @@
             // from bottom to top so as to quickly signal whether or not y-ordering is working.
             while (bottom.y > top.y) {
                 bottom.y -= POINT_DISTANCE;
-                var lonLat = map.getLonLatFromViewPortPx(bottom);
+                var lonLat = map.getLonLatFromPixel(bottom);
                 orderingFeatures.push(
                     new OpenLayers.Feature.Vector(
                         new OpenLayers.Geometry.Point(lonLat.lon, lonLat.lat)
@@ -89,7 +89,7 @@
             var indexFeatures = [];
             var useFirst = true;
             while (left.x <= right.x) {
-                var lonLat = map.getLonLatFromViewPortPx(left);
+                var lonLat = map.getLonLatFromPixel(left);
                 var point = new OpenLayers.Feature.Vector(
                     new OpenLayers.Geometry.Point(lonLat.lon, lonLat.lat)
                 );
@@ -147,8 +147,8 @@
             // and succomb to y-ordering.
             var orderingFeatures = [];
             while (bottom.y > top.y && left.x < right.x) {
-                var bottomLonLat = map.getLonLatFromViewPortPx(bottom);
+                var bottomLonLat = map.getLonLatFromPixel(bottom);
-                var leftLonLat = map.getLonLatFromViewPortPx(left);
+                var leftLonLat = map.getLonLatFromPixel(left);
                 orderingFeatures.push(
                     new OpenLayers.Feature.Vector(
                         new OpenLayers.Geometry.Point(leftLonLat.lon, bottomLonLat.lat),

examples/osm-google.html

@@ -6,9 +6,8 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
         <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?v=3.6&amp;sensor=false"></script>
+        <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
         <script src="../lib/OpenLayers.js"></script>
         <script src="osm-google.js"></script>
     </head>

examples/osm-marker-popup.html

@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+    <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+        <title>OpenLayers OSM and Google 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="osm-marker-popup.js"></script>
+    </head>
+    <body onload="init()">
+        <h1 id="title">OSM with Marker and Popup</h1>
+        <p id="shortdesc">
+            Demonstrate use of an OSM layer with a marker and a popup.
+        </p>
+        <div id="tags">
+            openstreetmap osm marker popup
+        </div>
+        <div id="map" class="smallmap"></div>
+        <div id="docs">
+            <p>
+                A common use case for OpenLayers is to display a marker at a
+                location on the map, and add some information in a popup. It
+                is also easy to add a tooltip with a short description.
+                See the <a href="osm-marker-popup.js" target="_blank">
+                osm-marker-popup.js source</a> to see how this is done.
+            </p>
+        </div>
+    </body>
+</html>

examples/osm-marker-popup.js

@@ -0,0 +1,39 @@
+var map;
+function init() {
+    
+    // The overlay layer for our marker, with a simple diamond as symbol
+    var overlay = new OpenLayers.Layer.Vector('Overlay', {
+        styleMap: new OpenLayers.StyleMap({
+            externalGraphic: '../img/marker.png',
+            graphicWidth: 20, graphicHeight: 24, graphicYOffset: -24,
+            title: '${tooltip}'
+        })
+    });
+
+    // The location of our marker and popup. We usually think in geographic
+    // coordinates ('EPSG:4326'), but the map is projected ('EPSG:3857').
+    var myLocation = new OpenLayers.Geometry.Point(10.2, 48.9)
+        .transform('EPSG:4326', 'EPSG:3857');
+
+    // We add the marker with a tooltip text to the overlay
+    overlay.addFeatures([
+        new OpenLayers.Feature.Vector(myLocation, {tooltip: 'OpenLayers'})
+    ]);
+
+    // A popup with some information about our location
+    var popup = new OpenLayers.Popup.FramedCloud("Popup", 
+        myLocation.getBounds().getCenterLonLat(), null,
+        '<a target="_blank" href="http://openlayers.org/">We</a> ' +
+        'could be here.<br>Or elsewhere.', null,
+        true // <-- true if we want a close (X) button, false otherwise
+    );
+
+    // Finally we create the map
+    map = new OpenLayers.Map({
+        div: "map", projection: "EPSG:3857",
+        layers: [new OpenLayers.Layer.OSM(), overlay],
+        center: myLocation.getBounds().getCenterLonLat(), zoom: 15
+    });
+    // and add the popup to it.
+    map.addPopup(popup);
+}

examples/overviewmap.html

@@ -80,7 +80,9 @@
         
         // create an overview map control with the default options
         var overview1 = new OpenLayers.Control.OverviewMap({
-            maximized: true
+            maximized: true,
+            maximizeTitle: 'Show the overview map',
+            minimizeTitle: 'Hide the overview map'
         });
         map1.addControl(overview1);
         

examples/polar-projections.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <title>Switch between polar projections</title>
+        <link rel="stylesheet" href="../theme/default/style.css" type="text/css">
+        <link rel="stylesheet" href="style.css" type="text/css">
+        <script type="text/javascript" src="http://svn.osgeo.org/metacrs/proj4js/trunk/lib/proj4js-compressed.js"></script>
+        <script type="text/javascript" src="http://spatialreference.org/ref/epsg/3574/proj4js/"></script>
+        <script type="text/javascript" src="http://spatialreference.org/ref/epsg/3576/proj4js/"></script>
+        <script type="text/javascript" src="http://spatialreference.org/ref/epsg/3571/proj4js/"></script>
+        <script type="text/javascript" src="http://spatialreference.org/ref/epsg/3573/proj4js/"></script>
+        <script type="text/javascript" src="../lib/OpenLayers.js"></script>
+        <script type="text/javascript" src="polar-projections.js"></script>
+    </head>
+    <body onload="init()">
+      <h1 id="title">Polar Projections WMS Example</h1>
+
+      <div id="tags">
+          switch projections polar
+      </div>
+
+      <div id="shortdesc">Switch between different projections</div>
+
+      <div id="map" class="smallmap" style="height:512px"></div>
+      <button id='epsg3574'>EPSG:3574</button>
+      <button id='epsg3576'>EPSG:3576</button>
+      <button id='epsg3571'>EPSG:3571</button>
+      <button id='epsg3573'>EPSG:3573</button>
+
+      <div id="docs">
+          <p>This example shows how to switch between different projections,
+              maintaining the center and resolution.</p>
+          <p>Click the buttons above to try it, and see
+              <a href='polar-projections.js'>polar-projections.js</a> for the
+              source code.</p>
+      </div>
+    </body>
+</html>

examples/polar-projections.js

@@ -0,0 +1,84 @@
+var map, layer, overlay;
+
+var projectionOptions = {
+    'EPSG:3574': {
+        projection: new OpenLayers.Projection('EPSG:3574'),
+        units: 'm',
+        maxExtent: new OpenLayers.Bounds(-5505054, -5505054, 5505054, 5505054),
+        maxResolution: 5505054 / 128,
+        numZoomLevels: 18
+    },
+    'EPSG:3576': {
+        projection: new OpenLayers.Projection('EPSG:3576'),
+        units: 'm',
+        maxExtent: new OpenLayers.Bounds(-5505054, -5505054, 5505054, 5505054),
+        maxResolution: 5505054 / 128,
+        numZoomLevels: 18
+    },
+    'EPSG:3571': {
+        projection: new OpenLayers.Projection('EPSG:3571'),
+        units: 'm',
+        maxExtent: new OpenLayers.Bounds(-5505054, -5505054, 5505054, 5505054),
+        maxResolution: 5505054 / 128,
+        numZoomLevels: 18
+    },
+    'EPSG:3573': {
+        projection: new OpenLayers.Projection('EPSG:3573'),
+        units: 'm',
+        maxExtent: new OpenLayers.Bounds(-5505054, -5505054, 5505054, 5505054),
+        maxResolution: 5505054 / 128,
+        numZoomLevels: 18
+    }
+};
+
+function setProjection() {
+    projCode = this.innerHTML;
+    var oldExtent = map.getExtent();
+    var oldCenter = map.getCenter();
+    var oldProjection = map.getProjectionObject();
+    
+    // map projection is controlled by the base layer
+    map.baseLayer.addOptions(projectionOptions[projCode]);
+    
+    // with the base layer updated, the map has the new projection now
+    var newProjection = map.getProjectionObject();
+    
+    // transform the center of the old projection, not the extent
+    map.setCenter(
+        oldCenter.transform(oldProjection, newProjection,
+        map.getZoomForExtent(oldExtent.transform(oldProjection, newProjection))
+    ));
+    
+    for (var i=map.layers.length-1; i>=0; --i) {
+        // update grid settings
+        map.layers[i].addOptions(projectionOptions[projCode]);
+        // redraw layer - just in case center and zoom are the same in old and
+        // new projection
+        map.layers[i].redraw();
+    }
+}
+
+function init() {
+    map = new OpenLayers.Map('map');
+    layer = new OpenLayers.Layer.WMS(
+        'world',
+        'http://v2.suite.opengeo.org/geoserver/wms',
+        {layers: 'world', version: '1.1.1'},
+        projectionOptions['EPSG:3574']
+    );
+    overlay = new OpenLayers.Layer.WMS(
+        'world',
+        'http://v2.suite.opengeo.org/geoserver/wms',
+        {transparent: 'true', layers: 'world:borders', styles: 'line'},
+        projectionOptions['EPSG:3574']
+    );
+    overlay.isBaseLayer = false;
+    map.addLayers([layer, overlay]);
+    map.zoomToMaxExtent();
+    
+    // add behaviour to dom elements
+    document.getElementById('epsg3574').onclick = setProjection;
+    document.getElementById('epsg3576').onclick = setProjection;
+    document.getElementById('epsg3571').onclick = setProjection;
+    document.getElementById('epsg3573').onclick = setProjection;
+}

examples/proxy.cgi

@@ -20,7 +20,7 @@ allowedHosts = ['www.openlayers.org', 'openlayers.org',
                 'prototype.openmnnd.org', 'geo.openplans.org',
                 'sigma.openplans.org', 'demo.opengeo.org',
                 'www.openstreetmap.org', 'sample.azavea.com',
-                'v2.suite.opengeo.org', 'v-swe.uni-muenster.de:8080', 
+                'v2.suite.opengeo.org', 'v-swe.uni-muenster.de:8080',
                 'vmap0.tiles.osgeo.org', 'www.openrouteservice.org',
                 'maps.wien.gv.at']
 

examples/select-feature.html

@@ -15,6 +15,7 @@
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
         var map, drawControls;
+        
         OpenLayers.Feature.Vector.style['default']['strokeWidth'] = '2';
         function init(){
             map = new OpenLayers.Map('map');
@@ -33,10 +34,10 @@
             });
             vectors.events.on({
                 'featureselected': function(feature) {
-                    $('counter').innerHTML = this.selectedFeatures.length;
+                    document.getElementById('counter').innerHTML = this.selectedFeatures.length;
                 },
                 'featureunselected': function(feature) {
-                    $('counter').innerHTML = this.selectedFeatures.length;
+                    document.getElementById('counter').innerHTML = this.selectedFeatures.length;
                 }
             });
 

examples/snap-split.html

@@ -35,13 +35,12 @@
     <script type="text/javascript">
 
         OpenLayers.Feature.Vector.style['default']['strokeWidth'] = '2';
-
+        
         function init() {
             initMap();
             initUI();
         }
 
-
         var map, draw, modify, snap, split, vectors;
         function initMap() {
 
@@ -185,15 +184,15 @@
          */
         function initUI() {
             // add behavior to snap elements
-            var snapCheck = $("snap_toggle");
+            var snapCheck = document.getElementById("snap_toggle");
             snapCheck.checked = true;
             snapCheck.onclick = function() {
                 if(snapCheck.checked) {
                     snap.activate();
-                    $("snap_options").style.display = "block";
+                    document.getElementById("snap_options").style.display = "block";
                 } else {
                     snap.deactivate();
-                    $("snap_options").style.display = "none";
+                    document.getElementById("snap_options").style.display = "none";
                 }
             };
             var target, type, tog, tol;
@@ -201,12 +200,12 @@
             var target = snap.targets[0];
             for(var j=0; j<types.length; ++j) {
                 type = types[j];
-                tog = $("target_" + type);
+                tog = document.getElementById("target_" + type);
                 tog.checked = target[type];
                 tog.onclick = (function(tog, type, target) {
                     return function() {target[type] = tog.checked;}
                 })(tog, type, target);
-                tol = $("target_" + type + "Tolerance");
+                tol = document.getElementById("target_" + type + "Tolerance");
                 tol.value = target[type + "Tolerance"];
                 tol.onchange = (function(tol, type, target) {
                     return function() {
@@ -216,24 +215,24 @@
             }
 
             // add behavior to split elements
-            var splitCheck = $("split_toggle");
+            var splitCheck = document.getElementById("split_toggle");
             splitCheck.checked = true;
             splitCheck.onclick = function() {
                 if(splitCheck.checked) {
                     split.activate();
-                    $("split_options").style.display = "block";
+                    document.getElementById("split_options").style.display = "block";
                 } else {
                     split.deactivate();
-                    $("split_options").style.display = "none";
+                    document.getElementById("split_options").style.display = "none";
                 }
             };
-            var edgeCheck = $("edge_toggle");
+            var edgeCheck = document.getElementById("edge_toggle");
             edgeCheck.checked = split.edge;
             edgeCheck.onclick = function() {
                 split.edge = edgeCheck.checked;
             };
             
-            $("clear").onclick = function() {
+            document.getElementById("clear").onclick = function() {
                 modify.deactivate();
                 vectors.destroyFeatures();
             };

examples/snapping.html

@@ -33,7 +33,7 @@
     <script src="../lib/OpenLayers.js"></script>
     <script type="text/javascript">
         OpenLayers.Feature.Vector.style['default']['strokeWidth'] = '2';
-
+        
         function init() {
             initMap();
             initUI();
@@ -194,7 +194,7 @@
          * property values.
          */
         function initUI() {
-            var check = $("snapping");
+            var check = document.getElementById("snapping");
             check.checked = true;
             check.onclick = function() {
                 if(check.checked) {
@@ -204,7 +204,7 @@
                 }
             };
             
-            var sel = $("editable");
+            var sel = document.getElementById("editable");
             sel.value = "poly";
             sel.onchange = function() {
                 updateEditable(sel.value);
@@ -216,12 +216,12 @@
                 target = snap.targets[i];
                 for(var j=0; j<types.length; ++j) {
                     type = types[j];
-                    tog = $(i + "_" + type);
+                    tog = document.getElementById(i + "_" + type);
                     tog.checked = target[type];
                     tog.onclick = (function(tog, type, target) {
                         return function() {target[type] = tog.checked;}
                     })(tog, type, target);
-                    tol = $(i + "_" + type + "Tolerance");
+                    tol = document.getElementById(i + "_" + type + "Tolerance");
                     tol.value = target[type + "Tolerance"];
                     tol.onchange = (function(tol, type, target) {
                         return function() {

examples/spherical-mercator.html

@@ -17,12 +17,16 @@
             right: inherit;
             width: 400px;
         }
+        /* conditionally position control differently for Google Maps */
+        .olForeignContainer div.olControlMousePosition {
+            bottom: 28px;
+        }
         #map {
             height: 512px;
         }
     </style>
 
-    <script src="http://maps.google.com/maps/api/js?v=3.6&amp;sensor=false"></script>
+    <script src="http://maps.google.com/maps/api/js?v=3&amp;sensor=false"></script>
 
     <script src="../lib/OpenLayers.js"></script>
   </head>
@@ -38,7 +42,12 @@
     </p>
     <div id="map" class="smallmap"></div>
 
-    <div id="docs"></div>
+    <div id="docs">
+        <p>Note that maps with Google layers are a special case, because we
+            cannot control the position of the attribution. To conditionally
+            position controls differently for Google layers, prepend the
+            css selector with <code>.olForeignContainer</code>.</p>
+    </div>
     <script type="text/javascript">
 
     var map = new OpenLayers.Map({

examples/strategy-bbox.html

@@ -10,20 +10,46 @@
         <script src="../lib/OpenLayers.js"></script>
         <script type="text/javascript">
             var map, photos;
-            OpenLayers.ProxyHost = (window.location.host == "localhost") ?
+
-                "/cgi-bin/proxy.cgi?url=" : "proxy.cgi?url=";
+            /**
-        
+             * A specific format for parsing Flickr API JSON responses.
+             */
+            OpenLayers.Format.Flickr = OpenLayers.Class(OpenLayers.Format, {
+                read: function(obj) {
+                    if(obj.stat === 'fail') {
+                        throw new Error(
+                            ['Flickr failure response (',
+                             obj.code,
+                             '): ',
+                             obj.message].join(''));
+                    }
+                    if(!obj || !obj.photos ||
+                       !OpenLayers.Util.isArray(obj.photos.photo)) {
+                        throw new Error(
+                            'Unexpected Flickr response');
+                    }
+                    var photos = obj.photos.photo, photo,
+                        x, y, point,
+                        feature, features = [];
+                    for(var i=0,l=photos.length; i<l; i++) {
+                        photo = photos[i];
+                        x = photo.longitude;
+                        y = photo.latitude;
+                        point = new OpenLayers.Geometry.Point(x, y);
+                        feature = new OpenLayers.Feature.Vector(point, {
+                            title: photo.title,
+                            img_url: photo.url_s
+                        });
+                        features.push(feature);
+                    }
+                    return features;
+                }
+            });
+
             function init() {
-                map = new OpenLayers.Map('map', {
+                map = new OpenLayers.Map('map');
-                    restrictedExtent: new OpenLayers.Bounds(-180, -90, 180, 90)
+
-                });
+                var base = new OpenLayers.Layer.OSM();
-                var base = new OpenLayers.Layer.WMS("Imagery", 
-                    ["http://t1.hypercube.telascience.org/tiles?",
-		     "http://t2.hypercube.telascience.org/tiles?",
-		     "http://t3.hypercube.telascience.org/tiles?",
-		     "http://t4.hypercube.telascience.org/tiles?"], 
-                    {layers: 'landsat7'}
-                );
 
                 var style = new OpenLayers.Style({
                     externalGraphic: "${img_url}",
@@ -31,24 +57,28 @@
                 });
 
                 photos = new OpenLayers.Layer.Vector("Photos", {
-                    strategies: [new OpenLayers.Strategy.BBOX()],
+                    projection: "EPSG:4326",
-                    protocol: new OpenLayers.Protocol.HTTP({
+                    strategies: [new OpenLayers.Strategy.BBOX({resFactor: 1})],
-                        url: "http://labs.metacarta.com/flickrbrowse/flickr.py/flickr",
+                    protocol: new OpenLayers.Protocol.Script({
+                        url: "http://api.flickr.com/services/rest",
                         params: {
-                            format: "WFS",
+                            api_key: 'b5e8c0e287e678671c3d8b2c0f3ced85',
-                            sort: "interestingness-desc",
+                            format: 'json',
-                            service: "WFS",
+                            method: 'flickr.photos.search',
-                            request: "GetFeatures",
+                            extras: 'geo,url_s',
-                            srs: "EPSG:4326",
+                            per_page: 10,
-                            maxfeatures: 10
+                            page: 1
                         },
-                        format: new OpenLayers.Format.GML()
+                        callbackKey: 'jsoncallback',
+                        format: new OpenLayers.Format.Flickr()
                     }),
                     styleMap: new OpenLayers.StyleMap(style)
                 });
 
                 map.addLayers([base, photos]);
-                map.setCenter(new OpenLayers.LonLat(-116.45, 35.42), 5);
+                map.setCenter(
+                        new OpenLayers.LonLat(-567468.5392481,
+                                              4950672.5471436), 5);
             }
             
         </script>
@@ -56,7 +86,7 @@
     <body onload="init()">
         <h1 id="title">BBOX Strategy Example</h1>
         <div id="tags">
-            vector, feature, stylemap, wfs, bbox, strategy, cleanup
+            vector, feature, stylemap, bbox, strategy, script, flickr
         </div>    
         <p id="shortdesc">
             Uses a BBOX strategy to request features within a bounding box.
@@ -67,6 +97,10 @@
             previously requested data bounds are invalidated (by browsing to
             some area not covered by those bounds), another request for data
             is issued.</p>
+
+            <p>This particular example uses the <a
+                href="http://www.flickr.com/services/api/">Flickr API.</a></p>
+
         </div>
     </body>
 </html>

examples/strategy-cluster-extended.js

@@ -73,67 +73,67 @@ var map, vectorlayer, features, stylemap, select;
 
     // The function that gets called on feature selection: shows information 
     // about the feature/cluser in a div on the page 
-	var showInformation = function(evt){
+    var showInformation = function(evt){
         var feature = evt.feature;
-		var info = 'Last hovered feature:<br>';
+        var info = 'Last hovered feature:<br>';
-		if (feature.cluster) {
+        if (feature.cluster) {
-			info += '&nbsp;&nbsp;Cluster of ' + feature.attributes.count + ' features:';
+            info += '&nbsp;&nbsp;Cluster of ' + feature.attributes.count + ' features:';
-			var clazzes = {
+            var clazzes = {
-				'1': 0,
+                '1': 0,
-				'2': 0,
+                '2': 0,
-				'3': 0,
+                '3': 0,
-				'4': 0
+                '4': 0
-			};
+            };
-			for (var i = 0; i < feature.attributes.count; i++) {
+            for (var i = 0; i < feature.attributes.count; i++) {
-				var feat = feature.cluster[i];
+                var feat = feature.cluster[i];
-				clazzes[feat.attributes.clazz]++;
+                clazzes[feat.attributes.clazz]++;
-			}
+            }
-			for (var j=1; j<=4; j++) {
+            for (var j=1; j<=4; j++) {
-				var plural_s = (clazzes[j] !== 1) ? 's' : '';
+                var plural_s = (clazzes[j] !== 1) ? 's' : '';
-				info += '<br>&nbsp;&nbsp;&nbsp;&nbsp;&bull;&nbsp;clazz ' + j + ': ' + clazzes[j] + ' feature' + plural_s;
+                info += '<br>&nbsp;&nbsp;&nbsp;&nbsp;&bull;&nbsp;clazz ' + j + ': ' + clazzes[j] + ' feature' + plural_s;
-			}
+            }
-		} else {
+        } else {
-			info += '&nbsp;&nbsp;Single feature of clazz = ' + feature.attributes.clazz;
+            info += '&nbsp;&nbsp;Single feature of clazz = ' + feature.attributes.clazz;
-		}
+        }
-		$('info').innerHTML = info;
+        document.getElementById('info').innerHTML = info;
     };
 
-	// The function that gets called on feature selection. Shows information 
+    // The function that gets called on feature selection. Shows information 
     // about the number of "points" on the map.
-	var updateGeneralInformation = function() {
+    var updateGeneralInformation = function() {
-		var info = 'Currently ' + vectorlayer.features.length + ' points are shown on the map.';
+        var info = 'Currently ' + vectorlayer.features.length + ' points are shown on the map.';
-		$('generalinfo').innerHTML = info;
+        document.getElementById('generalinfo').innerHTML = info;
-	};
+    };
-	
-	// instanciate the map
-	map = new OpenLayers.Map("map");
     
-	// background WMS
+    // instanciate the map
+    map = new OpenLayers.Map("map");
+    
+    // background WMS
     var ol_wms = new OpenLayers.Layer.WMS("OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0", {
         layers: "basic"
     });
     
-	// context to style the vectorlayer
+    // context to style the vectorlayer
     var context = {
         getColor: function(feature){
             var color = '#aaaaaa';
-			if (feature.attributes.clazz && feature.attributes.clazz === 4) {
+            if (feature.attributes.clazz && feature.attributes.clazz === 4) {
-				color = '#ee0000';
+                color = '#ee0000';
-			} else if(feature.cluster) {
+            } else if(feature.cluster) {
-				var onlyFour = true;
+                var onlyFour = true;
-				for (var i = 0; i < feature.cluster.length; i++) {
+                for (var i = 0; i < feature.cluster.length; i++) {
-					if (onlyFour && feature.cluster[i].attributes.clazz !== 4) {
+                    if (onlyFour && feature.cluster[i].attributes.clazz !== 4) {
-						onlyFour = false;
+                        onlyFour = false;
-					}
+                    }
-				}
+                }
-				if (onlyFour === true) {
+                if (onlyFour === true) {
-					color = '#ee0000';
+                    color = '#ee0000';
-				}
+                }
-			}
+            }
-			return color;
+            return color;
         }
     };
-	
+    
     // style the vectorlayer
     stylemap = new OpenLayers.StyleMap({
         'default': new OpenLayers.Style({
@@ -143,32 +143,32 @@ var map, vectorlayer, features, stylemap, select;
             strokeColor: "#666666",
             strokeWidth: 1,
             strokeOpacity: 1,
-			graphicZIndex: 1
+            graphicZIndex: 1
         }, {
             context: context
         }),
-		'select' : new OpenLayers.Style({
+        'select' : new OpenLayers.Style({
             pointRadius: 5,
             fillColor: "#ffff00",
             fillOpacity: 1,
             strokeColor: "#666666",
             strokeWidth: 1,
             strokeOpacity: 1,
-			graphicZIndex: 2
+            graphicZIndex: 2
         })
     });
     
     // the vectorlayer
     vectorlayer = new OpenLayers.Layer.Vector('Vectorlayer', {styleMap: stylemap, strategies: []});
     
-	// the select control
+    // the select control
-	select = new OpenLayers.Control.SelectFeature(
+    select = new OpenLayers.Control.SelectFeature(
         vectorlayer, {hover: true}
     );
     map.addControl(select);
     select.activate();
     vectorlayer.events.on({"featureselected": showInformation});
-	
+    
     map.addLayers([ol_wms, vectorlayer]);
     map.addControl(new OpenLayers.Control.LayerSwitcher());
     map.zoomToMaxExtent();
@@ -197,18 +197,18 @@ var map, vectorlayer, features, stylemap, select;
         switch(this.value) {
             case 'cluster':
                 // standard clustering
-				strategies.push(new OpenLayers.Strategy.Cluster());
+                strategies.push(new OpenLayers.Strategy.Cluster());
                 break;
             case 'attribute-cluster':
                 // use the custom class: only cluster features of the same clazz
-				strategies.push(new OpenLayers.Strategy.AttributeCluster({
+                strategies.push(new OpenLayers.Strategy.AttributeCluster({
                     attribute:'clazz'
                 }));
                 break;
             case 'rule-cluster':
                 // use the custom class: only cluster features that have a 
-				// clazz smaller than 4
+                // clazz smaller than 4
-				strategies.push(new OpenLayers.Strategy.RuleCluster({
+                strategies.push(new OpenLayers.Strategy.RuleCluster({
                     rule: new OpenLayers.Rule({
                         filter: new OpenLayers.Filter.Comparison({
                             type: OpenLayers.Filter.Comparison.LESS_THAN,
@@ -219,24 +219,24 @@ var map, vectorlayer, features, stylemap, select;
                 }));
                 break;
         }
-		// remove layer and control
+        // remove layer and control
         map.removeLayer(vectorlayer);
-		map.removeControl(select);
+        map.removeControl(select);
-		// rebuild layer
+        // rebuild layer
         vectorlayer = new OpenLayers.Layer.Vector('Vectorlayer', {styleMap: stylemap, strategies: strategies});
         map.addLayer( vectorlayer );
         vectorlayer.addFeatures(features);
         // rebuild select control
-		select = new OpenLayers.Control.SelectFeature(
+        select = new OpenLayers.Control.SelectFeature(
-	        vectorlayer, {hover: true}
+            vectorlayer, {hover: true}
-	    );
+        );
-	    map.addControl(select);
+        map.addControl(select);
-	    select.activate();
+        select.activate();
-	    vectorlayer.events.on({"featureselected": showInformation});
+        vectorlayer.events.on({"featureselected": showInformation});
-		// update meta information
+        // update meta information
-		updateGeneralInformation();
+        updateGeneralInformation();
     };
-	// bind the behviour to the radios
+    // bind the behviour to the radios
     var inputs = document.getElementsByTagName('input');
     for( var cnt = 0; cnt < inputs.length; cnt++) {
       var input = inputs[cnt];

examples/strategy-cluster-threshold.html

@@ -18,7 +18,6 @@
         </style>
         <script src="../lib/OpenLayers.js"></script>
         <script type="text/javascript">
-
             // create a semi-random grid of features to be clustered
             var dx = 3;
             var dy = 3;
@@ -38,10 +37,8 @@
             function init() {
                 map = new OpenLayers.Map('map');
                 var base = new OpenLayers.Layer.WMS("OpenLayers WMS", 
-                    ["http://t3.tilecache.osgeo.org/wms-c/Basic.py",
+                     "http://vmap0.tiles.osgeo.org/wms/vmap0",
-                     "http://t2.tilecache.osgeo.org/wms-c/Basic.py",
+                    {layers: 'basic'}
-                     "http://t1.tilecache.osgeo.org/wms-c/Basic.py"], 
-                    {layers: 'satellite'}
                 );
 
                 var style = new OpenLayers.Style({
@@ -90,24 +87,24 @@
                 map.setCenter(new OpenLayers.LonLat(0, 0), 2);
                 
                 reset();
-                $("reset").onclick = reset;
+                document.getElementById("reset").onclick = reset;
 
             }
             
             function reset() {
-                var distance = parseInt($("distance").value);
+                var distance = parseInt(document.getElementById("distance").value);
-                var threshold = parseInt($("threshold").value);
+                var threshold = parseInt(document.getElementById("threshold").value);
                 strategy.distance = distance || strategy.distance;
                 strategy.threshold = threshold || strategy.threshold;
-                $("distance").value = strategy.distance;
+                document.getElementById("distance").value = strategy.distance;
-                $("threshold").value = strategy.threshold || "null";
+                document.getElementById("threshold").value = strategy.threshold || "null";
                 clusters.removeFeatures(clusters.features);
                 clusters.addFeatures(features);
             }
             
             function display(event) {
                 var f = event.feature;
-                var el = $("output");
+                var el = document.getElementById("output");
                 if(f.cluster) {
                     el.innerHTML = "cluster of " + f.attributes.count;
                 } else {

examples/strategy-cluster.html

@@ -69,21 +69,47 @@
         <script src="Jugl.js"></script>
         <script src="animator.js"></script>
         <script type="text/javascript">
+        
             var map, template;
-            OpenLayers.ProxyHost = (window.location.host == "localhost") ?
+
-                "/cgi-bin/proxy.cgi?url=" : "proxy.cgi?url=";
+            /**
+             * A specific format for parsing Flickr API JSON responses.
+             */
+            OpenLayers.Format.Flickr = OpenLayers.Class(OpenLayers.Format, {
+                read: function(obj) {
+                    if(obj.stat === 'fail') {
+                        throw new Error(
+                            ['Flickr failure response (',
+                             obj.code,
+                             '): ',
+                             obj.message].join(''));
+                    }
+                    if(!obj || !obj.photos ||
+                       !OpenLayers.Util.isArray(obj.photos.photo)) {
+                        throw new Error(
+                            'Unexpected Flickr response');
+                    }
+                    var photos = obj.photos.photo, photo,
+                        x, y, point,
+                        feature, features = [];
+                    for(var i=0,l=photos.length; i<l; i++) {
+                        photo = photos[i];
+                        x = photo.longitude;
+                        y = photo.latitude;
+                        point = new OpenLayers.Geometry.Point(x, y);
+                        feature = new OpenLayers.Feature.Vector(point, {
+                            title: photo.title,
+                            img_url: photo.url_s
+                        });
+                        features.push(feature);
+                    }
+                    return features;
+                }
+            });
 
             function init() {
-                map = new OpenLayers.Map('map', {
+                map = new OpenLayers.Map('map');
-                    restrictedExtent: new OpenLayers.Bounds(-180, -90, 180, 90)
+                var base = new OpenLayers.Layer.OSM();
-                });
-                var base = new OpenLayers.Layer.WMS("Imagery", 
-                    ["http://t1.hypercube.telascience.org/tiles?",
-		     "http://t2.hypercube.telascience.org/tiles?",
-		     "http://t3.hypercube.telascience.org/tiles?",
-		     "http://t4.hypercube.telascience.org/tiles?"], 
-                    {layers: 'landsat7'}
-                );
 
                 var style = new OpenLayers.Style({
                     pointRadius: "${radius}",
@@ -101,22 +127,24 @@
                 });
 
                 var photos = new OpenLayers.Layer.Vector("Photos", {
+                    projection: "EPSG:4326",
                     strategies: [
                         new OpenLayers.Strategy.Fixed(),
                         new OpenLayers.Strategy.Cluster()
                     ],
-                    protocol: new OpenLayers.Protocol.HTTP({
+                    protocol: new OpenLayers.Protocol.Script({
-                        url: "http://labs.metacarta.com/flickrbrowse/flickr.py/flickr",
+                        url: "http://api.flickr.com/services/rest",
                         params: {
-                            format: "WFS",
+                            api_key: 'b5e8c0e287e678671c3d8b2c0f3ced85',
-                            sort: "interestingness-desc",
+                            format: 'json',
-                            service: "WFS",
+                            method: 'flickr.photos.search',
-                            request: "GetFeatures",
+                            extras: 'geo,url_s',
-                            srs: "EPSG:4326",
+                            per_page: 150,
-                            maxfeatures: 150,
+                            page: 1,
                             bbox: [-180, -90, 180, 90]
                         },
-                        format: new OpenLayers.Format.GML()
+                        callbackKey: 'jsoncallback',
+                        format: new OpenLayers.Format.Flickr()
                     }),
                     styleMap: new OpenLayers.StyleMap({
                         "default": style,
@@ -144,21 +172,21 @@
             
             function display(event) {
                 // clear previous photo list and create new one
-                $("photos").innerHTML = "";
+                document.getElementById("photos").innerHTML = "";
                 var node = template.process({
                     context: {features: event.feature.cluster},
                     clone: true,
-                    parent: $("photos")
+                    parent: document.getElementById("photos")
                 });
                 // set up forward/rewind
-                var forward = Animator.apply($("list"), ["start", "end"], {duration: 1500});
+                var forward = Animator.apply(document.getElementById("list"), ["start", "end"], {duration: 1500});
-                $("scroll-end").onmouseover = function() {forward.seekTo(1)};
+                document.getElementById("scroll-end").onmouseover = function() {forward.seekTo(1)};
-                $("scroll-end").onmouseout = function() {forward.seekTo(forward.state)};
+                document.getElementById("scroll-end").onmouseout = function() {forward.seekTo(forward.state)};
-                $("scroll-start").onmouseover = function() {forward.seekTo(0)};
+                document.getElementById("scroll-start").onmouseover = function() {forward.seekTo(0)};
-                $("scroll-start").onmouseout = function() {forward.seekTo(forward.state)};
+                document.getElementById("scroll-start").onmouseout = function() {forward.seekTo(forward.state)};
                 // set up photo zoom
                 for(var i=0; i<event.feature.cluster.length; ++i) {
-                    listen($("link-" + i), Animator.apply($("photo-" + i), ["thumb", "big"]));
+                    listen(document.getElementById("link-" + i), Animator.apply(document.getElementById("photo-" + i), ["thumb", "big"]));
                 }
             }
             
@@ -172,7 +200,7 @@
     <body onload="init()">
         <h1 id="title">Cluster Strategy Example</h1>
         <div id="tags">
-            vector, feature, stylemap, wfs, cluster, strategy, cleanup
+            vector, feature, stylemap, cluster, strategy, flickr, script
         </div>         
         <p id="shortdesc">
             Uses a cluster strategy to render points representing clusters of features.
@@ -181,6 +209,8 @@
         <div id="docs">
             <p>The Cluster strategy lets you display points representing clusters
             of features within some pixel distance.</p>
+            <p>This particular example uses the <a
+                href="http://www.flickr.com/services/api/">Flickr API.</a></p>
         </div>
         <div id="photos"></div>
         <p>Hover over a cluster on the map to see the photos it includes.</p>

examples/strategy-paging.html

@@ -10,20 +10,45 @@
         <script src="../lib/OpenLayers.js"></script>
         <script type="text/javascript">
             var map, photos, paging;
-            OpenLayers.ProxyHost = (window.location.host == "localhost") ?
+
-                "/cgi-bin/proxy.cgi?url=" : "proxy.cgi?url=";
+            /**
+             * A specific format for parsing Flickr API JSON responses.
+             */
+            OpenLayers.Format.Flickr = OpenLayers.Class(OpenLayers.Format, {
+                read: function(obj) {
+                    if(obj.stat === 'fail') {
+                        throw new Error(
+                            ['Flickr failure response (',
+                             obj.code,
+                             '): ',
+                             obj.message].join(''));
+                    }
+                    if(!obj || !obj.photos ||
+                       !OpenLayers.Util.isArray(obj.photos.photo)) {
+                        throw new Error(
+                            'Unexpected Flickr response');
+                    }
+                    var photos = obj.photos.photo, photo,
+                        x, y, point,
+                        feature, features = [];
+                    for(var i=0,l=photos.length; i<l; i++) {
+                        photo = photos[i];
+                        x = photo.longitude;
+                        y = photo.latitude;
+                        point = new OpenLayers.Geometry.Point(x, y);
+                        feature = new OpenLayers.Feature.Vector(point, {
+                            title: photo.title,
+                            img_url: photo.url_s
+                        });
+                        features.push(feature);
+                    }
+                    return features;
+                }
+            });
         
             function init() {
-                map = new OpenLayers.Map('map', {
+                map = new OpenLayers.Map('map');
-                    restrictedExtent: new OpenLayers.Bounds(-180, -90, 180, 90)
+                var base = new OpenLayers.Layer.OSM();
-                });
-                var base = new OpenLayers.Layer.WMS("Imagery", 
-                    ["http://t1.hypercube.telascience.org/tiles?",
-		     "http://t2.hypercube.telascience.org/tiles?",
-		     "http://t3.hypercube.telascience.org/tiles?",
-		     "http://t4.hypercube.telascience.org/tiles?"], 
-                    {layers: 'landsat7'}
-                );
 
                 var style = new OpenLayers.Style({
                     externalGraphic: "${img_url}",
@@ -33,19 +58,21 @@
                 paging = new OpenLayers.Strategy.Paging();
 
                 photos = new OpenLayers.Layer.Vector("Photos", {
+                    projection: "EPSG:4326",
                     strategies: [new OpenLayers.Strategy.Fixed(), paging],
-                    protocol: new OpenLayers.Protocol.HTTP({
+                    protocol: new OpenLayers.Protocol.Script({
-                        url: "http://labs.metacarta.com/flickrbrowse/flickr.py/flickr",
+                        url: "http://api.flickr.com/services/rest",
                         params: {
-                            format: "WFS",
+                            api_key: 'b5e8c0e287e678671c3d8b2c0f3ced85',
-                            sort: "interestingness-desc",
+                            format: 'json',
-                            service: "WFS",
+                            method: 'flickr.photos.search',
-                            request: "GetFeatures",
+                            extras: 'geo,url_s',
-                            srs: "EPSG:4326",
+                            per_page: 100,
-                            maxfeatures: 100,
+                            page: 1,
                             bbox: [-180, -90, 180, 90]
                         },
-                        format: new OpenLayers.Format.GML()
+                        callbackKey: 'jsoncallback',
+                        format: new OpenLayers.Format.Flickr()
                     }),
                     styleMap: new OpenLayers.StyleMap(style)
                 });
@@ -66,7 +93,7 @@
     <body onload="init()">
         <h1 id="title">Paging Strategy Example</h1>
         <div id="tags">
-            vector, feature, stylemap, wfs, paging, strategy, cleanup
+            vector, feature, stylemap, paging, strategy, flickr, script
         </div>        
         <p id="shortdesc">
             Uses a paging strategy to cache large batches of features and render a page at a time.
@@ -81,6 +108,8 @@
             that do not support paging on the server.  In this case, the protocol requests a
             batch of 100 features, the strategy caches those and supplies a single
             page at a time to the layer.</p>
+            <p>This particular example uses the <a
+                href="http://www.flickr.com/services/api/">Flickr API.</a></p>
         </div>
     </body>
 </html>

examples/style.mobile.css

@@ -1,42 +0,0 @@
-div.olControlZoom {
-    position: absolute;
-    top: 8px;
-    left: 8px;
-}
-* {
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-div.olControlZoom a {
-    display: block;
-    margin: 1px;
-    padding: 0;
-    color: white;
-    font-size: 28px;
-    font-family: sans-serif;
-    font-weight: bold;
-    text-decoration: none;
-    text-align: center;
-    height: 32px;
-    width: 32px;
-    line-height: 28px;
-    text-shadow: 0 0 3px rgba(0,0,0,0.8);
-    background: #666666; /* fallback for IE - IE6 requires background shorthand*/
-    background: rgba(0, 0, 0, 0.3);
-    filter: alpha(opacity=60);
-}
-a.olControlZoomIn {
-    border-radius: 4px 4px 0 0;
-}
-a.olControlZoomOut {
-    border-radius: 0 0 4px 4px;
-}
-div.olControlZoom a:hover {
-    background: #444444; /* fallback for IE */
-    background: rgba(0, 0, 0, 0.5);
-    filter: alpha(opacity=80);
-}
-@media only screen and (max-width: 600px) {
-    div.olControlZoom a:hover {
-        background: rgba(0, 0, 0, 0.3);
-    }
-}

examples/stylemap.html

@@ -78,7 +78,7 @@
 
     <p id="shortdesc">
         Shows how to use a StyleMap to style features with rule based styling.
-        A style map references on or more OpenLayers.Style objects.  These
+        A style map references one or more OpenLayers.Style objects.  These
         OpenLayers.Style objects are collections of OpenLayers.Rule objects
         that determine how features are styled.  An OpenLayers.Rule object
         combines an OpenLayers.Filter object with a symbolizer.  A filter is used

examples/tilecache.html

@@ -11,7 +11,7 @@
     <script type="text/javascript">
         var map, layer;
         function init(){
-            map = new OpenLayers.Map( $('map'), {
+            map = new OpenLayers.Map( 'map', {
                 resolutions: [0.087890625, 0.0439453125, 0.02197265625, 0.010986328125]
             });
             layer = new OpenLayers.Layer.TileCache("TileCache Layer",

examples/using-proj4js.html

@@ -64,7 +64,7 @@
             you would not inlude Proj4JS the way it is done in this example.
             In a production environment you would furthermore have a local copy 
             of the Proj4JS-projection definition that is hotlinked in this 
-            example.
+            example (see Graticule example for how to do this).
         </p>
         <div id="map">
         </div>

examples/using-proj4js.js

@@ -1,4 +1,5 @@
 var map, vector;
+
 function init(){
     map = new OpenLayers.Map('map', {
         projection: 'EPSG:31467',
@@ -7,16 +8,16 @@ function init(){
         numZoomLevels: 1,
         controls: [
             new OpenLayers.Control.Attribution({
-                div: $('attribution')
+                div: document.getElementById('attribution')
             }),
             new OpenLayers.Control.MousePosition({
-                div: $('mouse-position-31467'),
+                div: document.getElementById('mouse-position-31467'),
                 prefix: 'Coordinates: ',
                 suffix: ' (in <a href="http://spatialreference.org/ref/epsg/' 
                     + '31467/">EPSG:31467</a>)'
             }),
             new OpenLayers.Control.MousePosition({
-                div: $('mouse-position-4326'),
+                div: document.getElementById('mouse-position-4326'),
                 displayProjection: new OpenLayers.Projection('EPSG:4326'),
                 prefix: 'Coordinates: ',
                 suffix: ' (in <a href="http://spatialreference.org/ref/epsg/' 
@@ -59,7 +60,7 @@ function addVector(x, y, btn){
     
     status += '<br /><code class="emph">  ' 
         + geometry.toString() + '</code>.';
-    $('status').innerHTML = status;
+    document.getElementById('status').innerHTML = status;
     
     var feature = new OpenLayers.Feature.Vector(geometry, {}, {
         strokeColor: '#333333',
@@ -110,7 +111,7 @@ function addOutline(btn) {
         transformedFeature = new OpenLayers.Feature.Vector(geometry, {}, style);
     
     vector.addFeatures([transformedFeature]);
-    $('status').innerHTML = 'Transformed polygon';
+    document.getElementById('status').innerHTML = 'Transformed polygon';
     btn.disabled = true;
 }
 
@@ -124,8 +125,8 @@ function clearVectors(){
         'btnGermany'
     ];
     for (var i = 0, len = ids.length; i < len; i++) {
-        var elem = $(ids[i]);
+        var elem = document.getElementById(ids[i]);
         elem.disabled = false;
     }
-    $('status').innerHTML = '';
+    document.getElementById('status').innerHTML = '';
 }

examples/vector-features.html

@@ -49,7 +49,8 @@
                 strokeWidth: 3,
                 strokeDashstyle: "dashdot",
                 pointRadius: 6,
-                pointerEvents: "visiblePainted"
+                pointerEvents: "visiblePainted",
+                title: "this is a green line"
             };
 
             /*
@@ -70,8 +71,8 @@
             style_mark.graphicXOffset = 10; // default is -(style_mark.graphicWidth/2);
             style_mark.graphicYOffset = -style_mark.graphicHeight;
             style_mark.externalGraphic = "../img/marker.png";
-            // graphicTitle only works in Firefox and Internet Explorer
+            // title only works in Firefox and Internet Explorer
-            style_mark.graphicTitle = "this is a test tooltip";
+            style_mark.title = "this is a test tooltip";
 
             var vectorLayer = new OpenLayers.Layer.Vector("Simple Geometry", {
                 style: layer_style,

examples/vector-formats.html

@@ -87,8 +87,9 @@
                 gml3: new OpenLayers.Format.GML.v3(gmlOptionsIn),
                 kml: new OpenLayers.Format.KML(kmlOptionsIn),
                 atom: new OpenLayers.Format.Atom(in_options),
-                gpx: new OpenLayers.Format.GPX(in_options)
+                gpx: new OpenLayers.Format.GPX(in_options),
-              }, 
+                encoded_polyline: new OpenLayers.Format.EncodedPolyline(in_options)
+              },
               'out': {
                 wkt: new OpenLayers.Format.WKT(out_options),
                 geojson: new OpenLayers.Format.GeoJSON(out_options),
@@ -97,8 +98,9 @@
                 gml3: new OpenLayers.Format.GML.v3(gmlOptionsOut),
                 kml: new OpenLayers.Format.KML(out_options),
                 atom: new OpenLayers.Format.Atom(out_options),
-                gpx: new OpenLayers.Format.GPX(out_options)
+                gpx: new OpenLayers.Format.GPX(out_options),
-              } 
+                encoded_polyline: new OpenLayers.Format.EncodedPolyline(out_options)
+              }
             };
         }
         function init(){
@@ -202,6 +204,7 @@
                 <option value="gml3">GML (v3)</option>
                 <option value="wkt">Well-Known Text (WKT)</option>
                 <option value="gpx">GPX</option>
+                <option value="encoded_polyline">Encoded Polyline</option>
             </select>
             &nbsp;
             <label for="prettyPrint">Pretty print</label>

examples/wfs-states.html

@@ -22,7 +22,8 @@
         <div id="docs">
             <p>
                 This example shows the basic use of a vector layer with the
-                WFS protocol.
+                WFS protocol, and shows how to switch between a WMS and a vector
+                layer at a certain scale.
             </p>
             <p>
                 See the <a href="wfs-states.js" target="_blank">wfs-states.js

examples/wfs-states.js

@@ -13,7 +13,13 @@ function init() {
                 "http://vmap0.tiles.osgeo.org/wms/vmap0",
                 {layers: "basic"} 
             ),
+            new OpenLayers.Layer.WMS("States WMS",
+                "http://demo.opengeo.org/geoserver/wms",
+                {layers: "topp:states", format: "image/png", transparent: true},
+                {maxScale: 15000000}
+            ),
             new OpenLayers.Layer.Vector("States", {
+                minScale: 15000000,
                 strategies: [new OpenLayers.Strategy.BBOX()],
                 protocol: new OpenLayers.Protocol.WFS({
                     url: "http://demo.opengeo.org/geoserver/wfs",

examples/wmts-capabilities.html

@@ -20,15 +20,15 @@
         <h1 id="title">Web Map Tile Service (WMTS) Capabilities Parsing</h1>
         <div id="tags">
             wmts, capabilities, getcapabilities
-        </div>         
+        </div>
         <p id="shortdesc">
             The WMTS Capabilities format allows for parsing of capabilities
-            documents from OGC Web Map Tile Service (WMTS) version 1.0.0 
+            documents from OGC Web Map Tile Service (WMTS) version 1.0.0
             implementations.
         </p>
-        
+
         <div id="map" class="smallmap"></div>
-        
+
         <div id="docs">
             <p>
                 This example creates an OpenLayers.Layer.WMTS layer to based

examples/wmts-capabilities.js

@@ -1,15 +1,15 @@
-OpenLayers.ProxyHost = "/proxy/?url=";
+OpenLayers.ProxyHost = "proxy.cgi/?url=";
 
 var map, format;
 
 function init() {
-    
+
     format = new OpenLayers.Format.WMTSCapabilities({
         /**
          * This particular service is not in compliance with the WMTS spec and
          * is providing coordinates in y, x order regardless of the CRS.  To
-         * work around this, we can provide the format a table of CRS URN that 
+         * work around this, we can provide the format a table of CRS URN that
-         * should be considered y, x order.  These will extend the defaults on 
+         * should be considered y, x order.  These will extend the defaults on
          * the format.
          */
         yx: {
@@ -38,22 +38,21 @@ function init() {
                 isBaseLayer: false
             });
             map.addLayer(layer);
-        }, 
+        },
         failure: function() {
             alert("Trouble getting capabilities doc");
             OpenLayers.Console.error.apply(OpenLayers.Console, arguments);
         }
     });
-    
+
     map = new OpenLayers.Map({
         div: "map",
         projection: "EPSG:900913"
-    });    
+    });
-    
+
     var osm = new OpenLayers.Layer.OSM();
 
     map.addLayer(osm);
     map.addControl(new OpenLayers.Control.LayerSwitcher());
     map.setCenter(new OpenLayers.LonLat(-13677832, 5213272), 13);
-    
 }

examples/wps-client.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <title>OpenLayers WPS Client 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="wps-client.js"></script>
+  </head>
+  <body onload="init()">
+    <h1 id="title">WPS Client Example</h1>
+
+    <div id="tags">
+        wps
+    </div>
+
+    <div id="shortdesc">Shows the usage of the WPS Client</div>
+
+    <div id="map" class="smallmap"></div>
+
+    <div id="docs">
+        <p>This example shows how simple it is to use the WPS Client. It
+            buffers an intersection of a geometry and a feature, which is
+            accomplished by chaining two processes. See
+        <a href="wps-client.js">wps-client.js</a> to see how this is done.</p>
+    </div>
+  </body>
+</html>

examples/wps-client.js

@@ -0,0 +1,75 @@
+OpenLayers.ProxyHost = 'proxy.cgi?url=';
+
+var map, client, intersect, buffer;
+
+function init() {
+    
+    map = new OpenLayers.Map('map', {
+        allOverlays: true,
+        center: [114, 16],
+        zoom: 4,
+        layers: [new OpenLayers.Layer.Vector()]
+    });
+
+    var features = [new OpenLayers.Feature.Vector(OpenLayers.Geometry.fromWKT(
+        'LINESTRING(117 22,112 18,118 13, 115 8)'
+    ))];
+    var geometry = OpenLayers.Geometry.fromWKT(
+        'POLYGON((110 20,120 20,120 10,110 10,110 20),(112 17,118 18,118 16,112 15,112 17))'
+    );
+
+    map.baseLayer.addFeatures(features);
+    map.baseLayer.addFeatures([new OpenLayers.Feature.Vector(geometry)]);
+    
+    client = new OpenLayers.WPSClient({
+        servers: {
+            opengeo: 'http://demo.opengeo.org/geoserver/wps'
+        }
+    });
+    
+    // Create a process and configure it
+    intersect = client.getProcess('opengeo', 'JTS:intersection');    
+    intersect.configure({
+        // spatial input can be a feature or a geometry or an array of
+        // features or geometries
+        inputs: {
+            a: features,
+            b: geometry
+        }
+    });
+    
+    // Create another process which chains the previous one and execute it
+    buffer = client.getProcess('opengeo', 'JTS:buffer');
+    buffer.execute({
+        inputs: {
+            geom: intersect.output(),
+            distance: 1
+        },
+        success: function(outputs) {
+            // outputs.result is a feature or an array of features for spatial
+            // processes.
+            map.baseLayer.addFeatures(outputs.result);
+        }
+    });
+
+    // Instead of creating a process and executing it, we could call execute on
+    // the client directly if we are only dealing with a single process:
+    /*
+    client.execute({
+        server: "opengeo",
+        process: "JTS:intersection",
+        // spatial input can be a feature or a geometry or an array of
+        // features or geometries
+        inputs: {
+            a: features,
+            b: geometry
+        },
+        success: function(outputs) {
+            // outputs.result is a feature or an array of features for spatial
+            // processes.
+            map.baseLayer.addFeatures(outputs.result);
+        }
+    });
+    */
+
+}

examples/wps.html

@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <title>OpenLayers WPS Builder 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">
+        .olControlEditingToolbar .olControlModifyFeatureItemInactive {
+            background-image: url(../theme/default/img/draw_point_off.png);
+        }
+        .olControlEditingToolbar .olControlModifyFeatureItemActive {
+            background-image: url(../theme/default/img/draw_point_on.png);
+        }
+        textarea {
+            display: block;
+            width: 100%;
+            height: 3em;
+        }
+        label {
+            display: block;
+        }
+        .notsupported {
+            color: red;
+        }
+        button {
+            display: block;
+            margin-top: 10px;
+        }
+        #docs {
+            top: 6em;
+            left: 550px;
+            position: absolute;
+            margin-right: 10px;
+        }
+    </style>
+  </head>
+  <body>
+    <h1 id="title">WPS Builder Example</h1>
+
+    <div id="tags">
+        wps, process, advanced
+    </div>
+
+    <div id="shortdesc">Using WPS formats to interact with WPS</div>
+
+    <div id="docs">
+        <p>This example shows WPS in action by using the WPSCapabilities,
+        WPSDescribeProcess and WPSExecute formats. See
+        <a target="_blank" href="wps.js">wps.js</a> for the
+        source code. <b>Note: For applications using WPS, the high level
+        approach shown in the <a href="wps-client.html">wps-client</a> example
+        is recommended instead.</b></p>
+        <ol>
+            <li>Select a process from the list below the map. The list is
+            populated with the result of a WPS GetCapabilities request, parsed
+            using <code>OpenLayers.Format.WPSCapabilities::read</code>.</li>
+            <li>Fill out the Input form. Hover over fields to get a description.
+            Required fields are marked with a "*".
+            To use a geometry from the map as input, select the geometry on the
+            map (using the pen symbol on the left of the toolbar) and just
+            click the field. The form is generated from the object returned by
+            <code>OpenLayers.Format.WPSDescribeProcess::read</code></li>
+            <li>Click "Execute" and examine the result in the result text area.
+            If the result can be parsed as features, it will be displayed on
+            the map as well. The process data is sent to the server with the
+            serialized XML from <code>OpenLayers.Format.WPSExecute::write</code>,
+            which can use a modified
+            <code>OpenLayers.Format.WPSDescribeProcess</code> result object as
+            input.</li>
+        </ol>
+    </div>
+
+    <div id="example" style="width:520px">
+        <div id="map" class="smallmap"></div>
+
+        <div>
+            <select id="processes"><option>Select a process</option></select>
+            <p id="abstract"></p>
+            <div id="input"></div>
+            <div id="output"></div>
+        </div>
+    </div>
+    <script src="../lib/OpenLayers.js"></script>
+    <script src="wps.js"></script>
+  </body>
+</html>

examples/wps.js

@@ -0,0 +1,353 @@
+OpenLayers.ProxyHost = "proxy.cgi?url=";
+
+var wps = "http://demo.opengeo.org/geoserver/wps",
+    capabilities, // the capabilities, read by Format.WPSCapabilities::read
+    process; // the process description from Format.WPSDescribeProcess::read
+
+// get some capabilities
+getCapabilities();
+
+// create the UI
+var layer = new OpenLayers.Layer.Vector("Scratchpad");
+var toolbar = new OpenLayers.Control.EditingToolbar(layer);
+toolbar.addControls([new OpenLayers.Control.ModifyFeature(layer, {
+    title: "Select feature"
+})]);
+var map = new OpenLayers.Map('map', {
+    controls: [
+        toolbar,
+        new OpenLayers.Control.ZoomPanel(),
+        new OpenLayers.Control.PanPanel()
+    ],
+    layers: [
+        new OpenLayers.Layer.WMS(
+            "OSM", "http://maps.opengeo.org/geowebcache/service/wms",
+            {layers: "openstreetmap", format: "image/png"}
+        ), layer
+    ]
+});
+map.zoomToMaxExtent();
+
+// add behavior to html elements
+document.getElementById("processes").onchange = describeProcess;
+
+// using OpenLayers.Format.WPSCapabilities to read the capabilities
+function getCapabilities() {
+    OpenLayers.Request.GET({
+        url: wps,
+        params: {
+            "SERVICE": "WPS",
+            "REQUEST": "GetCapabilities"
+        },
+        success: function(response){
+            capabilities = new OpenLayers.Format.WPSCapabilities().read(
+                response.responseText
+            );
+            var dropdown = document.getElementById("processes");
+            var offerings = capabilities.processOfferings, option;
+            // populate the dropdown
+            for (var p in offerings) {
+                option = document.createElement("option");
+                option.innerHTML = offerings[p].identifier;
+                option.value = p;
+                dropdown.appendChild(option);
+            }
+        }
+    });
+}
+
+// using OpenLayers.Format.WPSDescribeProcess to get information about a
+// process
+function describeProcess() {
+    var selection = this.options[this.selectedIndex].value;
+    OpenLayers.Request.GET({
+        url: wps,
+        params: {
+            "SERVICE": "WPS",
+            "REQUEST": "DescribeProcess",
+            "VERSION": capabilities.version,
+            "IDENTIFIER": selection
+        },
+        success: function(response) {
+            process = new OpenLayers.Format.WPSDescribeProcess().read(
+                response.responseText
+            ).processDescriptions[selection];
+            buildForm();
+        }
+    });
+}
+
+// dynamically create a form from the process description
+function buildForm() {
+    document.getElementById("abstract").innerHTML = process["abstract"];
+    document.getElementById("input").innerHTML = "<h3>Input:</h3>";
+    document.getElementById("output").innerHTML = "";
+
+    var inputs = process.dataInputs, supported = true,
+        sld = "text/xml; subtype=sld/1.0.0",
+        input;
+    for (var i=0,ii=inputs.length; i<ii; ++i) {
+        input = inputs[i];
+        if (input.complexData) {
+            var formats = input.complexData.supported.formats;
+            if (formats["application/wkt"]) {
+                addWKTInput(input);
+            } else if (formats["text/xml; subtype=wfs-collection/1.0"]) {
+                addWFSCollectionInput(input);
+            } else if (formats["image/tiff"]) {
+                addRasterInput(input);
+            } else if (formats[sld]) {
+                addXMLInput(input, sld);
+            } else {
+                supported = false;
+            }
+        } else if (input.boundingBoxData) {
+            addBoundingBoxInput(input);
+        } else if (input.literalData) {
+            addLiteralInput(input);
+        } else {
+            supported = false;
+        }
+        if (input.minOccurs > 0) {
+            document.getElementById("input").appendChild(document.createTextNode("* "));
+        }
+    }
+    
+    if (supported) {
+        var executeButton = document.createElement("button");
+        executeButton.innerHTML = "Execute";
+        document.getElementById("input").appendChild(executeButton);
+        executeButton.onclick = execute;
+    } else {
+        document.getElementById("input").innerHTML = '<span class="notsupported">' +
+            "Sorry, the WPS builder does not support the selected process." +
+            "</span>";
+    }
+}
+
+// helper function to dynamically create a textarea for geometry (WKT) data
+// input
+function addWKTInput(input, previousSibling) {
+    var name = input.identifier;
+    var container = document.getElementById("input");
+    var label = document.createElement("label");
+    label["for"] = name;
+    label.title = input["abstract"];
+    label.innerHTML = name + " (select feature, then click field):";
+    previousSibling && previousSibling.nextSibling ?
+        container.insertBefore(label, previousSibling.nextSibling) :
+        container.appendChild(label);
+    var field = document.createElement("textarea");
+    field.onclick = function () {
+        if (layer.selectedFeatures.length) {
+            this.innerHTML = new OpenLayers.Format.WKT().write(
+                layer.selectedFeatures[0]
+            );
+        }
+        createCopy(input, this, addWKTInput);
+    };
+    field.onblur = function() {
+        input.data = field.value ? {
+            complexData: {
+                mimeType: "application/wkt",
+                value: this.value
+            }
+        } : undefined;
+    };
+    field.title = input["abstract"];
+    field.id = name;
+    previousSibling && previousSibling.nextSibling ?
+        container.insertBefore(field, previousSibling.nextSibling.nextSibling) :
+        container.appendChild(field);
+}
+
+// helper function for xml input
+function addXMLInput(input, type) {
+    var name = input.identifier;
+    var field = document.createElement("input");
+    field.title = input["abstract"];
+    field.value = name + " (" + type + ")";
+    field.onblur = function() {
+        input.data = field.value ? {
+            complexData: {
+                mimeType: type,
+                value: this.value
+            }
+        } : undefined;
+    };
+    document.getElementById("input").appendChild(field);
+}
+
+// helper function to dynamically create a WFS collection reference input
+function addWFSCollectionInput(input) {
+    var name = input.identifier;
+    var field = document.createElement("input");
+    field.title = input["abstract"];
+    field.value = name + " (layer on demo server)";
+    addValueHandlers(field, function() {
+        input.reference = field.value ? {
+            mimeType: "text/xml; subtype=wfs-collection/1.0",
+            href: "http://geoserver/wfs",
+            method: "POST",
+            body: {
+                wfs: {
+                    version: "1.0.0",
+                    outputFormat: "GML2",
+                    featureType: field.value
+                }
+            }
+        } : undefined;
+    });
+    document.getElementById("input").appendChild(field);
+}
+
+// helper function to dynamically create a raster (GeoTIFF) url input
+function addRasterInput(input) {
+    var name = input.identifier;
+    var field = document.createElement("input");
+    field.title = input["abstract"];
+    var url = window.location.href.split("?")[0];
+    field.value = url.substr(0, url.lastIndexOf("/")+1) + "data/tazdem.tiff";
+    document.getElementById("input").appendChild(field);
+    (field.onblur = function() {
+        input.reference = {
+            mimeType: "image/tiff",
+            href: field.value,
+            method: "GET"
+        };
+    })();
+}
+
+// helper function to dynamically create a bounding box input
+function addBoundingBoxInput(input) {
+    var name = input.identifier;
+    var field = document.createElement("input");
+    field.title = input["abstract"];
+    field.value = "left,bottom,right,top (EPSG:4326)";
+    document.getElementById("input").appendChild(field);
+    addValueHandlers(field, function() {
+        input.boundingBoxData = {
+            projection: "EPSG:4326",
+            bounds: OpenLayers.Bounds.fromString(field.value)
+        };
+    });
+}
+
+// helper function to create a literal input textfield or dropdown
+function addLiteralInput(input, previousSibling) {
+    var name = input.identifier;
+    var container = document.getElementById("input");
+    var anyValue = input.literalData.anyValue;
+    // anyValue means textfield, otherwise we create a dropdown
+    var field = document.createElement(anyValue ? "input" : "select");
+    field.id = name;
+    field.title = input["abstract"];
+    previousSibling && previousSibling.nextSibling ?
+        container.insertBefore(field, previousSibling.nextSibling) :
+        container.appendChild(field);
+    if (anyValue) {
+        var dataType = input.literalData.dataType;
+        field.value = name + (dataType ? " (" + dataType + ")" : "");
+        addValueHandlers(field, function() {
+            input.data = field.value ? {
+                literalData: {
+                    value: field.value
+                }
+            } : undefined;
+            createCopy(input, field, addLiteralInput);
+        });
+    } else {
+        var option;
+        option = document.createElement("option");
+        option.innerHTML = name;
+        field.appendChild(option);
+        for (var v in input.literalData.allowedValues) {
+            option = document.createElement("option");
+            option.value = v;
+            option.innerHTML = v;
+            field.appendChild(option);
+        }
+        field.onchange = function() {
+            createCopy(input, field, addLiteralInput);
+            input.data = this.selectedIndex ? {
+                literalData: {
+                    value: this.options[this.selectedIndex].value
+                }
+            } : undefined;
+        };
+    }
+}
+
+// if maxOccurs is > 1, this will add a copy of the field
+function createCopy(input, field, fn) {
+    if (input.maxOccurs && input.maxOccurs > 1 && !field.userSelected) {
+        // add another copy of the field - we don't check maxOccurs
+        field.userSelected = true;
+        var newInput = OpenLayers.Util.extend({}, input);
+        // we recognize copies by the occurrence property
+        newInput.occurrence = (input.occurrence || 0) + 1;
+        process.dataInputs.push(newInput);
+        fn(newInput, field);
+    }
+}
+
+// helper function for adding events to form fields
+function addValueHandlers(field, onblur) {
+    field.onclick = function() {
+        if (!this.initialValue) {
+            this.initialValue = this.value;
+            this.value = "";
+        }
+    };
+    field.onblur = function() {
+        if (!this.value) {
+            this.value = this.initialValue;
+            delete this.initialValue;
+        }
+        onblur.apply(this, arguments);
+    };
+}
+
+// execute the process
+function execute() {
+    var output = process.processOutputs[0];
+    var input;
+    // remove occurrences that the user has not filled out
+    for (var i=process.dataInputs.length-1; i>=0; --i) {
+        input = process.dataInputs[i];
+        if ((input.minOccurs === 0 || input.occurrence) && !input.data && !input.reference) {
+            OpenLayers.Util.removeItem(process.dataInputs, input);
+        }
+    }
+    process.responseForm = {
+        rawDataOutput: {
+            identifier: output.identifier
+        }
+    };
+    if (output.complexOutput && output.complexOutput.supported.formats["application/wkt"]) {
+        process.responseForm.rawDataOutput.mimeType = "application/wkt";
+    }
+    OpenLayers.Request.POST({
+        url: wps,
+        data: new OpenLayers.Format.WPSExecute().write(process),
+        success: showOutput
+    });
+}
+
+// add the process's output to the page
+function showOutput(response) {
+    var result = document.getElementById("output");
+    result.innerHTML = "<h3>Output:</h3>";
+    var features;
+    var contentType = response.getResponseHeader("Content-Type");
+    if (contentType == "application/wkt") {
+        features = new OpenLayers.Format.WKT().read(response.responseText);
+    } else if (contentType == "text/xml; subtype=wfs-collection/1.0") {
+        features = new OpenLayers.Format.WFST.v1_0_0().read(response.responseText);
+    }
+    if (features && (features instanceof OpenLayers.Feature.Vector || features.length)) {
+        layer.addFeatures(features);
+        result.innerHTML += "The result should also be visible on the map.";
+    }
+    result.innerHTML += "<textarea>" + response.responseText + "</textarea>";
+}

lib/OpenLayers.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /* 
@@ -132,6 +132,7 @@
             jsFiles = [
                 "OpenLayers/BaseTypes/Class.js",
                 "OpenLayers/Util.js",
+                "OpenLayers/Util/vendorPrefix.js",
                 "OpenLayers/Animation.js",
                 "OpenLayers/BaseTypes.js",
                 "OpenLayers/BaseTypes/Bounds.js",
@@ -143,10 +144,9 @@
                 "OpenLayers/Console.js",
                 "OpenLayers/Tween.js",
                 "OpenLayers/Kinetic.js",
-                "Rico/Corner.js",
-                "Rico/Color.js",
                 "OpenLayers/Events.js",
                 "OpenLayers/Events/buttonclick.js",
+                "OpenLayers/Events/featureclick.js",
                 "OpenLayers/Request.js",
                 "OpenLayers/Request/XMLHttpRequest.js",
                 "OpenLayers/Projection.js",
@@ -190,7 +190,6 @@
                 "OpenLayers/Layer/Zoomify.js",
                 "OpenLayers/Layer/ArcGISCache.js",
                 "OpenLayers/Popup/Anchored.js",
-                "OpenLayers/Popup/AnchoredBubble.js",
                 "OpenLayers/Popup/Framed.js",
                 "OpenLayers/Popup/FramedCloud.js",
                 "OpenLayers/Feature.js",
@@ -305,6 +304,7 @@
                 "OpenLayers/Format/GML/v2.js",
                 "OpenLayers/Format/GML/v3.js",
                 "OpenLayers/Format/Atom.js",
+                "OpenLayers/Format/EncodedPolyline.js",
                 "OpenLayers/Format/KML.js",
                 "OpenLayers/Format/GeoRSS.js",
                 "OpenLayers/Format/WFS.js",
@@ -312,6 +312,10 @@
                 "OpenLayers/Format/OWSCommon/v1.js",
                 "OpenLayers/Format/OWSCommon/v1_0_0.js",
                 "OpenLayers/Format/OWSCommon/v1_1_0.js",
+                "OpenLayers/Format/WCSCapabilities.js",
+                "OpenLayers/Format/WCSCapabilities/v1.js",
+                "OpenLayers/Format/WCSCapabilities/v1_0_0.js",
+                "OpenLayers/Format/WCSCapabilities/v1_1_0.js",
                 "OpenLayers/Format/WFSCapabilities.js",
                 "OpenLayers/Format/WFSCapabilities/v1.js",
                 "OpenLayers/Format/WFSCapabilities/v1_0_0.js",
@@ -393,7 +397,10 @@
                 "OpenLayers/Symbolizer/Raster.js",
                 "OpenLayers/Lang.js",
                 "OpenLayers/Lang/en.js",
-                "OpenLayers/Spherical.js"
+                "OpenLayers/Spherical.js",
+                "OpenLayers/TileManager.js",
+                "OpenLayers/WPSClient.js",
+                "OpenLayers/WPSProcess.js"
             ]; // etc.
         }
 
@@ -413,5 +420,10 @@
 
 /**
  * Constant: VERSION_NUMBER
+ *
+ * This constant identifies the version of OpenLayers.
+ *
+ * When asking questions or reporting issues, make sure to include the output of
+ *     OpenLayers.VERSION_NUMBER in the question or issue-description.
  */
-OpenLayers.VERSION_NUMBER="Release 2.12-rc1";
+OpenLayers.VERSION_NUMBER="Release 2.13";

lib/OpenLayers/Animation.js

@@ -1,10 +1,11 @@
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
+ * full list of contributors). Published under the 2-clause BSD license.
+ * See license.txt in the OpenLayers distribution or repository for the
+ * full text of the license. */
+
 /**
- * Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
- * full list of contributors). Published under the Clear BSD license.  
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
- * full text of the license. 
- *
  * @requires OpenLayers/SingleFile.js
+ * @requires OpenLayers/Util/vendorPrefix.js
  */
 
 /**
@@ -19,11 +20,8 @@ OpenLayers.Animation = (function(window) {
      * Property: isNative
      * {Boolean} true if a native requestAnimationFrame function is available
      */
-    var isNative = !!(window.requestAnimationFrame ||
+    var requestAnimationFrame = OpenLayers.Util.vendorPrefix.js(window, "requestAnimationFrame");
-        window.webkitRequestAnimationFrame ||
+    var isNative = !!(requestAnimationFrame);
-        window.mozRequestAnimationFrame ||
-        window.oRequestAnimationFrame ||
-        window.msRequestAnimationFrame);
     
     /**
      * Function: requestFrame
@@ -36,11 +34,7 @@ OpenLayers.Animation = (function(window) {
      * element - {DOMElement} Optional element that visually bounds the animation.
      */
     var requestFrame = (function() {
-        var request = window.requestAnimationFrame ||
+        var request = window[requestAnimationFrame] ||
-            window.webkitRequestAnimationFrame ||
-            window.mozRequestAnimationFrame ||
-            window.oRequestAnimationFrame ||
-            window.msRequestAnimationFrame ||
             function(callback, element) {
                 window.setTimeout(callback, 16);
             };

lib/OpenLayers/BaseTypes.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**
@@ -127,7 +127,9 @@ OpenLayers.String = {
                 if (i == 0) {
                     replacement = context;
                 }
-
+                if (replacement === undefined) {
+                    break;
+                }
                 replacement = replacement[subs[i]];
             }
 
@@ -189,13 +191,18 @@ OpenLayers.String = {
      * 
      * Parameters:
      * value - {String}
+     * trimWhitespace - {Boolean}
      *
      * Returns:
      * {Number|String} a Number if the passed value is a number, a String
      *     otherwise. 
      */
-    numericIf: function(value) {
+    numericIf: function(value, trimWhitespace) {
-        return OpenLayers.String.isNumeric(value) ? parseFloat(value) : value;
+        var originalValue = value;
+        if (trimWhitespace === true && value != null && value.replace) {
+            value = value.replace(/^\s*|\s*$/g, "");
+        }
+        return OpenLayers.String.isNumeric(value) ? parseFloat(value) : originalValue;
     }
 
 };
@@ -290,7 +297,25 @@ OpenLayers.Number = {
             str = integer + dsep + rem;
         }
         return str;
-    }
+    },
+
+    /**
+     * Method: zeroPad
+     * Create a zero padded string optionally with a radix for casting numbers.
+     *
+     * Parameters:
+     * num - {Number} The number to be zero padded.
+     * len - {Number} The length of the string to be returned.
+     * radix - {Number} An integer between 2 and 36 specifying the base to use
+     *     for representing numeric values.
+     */
+    zeroPad: function(num, len, radix) {
+        var str = num.toString(radix || 10);
+        while (str.length < len) {
+            str = "0" + str;
+        }
+        return str;
+    }    
 };
 
 /**

lib/OpenLayers/BaseTypes/Bounds.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**
@@ -63,7 +63,7 @@ OpenLayers.Bounds = OpenLayers.Class({
      * left - {Number} The left bounds of the box.  Note that for width
      *        calculations, this is assumed to be less than the right value.
      * bottom - {Number} The bottom bounds of the box.  Note that for height
-     *          calculations, this is assumed to be more than the top value.
+     *          calculations, this is assumed to be less than the top value.
      * right - {Number} The right bounds.
      * top - {Number} The top bounds.
      *
@@ -128,6 +128,7 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /** 
      * APIMethod: toString
+     * Returns a string representation of the bounds object.
      * 
      * Returns:
      * {String} String representation of bounds object. 
@@ -138,6 +139,11 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: toArray
+     * Returns an array representation of the bounds object.
+     *
+     * Returns an array of left, bottom, right, top properties, or -- when the
+     *     optional parameter is true -- an array of the  bottom, left, top,
+     *     right properties.
      *
      * Parameters:
      * reverseAxisOrder - {Boolean} Should we reverse the axis order?
@@ -155,6 +161,7 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /** 
      * APIMethod: toBBOX
+     * Returns a boundingbox-string representation of the bounds object.
      * 
      * Parameters:
      * decimal - {Integer} How many significant digits in the bbox coords?
@@ -163,7 +170,7 @@ OpenLayers.Bounds = OpenLayers.Class({
      * 
      * Returns:
      * {String} Simple String representation of bounds object.
-     *          (e.g. <i>"5,42,10,45"</i>)
+     *          (e.g. "5,42,10,45")
      */
     toBBOX:function(decimal, reverseAxisOrder) {
         if (decimal== null) {
@@ -202,9 +209,10 @@ OpenLayers.Bounds = OpenLayers.Class({
     
     /**
      * APIMethod: getWidth
+     * Returns the width of the bounds.
      * 
      * Returns:
-     * {Float} The width of the bounds
+     * {Float} The width of the bounds (right minus left).
      */
     getWidth:function() {
         return (this.right - this.left);
@@ -212,6 +220,7 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: getHeight
+     * Returns the height of the bounds.
      * 
      * Returns:
      * {Float} The height of the bounds (top minus bottom).
@@ -222,9 +231,10 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: getSize
+     * Returns an <OpenLayers.Size> object of the bounds.
      * 
      * Returns:
-     * {<OpenLayers.Size>} The size of the box.
+     * {<OpenLayers.Size>} The size of the bounds.
      */
     getSize:function() {
         return new OpenLayers.Size(this.getWidth(), this.getHeight());
@@ -232,6 +242,8 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: getCenterPixel
+     * Returns the <OpenLayers.Pixel> object which represents the center of the
+     *     bounds.
      * 
      * Returns:
      * {<OpenLayers.Pixel>} The center of the bounds in pixel space.
@@ -243,7 +255,9 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: getCenterLonLat
-     * 
+     * Returns the <OpenLayers.LonLat> object which represents the center of the
+     *     bounds.
+     *
      * Returns:
      * {<OpenLayers.LonLat>} The center of the bounds in map space.
      */
@@ -297,11 +311,24 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: add
-     * 
+     * Shifts the coordinates of the bound by the given horizontal and vertical
+     *     deltas.
+     *
+     * (start code)
+     * var bounds = new OpenLayers.Bounds(0, 0, 10, 10);
+     * bounds.toString();
+     * // => "0,0,10,10"
+     *
+     * bounds.add(-1.5, 4).toString();
+     * // => "-1.5,4,8.5,14"
+     * (end)
+     *
+     * This method will throw a TypeError if it is passed null as an argument.
+     *
      * Parameters:
-     * x - {Float}
+     * x - {Float} horizontal delta
-     * y - {Float}
+     * y - {Float} vertical delta
-     * 
+     *
      * Returns:
      * {<OpenLayers.Bounds>} A new bounds whose coordinates are the same as
      *     this, but shifted by the passed-in x and y values.
@@ -316,51 +343,77 @@ OpenLayers.Bounds = OpenLayers.Class({
     
     /**
      * APIMethod: extend
-     * Extend the bounds to include the point, lonlat, or bounds specified.
+     * Extend the bounds to include the <OpenLayers.LonLat>,
-     *     Note, this function assumes that left < right and bottom < top.
+     *     <OpenLayers.Geometry.Point> or <OpenLayers.Bounds> specified.
-     * 
+     *
-     * Parameters: 
+     * Please note that this function assumes that left < right and
-     * object - {Object} Can be LonLat, Point, or Bounds
+     *     bottom < top.
+     *
+     * Parameters:
+     * object - {<OpenLayers.LonLat>, <OpenLayers.Geometry.Point> or
+     *     <OpenLayers.Bounds>} The object to be included in the new bounds
+     *     object.
      */
     extend:function(object) {
-        var bounds = null;
         if (object) {
-            // clear cached center location
             switch(object.CLASS_NAME) {
-                case "OpenLayers.LonLat":    
+                case "OpenLayers.LonLat":
-                    bounds = new OpenLayers.Bounds(object.lon, object.lat,
+                    this.extendXY(object.lon, object.lat);
-                                                    object.lon, object.lat);
                     break;
                 case "OpenLayers.Geometry.Point":
-                    bounds = new OpenLayers.Bounds(object.x, object.y,
+                    this.extendXY(object.x, object.y);
-                                                    object.x, object.y);
                     break;
-                    
+
-                case "OpenLayers.Bounds":    
+                case "OpenLayers.Bounds":
-                    bounds = object;
+                    // clear cached center location
+                    this.centerLonLat = null;
+
+                    if ( (this.left == null) || (object.left < this.left)) {
+                        this.left = object.left;
+                    }
+                    if ( (this.bottom == null) || (object.bottom < this.bottom) ) {
+                        this.bottom = object.bottom;
+                    }
+                    if ( (this.right == null) || (object.right > this.right) ) {
+                        this.right = object.right;
+                    }
+                    if ( (this.top == null) || (object.top > this.top) ) {
+                        this.top = object.top;
+                    }
                     break;
             }
-    
+        }
-            if (bounds) {
+    },
-                this.centerLonLat = null;
+
-                if ( (this.left == null) || (bounds.left < this.left)) {
+    /**
-                    this.left = bounds.left;
+     * APIMethod: extendXY
-                }
+     * Extend the bounds to include the XY coordinate specified.
-                if ( (this.bottom == null) || (bounds.bottom < this.bottom) ) {
+     *
-                    this.bottom = bounds.bottom;
+     * Parameters:
-                } 
+     * x - {number} The X part of the the coordinate.
-                if ( (this.right == null) || (bounds.right > this.right) ) {
+     * y - {number} The Y part of the the coordinate.
-                    this.right = bounds.right;
+     */
-                }
+    extendXY:function(x, y) {
-                if ( (this.top == null) || (bounds.top > this.top) ) { 
+        // clear cached center location
-                    this.top = bounds.top;
+        this.centerLonLat = null;
-                }
+
-            }
+        if ((this.left == null) || (x < this.left)) {
+            this.left = x;
+        }
+        if ((this.bottom == null) || (y < this.bottom)) {
+            this.bottom = y;
+        }
+        if ((this.right == null) || (x > this.right)) {
+            this.right = x;
+        }
+        if ((this.top == null) || (y > this.top)) {
+            this.top = y;
         }
     },
 
     /**
      * APIMethod: containsLonLat
+     * Returns whether the bounds object contains the given <OpenLayers.LonLat>.
      * 
      * Parameters:
      * ll - {<OpenLayers.LonLat>|Object} OpenLayers.LonLat or an
@@ -399,6 +452,7 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: containsPixel
+     * Returns whether the bounds object contains the given <OpenLayers.Pixel>.
      * 
      * Parameters:
      * px - {<OpenLayers.Pixel>}
@@ -414,6 +468,7 @@ OpenLayers.Bounds = OpenLayers.Class({
     
     /**
      * APIMethod: contains
+     * Returns whether the bounds object contains the given x and y.
      * 
      * Parameters:
      * x - {Float}
@@ -535,7 +590,7 @@ OpenLayers.Bounds = OpenLayers.Class({
     
     /**
      * APIMethod: containsBounds
-     * Determine whether the target bounds is contained within this bounds.
+     * Returns whether the bounds object contains the given <OpenLayers.Bounds>.
      * 
      * bounds - {<OpenLayers.Bounds>} The target bounds.
      * partial - {Boolean} If any of the target corners is within this bounds
@@ -565,10 +620,12 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /** 
      * APIMethod: determineQuadrant
-     * 
+     * Returns the the quadrant ("br", "tr", "tl", "bl") in which the given
+     *     <OpenLayers.LonLat> lies.
+     *
      * Parameters:
      * lonlat - {<OpenLayers.LonLat>}
-     * 
+     *
      * Returns:
      * {String} The quadrant ("br" "tr" "tl" "bl") of the bounds in which the
      *     coordinate lies.
@@ -615,6 +672,7 @@ OpenLayers.Bounds = OpenLayers.Class({
 
     /**
      * APIMethod: wrapDateLine
+     * Wraps the bounds object around the dateline.
      *  
      * Parameters:
      * maxExtent - {<OpenLayers.Bounds>}
@@ -681,12 +739,18 @@ OpenLayers.Bounds = OpenLayers.Class({
 /** 
  * APIFunction: fromString
  * Alternative constructor that builds a new OpenLayers.Bounds from a 
- *     parameter string
+ *     parameter string.
- * 
+ *
+ * (begin code)
+ * OpenLayers.Bounds.fromString("5,42,10,45");
+ * // => equivalent to ...
+ * new OpenLayers.Bounds(5, 42, 10, 45);
+ * (end)
+ *
  * Parameters: 
- * str - {String}Comma-separated bounds string. (e.g. <i>"5,42,10,45"</i>)
+ * str - {String} Comma-separated bounds string. (e.g. "5,42,10,45")
  * reverseAxisOrder - {Boolean} Does the string use reverse axis order?
- * 
+ *
  * Returns:
  * {<OpenLayers.Bounds>} New bounds object built from the 
  *                       passed-in String.
@@ -698,11 +762,16 @@ OpenLayers.Bounds.fromString = function(str, reverseAxisOrder) {
 
 /** 
  * APIFunction: fromArray
- * Alternative constructor that builds a new OpenLayers.Bounds
+ * Alternative constructor that builds a new OpenLayers.Bounds from an array.
- *     from an array
+ *
- * 
+ * (begin code)
+ * OpenLayers.Bounds.fromArray( [5, 42, 10, 45] );
+ * // => equivalent to ...
+ * new OpenLayers.Bounds(5, 42, 10, 45);
+ * (end)
+ *
  * Parameters:
- * bbox - {Array(Float)} Array of bounds values (e.g. <i>[5,42,10,45]</i>)
+ * bbox - {Array(Float)} Array of bounds values (e.g. [5,42,10,45])
  * reverseAxisOrder - {Boolean} Does the array use reverse axis order?
  *
  * Returns:
@@ -716,12 +785,17 @@ OpenLayers.Bounds.fromArray = function(bbox, reverseAxisOrder) {
 
 /** 
  * APIFunction: fromSize
- * Alternative constructor that builds a new OpenLayers.Bounds
+ * Alternative constructor that builds a new OpenLayers.Bounds from a size.
- *     from a size
+ *
- * 
+ * (begin code)
+ * OpenLayers.Bounds.fromSize( new OpenLayers.Size(10, 20) );
+ * // => equivalent to ...
+ * new OpenLayers.Bounds(0, 20, 10, 0);
+ * (end)
+ *
  * Parameters:
- * size - {<OpenLayers.Size>|Object} OpenLayers.Size or an object with
+ * size - {<OpenLayers.Size> or Object} <OpenLayers.Size> or an object with
- *     a 'w' and 'h' properties.
+ *     both 'w' and 'h' properties.
  *
  * Returns:
  * {<OpenLayers.Bounds>} New bounds object built from the passed-in size.
@@ -737,6 +811,14 @@ OpenLayers.Bounds.fromSize = function(size) {
  * Function: oppositeQuadrant
  * Get the opposite quadrant for a given quadrant string.
  *
+ * (begin code)
+ * OpenLayers.Bounds.oppositeQuadrant( "tl" );
+ * // => "br"
+ *
+ * OpenLayers.Bounds.oppositeQuadrant( "tr" );
+ * // => "bl"
+ * (end)
+ *
  * Parameters:
  * quadrant - {String} two character quadrant shortstring
  *

lib/OpenLayers/BaseTypes/Class.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**

lib/OpenLayers/BaseTypes/Date.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**
@@ -15,6 +15,14 @@
  */
 OpenLayers.Date = {
 
+    /** 
+     * APIProperty: dateRegEx
+     * The regex to be used for validating dates. You can provide your own
+     * regex for instance for adding support for years before BC. Default
+     * value is: /^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/
+     */
+    dateRegEx: /^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/,
+
     /**
      * APIMethod: toISOString
      * Generates a string representing a date.  The format of the string follows
@@ -41,13 +49,6 @@ OpenLayers.Date = {
                 return date.toISOString();
             };
         } else {
-            function pad(num, len) {
-                var str = num + "";
-                while (str.length < len) {
-                    str = "0" + str;
-                }
-                return str;
-            }
             return function(date) {
                 var str;
                 if (isNaN(date.getTime())) {
@@ -57,12 +58,12 @@ OpenLayers.Date = {
                 } else {
                     str =
                         date.getUTCFullYear() + "-" +
-                        pad(date.getUTCMonth() + 1, 2) + "-" +
+                        OpenLayers.Number.zeroPad(date.getUTCMonth() + 1, 2) + "-" +
-                        pad(date.getUTCDate(), 2) + "T" +
+                        OpenLayers.Number.zeroPad(date.getUTCDate(), 2) + "T" +
-                        pad(date.getUTCHours(), 2) + ":" +
+                        OpenLayers.Number.zeroPad(date.getUTCHours(), 2) + ":" +
-                        pad(date.getUTCMinutes(), 2) + ":" +
+                        OpenLayers.Number.zeroPad(date.getUTCMinutes(), 2) + ":" +
-                        pad(date.getUTCSeconds(), 2) + "." +
+                        OpenLayers.Number.zeroPad(date.getUTCSeconds(), 2) + "." +
-                        pad(date.getUTCMilliseconds(), 3) + "Z";
+                        OpenLayers.Number.zeroPad(date.getUTCMilliseconds(), 3) + "Z";
                 }
                 return str;
             };
@@ -91,7 +92,7 @@ OpenLayers.Date = {
      */
     parse: function(str) {
         var date;
-        var match = str.match(/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/);
+        var match = str.match(this.dateRegEx);
         if (match && (match[1] || match[7])) { // must have at least year or time
             var year = parseInt(match[1], 10) || 0;
             var month = (parseInt(match[2], 10) - 1) || 0;

lib/OpenLayers/BaseTypes/Element.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**

lib/OpenLayers/BaseTypes/LonLat.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**

lib/OpenLayers/BaseTypes/Pixel.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**

lib/OpenLayers/BaseTypes/Size.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**

lib/OpenLayers/Console.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**

lib/OpenLayers/Control.js

@@ -1,6 +1,6 @@
-/* Copyright (c) 2006-2012 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2013 by OpenLayers Contributors (see authors.txt for
- * full list of contributors). Published under the Clear BSD license.  
+ * full list of contributors). Published under the 2-clause BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
+ * See license.txt in the OpenLayers distribution or repository for the
  * full text of the license. */
 
 /**
@@ -120,6 +120,12 @@ OpenLayers.Control = OpenLayers.Class({
      */
     active: null,
 
+    /**
+     * Property: handlerOptions
+     * {Object} Used to set non-default properties on the control's handler
+     */
+    handlerOptions: null,
+
     /** 
      * Property: handler 
      * {<OpenLayers.Handler>} null