Merge remote-tracking branch 'upstream/master'

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index 7558efd92f123c55fe01028ec83cffe618588c25..c36f0e577b0f76bdee623118065675fd678b5575 100644 (file)
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -1,4 +1,9 @@
 <?php
+       if (file_exists(getenv('NOMINATIM_SETTINGS')))
+       {
+               echo 'Using local config: '.getenv('NOMINATIM_SETTINGS');
+               require_once(getenv('NOMINATIM_SETTINGS'));
+       }
 
        require_once('init.php');
        require_once('cmd.php');

diff --git a/website/js/tiles.js b/website/js/tiles.js
index 37e243abda3b97631b8de0c26974e4d804d7a5fa..fdf5224c1ad1ca6f2c15a8fdfa745cf11e34d257 100644 (file)
--- a/website/js/tiles.js
+++ b/website/js/tiles.js
@@ -3,30 +3,6 @@
  */
 OpenLayers.Util.OSM = {};
 
-/**
- * Constant: MISSING_TILE_URL
- * {String} URL of image to display for missing tiles
- */
-OpenLayers.Util.OSM.MISSING_TILE_URL = "http://www.openstreetmap.org/openlayers/img/404.png";
-
-/**
- * Property: originalOnImageLoadError
- * {Function} Original onImageLoadError function.
- */
-OpenLayers.Util.OSM.originalOnImageLoadError = OpenLayers.Util.onImageLoadError;
-
-/**
- * Function: onImageLoadError
- */
-OpenLayers.Util.onImageLoadError = function() {
-    if (this.src.match(/^http:\/\/[abc]\.[a-z]+\.openstreetmap\.org\//)) {
-        this.src = OpenLayers.Util.OSM.MISSING_TILE_URL;
-    } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) {
-        // do nothing - this layer is transparent
-    } else {
-        OpenLayers.Util.OSM.originalOnImageLoadError;
-    }
-};
 
 /**
  * Class: OpenLayers.Layer.OSM.Mapnik
@@ -44,9 +20,9 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
-            "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png",
-            "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png",
-            "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"
+            "//a.tile.openstreetmap.org/${z}/${x}/${y}.png",
+            "//b.tile.openstreetmap.org/${z}/${x}/${y}.png",
+            "//c.tile.openstreetmap.org/${z}/${x}/${y}.png"
         ];
         options = OpenLayers.Util.extend({ numZoomLevels: 19, buffer: 0,
            attribution : '© <a target="_parent" href="http://www.openstreetmap.org">OpenStreetMap</a> and contributors, under an <a target="_parent" href="http://www.openstreetmap.org/copyright">open license</a>' }, options);