Changeset 406

Timestamp:

06/13/04 16:15:37 (5 years ago)

Author:

kake

Message:

Allow OS coords as input to distance search.

Location:

trunk

Files:

• lib/OpenGuides/SuperSearch.pm (modified) (4 diffs)
• t/33_supersearch_advanced_search.t (modified) (4 diffs)
• templates/supersearch.tt (modified) (1 diff)

trunk/lib/OpenGuides/SuperSearch.pm

@@ -97 +97 @@
     $tt_vars{ss_info_url} = 'http://london.openguides.org/?Search_Script';
 
-    # Strip out any non-digits from dist; lat and long also allowed '-' and '.'
-    $vars{lat} =~ s/[^-\.0-9]//g;
-    $vars{long} =~ s/[^-\.0-9]//g;
-    $vars{distance_in_metres} =~ s/[^0-9]//g;
+    # Strip out any non-digits from dist and OS co-ords; lat and long
+    # also allowed '-' and '.'
+    foreach my $param( qw( lat long ) ) {
+        if ( defined $vars{$param} ) {
+            $vars{$param} =~ s/[^-\.0-9]//g;
+            # will check for definedness later as can be 0.
+            delete $vars{$param} if $vars{$param} eq "";
+        }
+    }
+    foreach my $param ( qw( os_x os_y distance_in_metres ) ) {
+        if ( defined $vars{$param} ) {
+            $vars{$param} =~ s/[^0-9]//g;
+            # will check for definedness later as can be 0.
+            delete $vars{$param} if $vars{$param} eq "";
+        }
+    }
 
     # Strip leading and trailing whitespace from search text.
@@ -110 +122 @@
     my $doing_search;
     if ( $vars{search}
-         or ( defined $vars{lat}
-              && defined $vars{long}
+         or ( ( (defined $vars{lat} && defined $vars{long})
+                or (defined $vars{os_x} && defined $vars{os_y}) )
               && defined $vars{distance_in_metres} )
     ) {
         $doing_search = 1;
         $tt_vars{search_terms} = $vars{search};
-        $tt_vars{lat} = $vars{lat};
-        $tt_vars{long} = $vars{long};
         $tt_vars{dist} = $vars{distance_in_metres};
+        foreach my $param ( qw( lat long os_x os_y ) ) {
+            $tt_vars{$param} = $vars{$param};
+        }
         $self->_perform_search( vars => \%vars );
     }
@@ -312 +325 @@
 
     # Now filter by distance if required.
-    my ($lat, $long, $dist) = @vars{ qw( lat long distance_in_metres ) };
-    if ( defined $lat && defined $long && $dist ) {
+    my ($os_x, $os_y, $lat, $long, $dist) =
+                         @vars{ qw( os_x os_y lat long distance_in_metres ) };
+    if ( ( (defined $lat && defined $long)
+           or (defined $os_x and defined $os_y)
+                                                ) && $dist ) {
         my %results = %{ $self->{results} || {} };
-        my @close = $self->{locator}->find_within_distance(
-                                                            lat    => $lat,
-                                                            long   => $long,
-                                                            metres => $dist,
-                                                          );
+        my @close;
+        if ( defined $lat && defined $long ) {
+            @close = $self->{locator}->find_within_distance(
+                                                             lat    => $lat,
+                                                             long   => $long,
+                                                             metres => $dist,
+                                                           );
+        } else {
+            @close = $self->{locator}->find_within_distance(
+                                                             os_x   => $os_x,
+                                                             os_y   => $os_y,
+                                                             metres => $dist,
+                                                           );
+        }
         my %close_hash = map { $_ => 1 } @close;
         my @nodes = keys %results;
@@ -326 +351 @@
             $unmunged =~ s/_/ /g;
             if ( exists $close_hash{$unmunged} ) {
-                my $distance = $self->{locator}->distance(
+                my $distance;
+                if ( defined $lat && defined $long ) {
+                    $distance = $self->{locator}->distance(
                                                  from_lat  => $lat,
                                                  from_long => $long,
                                                  to_node   => $unmunged,
                                                  unit      => "metres"
-                                                         );
+                                                          );
+                } else {
+                    $distance = $self->{locator}->distance(
+                                                 from_os_x => $os_x,
+                                                 from_os_y => $os_y,
+                                                 to_node   => $unmunged,
+                                                 unit      => "metres"
+                                                          );
+                }
                 $results{$node}{distance} = $distance;                
             } else {

trunk/t/33_supersearch_advanced_search.t

@@ -3 +3 @@
 use Config::Tiny;
 use OpenGuides::SuperSearch;
-use Test::More tests => 4;
+use Test::More tests => 8;
 
 eval { require DBD::SQLite; };
@@ -9 +9 @@
 
 SKIP: {
-    skip "DBD::SQLite not installed - no database to test with", 4
+    skip "DBD::SQLite not installed - no database to test with", 8
       unless $have_sqlite;
 
@@ -127 +127 @@
                              return_tt_vars => 1,
                              vars => {
+                                       os_x => 523450,
+                                       os_y => 177650,
+                                       distance_in_metres => 1000,
+                                       search => " ",
+                                     },
+                           );
+    @ordered = map { $_->{name} } @{ $tt_vars{results} || [] };
+    @found = sort @ordered;
+    is_deeply( \@found,
+               [ "Blue_Anchor", "Crabtree_Tavern", "Hammersmith_Bridge" ],
+               "...works with OS co-ords" );
+
+    %tt_vars = eval {
+               $search->run(
+                             return_tt_vars => 1,
+                             vars => {
+                                       os_x => 523450,
+                                       os_y => 177650,
+                                       distance_in_metres => 1000,
+                                       search => " ",
+                                       lat => " ",
+                                       long => " ",
+                                     },
+                           );
+    };
+    is( $@, "", "...works with OS co-ords and whitespace-only lat/long" );
+    @ordered = map { $_->{name} } @{ $tt_vars{results} || [] };
+    @found = sort @ordered;
+    is_deeply( \@found,
+               [ "Blue_Anchor", "Crabtree_Tavern", "Hammersmith_Bridge" ],
+                 "...returns the right stuff" );
+
+    %tt_vars = $search->run(
+                             return_tt_vars => 1,
+                             vars => {
                                        lat  => 51.484320,
                                        long => -0.223484,
@@ -136 +171 @@
     is_deeply( \@found, [ "Blue_Anchor", "Crabtree_Tavern", ],
                "distance search in combination with text search works" );
+
+    %tt_vars = $search->run(
+                             return_tt_vars => 1,
+                             vars => {
+                                       os_x => 523450,
+                                       os_y => 177650,
+                                       distance_in_metres => 1000,
+                                       search => "pubs",
+                                     },
+                           );
+    @found = sort map { $_->{name} } @{ $tt_vars{results} || [] };
+    is_deeply( \@found, [ "Blue_Anchor", "Crabtree_Tavern", ],
+               "...works with OS co-ords too" );
 }

trunk/templates/supersearch.tt

@@ -32 +32 @@
     latitude <input type="text" name="lat" value="[% lat %]" size="10" maxlength="10" />
     longitude <input type="text" name="long" value="[% long %]" size="10" maxlength="10" />
+    <strong>or</strong> of OS co-ordinates
+    <input type="text" name="os_x" value="[% os_x %]" size="10" maxlength="10" />,
+    <input type="text" name="os_y" value="[% os_y %]" size="10" maxlength="10" />
     <br />
     <input type="submit" name="go" class="form_button" value="Go" />