Revert "Use an OSM layer instead of TMS with a custom getURL. Non functional change."

This reverts commit 00adfc7.

Author: elemoine

authors.txt

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

build/full.cfg

@@ -3,6 +3,7 @@
 
 [first]
 OpenLayers/SingleFile.js
+OpenLayers.js
 OpenLayers/BaseTypes.js
 OpenLayers/BaseTypes/Class.js
 OpenLayers/Util.js
@@ -14,5 +15,4 @@ Rico/Corner.js
 
 [exclude]
 Firebug
-OpenLayers.js
 OpenLayers/Lang

build/library.cfg

@@ -4,6 +4,7 @@
 
 [first]
 OpenLayers/SingleFile.js
+OpenLayers.js
 OpenLayers/BaseTypes.js
 OpenLayers/BaseTypes/Class.js
 OpenLayers/Util.js
@@ -15,7 +16,6 @@ Rico/Corner.js
 
 [exclude]
 Firebug
-OpenLayers.js
 OpenLayers/Format/GeoRSS.js
 OpenLayers/Format/GML.js
 OpenLayers/Format/WKT.js

build/lite.cfg

@@ -6,6 +6,7 @@
 
 [first]
 OpenLayers/SingleFile.js
+OpenLayers.js
 OpenLayers/BaseTypes.js
 OpenLayers/BaseTypes/Class.js
 OpenLayers/Util.js

examples/Jugl.js

@@ -98,6 +98,8 @@
         <script type="text/javascript" src="Jugl.js"></script>
         <script type="text/javascript" src="example-list.js"></script>
         <script type="text/javascript">
+            // import
+            var Jugl = window["http://jugl.tschaub.net/trunk/lib/Jugl.js"];
             var template, target;
 
             function listExamples(examples) {
@@ -199,7 +201,7 @@
                 }
             }
             window.onload = function() {
-                template = new jugl.Template("template");
+                template = new Jugl.Template("template");
                 target = document.getElementById("examples");
                 listExamples(info.examples);
                 document.getElementById("exwin").src = "../examples/example.html";

examples/donut.html

@@ -66,6 +66,7 @@
         <script src="animator.js"></script>
         <script type="text/javascript">
             var map, template;
+            var Jugl = window["http://jugl.tschaub.net/trunk/lib/Jugl.js"];
             OpenLayers.ProxyHost = (window.location.host == "localhost") ?
                 "/cgi-bin/proxy.cgi?url=" : "proxy.cgi?url=";
 
@@ -134,7 +135,7 @@
                 map.setCenter(new OpenLayers.LonLat(0, 0), 1);
 
                 // template setup
-                template = new jugl.Template("template");
+                template = new Jugl.Template("template");
 
             }
 

examples/donut.js

@@ -31,7 +31,15 @@
                                                  20037508.34, 20037508.34)
             };
             map = new OpenLayers.Map('map', options);
-            var mapnik = new OpenLayers.Layer.OSM("OpenStreetMap (Mapnik)");
+            var mapnik = new OpenLayers.Layer.TMS(
+                "OpenStreetMap (Mapnik)",
+                "http://tile.openstreetmap.org/",
+                {
+                    type: 'png', getURL: osm_getTileURL,
+                    displayOutsideMaxExtent: true,
+                    attribution: '<a href="http://www.openstreetmap.org/">OpenStreetMap</a>'
+                }
+            );
             var gmap = new OpenLayers.Layer.Google("Google", {sphericalMercator:true});
             var sundials = new OpenLayers.Layer.Vector("KML", {
                 projection: map.displayProjection,
@@ -88,6 +96,20 @@
                 delete feature.popup;
             }
         }
+        function osm_getTileURL(bounds) {
+            var res = this.map.getResolution();
+            var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
+            var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
+            var z = this.map.getZoom();
+            var limit = Math.pow(2, z);
+
+            if (y < 0 || y >= limit) {
+                return OpenLayers.Util.getImagesLocation() + "404.png";
+            } else {
+                x = ((x % limit) + limit) % limit;
+                return this.url + z + "/" + x + "/" + y + "." + this.type;
+            }
+        }
     </script>
   </head>
   <body onload="init()">

examples/example-list.html

