mprins / dokuwiki-plugin-geophp

geoPHP/lib/adapters/WKB.class.php

Spacing +27 added lines, -27 removed lines

@@ -30,11 +30,11 @@ 
    */
   public function read($wkb, $is_hex_string = FALSE) {
     if ($is_hex_string) {
-      $wkb = pack('H*',$wkb);
+      $wkb = pack('H*', $wkb);
     }
 
     if (empty($wkb)) {
-      throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));
+      throw new Exception('Cannot read empty WKB geometry. Found '.gettype($wkb));
     }
 
     $mem = fopen('php://memory', 'r+');
@@ -74,20 +74,20 @@ 
       case 3:
         return $this->getPolygon($mem);
       case 4:
-        return $this->getMulti($mem,'point');
+        return $this->getMulti($mem, 'point');
       case 5:
-        return $this->getMulti($mem,'line');
+        return $this->getMulti($mem, 'line');
       case 6:
-        return $this->getMulti($mem,'polygon');
+        return $this->getMulti($mem, 'polygon');
       case 7:
-        return $this->getMulti($mem,'geometry');
+        return $this->getMulti($mem, 'geometry');
     }
   }
 
   function getPoint(&$mem) {
-    $point_coords = unpack("d*", fread($mem,$this->dimension*8));
+    $point_coords = unpack("d*", fread($mem, $this->dimension * 8));
     if (!empty($point_coords)) {
-      return new Point($point_coords[1],$point_coords[2]);
+      return new Point($point_coords[1], $point_coords[2]);
     }
     else {
       return new Point(); // EMPTY point
@@ -96,20 +96,20 @@ 
 
   function getLinstring(&$mem) {
     // Get the number of points expected in this string out of the first 4 bytes
-    $line_length = unpack('L',fread($mem,4));
+    $line_length = unpack('L', fread($mem, 4));
 
     // Return an empty linestring if there is no line-length
     if (!$line_length[1]) return new LineString();
 
     // Read the nubmer of points x2 (each point is two coords) into decimal-floats
-    $line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));
+    $line_coords = unpack('d*', fread($mem, $line_length[1] * $this->dimension * 8));
 
     // We have our coords, build up the linestring
     $components = array();
     $i = 1;
     $num_coords = count($line_coords);
     while ($i <= $num_coords) {
-      $components[] = new Point($line_coords[$i],$line_coords[$i+1]);
+      $components[] = new Point($line_coords[$i], $line_coords[$i+1]);
       $i += 2;
     }
     return new LineString($components);
@@ -117,7 +117,7 @@ 
 
   function getPolygon(&$mem) {
     // Get the number of linestring expected in this poly out of the first 4 bytes
-    $poly_length = unpack('L',fread($mem,4));
+    $poly_length = unpack('L', fread($mem, 4));
 
     $components = array();
     $i = 1;
@@ -130,7 +130,7 @@ 
 
   function getMulti(&$mem, $type) {
     // Get the number of items expected in this multi out of the first 4 bytes
-    $multi_length = unpack('L',fread($mem,4));
+    $multi_length = unpack('L', fread($mem, 4));
 
     $components = array();
     $i = 1;
@@ -159,41 +159,41 @@ 
    */
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
     // We always write into NDR (little endian)
-    $wkb = pack('c',1);
+    $wkb = pack('c', 1);
 
     switch ($geometry->getGeomType()) {
       case 'Point';
-        $wkb .= pack('L',1);
+        $wkb .= pack('L', 1);
         $wkb .= $this->writePoint($geometry);
         break;
       case 'LineString';
-        $wkb .= pack('L',2);
+        $wkb .= pack('L', 2);
         $wkb .= $this->writeLineString($geometry);
         break;
       case 'Polygon';
-        $wkb .= pack('L',3);
+        $wkb .= pack('L', 3);
         $wkb .= $this->writePolygon($geometry);
         break;
       case 'MultiPoint';
-        $wkb .= pack('L',4);
+        $wkb .= pack('L', 4);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiLineString';
-        $wkb .= pack('L',5);
+        $wkb .= pack('L', 5);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiPolygon';
-        $wkb .= pack('L',6);
+        $wkb .= pack('L', 6);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'GeometryCollection';
-        $wkb .= pack('L',7);
+        $wkb .= pack('L', 7);
         $wkb .= $this->writeMulti($geometry);
         break;
     }
 
     if ($write_as_hex) {
-      $unpacked = unpack('H*',$wkb);
+      $unpacked = unpack('H*', $wkb);
       return $unpacked[1];
     }
     else {
@@ -204,7 +204,7 @@ 
   function writePoint($point) {
     // Set the coords
     if (!$point->isEmpty()) {
-      $wkb = pack('dd',$point->x(), $point->y());
+      $wkb = pack('dd', $point->x(), $point->y());
       return $wkb;
     } else {
       return '';
@@ -213,11 +213,11 @@ 
 
   function writeLineString($line) {
     // Set the number of points in this line
-    $wkb = pack('L',$line->numPoints());
+    $wkb = pack('L', $line->numPoints());
 
     // Set the coords
     foreach ($line->getComponents() as $point) {
-      $wkb .= pack('dd',$point->x(), $point->y());
+      $wkb .= pack('dd', $point->x(), $point->y());
     }
 
     return $wkb;
@@ -225,7 +225,7 @@ 
 
   function writePolygon($poly) {
     // Set the number of lines in this poly
-    $wkb = pack('L',$poly->numGeometries());
+    $wkb = pack('L', $poly->numGeometries());
 
     // Write the lines
     foreach ($poly->getComponents() as $line) {
@@ -237,7 +237,7 @@ 
 
   function writeMulti($geometry) {
     // Set the number of components
-    $wkb = pack('L',$geometry->numGeometries());
+    $wkb = pack('L', $geometry->numGeometries());
 
     // Write the components
     foreach ($geometry->getComponents() as $component) {

Braces +5 added lines, -5 removed lines

@@ -88,8 +88,7 @@ 
     $point_coords = unpack("d*", fread($mem,$this->dimension*8));
     if (!empty($point_coords)) {
       return new Point($point_coords[1],$point_coords[2]);
-    }
-    else {
+    } else {
       return new Point(); // EMPTY point
     }
   }
@@ -99,7 +98,9 @@ 
     $line_length = unpack('L',fread($mem,4));
 
     // Return an empty linestring if there is no line-length
-    if (!$line_length[1]) return new LineString();
+    if (!$line_length[1]) {
+      return new LineString();
+    }
 
     // Read the nubmer of points x2 (each point is two coords) into decimal-floats
     $line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));
@@ -195,8 +196,7 @@ 
     if ($write_as_hex) {
       $unpacked = unpack('H*',$wkb);
       return $unpacked[1];
-    }
-    else {
+    } else {
       return $wkb;
     }
   }

geoPHP/lib/adapters/GeoHash.class.php

Spacing +58 added lines, -58 removed lines

@@ -6,7 +6,7 @@ 
  * @see http://en.wikipedia.org/wiki/Geohash
  *
  */
-class GeoHash extends GeoAdapter{
+class GeoHash extends GeoAdapter {
 
   /**
    * base32 encoding character map.
@@ -16,24 +16,24 @@ 
   /**
    * array of neighbouring hash character maps.
    */
-  private $neighbours = array (
+  private $neighbours = array(
       // north
-      'top' => array (
+      'top' => array(
           'even' => 'p0r21436x8zb9dcf5h7kjnmqesgutwvy',
           'odd' => 'bc01fg45238967deuvhjyznpkmstqrwx'
       ),
       // east
-      'right' => array (
+      'right' => array(
           'even' => 'bc01fg45238967deuvhjyznpkmstqrwx',
           'odd' => 'p0r21436x8zb9dcf5h7kjnmqesgutwvy'
       ),
       // west
-      'left' => array (
+      'left' => array(
           'even' => '238967debc01fg45kmstqrwxuvhjyznp',
           'odd' => '14365h7k9dcfesgujnmqp0r2twvyx8zb'
       ),
       // south
-      'bottom' => array (
+      'bottom' => array(
           'even' => '14365h7k9dcfesgujnmqp0r2twvyx8zb',
           'odd' => '238967debc01fg45kmstqrwxuvhjyznp'
       )
@@ -42,24 +42,24 @@ 
   /**
    * array of bordering hash character maps.
    */
-  private $borders = array (
+  private $borders = array(
       // north
-      'top' => array (
+      'top' => array(
           'even' => 'prxz',
           'odd' => 'bcfguvyz'
       ),
       // east
-      'right' => array (
+      'right' => array(
           'even' => 'bcfguvyz',
           'odd' => 'prxz'
       ),
       // west
-      'left' => array (
+      'left' => array(
           'even' => '0145hjnp',
           'odd' => '028b'
       ),
       // south
-      'bottom' => array (
+      'bottom' => array(
           'even' => '028b',
           'odd' => '0145hjnp'
       )
@@ -95,10 +95,10 @@ 
    * @param Point $geometry
    * @see GeoAdapter::write()
    */
-  public function write(Geometry $geometry, $precision = NULL){
+  public function write(Geometry $geometry, $precision = NULL) {
     if ($geometry->isEmpty()) return '';
 
-    if($geometry->geometryType() === 'Point'){
+    if ($geometry->geometryType() === 'Point') {
       return $this->encodePoint($geometry, $precision);
     }
     else {
@@ -130,30 +130,30 @@ 
    * @author algorithm based on code by Alexander Songe <a@songe.me>
    * @see https://github.com/asonge/php-geohash/issues/1
    */
-  private function encodePoint($point, $precision = NULL){
+  private function encodePoint($point, $precision = NULL) {
     if ($precision === NULL) {
-      $lap = strlen($point->y())-strpos($point->y(),".");
-      $lop = strlen($point->x())-strpos($point->x(),".");
-      $precision = pow(10,-max($lap-1,$lop-1,0))/2;
+      $lap = strlen($point->y())-strpos($point->y(), ".");
+      $lop = strlen($point->x())-strpos($point->x(), ".");
+      $precision = pow(10, -max($lap-1, $lop-1, 0)) / 2;
     }
 
-    $minlat =  -90;
-    $maxlat =   90;
+    $minlat = -90;
+    $maxlat = 90;
     $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
+    $maxlon = 180;
+    $latE   = 90;
+    $lonE   = 180;
     $i = 0;
     $error = 180;
-    $hash='';
-    while($error>=$precision) {
+    $hash = '';
+    while ($error >= $precision) {
       $chr = 0;
-      for($b=4;$b>=0;--$b) {
-        if((1&$b) == (1&$i)) {
+      for ($b = 4; $b >= 0; --$b) {
+        if ((1&$b) == (1&$i)) {
           // even char, even bit OR odd char, odd bit...a lon
-          $next = ($minlon+$maxlon)/2;
-          if($point->x()>$next) {
-            $chr |= pow(2,$b);
+          $next = ($minlon+$maxlon) / 2;
+          if ($point->x() > $next) {
+            $chr |= pow(2, $b);
             $minlon = $next;
           } else {
             $maxlon = $next;
@@ -161,9 +161,9 @@ 
           $lonE /= 2;
         } else {
           // odd char, even bit OR even char, odd bit...a lat
-          $next = ($minlat+$maxlat)/2;
-          if($point->y()>$next) {
-            $chr |= pow(2,$b);
+          $next = ($minlat+$maxlat) / 2;
+          if ($point->y() > $next) {
+            $chr |= pow(2, $b);
             $minlat = $next;
           } else {
             $maxlat = $next;
@@ -173,7 +173,7 @@ 
       }
       $hash .= $this->table[$chr];
       $i++;
-      $error = min($latE,$lonE);
+      $error = min($latE, $lonE);
     }
     return $hash;
   }
@@ -183,30 +183,30 @@ 
    * @author algorithm based on code by Alexander Songe <a@songe.me>
    * @see https://github.com/asonge/php-geohash/issues/1
    */
-  private function decode($hash){
+  private function decode($hash) {
     $ll = array();
-    $minlat =  -90;
-    $maxlat =   90;
+    $minlat = -90;
+    $maxlat = 90;
     $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
-    for($i=0,$c=strlen($hash);$i<$c;$i++) {
-      $v = strpos($this->table,$hash[$i]);
-      if(1&$i) {
-        if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+    $maxlon = 180;
+    $latE   = 90;
+    $lonE   = 180;
+    for ($i = 0, $c = strlen($hash); $i < $c; $i++) {
+      $v = strpos($this->table, $hash[$i]);
+      if (1&$i) {
+        if (16&$v)$minlat = ($minlat+$maxlat) / 2; else $maxlat = ($minlat+$maxlat) / 2;
+        if (8&$v) $minlon = ($minlon+$maxlon) / 2; else $maxlon = ($minlon+$maxlon) / 2;
+        if (4&$v) $minlat = ($minlat+$maxlat) / 2; else $maxlat = ($minlat+$maxlat) / 2;
+        if (2&$v) $minlon = ($minlon+$maxlon) / 2; else $maxlon = ($minlon+$maxlon) / 2;
+        if (1&$v) $minlat = ($minlat+$maxlat) / 2; else $maxlat = ($minlat+$maxlat) / 2;
         $latE /= 8;
         $lonE /= 4;
       } else {
-        if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+        if (16&$v)$minlon = ($minlon+$maxlon) / 2; else $maxlon = ($minlon+$maxlon) / 2;
+        if (8&$v) $minlat = ($minlat+$maxlat) / 2; else $maxlat = ($minlat+$maxlat) / 2;
+        if (4&$v) $minlon = ($minlon+$maxlon) / 2; else $maxlon = ($minlon+$maxlon) / 2;
+        if (2&$v) $minlat = ($minlat+$maxlat) / 2; else $maxlat = ($minlat+$maxlat) / 2;
+        if (1&$v) $minlon = ($minlon+$maxlon) / 2; else $maxlon = ($minlon+$maxlon) / 2;
         $latE /= 4;
         $lonE /= 8;
       }
@@ -215,8 +215,8 @@ 
     $ll['minlon'] = $minlon;
     $ll['maxlat'] = $maxlat;
     $ll['maxlon'] = $maxlon;
-    $ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
-    $ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
+    $ll['medlat'] = round(($minlat+$maxlat) / 2, max(1, -round(log10($latE)))-1);
+    $ll['medlon'] = round(($minlon+$maxlon) / 2, max(1, -round(log10($lonE)))-1);
     return $ll;
   }
 
@@ -237,11 +237,11 @@ 
    * @param string $direction the direction of the neighbor (top, bottom, left or right)
    * @return string the geohash of the adjacent cell
    */
-  public function adjacent($hash, $direction){
+  public function adjacent($hash, $direction) {
     $last = substr($hash, -1);
-    $type = (strlen($hash) % 2)? 'odd': 'even';
-    $base = substr($hash, 0, strlen($hash) - 1);
-    if(strpos(($this->borders[$direction][$type]), $last) !== false){
+    $type = (strlen($hash) % 2) ? 'odd' : 'even';
+    $base = substr($hash, 0, strlen($hash)-1);
+    if (strpos(($this->borders[$direction][$type]), $last) !== false) {
         $base = $this->adjacent($base, $direction);
     }
     return $base.$this->table[strpos($this->neighbours[$direction][$type], $last)];

Braces +55 added lines, -15 removed lines

@@ -75,8 +75,7 @@ 
     $ll = $this->decode($hash);
     if (!$as_grid) {
       return new Point($ll['medlon'], $ll['medlat']);
-    }
-    else {
+    } else {
       return new Polygon(array(
         new LineString(array(
           new Point($ll['minlon'], $ll['maxlat']),
@@ -96,12 +95,13 @@ 
    * @see GeoAdapter::write()
    */
   public function write(Geometry $geometry, $precision = NULL){
-    if ($geometry->isEmpty()) return '';
+    if ($geometry->isEmpty()) {
+      return '';
+    }
 
     if($geometry->geometryType() === 'Point'){
       return $this->encodePoint($geometry, $precision);
-    }
-    else {
+    } else {
       // The geohash is the hash grid ID that fits the envelope
       $envelope = $geometry->envelope();
       $geohashes = array();
@@ -194,19 +194,59 @@ 
     for($i=0,$c=strlen($hash);$i<$c;$i++) {
       $v = strpos($this->table,$hash[$i]);
       if(1&$i) {
-        if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+        if(16&$v) {
+          $minlat = ($minlat+$maxlat)/2;
+        } else {
+          $maxlat = ($minlat+$maxlat)/2;
+        }
+        if(8&$v) {
+          $minlon = ($minlon+$maxlon)/2;
+        } else {
+          $maxlon = ($minlon+$maxlon)/2;
+        }
+        if(4&$v) {
+          $minlat = ($minlat+$maxlat)/2;
+        } else {
+          $maxlat = ($minlat+$maxlat)/2;
+        }
+        if(2&$v) {
+          $minlon = ($minlon+$maxlon)/2;
+        } else {
+          $maxlon = ($minlon+$maxlon)/2;
+        }
+        if(1&$v) {
+          $minlat = ($minlat+$maxlat)/2;
+        } else {
+          $maxlat = ($minlat+$maxlat)/2;
+        }
         $latE /= 8;
         $lonE /= 4;
       } else {
-        if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-        if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-        if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+        if(16&$v) {
+          $minlon = ($minlon+$maxlon)/2;
+        } else {
+          $maxlon = ($minlon+$maxlon)/2;
+        }
+        if(8&$v) {
+          $minlat = ($minlat+$maxlat)/2;
+        } else {
+          $maxlat = ($minlat+$maxlat)/2;
+        }
+        if(4&$v) {
+          $minlon = ($minlon+$maxlon)/2;
+        } else {
+          $maxlon = ($minlon+$maxlon)/2;
+        }
+        if(2&$v) {
+          $minlat = ($minlat+$maxlat)/2;
+        } else {
+          $maxlat = ($minlat+$maxlat)/2;
+        }
+        if(1&$v) {
+          $minlon = ($minlon+$maxlon)/2;
+        } else {
+          $maxlon = ($minlon+$maxlon)/2;
+        }
         $latE /= 4;
         $lonE /= 8;
       }

geoPHP/lib/adapters/WKT.class.php

Spacing +18 added lines, -18 removed lines

@@ -16,10 +16,10 @@ 
     $wkt = trim($wkt);
 
     // If it contains a ';', then it contains additional SRID data
-    if (strpos($wkt,';')) {
+    if (strpos($wkt, ';')) {
       $parts = explode(';', $wkt);
       $wkt = $parts[1];
-      $eparts = explode('=',$parts[0]);
+      $eparts = explode('=', $parts[0]);
       $srid = $eparts[1];
     }
     else {
@@ -67,7 +67,7 @@ 
     // If it's marked as empty, then return an empty point
     if ($data_string == 'EMPTY') return new Point();
 
-    $parts = explode(' ',$data_string);
+    $parts = explode(' ', $data_string);
     return new Point($parts[0], $parts[1]);
   }
 
@@ -77,7 +77,7 @@ 
     // If it's marked as empty, then return an empty line
     if ($data_string == 'EMPTY') return new LineString();
 
-    $parts = explode(',',$data_string);
+    $parts = explode(',', $data_string);
     $points = array();
     foreach ($parts as $part) {
       $points[] = $this->parsePoint($part);
@@ -91,11 +91,11 @@ 
     // If it's marked as empty, then return an empty polygon
     if ($data_string == 'EMPTY') return new Polygon();
 
-    $parts = explode('),(',$data_string);
+    $parts = explode('),(', $data_string);
     $lines = array();
     foreach ($parts as $part) {
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part, '(')) $part = '('.$part;
+      if (!$this->endsWith($part, ')'))   $part = $part.')';
       $lines[] = $this->parseLineString($part);
     }
     return new Polygon($lines);
@@ -107,7 +107,7 @@ 
     // If it's marked as empty, then return an empty MutiPoint
     if ($data_string == 'EMPTY') return new MultiPoint();
 
-    $parts = explode(',',$data_string);
+    $parts = explode(',', $data_string);
     $points = array();
     foreach ($parts as $part) {
       $points[] = $this->parsePoint($part);
@@ -121,12 +121,12 @@ 
     // If it's marked as empty, then return an empty multi-linestring
     if ($data_string == 'EMPTY') return new MultiLineString();
 
-    $parts = explode('),(',$data_string);
+    $parts = explode('),(', $data_string);
     $lines = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part, '(')) $part = '('.$part;
+      if (!$this->endsWith($part, ')'))   $part = $part.')';
       $lines[] = $this->parseLineString($part);
     }
     return new MultiLineString($lines);
@@ -138,12 +138,12 @@ 
     // If it's marked as empty, then return an empty multi-polygon
     if ($data_string == 'EMPTY') return new MultiPolygon();
 
-    $parts = explode(')),((',$data_string);
+    $parts = explode(')),((', $data_string);
     $polys = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'((')) $part = '((' . $part;
-      if (!$this->endsWith($part,'))'))   $part = $part . '))';
+      if (!$this->beginsWith($part, '((')) $part = '(('.$part;
+      if (!$this->endsWith($part, '))'))   $part = $part.'))';
       $polys[] = $this->parsePolygon($part);
     }
     return new MultiPolygon($polys);
@@ -171,7 +171,7 @@ 
 
     if ($first_paren !== FALSE) {
       return substr($wkt, $first_paren);
-    } elseif (strstr($wkt,'EMPTY')) {
+    } elseif (strstr($wkt, 'EMPTY')) {
       return 'EMPTY';
     } else
       return FALSE;
@@ -185,18 +185,18 @@ 
 
     // We want to only strip off one set of parenthesis
     if ($this->beginsWith($str, '(')) {
-      return substr($str,1,-1);
+      return substr($str, 1, -1);
     }
     else return $str;
   }
 
   protected function beginsWith($str, $char) {
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
+    if (substr($str, 0, strlen($char)) == $char) return TRUE;
     else return FALSE;
   }
 
   protected function endsWith($str, $char) {
-    if (substr($str,(0 - strlen($char))) == $char) return TRUE;
+    if (substr($str, (0-strlen($char))) == $char) return TRUE;
     else return FALSE;
   }
 

Braces +58 added lines, -28 removed lines

@@ -21,8 +21,7 @@ 
       $wkt = $parts[1];
       $eparts = explode('=',$parts[0]);
       $srid = $eparts[1];
-    }
-    else {
+    } else {
       $srid = NULL;
     }
 
@@ -33,8 +32,7 @@ 
         $geom = geoPHP::geosToGeometry($reader->read($wkt));
         $geom->setSRID($srid);
         return $geom;
-      }
-      else {
+      } else {
         return geoPHP::geosToGeometry($reader->read($wkt));
       }
     }
@@ -52,8 +50,7 @@ 
           $geom = $this->$method($data_string);
           $geom->setSRID($srid);
           return $geom;
-        }
-        else {
+        } else {
           return $this->$method($data_string);
         }
 
@@ -65,7 +62,9 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty point
-    if ($data_string == 'EMPTY') return new Point();
+    if ($data_string == 'EMPTY') {
+      return new Point();
+    }
 
     $parts = explode(' ',$data_string);
     return new Point($parts[0], $parts[1]);
@@ -75,7 +74,9 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty line
-    if ($data_string == 'EMPTY') return new LineString();
+    if ($data_string == 'EMPTY') {
+      return new LineString();
+    }
 
     $parts = explode(',',$data_string);
     $points = array();
@@ -89,13 +90,19 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty polygon
-    if ($data_string == 'EMPTY') return new Polygon();
+    if ($data_string == 'EMPTY') {
+      return new Polygon();
+    }
 
     $parts = explode('),(',$data_string);
     $lines = array();
     foreach ($parts as $part) {
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part,'(')) {
+        $part = '(' . $part;
+      }
+      if (!$this->endsWith($part,')')) {
+        $part = $part . ')';
+      }
       $lines[] = $this->parseLineString($part);
     }
     return new Polygon($lines);
@@ -105,7 +112,9 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty MutiPoint
-    if ($data_string == 'EMPTY') return new MultiPoint();
+    if ($data_string == 'EMPTY') {
+      return new MultiPoint();
+    }
 
     $parts = explode(',',$data_string);
     $points = array();
@@ -119,14 +128,20 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty multi-linestring
-    if ($data_string == 'EMPTY') return new MultiLineString();
+    if ($data_string == 'EMPTY') {
+      return new MultiLineString();
+    }
 
     $parts = explode('),(',$data_string);
     $lines = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
+      if (!$this->beginsWith($part,'(')) {
+        $part = '(' . $part;
+      }
+      if (!$this->endsWith($part,')')) {
+        $part = $part . ')';
+      }
       $lines[] = $this->parseLineString($part);
     }
     return new MultiLineString($lines);
@@ -136,14 +151,20 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty multi-polygon
-    if ($data_string == 'EMPTY') return new MultiPolygon();
+    if ($data_string == 'EMPTY') {
+      return new MultiPolygon();
+    }
 
     $parts = explode(')),((',$data_string);
     $polys = array();
     foreach ($parts as $part) {
       // Repair the string if the explode broke it
-      if (!$this->beginsWith($part,'((')) $part = '((' . $part;
-      if (!$this->endsWith($part,'))'))   $part = $part . '))';
+      if (!$this->beginsWith($part,'((')) {
+        $part = '((' . $part;
+      }
+      if (!$this->endsWith($part,'))')) {
+        $part = $part . '))';
+      }
       $polys[] = $this->parsePolygon($part);
     }
     return new MultiPolygon($polys);
@@ -153,7 +174,9 @@ 
     $data_string = $this->trimParens($data_string);
 
     // If it's marked as empty, then return an empty geom-collection
-    if ($data_string == 'EMPTY') return new GeometryCollection();
+    if ($data_string == 'EMPTY') {
+      return new GeometryCollection();
+    }
 
     $geometries = array();
     $matches = array();
@@ -173,8 +196,9 @@ 
       return substr($wkt, $first_paren);
     } elseif (strstr($wkt,'EMPTY')) {
       return 'EMPTY';
-    } else
-      return FALSE;
+    } else {
+          return FALSE;
+    }
   }
 
   /**
@@ -186,18 +210,25 @@ 
     // We want to only strip off one set of parenthesis
     if ($this->beginsWith($str, '(')) {
       return substr($str,1,-1);
+    } else {
+      return $str;
     }
-    else return $str;
   }
 
   protected function beginsWith($str, $char) {
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
-    else return FALSE;
+    if (substr($str,0,strlen($char)) == $char) {
+      return TRUE;
+    } else {
+      return FALSE;
+    }
   }
 
   protected function endsWith($str, $char) {
-    if (substr($str,(0 - strlen($char))) == $char) return TRUE;
-    else return FALSE;
+    if (substr($str,(0 - strlen($char))) == $char) {
+      return TRUE;
+    } else {
+      return FALSE;
+    }
   }
 
   /**
@@ -217,8 +248,7 @@ 
 
     if ($geometry->isEmpty()) {
       return strtoupper($geometry->geometryType()).' EMPTY';
-    }
-    else if ($data = $this->extractData($geometry)) {
+    } else if ($data = $this->extractData($geometry)) {
       return strtoupper($geometry->geometryType()).' ('.$data.')';
     }
   }

geoPHP/lib/adapters/EWKB.class.php

Spacing +10 added lines, -10 removed lines

@@ -14,7 +14,7 @@ 
    */
   public function read($wkb, $is_hex_string = FALSE) {
     if ($is_hex_string) {
-      $wkb = pack('H*',$wkb);
+      $wkb = pack('H*', $wkb);
     }
     
     // Open the wkb up in memory so we can examine the SRID
@@ -51,41 +51,41 @@ 
    */
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
     // We always write into NDR (little endian)
-    $wkb = pack('c',1);
+    $wkb = pack('c', 1);
     
     switch ($geometry->getGeomType()) {
       case 'Point';
-        $wkb .= pack('L',1);
+        $wkb .= pack('L', 1);
         $wkb .= $this->writePoint($geometry);
         break;
       case 'LineString';
-        $wkb .= pack('L',2);
+        $wkb .= pack('L', 2);
         $wkb .= $this->writeLineString($geometry);
         break;
       case 'Polygon';
-        $wkb .= pack('L',3);
+        $wkb .= pack('L', 3);
         $wkb .= $this->writePolygon($geometry);
         break;
       case 'MultiPoint';
-        $wkb .= pack('L',4);
+        $wkb .= pack('L', 4);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiLineString';
-        $wkb .= pack('L',5);
+        $wkb .= pack('L', 5);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiPolygon';
-        $wkb .= pack('L',6);
+        $wkb .= pack('L', 6);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'GeometryCollection';
-        $wkb .= pack('L',7);
+        $wkb .= pack('L', 7);
         $wkb .= $this->writeMulti($geometry);
         break;
     }
     
     if ($write_as_hex) {
-      $unpacked = unpack('H*',$wkb);
+      $unpacked = unpack('H*', $wkb);
       return $unpacked[1];
     }
     else {

Braces +2 added lines, -4 removed lines

@@ -24,8 +24,7 @@ 
     $base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));
     if ($base_info['s']) {
       $srid = current(unpack("Lsrid", fread($mem, 4)));
-    }
-    else {
+    } else {
       $srid = NULL;
     }
     fclose($mem);
@@ -87,8 +86,7 @@ 
     if ($write_as_hex) {
       $unpacked = unpack('H*',$wkb);
       return $unpacked[1];
-    }
-    else {
+    } else {
       return $wkb;
     }
   }

geoPHP/lib/adapters/KML.class.php

Spacing +16 added lines, -16 removed lines

@@ -52,21 +52,21 @@ 
   public function geomFromText($text) {
     // Change to lower-case and strip all CDATA
     $text = mb_strtolower($text, mb_detect_encoding($text));
-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);
 
     // Load into DOMDocument
     $xmlobj = new DOMDocument();
     @$xmlobj->loadXML($text);
     if ($xmlobj === false) {
-      throw new Exception("Invalid KML: ". $text);
+      throw new Exception("Invalid KML: ".$text);
     }
 
     $this->xmlobj = $xmlobj;
     try {
       $geom = $this->geomFromXML();
-    } catch(InvalidText $e) {
-        throw new Exception("Cannot Read Geometry From KML: ". $text);
-    } catch(Exception $e) {
+    } catch (InvalidText $e) {
+        throw new Exception("Cannot Read Geometry From KML: ".$text);
+    } catch (Exception $e) {
         throw $e;
     }
 
@@ -115,7 +115,7 @@ 
   protected function parsePoint($xml) {
     $coordinates = $this->_extractCoordinates($xml);
     if (!empty($coordinates)) {
-      return new Point($coordinates[0][0],$coordinates[0][1]);
+      return new Point($coordinates[0][0], $coordinates[0][1]);
     }
     else {
       return new Point();
@@ -126,7 +126,7 @@ 
     $coordinates = $this->_extractCoordinates($xml);
     $point_array = array();
     foreach ($coordinates as $set) {
-      $point_array[] = new Point($set[0],$set[1]);
+      $point_array[] = new Point($set[0], $set[1]);
     }
     return new LineString($point_array);
   }
@@ -180,7 +180,7 @@ 
       foreach ($coord_sets as $set_string) {
         $set_string = trim($set_string);
         if ($set_string) {
-          $set_array = explode(',',$set_string);
+          $set_array = explode(',', $set_string);
           if (count($set_array) >= 2) {
             $coordinates[] = $set_array;
           }
@@ -226,21 +226,21 @@ 
       $type = $geom->getGeomType();
     }
 
-    $str = '<'.$this->nss . $type .'>';
+    $str = '<'.$this->nss.$type.'>';
 
     if (!$geom->isEmpty()) {
       $str .= '<'.$this->nss.'coordinates>';
-      $i=0;
+      $i = 0;
       foreach ($geom->getComponents() as $comp) {
         if ($i != 0) $str .= ' ';
-        $str .= $comp->getX() .','. $comp->getY();
+        $str .= $comp->getX().','.$comp->getY();
         $i++;
       }
 
       $str .= '</'.$this->nss.'coordinates>';
     }
 
-    $str .= '</'. $this->nss . $type .'>';
+    $str .= '</'.$this->nss.$type.'>';
 
     return $str;
   }
@@ -249,13 +249,13 @@ 
     $components = $geom->getComponents();
     $str = '';
     if (!empty($components)) {
-      $str = '<'.$this->nss.'outerBoundaryIs>' . $this->linestringToKML($components[0], 'LinearRing') . '</'.$this->nss.'outerBoundaryIs>';
+      $str = '<'.$this->nss.'outerBoundaryIs>'.$this->linestringToKML($components[0], 'LinearRing').'</'.$this->nss.'outerBoundaryIs>';
       foreach (array_slice($components, 1) as $comp) {
-        $str .= '<'.$this->nss.'innerBoundaryIs>' . $this->linestringToKML($comp) . '</'.$this->nss.'innerBoundaryIs>';
+        $str .= '<'.$this->nss.'innerBoundaryIs>'.$this->linestringToKML($comp).'</'.$this->nss.'innerBoundaryIs>';
       }
     }
 
-    return '<'.$this->nss.'Polygon>'. $str .'</'.$this->nss.'Polygon>';
+    return '<'.$this->nss.'Polygon>'.$str.'</'.$this->nss.'Polygon>';
   }
 
   public function collectionToKML($geom) {
@@ -266,7 +266,7 @@ 
       $str .= $sub_adapter->write($comp);
     }
 
-    return $str .'</'.$this->nss.'MultiGeometry>';
+    return $str.'</'.$this->nss.'MultiGeometry>';
   }
 
 }

Braces +5 added lines, -5 removed lines

@@ -88,8 +88,7 @@ 
           }
         }
       }
-    }
-    else {
+    } else {
       // The document does not have a placemark, try to create a valid geometry from the root element
       $node_name = $this->xmlobj->documentElement->nodeName == 'multigeometry' ? 'geometrycollection' : $this->xmlobj->documentElement->nodeName;
       if (array_key_exists($node_name, $geom_types)) {
@@ -116,8 +115,7 @@ 
     $coordinates = $this->_extractCoordinates($xml);
     if (!empty($coordinates)) {
       return new Point($coordinates[0][0],$coordinates[0][1]);
-    }
-    else {
+    } else {
       return new Point();
     }
   }
@@ -232,7 +230,9 @@ 
       $str .= '<'.$this->nss.'coordinates>';
       $i=0;
       foreach ($geom->getComponents() as $comp) {
-        if ($i != 0) $str .= ' ';
+        if ($i != 0) {
+          $str .= ' ';
+        }
         $str .= $comp->getX() .','. $comp->getY();
         $i++;
       }

geoPHP/geoPHP.inc

Spacing +6 added lines, -6 removed lines

@@ -90,7 +90,7 @@ 
   }
 
   static function getAdapterMap() {
-    return array (
+    return array(
       'wkt' =>  'WKT',
       'ewkt' => 'EWKT',
       'wkb' =>  'WKB',
@@ -153,8 +153,8 @@ 
 
     // If the geometry cannot even theoretically be reduced more, then pass it back
     if (gettype($geometry) == 'object') {
-      $passbacks = array('Point','LineString','Polygon');
-      if (in_array($geometry->geometryType(),$passbacks)) {
+      $passbacks = array('Point', 'LineString', 'Polygon');
+      if (in_array($geometry->geometryType(), $passbacks)) {
         return $geometry;
       }
     }
@@ -162,8 +162,8 @@ 
     // If it is a mutlti-geometry, check to see if it just has one member
     // If it does, then pass the member, if not, then just pass back the geometry
     if (gettype($geometry) == 'object') {
-      $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');
-      if (in_array(get_class($geometry),$passbacks)) {
+      $simple_collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon');
+      if (in_array(get_class($geometry), $passbacks)) {
         $components = $geometry->getComponents();
         if (count($components) == 1) {
           return $components[0];
@@ -182,7 +182,7 @@ 
     $geometries = array();
     $geom_types = array();
 
-    $collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');
+    $collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon', 'GeometryCollection');
 
     foreach ($geometry as $item) {
       if ($item) {

Braces +42 added lines, -21 removed lines

@@ -52,7 +52,9 @@ 
     if (!$type) {
       // If the user is trying to load a Geometry from a Geometry... Just pass it back
       if (is_object($data)) {
-        if ($data instanceOf Geometry) return $data;
+        if ($data instanceOf Geometry) {
+          return $data;
+        }
       }
       
       $detected = geoPHP::detectFormat($data);
@@ -119,7 +121,9 @@ 
 
   static function geosInstalled($force = NULL) {
     static $geos_installed = NULL;
-    if ($force !== NULL) $geos_installed = $force;
+    if ($force !== NULL) {
+      $geos_installed = $force;
+    }
     if ($geos_installed !== NULL) {
       return $geos_installed;
     }
@@ -147,8 +151,12 @@ 
   static function geometryReduce($geometry) {
     // If it's an array of one, then just parse the one
     if (is_array($geometry)) {
-      if (empty($geometry)) return FALSE;
-      if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));
+      if (empty($geometry)) {
+        return FALSE;
+      }
+      if (count($geometry) == 1) {
+        return geoPHP::geometryReduce(array_shift($geometry));
+      }
     }
 
     // If the geometry cannot even theoretically be reduced more, then pass it back
@@ -167,8 +175,7 @@ 
         $components = $geometry->getComponents();
         if (count($components) == 1) {
           return $components[0];
-        }
-        else {
+        } else {
           return $geometry;
         }
       }
@@ -191,8 +198,7 @@ 
             $geometries[] = $component;
             $geom_types[] = $component->geometryType();
           }
-        }
-        else {
+        } else {
           $geometries[] = $item;
           $geom_types[] = $item->geometryType();
         }
@@ -208,13 +214,11 @@ 
     if (count($geom_types) == 1) {
       if (count($geometries) == 1) {
         return $geometries[0];
-      }
-      else {
+      } else {
         $class = 'Multi'.$geom_types[0];
         return new $class($geometries);
       }
-    }
-    else {
+    } else {
       return new GeometryCollection($geometries);
     }
   }
@@ -229,7 +233,9 @@ 
     $bytes = unpack("c*", fread($mem, 11));
 
     // If bytes is empty, then we were passed empty input
-    if (empty($bytes)) return FALSE;
+    if (empty($bytes)) {
+      return FALSE;
+    }
 
     // First char is a tab, space or carriage-return. trim it and try again
     if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {
@@ -240,8 +246,11 @@ 
     // Detect WKB or EWKB -- first byte is 1 (little endian indicator)
     if ($bytes[1] == 1) {
       // If SRID byte is TRUE (1), it's EWKB
-      if ($bytes[5]) return 'ewkb';
-      else return 'wkb';
+      if ($bytes[5]) {
+        return 'ewkb';
+      } else {
+        return 'wkb';
+      }
     }
 
     // Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)
@@ -274,12 +283,24 @@ 
     if ($bytes[1] == 60) {
       // grab the first 256 characters
       $string = substr($input, 0, 256);
-      if (strpos($string, '<kml') !== FALSE)        return 'kml';
-      if (strpos($string, '<coordinate') !== FALSE) return 'kml';
-      if (strpos($string, '<gpx') !== FALSE)        return 'gpx';
-      if (strpos($string, '<georss') !== FALSE)     return 'georss';
-      if (strpos($string, '<rss') !== FALSE)        return 'georss';
-      if (strpos($string, '<feed') !== FALSE)       return 'georss';
+      if (strpos($string, '<kml') !== FALSE) {
+        return 'kml';
+      }
+      if (strpos($string, '<coordinate') !== FALSE) {
+        return 'kml';
+      }
+      if (strpos($string, '<gpx') !== FALSE) {
+        return 'gpx';
+      }
+      if (strpos($string, '<georss') !== FALSE) {
+        return 'georss';
+      }
+      if (strpos($string, '<rss') !== FALSE) {
+        return 'georss';
+      }
+      if (strpos($string, '<feed') !== FALSE) {
+        return 'georss';
+      }
     }
 
     // We need an 8 byte string for geohash and unpacked WKB / WKT

_test/general.test.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      * Simple test to make sure the plugin.info.txt is in correct format
      */
     public function test_plugininfo() {
-        $file = __DIR__ . '/../plugin.info.txt';
+        $file = __DIR__.'/../plugin.info.txt';
         $this->assertFileExists($file);
 
         $info = confToHash($file);