From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 20 Feb 2014 18:52:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~552
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/e33928bbf031720bab699c8acfa401b3ced7c02b?hp=1187929a02ee62ae154f0faed14a5ad853f0674f

Merge remote-tracking branch 'upstream/master'
---

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index 7558efd9..c36f0e57 100644
--- 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 37e243ab..fdf5224c 100644
--- 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);