Changeset 553 for trunk

Timestamp:

May 16, 2007, 6:06:55 PM (13 years ago)

Author:

Nick Burch

Message:

Update the export script to handle OSIE as well as OSGB

Location:

trunk/npemap.org.uk

Files:

• perllib/NPEMap/GeoConverter.pm (modified) (3 diffs)
• scripts/exporter/export.pl (modified) (7 diffs)

trunk/npemap.org.uk/perllib/NPEMap/GeoConverter.pm

@@ -14 +14 @@
 use Geography::NationalGrid;
 use Geography::NationalGrid::GB;
+use Geography::NationalGrid::IE;
 
 require Exporter;
@@ -20 +21 @@
 
 sub eastingNorthingToLatLong {
-        my ($e,$n) = @_;
+        my ($e,$n,$grid) = @_;
 
-        # Turn e+n into OSGB lat+long
-        my $point = Geography::NationalGrid::GB->new( Easting=>$e, Northing=>$n );
+        # Turn e+n into OSGB/OSIE lat+long
+        my $point = getNGPoint($e,$n,$grid);
         my $oslat = $point->latitude;
         my $oslong = $point->longitude;
 
-        # Turn OSGB lat+long into WGS84 lat+long
-        my $osgb_helper = Geo::HelmertTransform::datum("Airy1830");
+        # Turn OSGB/OSIE lat+long into WGS84 lat+long
+        my $datum = getDatum($grid);
+        my $osgb_helper = Geo::HelmertTransform::datum($datum);
         my $wgs84_helper = Geo::HelmertTransform::datum('WGS84');
 
@@ -38 +40 @@
 
 sub eastingNorthingToNGR {
-        my ($e,$n) = @_;
+        my ($e,$n,$grid) = @_;
 
         # Turn e+n into 2+6 NGR
-        my $point = Geography::NationalGrid::GB->new( Easting=>$e, Northing=>$n );
+        my $point = getNGPoint($e,$n,$grid);
         return $point->gridReference(100);
+}
+
+###########################################################################
+
+sub getNGPoint {
+        my ($e,$n,$grid) = @_;
+        unless($grid) { $grid = "osgb"; }
+
+        if($grid eq "osgb") {
+                return Geography::NationalGrid::GB->new( Easting=>$e, Northing=>$n );
+        }
+        if($grid eq "osie") {
+                return Geography::NationalGrid::IE->new( Easting=>$e, Northing=>$n );
+        }
+
+        warn("Unknown grid '$grid' requested, treating as osgb");
+        return getNGPoint($e,$n,'osgb');
+}
+
+sub getDatum {
+        my $grid = shift;
+        unless($grid) { $grid = "osgb"; }
+
+        if($grid eq "osgb") {
+                return "Airy1830";
+        }
+        if($grid eq "osie") {
+                return "Airy1830Modified";
+        }
+
+        warn("Unknown grid '$grid' requested, treating as osgb");
+        return getDatum('osgb');
 }
 

trunk/npemap.org.uk/scripts/exporter/export.pl

@@ -21 +21 @@
 use Geography::NationalGrid;
 use Geography::NationalGrid::GB;
+use Geography::NationalGrid::IE;
 
 # Find our private perl libraries
@@ -50 +51 @@
 print "# This information is public domain, and comes from http://www.npemap.org.uk/\n";
 print "#\n";
-print "# <outward>,<inward>,<easting>,<northing>,<WGS84 lat>,<WGS84 long>,<2+6 NGR>\n";
+print "# <outward>,<inward>,<easting>,<northing>,<WGS84 lat>,<WGS84 long>,<2+6 NGR>,<grid>\n";
 
 # Get our data fetch query
@@ -57 +58 @@
 # Process the query
 $query->execute;
-while(my ($outer,$inner,$e,$n) = $query->fetchrow_array) {
+while(my ($outer,$inner,$e,$n,$ie_e,$ie_n) = $query->fetchrow_array) {
+        # What grid are we on?
+        my $grid = "osgb";
+        if(!$e && $ie_e) {
+                $grid = "osie";
+                $e = $ie_e;
+                $n = $ie_n;
+        }
+        
         # Generate lat+long
-        my ($lat,$long) = eastingNorthingToLatLong($e,$n);
+        my ($lat,$long) = eastingNorthingToLatLong($e,$n,$grid);
         # Generate 2+6 NGR
-        my $ngr = eastingNorthingToNGR($e,$n);
+        my $ngr = eastingNorthingToNGR($e,$n,$grid);
 
         # Make e+n look nicer
@@ -71 +80 @@
         $long = sprintf("%0.6f", $long);
 
-        print "$outer,$inner,$e,$n,$lat,$long,$ngr\n";
+        print "$outer,$inner,$e,$n,$lat,$long,$ngr,$grid\n";
 }
 
@@ -95 +104 @@
 
                 my $sql = 
-                        "SELECT outward, inward, AVG(easting) AS avg_easting, AVG(northing) AS avg_northing ".
+                        "SELECT outward, inward, AVG(easting) AS avg_easting, AVG(northing) AS avg_northing, AVG(ie_easting) AS avg_easting_ie, AVG(ie_northing) AS avg_northing_ie ".
                         "FROM postcodes   ".
                         "WHERE source = ? AND NOT deleted ".
@@ -106 +115 @@
         } elsif($mode eq "-outer") {
                 my $sql = 
-                        "SELECT outward, '###' AS inward, AVG(easting) AS avg_easting, AVG(northing) AS avg_northing ".
+                        "SELECT outward, '###' AS inward, AVG(easting) AS avg_easting, AVG(northing) AS avg_northing, AVG(ie_easting) AS avg_easting_ie, AVG(ie_northing) AS avg_northing_ie ".
                         "FROM postcodes WHERE NOT deleted ".
                         "GROUP BY outward ".
@@ -115 +124 @@
         } elsif($mode eq "-outer1") {
                 my $sql = 
-                        "SELECT outward, substr(inward,1,1) || '##' AS inward, AVG(easting) AS avg_easting, AVG(northing) AS avg_northing ".
+                        "SELECT outward, substr(inward,1,1) || '##' AS inward, AVG(easting) AS avg_easting, AVG(northing) AS avg_northing, AVG(ie_easting) AS avg_easting_ie, AVG(ie_northing) AS avg_northing_ie ".
                         "FROM postcodes WHERE NOT deleted ".
                         "GROUP BY outward, substr(inward,1,1) ".