diff options
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Open311.pm | 16 | ||||
| -rw-r--r-- | perllib/Open311.pm | 22 |
2 files changed, 30 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index 17492624d..fe99e3043 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -30,6 +30,10 @@ sub send { foreach my $council ( keys %{ $self->councils } ) { my $conf = FixMyStreet::App->model("DB::Open311conf")->search( { area_id => $council, endpoint => { '!=', '' } } )->first; + my $always_send_latlong = 1; + + my $basic_desc = 0; + # Extra bromley fields if ( $row->council =~ /2482/ ) { @@ -44,6 +48,10 @@ sub send { push @$extra, { name => 'requested_datetime', value => DateTime::Format::W3CDTF->format_datetime($row->confirmed_local->set_nanosecond(0)) }; push @$extra, { name => 'email', value => $row->user->email }; $row->extra( $extra ); + + $always_send_latlong = 0; + + $basic_desc = 1; } # FIXME: we've already looked this up before @@ -54,9 +62,11 @@ sub send { } ); my $open311 = Open311->new( - jurisdiction => $conf->jurisdiction, - endpoint => $conf->endpoint, - api_key => $conf->api_key, + jurisdiction => $conf->jurisdiction, + endpoint => $conf->endpoint, + api_key => $conf->api_key, + always_send_latlong => $always_send_latlong, + basic_description => $basic_desc, ); # non standard west berks end points diff --git a/perllib/Open311.pm b/perllib/Open311.pm index d97b61f90..b380409cf 100644 --- a/perllib/Open311.pm +++ b/perllib/Open311.pm @@ -20,6 +20,8 @@ has debug => ( is => 'ro', isa => 'Bool', default => 0 ); has debug_details => ( is => 'rw', 'isa' => 'Str', default => '' ); has success => ( is => 'rw', 'isa' => 'Bool', default => 0 ); has error => ( is => 'rw', 'isa' => 'Str', default => '' ); +has always_send_latlong => ( is => 'ro', isa => 'Bool', default => 1 ); +has basic_description => ( is => 'ro', isa => 'Bool', default => 0 ); before [ qw/get_service_list get_service_meta_info get_service_requests get_service_request_updates @@ -81,15 +83,18 @@ sub _populate_service_request_params { my $extra = shift; my $service_code = shift; - my $description = $self->_generate_service_request_description( - $problem, $extra - ); + my $description; + if ( $self->basic_description ) { + $description = $problem->detail; + } else { + $description = $self->_generate_service_request_description( + $problem, $extra + ); + } my ( $firstname, $lastname ) = ( $problem->user->name =~ /(\w+)\s+(.+)/ ); my $params = { - lat => $problem->latitude, - long => $problem->longitude, email => $problem->user->email, description => $description, service_code => $service_code, @@ -97,6 +102,13 @@ sub _populate_service_request_params { last_name => $lastname || '', }; + if ( $problem->used_map || $self->always_send_latlong ) { + $params->{lat} = $problem->latitude; + $params->{long} = $problem->longitude; + } else { + $params->{address} = $problem->postcode; + } + if ( $problem->user->phone ) { $params->{ phone } = $problem->user->phone; } |