Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses

Conflicts:
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/JSON.pm
	perllib/FixMyStreet/Map/Tilma/Original.pm
	web/css/core.css

1 files changed, 0 insertions, 35 deletions

diff --git a/perllib/FixMyStreet/Map/Tilma/OpenLayers.pm b/perllib/FixMyStreet/Map/Tilma/OpenLayers.pm
deleted file mode 100644
index 31e9eb096..000000000
--- a/perllib/FixMyStreet/Map/Tilma/OpenLayers.pm
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/perl
-#
-# FixMyStreet:Map::Tilma::1_10k_OL
-# Using tilma.mysociety.org with OpenLayers
-#
-# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
-# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
-
-package FixMyStreet::Map::Tilma::OpenLayers;
-
-use strict;
-
-sub TILE_WIDTH()   { return $FixMyStreet::Map::map_class->tile_width;   }
-sub SCALE_FACTOR() { return $FixMyStreet::Map::map_class->scale_factor; }
-sub TILE_TYPE()    { return $FixMyStreet::Map::map_class->tile_type;    }
-
-# display_map C PARAMS
-# PARAMS include:
-# latitude, longitude for the centre point of the map
-# TYPE is 1 if the map is clickable, 0 otherwise.
-# PINS is array of pins to show, location and colour
-sub display_map {
-    my ($self, $c, %params) = @_;
-    $c->stash->{map} = {
-        %params,
-        type => 'tilma/openlayers',
-        tile_type => TILE_TYPE,
-        tilewidth => TILE_WIDTH,
-        watermark => $self->watermark(),
-        copyright => $self->copyright(),
-        maxResolution => SCALE_FACTOR / TILE_WIDTH,
-    };
-}
-
-1;