Changeset 1079

Timestamp:

06/16/07 16:41:13 (1 year ago)

Author:

dom

Message:

Fix bug representing zero geodata (fixes #215)

Files:

• trunk/lib/OpenGuides/Template.pm (modified) (5 diffs)
• trunk/t/69_bug_zero_geo.t (added)

trunk/lib/OpenGuides/Template.pm

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