mprins / dokuwiki-plugin-geophp

geoPHP/lib/adapters/WKB.class.php

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

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

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

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

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

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