Generate GeoJSON instead of KML

diff --git a/.gitignore b/.gitignore
index 9c008160e24d7cfde4a8bb06e8d65ebe540831ec..80e66a75d6eda9037edb323a5e896cc8e26ed235 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 data/
+json/
 kml/

diff --git a/Makefile b/Makefile
index 2440c50eb11415d40ae861a2344d9b6a9b541594..18a3a6fff5e02bbfff31c125763c979b6276b430 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,7 @@ data/switch2osm.org: src/switch2osm
 data/switch2osm.com: src/switch2osm
 data/stateofthemap.eu: src/stateofthemap-eu
 
-data/tile.openstreetmap.org kml/tile.openstreetmap.org.kml: src/tile.openstreetmap bandwidth/tile.openstreetmap.yml bin/mkgeo lib/countries.xml
+data/tile.openstreetmap.org json/tile.openstreetmap.org.json: src/tile.openstreetmap bandwidth/tile.openstreetmap.yml bin/mkgeo lib/countries.xml
        bin/mkgeo tile.openstreetmap tile.openstreetmap.org
 
 data/%:

diff --git a/bin/mkgeo b/bin/mkgeo
index a47ea816a0dc39510a87a0ec595160706c41943e..fd0459307a2b2c7a13ee2b9533d522e9180fece1 100755 (executable)
--- 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;
 
@@ -131,15 +130,12 @@ foreach my $mapping (sort {  $b->{priority} <=> $a->{priority} || $a->{distance}
     $country->{server} = $server unless exists($country->{server});
 }
 
+# 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');
-
-# Output the KML header
-$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)
@@ -152,21 +148,25 @@ 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)
     {
-        $slon = $slon - 360;
+        $clon = $clon + 360;
     }
 
     $zonefile->print("C\L$country->{code}\E.${zone}:$server->{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");
+    push @json, {
+        type => "Feature",
+        geometry => {
+            type => "LineString",
+            coordinates => [ [ $clon, $clat ], [ $slon, $slat ] ]
+        },
+        properties => {
+            country => $country->{name}
+        }
+    };
 }
 
 # Output default records for IPs that can't be mapped to a country
@@ -175,13 +175,11 @@ foreach my $server (grep { $servers->{$_}->{default} } keys %$servers)
     $zonefile->print("Cxx.${zone}:${server}.${zone}:600\n");
 }
 
-# End the KML file
-$kmlwriter->endTag("Document");
-$kmlwriter->endTag("kml");
-$kmlwriter->end();
+# Output the GeoJSON text
+$jsonfile->print(encode_json(\@json));
 
 # Close the output files
-$kmlfile->close();
+$jsonfile->close();
 $zonefile->close();
 
 exit 0;

diff --git a/kml/.gitkeep b/json/.gitkeep
similarity index 100%
rename from kml/.gitkeep
rename to json/.gitkeep