Changeset 1080

Timestamp:

06/16/07 18:30:53 (1 year ago)

Author:

ilmari

Message:

Make sure coordinates are non-empty as well as defined.

Files:

• trunk/lib/OpenGuides/Template.pm (modified) (6 diffs)

trunk/lib/OpenGuides/Template.pm

@@ -424 +424 @@
-
-            # If we were sent x and y, work out lat/long; and vice versa.
-defined
+length $os_x && defined $os_y && length
-                my $point = Geography::NationalGrid::GB->new( Easting =>$os_x,
-                                     Northing=>$os_y);
-                $lat  = sprintf("%.6f", $point->latitude);
-                $long = sprintf("%.6f", $point->longitude);
-defined
+length $lat && defined $long && length
-                my $point = Geography::NationalGrid::GB->new(Latitude  => $lat,
-                                                             Longitude => $long);
@@ -436 +436 @@
-            }
-            
-defined
+length $os_x && defined $os_y && length
-                %vars = (
-                            %vars,
@@ -469 +469 @@
-
-            # If we were sent x and y, work out lat/long; and vice versa.
-defined
+length $osie_x && defined $osie_y && length
-                my $point = Geography::NationalGrid::IE->new(Easting=>$osie_x,
-                                   Northing=>$osie_y);
-                $lat = sprintf("%.6f", $point->latitude);
-                $long = sprintf("%.6f", $point->longitude);
-defined
+length $lat && defined $long && length
-                my $point = Geography::NationalGrid::GB->new(Latitude  => $lat,
-                                                             Longitude => $long);
@@ -480 +480 @@
-                $osie_y = $point->northing;
-            }
-defined
+length $osie_x && defined $osie_y && length
-                %vars = (
-                            %vars,
@@ -506 +506 @@
-            my $long   = $q->param("longitude");
-            
-defined
+length $lat && defined $long && length
-                # Trim whitespace.
-                $lat =~ s/\s+//g;
@@ -543 +543 @@
-    if ( $prefs{latlong_traditional} ) {
-        foreach my $var ( qw( latitude longitude ) ) {
-
+ && length $vars{$var}
-            $vars{$var."_unmunged"} = $vars{$var};
-            $vars{$var} = Geography::NationalGrid->deg2string($vars{$var});