Fix generation of JSON data for tile server map

diff --git a/bin/mkgeo b/bin/mkgeo
index d942ee0e603c1474c92d86159f8d779ebf35f345..77b44d9a3d1b790b266412c8c780e894d00f342f 100755 (executable)
--- a/bin/mkgeo
+++ b/bin/mkgeo
@@ -212,48 +212,51 @@ my $jsonfile = IO::File->new("> json/${zone}.json") || die "$!";
 # Output headers
 $jszonefile->print("var \U${jszone}\E_RECORDS = [\n");
 
 # Output headers
 $jszonefile->print("var \U${jszone}\E_RECORDS = [\n");
 

-# Skip outputting server map if gdnsd is doing that
-if (!defined($gdnsname))
+# Output details for each country
+foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)

 {
 {

-    # Output details for each country
-    foreach my $origin (sort { $a->{name} cmp $b->{name} } values %$origins)
-    {
-        my $cluster = $origin->{cluster};
-        my $clon = $origin->{lon};
-        my $clat = $origin->{lat};
-        my $slon = $cluster->{lon};
-        my $slat = $cluster->{lat};
+    my $cluster = $origin->{cluster};
+    my $clon = $origin->{lon};
+    my $clat = $origin->{lat};
+    my $slon = $cluster->{lon};
+    my $slat = $cluster->{lat};

 
 

-        if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
-        {
-            $slon = $slon + 360;
-        }
-        elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon)
-        {
-            $clon = $clon + 360;
-        }
+    if ($clon > 0 && $slon < 0 && 360 + $slon - $clon < $clon - $slon)
+    {
+        $slon = $slon + 360;
+    }
+    elsif ($slon > 0 && $clon < 0 && 360 + $clon - $slon < $slon - $clon)
+    {
+        $clon = $clon + 360;
+    }

 
 

+    if (!defined($gdnsname))
+    {

         $zonefile->print("# $origin->{name}\n");
         $zonefile->print("C\L$origin->{code}\E.${zone}:$cluster->{name}.${zone}:600\n");
 
         $jszonefile->print("  CNAME(\"\L$origin->{code}\E.${jszone}\", \"$cluster->{name}.${zone}.\", TTL(\"10m\")),\n");
         $zonefile->print("# $origin->{name}\n");
         $zonefile->print("C\L$origin->{code}\E.${zone}:$cluster->{name}.${zone}:600\n");
 
         $jszonefile->print("  CNAME(\"\L$origin->{code}\E.${jszone}\", \"$cluster->{name}.${zone}.\", TTL(\"10m\")),\n");

+    }

 
 

-        push @json, {
-            type => "Feature",
-            geometry => {
-                type => "LineString",
-                coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
-            },
-            properties => {
-                origin => $origin->{name},
-                server => $cluster->{name},
-                colour => $cluster->{colour}
-            }
-        };
+    push @json, {
+        type => "Feature",
+        geometry => {
+            type => "LineString",
+            coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
+        },
+        properties => {
+            origin => $origin->{name},
+            server => $cluster->{name},
+            colour => $cluster->{colour}
+        }
+    };

 
 

-        $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
-    }
+    $targetorigins->{$cluster->{name}}->{bandwidth} += $origin->{bandwidth};
+}

 
 

+# Skip default records if we don't need them
+if (!defined($gdnsname))
+{

     # Header for default records
     $zonefile->print("# Unknown origins\n");
 
     # Header for default records
     $zonefile->print("# Unknown origins\n");