X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/d4179b857731db3a6d9d9b59662c7a9abd26221f..0e2e6b9d7534cd8ad31dfde5006a5e20807a03d9:/bin/mkgeo

diff --git a/bin/mkgeo b/bin/mkgeo
index aa79f7b..b2c1d4f 100755
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -7,7 +7,6 @@ use IO::File;
 use Math::Trig qw(deg2rad pip2 great_circle_distance);
 use JSON::XS;
 use LWP::UserAgent;
-use XML::Writer;
 use XML::TreeBuilder;
 use YAML;
 
@@ -15,11 +14,24 @@ my $source = shift @ARGV;
 my $zone = shift @ARGV;
 my $servers = YAML::LoadFile("src/${source}");
 
-foreach my $server (values %$servers)
+# Initialise server details
+while (my($name,$server) = each %$servers)
 {
-    $server->{status} = "down";
+    $server->{name} = $name;
+    $server->{bandwidth_limit} = $server->{bandwidth} * 1024 * 1024;
+    $server->{bandwidth_used} = 0;
+
+    if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
+    {
+        $server->{status} = "down";
+    }
+    else
+    {
+        $server->{status} = "up";
+    }
 }
 
+# If pingdom support is enabled then check which servers are up
 if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
 {
     my $ua = LWP::UserAgent->new;
@@ -44,62 +56,93 @@ if ($ENV{PINGDOM_USERNAME} && $ENV{PINGDOM_PASSWORD})
 }
 
 my %countries = ();
+my @mappings = ();
 
+# Create a parser for the country database
 my $countries = XML::TreeBuilder->new;
 
+# Parse the country database
 $countries->parsefile("lib/countries.xml");
 
+# Load the per-country bandwidth details
+my $bandwidth = YAML::LoadFile("bandwidth/${source}.yml");
+
+# Fill in country table and work out which servers each can use
 foreach my $country ($countries->look_down("_tag" => "country"))
 {
     my $code = $country->look_down("_tag" => "countryCode")->as_text;
     my $name = $country->look_down("_tag" => "countryName")->as_text;
+    my $population = $country->look_down("_tag" => "population")->as_text;
+    my $bandwidth = $bandwidth->{$code} || 0;
     my $continent = $country->look_down("_tag" => "continent")->as_text;
-    my $west = $country->look_down("_tag" => "bBoxWest")->as_text;
-    my $north = $country->look_down("_tag" => "bBoxNorth")->as_text;
-    my $east = $country->look_down("_tag" => "bBoxEast")->as_text;
-    my $south = $country->look_down("_tag" => "bBoxSouth")->as_text;
+    my $west = $country->look_down("_tag" => "west")->as_text;
+    my $north = $country->look_down("_tag" => "north")->as_text;
+    my $east = $country->look_down("_tag" => "east")->as_text;
+    my $south = $country->look_down("_tag" => "south")->as_text;
     my $lat = centre_lat( $south, $north );
     my $lon = centre_lon( $west, $east );
-    my @servers;
 
-    foreach my $servername (keys %$servers)
+    $countries{$code} = {
+        code => $code, name => $name, continent => $continent,
+        bandwidth => $bandwidth, lat => $lat, lon => $lon
+    };
+
+    foreach my $server (values %$servers)
     {
-        my $server = $servers->{$servername};
         my $match = match_country($server, $code, $continent);
 
-        if ($match eq "preferred" || $match eq "allowed")
+        if ($server->{status} eq "up" && $match ne "denied")
         {
             my $priority = $match eq "preferred" ? 20 : 10;
             my $distance = distance($lat, $lon, $server->{lat}, $server->{lon});
 
-            $priority = $priority * 10 if $server->{status} eq "up";
+            push @mappings, {
+                country => $countries{$code}, server => $server,
+                priority => $priority, distance => $distance
+            };
+        }
+    }
+}
+
+# Discard the parsed country database
+$countries->delete;
 
-#            print STDERR "$servername is $match for $name with distance $distance\n";
+# Allocate each country to a server
+allocate_servers(\@mappings);
 
-            push @servers, { name => $servername, priority => $priority, distance => $distance };
-        }
+# If we failed to allocate every country then loop, increasing
+# the bandwidth for each server by a little and retrying until
+# we manage to allocate everything
+while (grep { !exists($_->{server}) } values %countries)
+{
+    # Clear any existing mappings of countries to servers
+    foreach my $country (values %countries)
+    {
+        delete $country->{server};
     }
 
-    $countries{$code} = {
-        code => $code, name => $name, continent => $continent,
-        lat => $lat, lon => $lon, servers => \@servers
-    };
+    # Reset bandwidth usage for servers and increase limits by 10%
+    foreach my $server (values %$servers)
+    {
+        $server->{bandwidth_used} = 0;
+        $server->{bandwidth_limit} = $server->{bandwidth_limit} * 1.1;
+    }
+
+    # Try the allocate again
+    allocate_servers(\@mappings);
 }
 
