From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Jul 2020 07:18:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/321'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c7dae1efb8bf82fc9c8ebded662fc0101f7c8d2d?hp=8aef5776d29ea1a8252e48593995ffcea68a9602

Merge remote-tracking branch 'github/pull/321'
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 5ac109bee..21af3c9c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,8 +4,8 @@ GEM
     ast (2.4.1)
     bcrypt_pbkdf (1.0.1)
     builder (3.2.4)
-    cookstyle (6.11.4)
-      rubocop (= 0.87.1)
+    cookstyle (6.12.6)
+      rubocop (= 0.88.0)
     diff-lcs (1.4.4)
     docker-api (1.34.2)
       excon (>= 0.47.0)
@@ -74,7 +74,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.87.1)
+    rubocop (0.88.0)
       parallel (~> 1.10)
       parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
diff --git a/cookbooks/imagery/templates/default/imagery.js.erb b/cookbooks/imagery/templates/default/imagery.js.erb
index 0f277444b..b42705d70 100644
--- a/cookbooks/imagery/templates/default/imagery.js.erb
+++ b/cookbooks/imagery/templates/default/imagery.js.erb
@@ -6,7 +6,7 @@ function createMap(divName) {
   var layers = L.control.layers(null, null, {collapsed:false}).addTo(map);
 
   // Add OpenStreetMap layer
-  layers.addBaseLayer(L.tileLayer("//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+  layers.addBaseLayer(L.tileLayer("//tile-openstreetmap-org.global.ssl.fastly.net/{z}/{x}/{y}.png", {
     attribution: "© <a target=\"_parent\" href=\"https://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"https://www.openstreetmap.org/copyright\">open license</a>",
     maxZoom: 19
   }), "OpenStreetMap");