5 files changed, 135 insertions, 13 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Angus.pm b/perllib/FixMyStreet/Cobrand/Angus.pm
new file mode 100644
index 000000000..23d0d2c58
--- /dev/null
+++ b/perllib/FixMyStreet/Cobrand/Angus.pm
@@ -0,0 +1,127 @@
+package FixMyStreet::Cobrand::Angus;
+use parent 'FixMyStreet::Cobrand::UKCouncils';
+
+use strict;
+use warnings;
+
+sub council_id { return 2550; }
+sub council_area { return 'Angus'; }
+sub council_name { return 'Angus Council'; }
+sub council_url { return 'angus'; }
+
+sub base_url {
+    return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE');
+    return 'https://fix.angus.gov.uk';
+}
+
+sub enter_postcode_text {
+    my ($self) = @_;
+    return 'Enter an Angus postcode, or street name and area';
+}
+
+sub example_places {
+    return ( 'DD8 3AP', "Canmore Street" );
+}
+
+sub default_show_name { 0 }
+
+sub disambiguate_location {
+    my $self    = shift;
+    my $string  = shift;
+
+    return {
+        %{ $self->SUPER::disambiguate_location() },
+        town => 'Angus',
+        centre => '56.7240845983561,-2.91774391131183',
+        span   => '0.525195055746977,0.985870680170788',
+        bounds => [ 56.4616875530489, -3.40703662677109, 56.9868826087959, -2.4211659466003 ],
+    };
+}
+
+sub pin_colour {
+    my ( $self, $p, $context ) = @_;
+    return 'grey' if $p->state eq 'not responsible';
+    return 'green' if $p->is_fixed || $p->is_closed;
+    return 'red' if $p->state eq 'confirmed';
+    return 'yellow';
+}
+
+sub contact_email {
+    my $self = shift;
+    return join( '@', 'accessline', 'angus.gov.uk' );
+}
+
+=head2 temp_email_to_update, temp_update_contacts
+
+Temporary helper routines to update the extra for potholes (temporary setup
+hack, cargo-culted from Harrogate, may in future be superseded either by
+Open311/integration or a better mechanism for manually creating rich contacts).
+
+Can run with a script or command line like:
+
+ bin/cron-wrapper perl -MFixMyStreet::App -MFixMyStreet::Cobrand::Angus -e \
+ 'FixMyStreet::Cobrand::Angus->new({c => FixMyStreet::App->new})->temp_update_contacts'
+
+=cut
+
+sub temp_update_contacts {
+    my $self = shift;
+
+    my $contact_rs = $self->{c}->model('DB::Contact');
+
+    my $_update = sub {
+        my ($category, $field, $category_details) = @_;
+        # NB: we're accepting just 1 field, but supply as array [ $field ]
+
+        my $contact = $contact_rs->find_or_create(
+            {
+                body_id => $self->council_id,
+                category => $category,
+                %{ $category_details || {} },
+            },
+            {
+                key => 'contacts_body_id_category_idx'
+            }
+        );
+
+        my %default = (
+            variable => 'true',
+            order => '1',
+            required => 'no',
+            datatype => 'string',
+            datatype_description => 'a string',
+        );
+
+        if ($field->{datatype} || '' eq 'boolean') {
+            my $description = $field->{description};
+            %default = (
+                %default,
+                datatype => 'singlevaluelist',
+                datatype_description => 'Yes or No',
+                values => { value => [
+                        { key => ['No'],  name => ['No'] },
+                        { key => ['Yes'], name => ['Yes'] },
+                ] },
+            );
+        }
+
+        $contact->update({
+            # XXX: we're just setting extra with the expected layout,
+            # this could be encapsulated more nicely
+            extra => { _fields => [ { %default, %$field } ] },
+            confirmed => 1,
+            deleted => 0,
+            editor => 'automated script',
+            whenedited => \'NOW()',
+            note => 'Edited by script as per requirements Jan 2016',
+        });
+    };
+
+    $_update->( 'Street lighting', {
+            code => 'column_id',
+            description => 'Lamp post number',
+        });
+
+}
+
+1;
diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index b3b830f06..c76ee0f7d 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -936,10 +936,6 @@ sub updates_as_hashref {
     return {};
 }
 
-sub get_country_for_ip_address {
-    return 0;
-}
-
 sub jurisdiction_id_example {
     my $self = shift;
     return $self->moniker;
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index 159f2f5db..99fe6da15 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -1,6 +1,5 @@
 package FixMyStreet::Cobrand::FixMyStreet;
 use base 'FixMyStreet::Cobrand::UK';
-use mySociety::Gaze;
 
 use constant COUNCIL_ID_BROMLEY => 2482;
 
@@ -52,13 +51,6 @@ sub extra_contact_validation {
     return %errors;
 }
 
-sub get_country_for_ip_address {
-    my $self = shift;
-    my $ip = shift;
-
-    return mySociety::Gaze::get_country_from_ip($ip);
-}
-
 sub report_form_extras {
     ( { name => 'gender', required => 0 }, { name => 'variant', required => 0 } )
 }
diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm
index 7535a34bf..d23e62138 100644
--- a/perllib/FixMyStreet/Cobrand/Greenwich.pm
+++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm
@@ -9,6 +9,11 @@ sub council_area { return 'Greenwich'; }
 sub council_name { return 'Royal Borough of Greenwich'; }
 sub council_url { return 'greenwich'; }
 
+sub base_url {
+    return FixMyStreet->config('BASE_URL') if FixMyStreet->config('STAGING_SITE');
+    return 'https://fix.royalgreenwich.gov.uk';
+}
+
 sub example_places {
     return ( 'SE18 6HQ', "Woolwich Road" );
 }
diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
index c78ae5e09..543dd431a 100644
--- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
+++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm
@@ -52,6 +52,8 @@ sub default_show_name { 0 }
 Returns the number of working days that are expected to elapse
 between the problem being reported and it being responded to by
 the council/body.
+If the value 'emergency' is returned, a different template block
+is triggered that has custom wording.
 
 =cut
 
@@ -79,7 +81,7 @@ sub problem_response_days {
     return 10 if $p->category eq 'Road traffic signs';
     return 10 if $p->category eq 'Roads/highways';
     return 10 if $p->category eq 'Skips and scaffolding';
-    return 10 if $p->category eq 'Street lighting';
+    return 'emergency' if $p->category eq 'Street lighting';
     return 10 if $p->category eq 'Traffic lights'; # phone if urgent
     return 10 if $p->category eq 'Traffic';
     return 10 if $p->category eq 'Trees';