Merge remote-tracking branch 'openstreetmap/pull/1538'

diff --git a/.mailmap b/.mailmap
index e4c19a34cf5bc39fe643d544de30527476191dc5..29f21fde6f1178be3dd239791da197b071f89b44 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -7,3 +7,4 @@ Kai Krueger <kakrueger@gmail.com> <kai@aiputerlx.(none)>
 Michael Glanznig <nebulon42@yandex.com>
 Petr Kadlec <mormegil@centrum.cz>
 Richard Fairhurst <richard@systemeD.net> <richard@systemed.net>
+Simon Poole <simon@poole.ch> <simon@rails-dev.poole.ch>

diff --git a/config/example.application.yml b/config/example.application.yml
index 45c0a39c4aca3cfbd1d3be77e79d6f2d3d222f76..9c5c7a180ca3fb7eb3ee2ffeb1baef6e51861272 100644 (file)
--- a/config/example.application.yml
+++ b/config/example.application.yml
@@ -95,6 +95,8 @@ defaults: &defaults
     - ".*\\.google(apis)?\\..*/(vt|kh)[\\?/].*([xyz]=.*){3}.*"
     # Blacklist VWorld
     - "http://xdworld\\.vworld\\.kr:8080/.*"
+    # Blacklist here
+    - ".*\\.here\\.com[/:].*"
   # URL of Overpass instance to use for feature queries
   overpass_url: "//overpass-api.de/api/interpreter"
   # Routing endpoints