set VERSION_NUMBER to Release 2.12-rc5

Merge pull request #481 from elemoine/481
2.12-rc4 Tile.js script error (Firefox)
2012-05-25 14:55:14 +02:00 · 2012-05-25 05:49:16 -07:00 · 2012-05-24 22:55:43 +02:00 · 2012-05-24 06:14:07 -07:00 · 2012-05-22 10:07:18 +02:00 · 2012-05-21 04:20:54 -07:00
301 changed files with 1420 additions and 1069 deletions
--- a/doc/authors.txt
+++ b/doc/authors.txt
--- a/build/license.txt
+++ b/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-2012 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>)
 */
--- a/doc/customization
+++ b/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;
  }
--- a/doc/readme.txt
+++ b/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
--- a/examples/all-overlays-google.html
+++ b/examples/all-overlays-google.html
@@ -8,7 +8,7 @@
        <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>
--- a/examples/fusiontables.html
+++ b/examples/fusiontables.html
@@ -0,0 +1,32 @@
 <!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 can be made public, in which case no authorization is needed to read them. Geometries can be stored in Location columns in KML format. The default output is a CSV dump of each table row/column selected. Multi-line CSV files are not easy to parse in Javascript, but by adding a jsonCallback parameter to the HTTP command, the output will be 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. <a href="https://www.google.com/fusiontables/DataSource?docid=1g5DrXcdotCiO_yffkdW0zhuJk0a1i80SPvERHI8">Table used</a>
            </p>
        </div>
        <script src="fusiontables.js"></script>
    </body>
 </html>
--- a/examples/fusiontables.js
+++ b/examples/fusiontables.js
@@ -0,0 +1,46 @@
 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.google.com/fusiontables/api/query",
                params: {sql: "select * from 1g5DrXcdotCiO_yffkdW0zhuJk0a1i80SPvERHI8"},
                format: new OpenLayers.Format.GeoJSON({
                    ignoreExtraDims: true,
                    read: function(json) {
                        var row, feature, atts = {}, features = [];
                        var cols = json.table.cols; // column names
                        for (var i = 0; i < json.table.rows.length; i++) {
                            row = json.table.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]);
                                } 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;
                    }
                }),
                callbackKey: "jsonCallback"
            }),
            eventListeners: {
                "featuresadded": function () {
                    this.map.zoomToExtent(this.getDataExtent());
                }
            }
        })
    ]
 });
--- a/examples/google-v3-alloverlays.html
+++ b/examples/google-v3-alloverlays.html
@@ -8,7 +8,7 @@
        <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>
--- a/examples/google-v3.html
+++ b/examples/google-v3.html
@@ -8,7 +8,7 @@
        <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>
@@ -35,6 +35,17 @@
                location, you must include the extra theme/default/google.css 
                stylesheet.
            </p>
            <p>
                <strong>Note on Google Maps API versioning:</strong>
                This example uses the "nightly" version of Google Maps
                API. This is specified by using <code>v=3</code> in the
                the Google Maps API URL. Production applications should use the
                "release" or "frozen" versions of Google Maps
                API. See the <code>OpenLayers.Layer.Google.v3</code> API
                docs, and the
                <a href="https://developers.google.com/maps/documentation/javascript/basics#Versioning">Versioning Section</a>
                of the Google Maps API docs, for more details.
            </p>
        </div>
    </body>
 </html>
--- a/examples/graticule.html
+++ b/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">
--- a/examples/light-basic.js
+++ b/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
    }); 
--- a/examples/mapbox.html
+++ b/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>
--- a/examples/mapbox.js
+++ b/examples/mapbox.js
@@ -6,13 +6,14 @@ var streets = new OpenLayers.Layer.XYZ(
        "http://c.tiles.mapbox.com/v3/mapbox.mapbox-streets/${z}/${x}/${y}.png",
        "http://d.tiles.mapbox.com/v3/mapbox.mapbox-streets/${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> " +
+            "Data &copy; <a href='http://www.openstreetmap.org/'>OpenStreetMap</a> " +
            "and contributors, CC-BY-SA",
        sphericalMercator: true,
        wrapDateLine: true,
        transitionEffect: "resize",
        buffer: 1,
-        numZoomLevels: 16
+        numZoomLevels: 17
    }
 );
