From: Paul Norman <penorman@mac.com>
Date: Sat, 13 Aug 2016 20:56:20 +0000 (-0700)
Subject: Blacklist all Google imagery with one regex
X-Git-Tag: live~3823
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/00982e137f8b6034c73312ec6d029fd42d53f5fb?ds=sidebyside

Blacklist all Google imagery with one regex

This expression catches 100% of Google imagery seen in imagery_used
tags with no false positives.

It won't stop someone who tries to load "https://www.google.com/maps" as
imagery, but that will fail to get imagery anyway.
---

diff --git a/config/example.application.yml b/config/example.application.yml
index 1f0705bd3..9234099b7 100644
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -87,9 +87,9 @@ defaults: &defaults
   require_terms_agreed: false
   # Imagery to return in capabilities as blacklisted
   imagery_blacklist:
-    - ".*\\.googleapis\\.com/.*"
-    - ".*\\.google\\.com/.*"
-    - ".*\\.google\\.ru/.*"
+    # Current Google imagery URLs have google or googleapis in the domain
+    # with a vt or kh endpoint, and x, y and z query parameters
+    - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
   # URL of Overpass instance to use for feature queries
   overpass_url: "//overpass-api.de/api/interpreter"
   # Routing endpoints