GeoJSON expects the coordinates in lon/lat format, not in lat/lon format. Fixed.

git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/mediawiki_extensions/wrmap/trunk@1497 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wrmap.body.php b/wrmap.body.php
index 5f43adc683c115a162573ecb882f066c0ef26154..1fdc8234f855125ab81fd5a21e780caff9385131 100644 (file)
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -7,17 +7,17 @@ function array_get($key, $array, $default) {
 }
 
 
-// gets coordinates and returns an array of coordinate pairs, e.g.
+// gets coordinates and returns an array of lon/lat coordinate pairs, e.g.
 // 47.12 N 11.87 E
 // 47.13 N 11.70 E
 // ->
-// array(array(47.12, 11.87), array(47.13, 11.70))
+// array(array(11.87, 47.12), array(11.70, 47.13))
 function geo_to_coordinates($input) {
        $matches = array();
        $num_matches = preg_match_all('/(\d+\.?\d*)\s*N?\s+(\d+\.?\d*)\s*E?\s*/', $input, $matches);
        $result = array();
        for ($i=0; $i!=$num_matches; ++$i) {
-               $result[] = array(floatval($matches[1][$i]), floatval($matches[2][$i]));
+               $result[] = array(floatval($matches[2][$i]), floatval($matches[1][$i]));
        }
        return $result;
 }
@@ -171,9 +171,9 @@ class WrBaseMap {
                
                return $output;
        }
-
 }
 
+
 // <wrmap> tag
 class WrMap extends WrBaseMap {
 }