Changeset 512 for trunk/npemap.org.uk/cgi/get-postcodes.fcgi

Timestamp:

Mar 26, 2007, 6:44:57 PM (14 years ago)

Author:

Nick Burch

Message:

Support getting gb and ie postcodes, with the optional parameter ie

File:

• trunk/npemap.org.uk/cgi/get-postcodes.fcgi (modified) (5 diffs)

trunk/npemap.org.uk/cgi/get-postcodes.fcgi

@@ -26 +26 @@
 my $max_distance = 50000; # in metres
 
+my %grid_max = (
+        easting  => { 'gb' => 700000, 'ie' => 400000 },
+        northing => { 'gb' => 1300000, 'ie' => 500000 },
+);
+
 my $cgi;
 # Process incoming requests
@@ -35 +40 @@
         next REQUEST;
     }
+
+        # Did they request the irish grid?
+        my $grid = 'gb';
+        my $ie = 0;
+        if(defined $cgi->param('ie')) {
+                $grid = 'ie';
+                $ie = 1;
+        }
 
     # Input validation
@@ -46 +59 @@
     # Are the Eastings in a valid range?
     foreach (qw(mineasting maxeasting)) {
-        if (($cgi->param($_) > 700000) or
+        if (($cgi->param($_) > $grid_max{'easting'}->{$grid}) or
             ($cgi->param($_) < 0)) {
-            print_err ("Parameter '$_' must be an integer between 0 and 700,000");
+            print_err ("Parameter '$_' must be an integer between 0 and ".($grid_max{'easting'}->{$grid}/1000).",000");
             next REQUEST;
         }
@@ -55 +68 @@
     # Are the Northings in a valid range?
     foreach (qw(minnorthing maxnorthing)) {
-        if (($cgi->param($_) > 1300000) or
+        if (($cgi->param($_) > $grid_max{'northing'}->{$grid}) or
             ($cgi->param($_) < 0)) {
-            print_err("Parameter '$_' must be an integer between 0 and 1,300,000");
+            print_err("Parameter '$_' must be an integer between 0 and ".($grid_max{'northing'}->{$grid}/1000).",000");
             next REQUEST;
         }
@@ -68 +81 @@
     }
 
-    my $sth = $dbh->prepare("SELECT outward || ' ' || inward AS postcode, easting, northing,id,source FROM postcodes WHERE easting BETWEEN ? AND ? AND northing BETWEEN ? AND ? AND NOT deleted");
+        my ($e,$n) = ("easting","northing");
+        if($ie) { ($e,$n) = ("ie_easting","ie_northing"); }
+    my $sth = $dbh->prepare("SELECT outward || ' ' || inward AS postcode, $e, $n,id,source FROM postcodes WHERE $e BETWEEN ? AND ? AND $n BETWEEN ? AND ? AND NOT deleted");
     
     if ($sth->execute($cgi->param('mineasting'), $cgi->param('maxeasting'), $cgi->param('minnorthing'), $cgi->param('maxnorthing'))) {