Merge remote-tracking branch 'origin/master' into send-report-rewrite

Conflicts:
	bin/send-reports
	perllib/FixMyStreet/Cobrand/Default.pm
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 33 insertions, 0 deletions

diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
new file mode 100644
index 000000000..9cf6de01f
--- /dev/null
+++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
@@ -0,0 +1,33 @@
+#!/usr/bin/perl
+#
+# FixMyStreet:Map::OSM::CycleMap
+# OSM CycleMap maps on FixMyStreet.
+#
+# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
+# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
+
+package FixMyStreet::Map::OSM::MapQuest;
+use base 'FixMyStreet::Map::OSM';
+
+use strict;
+
+sub map_type {
+    return 'OpenLayers.Layer.OSM.MapQuestOpen';
+}
+
+sub map_tiles {
+    my ($self, $x, $y, $z) = @_;
+    my $tile_url = $self->base_tile_url();
+    return [
+        "http://otile1.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png",
+        "http://otile2.$tile_url/$z/$x/" . ($y - 1) . ".png",
+        "http://otile3.$tile_url/$z/" . ($x - 1) . "/$y.png",
+        "http://otile4.$tile_url/$z/$x/$y.png",
+    ];
+}
+
+sub base_tile_url {
+    return 'mqcdn.com/tiles/1.0.0/osm/';
+}
+
+1;