-$countries->delete;
+# Create JSON collection object
+my @json;
 
+# Open output files
 my $zonefile = IO::File->new("> data/${zone}") || die "$!";
-my $kmlfile = IO::File->new("> kml/${zone}.kml") || die "$!";
-my $kmlwriter = XML::Writer->new(OUTPUT => $kmlfile, ENCODING => 'utf-8');
-
-$kmlwriter->xmlDecl();
-$kmlwriter->startTag("kml", "xmlns" => "http://www.opengis.net/kml/2.2");
-$kmlwriter->startTag("Document");
+my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 
+# Output details for each country
 foreach my $country (values %countries)
 {
-    my @servers = sort { $b->{priority} <=> $a->{priority} || $a->{distance} <=> $b->{distance} } @{$country->{servers}};
-    my $server = $servers->{$servers[0]->{name}};
+    my $server = $country->{server};
     my $clon = $country->{lon};
     my $clat = $country->{lat};
     my $slon = $server->{lon};
@@ -107,33 +150,48 @@ foreach my $country (values %countries)
 
     if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
     {
-        $clon = $clon - 360;
+        $slon = $slon + 360;
+    }
+    elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon)
+    {
+        $clon = $clon + 360;
     }
 
-    $zonefile->print("C\L$country->{code}\E.${zone}:$servers[0]->{name}.${zone}:600\n");
-
-    $kmlwriter->startTag("Placemark");
-    $kmlwriter->dataElement("name", $country->{name});
-    $kmlwriter->startTag("LineString");
-    $kmlwriter->dataElement("coordinates", "$clon,$clat $slon,$slat");
-    $kmlwriter->endTag("LineString");
-    $kmlwriter->endTag("Placemark");
+    $zonefile->print("# $country->{name}\n");
+    $zonefile->print("C\L$country->{code}\E.${zone}:$server->{name}.${zone}:600\n");
+
+    push @json, {
+        type => "Feature",
+        geometry => {
+            type => "LineString",
+            coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
+        },
+        properties => {
+            country => $country->{name},
+            server => $server->{name},
+            colour => $server->{colour}
+        }
+    };
 }
 
+# Output default records for IPs that can't be mapped to a country
 foreach my $server (grep { $servers->{$_}->{default} } keys %$servers)
 {
     $zonefile->print("Cxx.${zone}:${server}.${zone}:600\n");
 }
 
-$kmlwriter->endTag("Document");
-$kmlwriter->endTag("kml");
-$kmlwriter->end();
+# Output the GeoJSON text
+$jsonfile->print(encode_json(\@json));
 
-$kmlfile->close();
+# Close the output files
+$jsonfile->close();
 $zonefile->close();
 
 exit 0;
 
+#
+# Find the centre value between two latitudes
+#
 sub centre_lat
 {
     my $south = shift;
@@ -142,6 +200,9 @@ sub centre_lat
     return ( $south + $north ) / 2;
 }
 
+#
+# Find the centre value between two longitudes
+#
 sub centre_lon
 {
     my $west = shift;
@@ -162,6 +223,9 @@ sub centre_lon
     return $lon
 }
 
+#
+# Match a country against a server
+#
 sub match_country
 {
     my $server = shift;
@@ -193,9 +257,21 @@ sub match_country
     {
         $match = "allowed";
     }
+    elsif ($server->{denied} &&
+        $server->{denied}->{countries} &&
+        grep { $_ eq $country } @{$server->{preferred}->{countries}})
+    {
+        $match = "denied";
+    }
+    elsif ($server->{denied} &&
+           $server->{denied}->{continents} &&
+           grep { $_ eq $continent } @{$server->{preferred}->{continents}})
+    {
+        $match = "denied";
+    }
     elsif ($server->{allowed})
     {
-        $match = "none";
+        $match = "denied";
     }
     else
     {
@@ -205,6 +281,9 @@ sub match_country
     return $match;
 }
 
+#
+# Compute the great circle distance between two points
+#
 sub distance
 {
     my $lat1 = deg2rad(shift);
@@ -214,3 +293,28 @@ sub distance
 
     return great_circle_distance($lon1, pip2 - $lat1, $lon2, pip2 - $lat2);
 }
+
+#
+# Allocate each country to a server
+#
+sub allocate_servers
+{
+    my $mappings = shift;
+
+    # Loop over the mappings, trying to assign each country to the
+    # nearest server, but subject to the bandwidth limits
+    foreach my $mapping (sort {  $b->{priority} <=> $a->{priority} || $a->{distance} <=> $b->{distance} } @$mappings)
+    {
+        my $country = $mapping->{country};
+        my $server = $mapping->{server};
+
+        if (!exists($country->{server}) &&
+            $server->{bandwidth_used} + $country->{bandwidth} <= $server->{bandwidth_limit})
+        {
+            $country->{server} = $server;
+            $server->{bandwidth_used} = $server->{bandwidth_used} + $country->{bandwidth};
+        }
+    }
+
+    return;
+}