@@ -7,49 +7,62 @@
  * @requires OpenLayers/BaseTypes.js
  * @requires OpenLayers/Lang/en.js
  * @requires OpenLayers/Console.js
- */
- 
-/*
- * TODO: In 3.0, we will stop supporting build profiles that include
- * OpenLayers.js. This means we will not need the singleFile and scriptFile
- * variables, because we don't have to handle the singleFile case any more.
- */
+ */ 
 
 (function() {
     /**
      * Before creating the OpenLayers namespace, check to see if
      * OpenLayers.singleFile is true.  This occurs if the
      * OpenLayers/SingleFile.js script is included before this one - as is the
-     * case with old single file build profiles that included both
-     * OpenLayers.js and OpenLayers/SingleFile.js.
+     * case with single file builds.
      */
     var singleFile = (typeof OpenLayers == "object" && OpenLayers.singleFile);
 
     /**
-     * Relative path of this script.
+     * Cache for the script location returned from
+     * OpenLayers._getScriptLocation
      */
-    var scriptName = (!singleFile) ? "lib/OpenLayers.js" : "OpenLayers.js";
+    var scriptLocation;
 
     /**
      * Namespace: OpenLayers
      * The OpenLayers object provides a namespace for all things OpenLayers
      */
     window.OpenLayers = {
+        
+        /**
+         * Property: _scriptName
+         * {String} Relative path of this script.
+         */
+        _scriptName: (!singleFile) ? "lib/OpenLayers.js" : "OpenLayers.js",
+
         /**
-         * Method: _getScriptLocation
-         * Return the path to this script. This is also implemented in
-         * OpenLayers/SingleFile.js
+         * Function: _getScriptLocation
+         * Return the path to this script.
          *
          * Returns:
          * {String} Path to this script
          */
-        _getScriptLocation: (function() {
-            var r = new RegExp("(^|(.*?\\/))(" + scriptName + ")(\\?|$)");
-            var s = document.getElementsByTagName('script');
-            var m = s[s.length-1].getAttribute("src").match(r);
-            var l = m ? m[1] : "";
-            return (function() { return l; });
-        })()
+        _getScriptLocation: function () {
+            if (scriptLocation != undefined) {
+                return scriptLocation;
+            }
+            scriptLocation = "";            
+            var isOL = new RegExp("(^|(.*?\\/))(" + OpenLayers._scriptName + ")(\\?|$)");
+         
+            var scripts = document.getElementsByTagName('script');
+            for (var i=0, len=scripts.length; i<len; i++) {
+                var src = scripts[i].getAttribute('src');
+                if (src) {
+                    var match = src.match(isOL);
+                    if(match) {
+                        scriptLocation = match[1];
+                        break;
+                    }
+                }
+            }
+            return scriptLocation;
+        }
     };
     /**
      * OpenLayers.singleFile is a flag indicating this file is being included
@@ -60,7 +73,7 @@
      * 
      * When we *are* part of a SFL build we do not dynamically include the 
      * OpenLayers library code as it will be appended at the end of this file.
-     */
+      */
     if(!singleFile) {
         var jsfiles = new Array(
             "OpenLayers/Util.js",

examples/strategy-cluster.html

@@ -343,7 +343,10 @@ OpenLayers.Control = OpenLayers.Class({
                     this.displayClass.replace(/ /g, "") + "Active"
                 );
             }
-            this.events.triggerEvent("deactivate");
+            // deal with the case where the control is destroyed
+            if(this.events) {
+                this.events.triggerEvent("deactivate");
+            }
             return true;
         }
         return false;

examples/sundials-spherical-mercator.html

@@ -207,8 +207,7 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
      *
      * Parameters:
      * options - {Object} A configuration object which at least has to contain
-     *     a <protocol> property (if not, it has to be set before a request is
-     *     made)
+     *     a <protocol> property
      */
     initialize: function(options) {
         // concatenate events specific to vector with those from the base

lib/OpenLayers.js

@@ -95,6 +95,7 @@ OpenLayers.Control.Panel = OpenLayers.Class(OpenLayers.Control, {
      * APIMethod: destroy
      */
     destroy: function() {
+        this.deactivate();
         OpenLayers.Control.prototype.destroy.apply(this, arguments);
         for(var i = this.controls.length - 1 ; i >= 0; i--) {
             if(this.controls[i].events) {