@@ -26,7 +27,7 @@ var map = new OpenLayers.Map({
                enableKinetic: true
            }
        }),
-        new OpenLayers.Control.ZoomPanel(),
+        new OpenLayers.Control.Zoom(),
        new OpenLayers.Control.Permalink({anchor: true})
    ],
    center: [0, 0],
--- a/examples/osm-google.html
+++ b/examples/osm-google.html
@@ -8,7 +8,7 @@
        <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>
--- a/examples/spherical-mercator.html
+++ b/examples/spherical-mercator.html
@@ -22,7 +22,7 @@
        }
    </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>
--- a/examples/strategy-bbox.html
+++ b/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>
--- a/examples/strategy-cluster.html
+++ b/examples/strategy-cluster.html
@@ -70,20 +70,45 @@
        <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 +126,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,
@@ -172,7 +199,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 +208,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>
--- a/examples/strategy-paging.html
+++ b/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>
--- a/examples/style.mobile.css
+++ b/examples/style.mobile.css
@@ -2,6 +2,9 @@ div.olControlZoom {
    position: absolute;
    top: 8px;
    left: 8px;
    background: rgba(255,255,255,0.4);
    border-radius: 4px;
    padding: 2px;
 }
 * {
    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
@@ -20,9 +23,9 @@ div.olControlZoom a {
    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: #130085; /* fallback for IE - IE6 requires background shorthand*/
-    background: rgba(0, 0, 0, 0.3);
+    background: rgba(0, 60, 136, 0.5);
-    filter: alpha(opacity=60);
+    filter: alpha(opacity=80);
 }
 a.olControlZoomIn {
    border-radius: 4px 4px 0 0;
@@ -31,12 +34,18 @@ a.olControlZoomOut {
    border-radius: 0 0 4px 4px;
 }
 div.olControlZoom a:hover {
-    background: #444444; /* fallback for IE */
+    background: #130085; /* fallback for IE */
-    background: rgba(0, 0, 0, 0.5);
+    background: rgba(0, 60, 136, 0.7);
-    filter: alpha(opacity=80);
+    filter: alpha(opacity=100);
 }
@media only screen and (max-width: 600px) {
    div.olControlZoom a:hover {
-        background: rgba(0, 0, 0, 0.3);
+        background: rgba(0, 60, 136, 0.5);
    }
 }
 .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;
 }
--- a/examples/using-proj4js.html
+++ b/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>
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /* 
@@ -414,4 +414,4 @@
 /**
 * Constant: VERSION_NUMBER
 */
-OpenLayers.VERSION_NUMBER="Release 2.12-rc1";
+OpenLayers.VERSION_NUMBER="Release 2.12-rc5";
--- a/lib/OpenLayers/Animation.js
+++ b/lib/OpenLayers/Animation.js
@@ -1,7 +1,7 @@
 /**
 * Copyright (c) 2006-2012 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. 
 *
 * @requires OpenLayers/SingleFile.js
--- a/lib/OpenLayers/BaseTypes.js
+++ b/lib/OpenLayers/BaseTypes.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/BaseTypes/Bounds.js
+++ b/lib/OpenLayers/BaseTypes/Bounds.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/BaseTypes/Class.js
+++ b/lib/OpenLayers/BaseTypes/Class.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/BaseTypes/Date.js
+++ b/lib/OpenLayers/BaseTypes/Date.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/BaseTypes/Element.js
+++ b/lib/OpenLayers/BaseTypes/Element.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/BaseTypes/LonLat.js
+++ b/lib/OpenLayers/BaseTypes/LonLat.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/BaseTypes/Pixel.js
+++ b/lib/OpenLayers/BaseTypes/Pixel.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/BaseTypes/Size.js
+++ b/lib/OpenLayers/BaseTypes/Size.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Console.js
+++ b/lib/OpenLayers/Console.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control.js
+++ b/lib/OpenLayers/Control.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/ArgParser.js
+++ b/lib/OpenLayers/Control/ArgParser.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/Attribution.js
+++ b/lib/OpenLayers/Control/Attribution.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/Button.js
+++ b/lib/OpenLayers/Control/Button.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/CacheRead.js
+++ b/lib/OpenLayers/Control/CacheRead.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/CacheWrite.js
+++ b/lib/OpenLayers/Control/CacheWrite.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
@@ -173,11 +173,13 @@ OpenLayers.Control.CacheWrite = OpenLayers.Class(OpenLayers.Control, {
                try {
                    var canvasContext = tile.getCanvasContext();
                    if (canvasContext) {
                        var urlMap = OpenLayers.Control.CacheWrite.urlMap;
                        var url = urlMap[tile.url] || tile.url;
                        window.localStorage.setItem(
-                            "olCache_" + OpenLayers.Control.CacheWrite.urlMap[tile.url],
+                            "olCache_" + url,
                            canvasContext.canvas.toDataURL(this.imageFormat)
                        );
-                        delete OpenLayers.Control.CacheWrite.urlMap[tile.url];
+                        delete urlMap[tile.url];
                    }
                } catch(e) {
                    // local storage full or CORS violation
--- a/lib/OpenLayers/Control/DragFeature.js
+++ b/lib/OpenLayers/Control/DragFeature.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/DragPan.js
+++ b/lib/OpenLayers/Control/DragPan.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/DrawFeature.js
+++ b/lib/OpenLayers/Control/DrawFeature.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/EditingToolbar.js
+++ b/lib/OpenLayers/Control/EditingToolbar.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/Geolocate.js
+++ b/lib/OpenLayers/Control/Geolocate.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/GetFeature.js
+++ b/lib/OpenLayers/Control/GetFeature.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/Graticule.js
+++ b/lib/OpenLayers/Control/Graticule.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/KeyboardDefaults.js
+++ b/lib/OpenLayers/Control/KeyboardDefaults.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/LayerSwitcher.js
+++ b/lib/OpenLayers/Control/LayerSwitcher.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /** 
--- a/lib/OpenLayers/Control/Measure.js
+++ b/lib/OpenLayers/Control/Measure.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/ModifyFeature.js
+++ b/lib/OpenLayers/Control/ModifyFeature.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/MousePosition.js
+++ b/lib/OpenLayers/Control/MousePosition.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/NavToolbar.js
+++ b/lib/OpenLayers/Control/NavToolbar.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/Navigation.js
+++ b/lib/OpenLayers/Control/Navigation.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/NavigationHistory.js
+++ b/lib/OpenLayers/Control/NavigationHistory.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/OverviewMap.js
+++ b/lib/OpenLayers/Control/OverviewMap.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /** 
--- a/lib/OpenLayers/Control/Pan.js
+++ b/lib/OpenLayers/Control/Pan.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/PanPanel.js
+++ b/lib/OpenLayers/Control/PanPanel.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/PanZoom.js
+++ b/lib/OpenLayers/Control/PanZoom.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/PanZoomBar.js
+++ b/lib/OpenLayers/Control/PanZoomBar.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/Panel.js
+++ b/lib/OpenLayers/Control/Panel.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/Permalink.js
+++ b/lib/OpenLayers/Control/Permalink.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/PinchZoom.js
+++ b/lib/OpenLayers/Control/PinchZoom.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/SLDSelect.js
+++ b/lib/OpenLayers/Control/SLDSelect.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/Scale.js
+++ b/lib/OpenLayers/Control/Scale.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/ScaleLine.js
+++ b/lib/OpenLayers/Control/ScaleLine.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/SelectFeature.js
+++ b/lib/OpenLayers/Control/SelectFeature.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/Snapping.js
+++ b/lib/OpenLayers/Control/Snapping.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/Split.js
+++ b/lib/OpenLayers/Control/Split.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/TouchNavigation.js
+++ b/lib/OpenLayers/Control/TouchNavigation.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/TransformFeature.js
+++ b/lib/OpenLayers/Control/TransformFeature.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/UTFGrid.js
+++ b/lib/OpenLayers/Control/UTFGrid.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/WMSGetFeatureInfo.js
+++ b/lib/OpenLayers/Control/WMSGetFeatureInfo.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/WMTSGetFeatureInfo.js
+++ b/lib/OpenLayers/Control/WMTSGetFeatureInfo.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Control/Zoom.js
+++ b/lib/OpenLayers/Control/Zoom.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/ZoomBox.js
+++ b/lib/OpenLayers/Control/ZoomBox.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/ZoomIn.js
+++ b/lib/OpenLayers/Control/ZoomIn.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/ZoomOut.js
+++ b/lib/OpenLayers/Control/ZoomOut.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/ZoomPanel.js
+++ b/lib/OpenLayers/Control/ZoomPanel.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Control/ZoomToMaxExtent.js
+++ b/lib/OpenLayers/Control/ZoomToMaxExtent.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Events.js
+++ b/lib/OpenLayers/Events.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Events/buttonclick.js
+++ b/lib/OpenLayers/Events/buttonclick.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Feature.js
+++ b/lib/OpenLayers/Feature.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Feature/Vector.js
+++ b/lib/OpenLayers/Feature/Vector.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 // TRASH THIS
--- a/lib/OpenLayers/Filter.js
+++ b/lib/OpenLayers/Filter.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Filter/Comparison.js
+++ b/lib/OpenLayers/Filter/Comparison.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Filter/FeatureId.js
+++ b/lib/OpenLayers/Filter/FeatureId.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Filter/Function.js
+++ b/lib/OpenLayers/Filter/Function.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Filter/Logical.js
+++ b/lib/OpenLayers/Filter/Logical.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
--- a/lib/OpenLayers/Filter/Spatial.js
+++ b/lib/OpenLayers/Filter/Spatial.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format.js
+++ b/lib/OpenLayers/Format.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/ArcXML.js
+++ b/lib/OpenLayers/Format/ArcXML.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/ArcXML/Features.js
+++ b/lib/OpenLayers/Format/ArcXML/Features.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/Atom.js
+++ b/lib/OpenLayers/Format/Atom.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/CQL.js
+++ b/lib/OpenLayers/Format/CQL.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/CSWGetDomain.js
+++ b/lib/OpenLayers/Format/CSWGetDomain.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js
+++ b/lib/OpenLayers/Format/CSWGetDomain/v2_0_2.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/CSWGetRecords.js
+++ b/lib/OpenLayers/Format/CSWGetRecords.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js
+++ b/lib/OpenLayers/Format/CSWGetRecords/v2_0_2.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/Context.js
+++ b/lib/OpenLayers/Format/Context.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/Filter.js
+++ b/lib/OpenLayers/Format/Filter.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/lib/OpenLayers/Format/Filter/v1.js
+++ b/lib/OpenLayers/Format/Filter/v1.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
 * @requires OpenLayers/Format/Filter.js
--- a/lib/OpenLayers/Format/Filter/v1_0_0.js
+++ b/lib/OpenLayers/Format/Filter/v1_0_0.js
@@ -1,6 +1,6 @@
 /* Copyright (c) 2006-2012 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. */
 /**
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Éric Lemoine	f5c43d6506	set VERSION_NUMBER to Release 2.12-rc5	2012-05-25 14:55:14 +02:00
Éric Lemoine	ba4a68d0e3	Merge pull request #481 from elemoine/481 2.12-rc4 Tile.js script error (Firefox)	2012-05-25 05:49:16 -07:00
Éric Lemoine	d289aa327e	Grid.removeExcessTiles removes more tiles than it should, refs #481	2012-05-24 22:55:43 +02:00
Éric Lemoine	65cd2bcb88	Merge pull request #480 from elemoine/googleexamples Use nightly version of Google Maps API in examples	2012-05-24 06:14:07 -07:00
Éric Lemoine	2cd979d34c	use the nightly version of Google Maps API in the examples, and provide some information about Google Maps API versioning in the google-v3 example	2012-05-22 10:07:18 +02:00
Éric Lemoine	c34b111b38	Merge pull request #476 from probins/googledoc Document issues with Google v3 layers	2012-05-21 04:20:54 -07:00
Peter Robins	1193e17266	Google v3 docs amendment	2012-05-21 10:06:27 +01:00
Peter Robins	95164d8cc0	Document issues with Google v3 layers	2012-05-20 14:01:12 +01:00
Tim Schaub	ae89452936	Merge pull request #473 from ahocevar/svg-block Using display:block instead of position:absolute.	2012-05-18 12:29:26 -07:00
ahocevar	120cc0680d	Using display:block instead of position:absolute. This fixes a regression that can be seen e.g. when using the FeatureRenderer in GeoExt, causing an incorrect alignment of the renderer.	2012-05-18 12:38:34 +02:00
ahocevar	92f04a7a42	Merge pull request #472 from probins/goopop Fix Google terms/poweredby/popup. Thanks @probins for the quick fix.	2012-05-17 11:31:51 -07:00
Peter Robins	f435a98a2a	Fix Google terms/poweredby/popup	2012-05-17 16:48:43 +01:00
Éric Lemoine	2624ea089e	set VERSION_NUMBER to 2.12-rc4	2012-05-16 21:10:08 +02:00
Éric Lemoine	24b1fa1b08	Merge pull request #467 from jorix/392 Add style = "position: absolute;" on the SVG to skip the bug of Chrome 18	2012-05-16 12:04:41 -07:00
Éric Lemoine	af3615f1ee	Merge pull request #469 from elemoine/indexof Use Util.indexOf in Layer.Bing	2012-05-16 00:19:42 -07:00
Éric Lemoine	62bd06f465	use Util.indexOf in Layer.Bing, for compatibility with IE < 9	2012-05-16 08:24:55 +02:00
Bart van den Eijnden	adcf5bb20a	Merge pull request #468 from bartvde/bboxstrategy Fix visibility and inRange issues with the BBOX strategy (r=@elemoine)	2012-05-15 08:13:55 -07:00
Bart van den Eijnden	44f9b81085	also check for visibility of the layer in the central place: the update function	2012-05-15 12:26:21 +02:00
Bart van den Eijnden	bca3e45940	BBOX strategy should not request data if its layer is out of range when changing layer visibility	2012-05-15 12:18:42 +02:00
Éric Lemoine	4e42dec4ab	Merge pull request #465 from probins/gpxwrite Fix GPX write Point transform	2012-05-15 01:03:35 -07:00
Peter Robins	359bd3d598	Merge pull request #16 from elemoine/gpxwrite use t.geom_eq in GPX read test	2012-05-15 00:45:20 -07:00
Éric Lemoine	114541d0b7	use t.geom_eq in GPX tests	2012-05-15 08:58:23 +02:00
Xavier Mamano	05672deefa	Add style = "position: absolute;" on the SVG to skip the bug of Chrome 18	2012-05-14 23:02:53 +02:00
Peter Robins	9ea3c2f121	Fix GPX write Point transform	2012-05-14 14:21:23 +01:00
Tim Schaub	44e526a0e8	Merge pull request #439 from tschaub/439 Changing/fixing the meaning of getServerZoom	2012-05-11 00:16:09 -07:00
ahocevar	72d1b54956	Also taking into account zoomOffset. Now the meaning of getServerZoom is fully clarified, and we can get rid of some code again as well.	2012-05-11 00:26:09 -06:00
ahocevar	40b4cc49e0	Using OpenLayers.Util.indexOf. Thanks @jorix for catching this.	2012-05-11 00:26:09 -06:00
ahocevar	9585341d9c	Changing/fixing the meaning of getServerZoom. If a layer is configured with serverResolutions, then getServerZoom should return the zoom level as index of the current resolution in the serverResolutions array.	2012-05-11 00:26:08 -06:00
Éric Lemoine	293ad9b32a	Merge pull request #460 from elemoine/460 Fixing issue of calculating maxResolution of layer again	2012-05-10 06:44:14 -07:00
Éric Lemoine	4ad6bacc5d	when calculating maxResolution from maxExtent and tileSize we dont want to the actual tile size for single layers	2012-05-10 15:42:59 +02:00
Éric Lemoine	98fb795f97	set VERSION_NUMBER to 2.12-rc3	2012-05-05 14:27:12 +02:00
Éric Lemoine	23d8057222	Merge pull request #449 from elemoine/449 Issues with window resize in IE9 for OL 2.12RC2	2012-05-05 04:49:55 -07:00
Éric Lemoine	2608a0ebe7	fix resize handling in IE 9 and better (refs #449 )	2012-05-04 14:28:12 +02:00
Éric Lemoine	ac3d361778	Merge pull request #441 from elemoine/gutter Tiles with gutters are shifted	2012-05-02 02:35:32 -07:00
Éric Lemoine	612401a644	fix bug where tiles with gutters are shifted (refs #441 )	2012-04-28 21:23:55 +02:00
Frederic Junod	5f1651a30f	Add missing hover option to the SelectFeature control. Thanks Arnie Shore.	2012-04-25 10:34:40 +02:00
Éric Lemoine	1ace4df160	set OpenLayers.VERSION_NUMBER to Release 2.12-rc2	2012-04-24 21:55:49 +02:00
ahocevar	f4a77cad06	Merge pull request #432 from ahocevar/iframe-opacity Long URLs messing up Opacity. r=@elemoine,@lewinmadrid	2012-04-24 12:32:48 -07:00
ahocevar	fc0b15ad45	Overriding onImageLoad to set the opacity on the correct element.	2012-04-24 08:08:41 -04:00
Éric Lemoine	07533fcdcb	Merge pull request #426 from elemoine/moveend-bug pan() triggers moveend event twice	2012-04-24 04:02:36 -07:00
ahocevar	179433da2f	For IFrame tiles, we need to set opacity on the IFrame's parent.	2012-04-23 18:46:28 -04:00
ahocevar	a57c56ed96	Revert "Merge pull request #432 from ahocevar/iframe-opacity" This reverts commit `af046b9af8`, reversing changes made to `f36fd5f0d1`. The reason for reverting this is that the change breaks the select-feature-multilayer.html example.	2012-04-23 18:03:39 -04:00
Éric Lemoine	c6c1bf1f77	fix movestart, move, moveend sequence on pan with animate:false	2012-04-23 23:57:48 +02:00
ahocevar	af046b9af8	Merge pull request #432 from ahocevar/iframe-opacity Long URLs messing up Opacity. r=@elemoine	2012-04-23 14:14:08 -07:00
ahocevar	11cc960be5	Setting opacity on the IFrame's parent, like we used to do in 2.11.	2012-04-23 10:36:51 -04:00
ahocevar	07114fc894	Setting opacity on the last child. This is required for IFrame tiles, so we don't set the opacity on the event pane. To make this work with vector layers, the defs node needs to be inserted before the root group element instead of after it.	2012-04-23 10:17:20 -04:00
Éric Lemoine	f36fd5f0d1	Merge pull request #393 from elemoine/393 grid layers may be misplaced	2012-04-20 06:27:27 -07:00
ahocevar	bd4c092943	Merge pull request #419 from ahocevar/bing-attribution Incorrect Bing attribution when custom maxResolution is set. r=@elemoine	2012-04-20 06:11:31 -07:00
ahocevar	9ab6d08fb0	Calculate zoom level from serverResolutions. The previous way of hard-coding an offset of 1 causes an incorrect attribution for layers with a custom maxResolution.	2012-04-20 15:08:45 +02:00
Éric Lemoine	e998335718	Merge pull request #399 from elemoine/399 adding an OverviewMap to an OSM map no longer just works	2012-04-20 05:10:34 -07:00
Frédéric Junod	7ec0071823	Merge pull request #403 from fredj/403 Util.html test fail with Chrome and Chromium. r=elemoine	2012-04-17 06:53:43 -07:00
Frederic Junod	e14d7d686e	Fix Util.html test for Chrome/Chromium browsers.	2012-04-16 10:41:07 +02:00
Éric Lemoine	c88a610f21	Merge pull request #406 from elemoine/406 TMS zoomOffset test sets NaN maxResolution values in the map	2012-04-14 05:25:07 -07:00
Éric Lemoine	bfd6be634f	if maxResolution is "auto" calculate maxResolution based on maxExtent and map size, else calculate maxResolution based on maxExtent and tile size	2012-04-11 17:45:34 +02:00
Éric Lemoine	ebfbb354ed	fix the TMS zoomOffset test	2012-04-11 17:43:17 +02:00
Bart van den Eijnden	344e2124c9	Merge pull request #400 from bartvde/bing fix Bing attribution issue caused by reverse axis order (r=@elemoine). Thanks Eric Blasenheim for the detailed report.	2012-04-10 06:02:30 -07:00
Bart van den Eijnden	59cc18d85b	fix Bing attribution issue reported by PitneyBowes	2012-04-10 14:31:20 +02:00
Éric Lemoine	ae75fdacd7	Revert "Merge pull request #116 from elemoine/redraw" This reverts commit `7a5b469192`, reversing changes made to `a719de7e93`. Conflicts: tests/Tile/Image.html	2012-04-07 21:07:03 +02:00
Éric Lemoine	58e86a37f5	Revert "Declare zoomChanged." This reverts commit `b910a5f4d0`.	2012-04-07 21:02:24 +02:00
Éric Lemoine	4df1104b7a	Revert "Merge pull request #312 from elemoine/redraw" This reverts commit `7f94945244`, reversing changes made to `dfa70fafac`. Conflicts: lib/OpenLayers/Layer/Vector.js	2012-04-07 21:01:52 +02:00
Éric Lemoine	685eae7c04	Merge pull request #390 from elemoine/scriptlocation _getScriptLocation regexp not robust enough	2012-04-04 21:43:08 -07:00
Tim Schaub	0554637c56	Merge pull request #388 from tschaub/offline Make cache writing work when cross-origin.	2012-04-04 17:49:24 -07:00
Éric Lemoine	b1b4736315	make _getScriptLocation RegExp more robust, p=jpfiset, t,r=me	2012-04-04 20:30:50 +02:00
Tim Schaub	2582e762b7	Avoid undefined url.	2012-04-03 16:49:23 -10:00
Éric Lemoine	5c597de900	Merge pull request #384 from elemoine/gridclass renaming from olLayerGridTile to olLayerGrid	2012-04-03 08:55:49 -07:00
Frederic Junod	f2dd130256	update mapbox example. * use Zoom control instead of ZoomPanel * wrap date line * attribution control already at the bottom of the map * use html entities for the copyright symbol * layer has 17 levels, update numZoomLevels	2012-04-02 21:13:42 -10:00
Éric Lemoine	f870417a30	class name olLayerGridTile renamed olLayerGrid	2012-04-03 06:28:06 +02:00
Éric Lemoine	eb2d62dacb	Merge pull request #365 from elemoine/anim2 Display issues with backbuffer delay on single tiled transparent layers	2012-04-02 12:02:05 -07:00
Éric Lemoine	9d23b81dae	update 2.12 notes	2012-04-02 21:00:20 +02:00
Éric Lemoine	d650ba20d9	Layer.Grid - better docs for transitionEffect, removeBackBufferDelay, and className	2012-04-02 20:59:16 +02:00
Éric Lemoine	d8473f9249	make Layer.Grid.prototype.className an API property	2012-04-02 17:57:37 +02:00
Éric Lemoine	8c6466bf2a	move transitionEffect to Layer.Grid.prototype, and discourage the use of transitionEffect:"resize" on non-opaque layers	2012-03-31 21:32:49 +02:00
Éric Lemoine	d252a6156a	add tests for className and removeBackBufferDelay default values	2012-03-31 21:24:45 +02:00
Éric Lemoine	8f20ff8ca0	update 2.12 release notes	2012-03-31 21:24:18 +02:00
Éric Lemoine	5b40ffe474	change CSS accessor for tile transition	2012-03-31 21:24:03 +02:00
Éric Lemoine	1e5f83593c	removeBackBufferDelay defaults to 0 for singleTile layers	2012-03-31 21:23:21 +02:00
Éric Lemoine	86cd9c7bf7	add class to Layer.Grid layer div	2012-03-31 21:22:36 +02:00
Frédéric Junod	35333681c1	Merge pull request #377 from probins/rmfc Remove framedCloud.css. p=probins	2012-03-30 05:53:52 -07:00
Éric Lemoine	b876f815fb	Merge pull request #376 from probins/rmsvn Further tidy-up of svn refs	2012-03-30 05:45:06 -07:00
Peter Robins	d5adedb708	Remove framedCloud.css	2012-03-30 12:00:52 +01:00
Peter Robins	349fc2f69e	Further tidy-up of svn refs	2012-03-30 11:36:40 +01:00
Éric Lemoine	e0b93c2e45	The OpenLayers code is published under the 2-clause BSD license	2012-03-30 08:33:55 +02:00
Éric Lemoine	650df2a8f1	change copyright header in every OpenLayers js file	2012-03-29 22:14:56 +02:00
Éric Lemoine	95eb1454f4	change copyright dates in build/license.txt	2012-03-29 22:01:48 +02:00
Éric Lemoine	f5cc652685	remove any reference to svn.openlayers.org from license.txt	2012-03-29 22:00:56 +02:00
Éric Lemoine	2cc0090f81	move the licenses dir to the root of the repo	2012-03-29 21:59:58 +02:00
Éric Lemoine	6b04ff1c94	move authors.txt to the root of the repo	2012-03-29 21:58:54 +02:00
Éric Lemoine	5f4519b378	remove doc/customization and doc/readme.txt	2012-03-29 21:57:42 +02:00
Éric Lemoine	3a925d9903	remove release-license.txt and repository-license.txt	2012-03-29 21:56:24 +02:00
Peter Robins	4c0d85ee67	Fusiontables example correction	2012-03-28 23:06:36 -07:00
Peter Robins	bb09ff341e	Fusion Tables example	2012-03-28 23:06:12 -07:00
Éric Lemoine	801b32a667	Merge pull request #345 from elemoine/flickr timed out on "examples/strategy-cluster.html"	2012-03-28 21:31:17 -07:00
Éric Lemoine	9a9a5ba452	rely on the Flickr APIs in the strategy-cluster example	2012-03-28 14:20:24 +02:00
Éric Lemoine	d574f09e6a	rely on the Flickr APIs in the strategy-paging example	2012-03-28 14:13:31 +02:00
Éric Lemoine	74a34ec14b	rely on the Flickr APIs in the strategy-bbox example	2012-03-28 14:13:08 +02:00
ahocevar	032293c26f	Merge pull request #352 from ahocevar/352 Layer/Grid.html tests fail. r=@elemoine	2012-03-27 16:27:00 -07:00
ahocevar	3eedfce46e	Fixing test after `5e9104a2a2`.	2012-03-27 13:10:28 -07:00
Éric Lemoine	11395e7e84	Merge pull request #363 from probins/projex2.12 Improve proj4js examples docs 2.12	2012-03-27 08:30:53 -07:00
Peter Robins	1a59ade32a	Improve proj4js examples docs	2012-03-27 15:53:01 +01:00
Frédéric Junod	31c2d183f6	Merge pull request #359 from fredj/projdocs Improvements for projection docs. p=probins	2012-03-27 06:13:12 -07:00
Peter Robins	720a815479	Improvements for projection docs	2012-03-27 14:07:58 +02:00
Antoine Abt	eb74d93d48	Merge pull request #355 from tonio/blue Zoom control, back to blue	2012-03-27 00:03:25 -07:00
Antoine Abt	935c56961b	Merge pull request #356 from tonio/transition Add css transitions to mobile example stylesheet	2012-03-26 23:50:25 -07:00
Antoine Abt	87763af644	add css transition for mobile examples	2012-03-26 22:19:00 +02:00
Antoine Abt	8f3f5d1366	blue’s back — Zoom control refresh	2012-03-26 21:53:11 +02:00