Completed
Push — master ( 491897...dd0fde )
by Yannick
29:49
created
require/libs/geoPHP/lib/adapters/EWKT.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
     $srid = $geometry->SRID();
17 17
     $wkt = '';
18 18
     if ($srid) {
19
-      $wkt = 'SRID=' . $srid . ';';
19
+      $wkt = 'SRID='.$srid.';';
20 20
       $wkt .= $geometry->out('wkt');
21 21
       return $wkt;
22 22
     }
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/GeoRSS.class.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -44,21 +44,21 @@  discard block
 block discarded – undo
44 44
   public function geomFromText($text) {
45 45
     // Change to lower-case, strip all CDATA, and de-namespace
46 46
     $text = strtolower($text);
47
-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
47
+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);
48 48
         
49 49
     // Load into DOMDOcument
50 50
     $xmlobj = new DOMDocument();
51 51
     @$xmlobj->loadXML($text);
52 52
     if ($xmlobj === false) {
53
-      throw new Exception("Invalid GeoRSS: ". $text);
53
+      throw new Exception("Invalid GeoRSS: ".$text);
54 54
     }
55 55
     
56 56
     $this->xmlobj = $xmlobj;
57 57
     try {
58 58
       $geom = $this->geomFromXML();
59
-    } catch(InvalidText $e) {
60
-        throw new Exception("Cannot Read Geometry From GeoRSS: ". $text);
61
-    } catch(Exception $e) {
59
+    } catch (InvalidText $e) {
60
+        throw new Exception("Cannot Read Geometry From GeoRSS: ".$text);
61
+    } catch (Exception $e) {
62 62
         throw $e;
63 63
     }
64 64
 
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
   
83 83
   protected function getPointsFromCoords($string) {
84 84
     $coords = array();
85
-    $latlon = explode(' ',$string);
85
+    $latlon = explode(' ', $string);
86 86
     foreach ($latlon as $key => $item) {
87
-      if (!($key % 2)) {
87
+      if (!($key%2)) {
88 88
         // It's a latitude
89 89
         $lat = $item;
90 90
       }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
     $polygons = array();
140 140
     $box_elements = $this->xmlobj->getElementsByTagName('box');
141 141
     foreach ($box_elements as $box) {
142
-      $parts = explode(' ',trim($box->firstChild->nodeValue));
142
+      $parts = explode(' ', trim($box->firstChild->nodeValue));
143 143
       $components = array(
144 144
         new Point($parts[3], $parts[2]),
145 145
         new Point($parts[3], $parts[0]),
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
     $points = array();
160 160
     $circle_elements = $this->xmlobj->getElementsByTagName('circle');
161 161
     foreach ($circle_elements as $circle) {
162
-      $parts = explode(' ',trim($circle->firstChild->nodeValue));
162
+      $parts = explode(' ', trim($circle->firstChild->nodeValue));
163 163
       $points[] = new Point($parts[1], $parts[0]);
164 164
     }
165 165
     return $points;
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
     $output = '<'.$this->nss.'line>';
197 197
     foreach ($geom->getComponents() as $k => $point) {
198 198
       $output .= $point->getY().' '.$point->getX();
199
-      if ($k < ($geom->numGeometries() -1)) $output .= ' ';
199
+      if ($k < ($geom->numGeometries() - 1)) $output .= ' ';
200 200
     }
201 201
     $output .= '</'.$this->nss.'line>';
202 202
     return $output;
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
     $exterior_ring = $geom->exteriorRing();
208 208
     foreach ($exterior_ring->getComponents() as $k => $point) {
209 209
       $output .= $point->getY().' '.$point->getX();
210
-      if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';
210
+      if ($k < ($exterior_ring->numGeometries() - 1)) $output .= ' ';
211 211
     }
212 212
     $output .= '</'.$this->nss.'polygon>';
213 213
     return $output;
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/WKT.class.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -16,10 +16,10 @@  discard block
 block discarded – undo
16 16
     $wkt = trim($wkt);
17 17
     
18 18
     // If it contains a ';', then it contains additional SRID data
19
-    if (strpos($wkt,';')) {
19
+    if (strpos($wkt, ';')) {
20 20
       $parts = explode(';', $wkt);
21 21
       $wkt = $parts[1];
22
-      $eparts = explode('=',$parts[0]);
22
+      $eparts = explode('=', $parts[0]);
23 23
       $srid = $eparts[1];
24 24
     }
25 25
     else {
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
   
64 64
   private function parsePoint($data_string) {
65 65
     $data_string = $this->trimParens($data_string);
66
-    $parts = explode(' ',$data_string);
66
+    $parts = explode(' ', $data_string);
67 67
     return new Point($parts[0], $parts[1]);
68 68
   }
69 69
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
     // If it's marked as empty, then return an empty line
74 74
     if ($data_string == 'EMPTY') return new LineString();
75 75
     
76
-    $parts = explode(',',$data_string);
76
+    $parts = explode(',', $data_string);
77 77
     $points = array();
78 78
     foreach ($parts as $part) {
79 79
       $points[] = $this->parsePoint($part);
@@ -87,11 +87,11 @@  discard block
 block discarded – undo
87 87
     // If it's marked as empty, then return an empty polygon
88 88
     if ($data_string == 'EMPTY') return new Polygon();
89 89
     
90
-    $parts = explode('),(',$data_string);
90
+    $parts = explode('),(', $data_string);
91 91
     $lines = array();
92 92
     foreach ($parts as $part) {
93
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
94
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
93
+      if (!$this->beginsWith($part, '(')) $part = '('.$part;
94
+      if (!$this->endsWith($part, ')'))   $part = $part.')';
95 95
       $lines[] = $this->parseLineString($part);
96 96
     }
97 97
     return new Polygon($lines);
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
     // If it's marked as empty, then return an empty MutiPoint
104 104
     if ($data_string == 'EMPTY') return new MultiPoint();
105 105
     
106
-    $parts = explode(',',$data_string);
106
+    $parts = explode(',', $data_string);
107 107
     $points = array();
108 108
     foreach ($parts as $part) {
109 109
       $points[] = $this->parsePoint($part);
@@ -117,12 +117,12 @@  discard block
 block discarded – undo
117 117
     // If it's marked as empty, then return an empty multi-linestring
118 118
     if ($data_string == 'EMPTY') return new MultiLineString();
119 119
     
120
-    $parts = explode('),(',$data_string);
120
+    $parts = explode('),(', $data_string);
121 121
     $lines = array();
122 122
     foreach ($parts as $part) {
123 123
       // Repair the string if the explode broke it
124
-      if (!$this->beginsWith($part,'(')) $part = '(' . $part;
125
-      if (!$this->endsWith($part,')'))   $part = $part . ')';
124
+      if (!$this->beginsWith($part, '(')) $part = '('.$part;
125
+      if (!$this->endsWith($part, ')'))   $part = $part.')';
126 126
       $lines[] = $this->parseLineString($part);
127 127
     }
128 128
     return new MultiLineString($lines);
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
     // If it's marked as empty, then return an empty multi-polygon
135 135
     if ($data_string == 'EMPTY') return new MultiPolygon();
136 136
     
137
-    $parts = explode(')),((',$data_string);
137
+    $parts = explode(')),((', $data_string);
138 138
     $polys = array();
139 139
     foreach ($parts as $part) {
140 140
       // Repair the string if the explode broke it
141
-      if (!$this->beginsWith($part,'((')) $part = '((' . $part;
142
-      if (!$this->endsWith($part,'))'))   $part = $part . '))';
141
+      if (!$this->beginsWith($part, '((')) $part = '(('.$part;
142
+      if (!$this->endsWith($part, '))'))   $part = $part.'))';
143 143
       $polys[] = $this->parsePolygon($part);
144 144
     }
145 145
     return new MultiPolygon($polys);
@@ -179,18 +179,18 @@  discard block
 block discarded – undo
179 179
     
180 180
     // We want to only strip off one set of parenthesis
181 181
     if ($this->beginsWith($str, '(')) {
182
-      return substr($str,1,-1);
182
+      return substr($str, 1, -1);
183 183
     }
184 184
     else return $str;
185 185
   }
186 186
   
187 187
   protected function beginsWith($str, $char) {
188
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
188
+    if (substr($str, 0, strlen($char)) == $char) return TRUE;
189 189
     else return FALSE;
190 190
   }
191 191
 
192 192
   protected function endsWith($str, $char) {
193
-    if (substr($str,(0 - strlen($char))) == $char) return TRUE;
193
+    if (substr($str, (0 - strlen($char))) == $char) return TRUE;
194 194
     else return FALSE;
195 195
   }
196 196
     
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/GoogleGeocode.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
     }
44 44
     
45 45
     $url = "http://maps.googleapis.com/maps/api/geocode/json";
46
-    $url .= '?address='. urlencode($address);
46
+    $url .= '?address='.urlencode($address);
47 47
     $url .= $bounds_string;
48 48
     $url .= '&sensor=false';
49 49
     $this->result = json_decode(@file_get_contents($url));
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
   }
122 122
 
123 123
   private function getPolygon($delta = 0) {
124
-    $points = array (
124
+    $points = array(
125 125
       $this->getTopLeft($delta),
126 126
       $this->getTopRight($delta),
127 127
       $this->getBottomRight($delta),
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/EWKB.class.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
    */
15 15
   public function read($wkb, $is_hex_string = FALSE) {
16 16
     if ($is_hex_string) {
17
-      $wkb = pack('H*',$wkb);
17
+      $wkb = pack('H*', $wkb);
18 18
     }
19 19
     
20 20
     // Open the wkb up in memory so we can examine the SRID
@@ -51,41 +51,41 @@  discard block
 block discarded – undo
51 51
    */
52 52
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
53 53
     // We always write into NDR (little endian)
54
-    $wkb = pack('c',1);
54
+    $wkb = pack('c', 1);
55 55
     
56 56
     switch ($geometry->getGeomType()) {
57 57
       case 'Point';
58
-        $wkb .= pack('L',1);
58
+        $wkb .= pack('L', 1);
59 59
         $wkb .= $this->writePoint($geometry);
60 60
         break;
61 61
       case 'LineString';
62
-        $wkb .= pack('L',2);
62
+        $wkb .= pack('L', 2);
63 63
         $wkb .= $this->writeLineString($geometry);
64 64
         break;
65 65
       case 'Polygon';
66
-        $wkb .= pack('L',3);
66
+        $wkb .= pack('L', 3);
67 67
         $wkb .= $this->writePolygon($geometry);
68 68
         break;
69 69
       case 'MultiPoint';
70
-        $wkb .= pack('L',4);
70
+        $wkb .= pack('L', 4);
71 71
         $wkb .= $this->writeMulti($geometry);
72 72
         break;
73 73
       case 'MultiLineString';
74
-        $wkb .= pack('L',5);
74
+        $wkb .= pack('L', 5);
75 75
         $wkb .= $this->writeMulti($geometry);
76 76
         break;
77 77
       case 'MultiPolygon';
78
-        $wkb .= pack('L',6);
78
+        $wkb .= pack('L', 6);
79 79
         $wkb .= $this->writeMulti($geometry);
80 80
         break;
81 81
       case 'GeometryCollection';
82
-        $wkb .= pack('L',7);
82
+        $wkb .= pack('L', 7);
83 83
         $wkb .= $this->writeMulti($geometry);
84 84
         break;
85 85
     }
86 86
     
87 87
     if ($write_as_hex) {
88
-      $unpacked = unpack('H*',$wkb);
88
+      $unpacked = unpack('H*', $wkb);
89 89
       return $unpacked[1];
90 90
     }
91 91
     else {
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/GeoHash.class.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @see http://en.wikipedia.org/wiki/Geohash
7 7
  *
8 8
  */
9
-class GeoHash extends GeoAdapter{
9
+class GeoHash extends GeoAdapter {
10 10
   private $table = "0123456789bcdefghjkmnpqrstuvwxyz";
11 11
 
12 12
   /**
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
    * @param Point $geometry
40 40
    * @see GeoAdapter::write()
41 41
    */
42
-  public function write(Geometry $geometry, $precision = NULL){
42
+  public function write(Geometry $geometry, $precision = NULL) {
43 43
     if ($geometry->isEmpty()) return '';
44 44
 
45
-    if($geometry->geometryType() === 'Point'){
45
+    if ($geometry->geometryType() === 'Point') {
46 46
       return $this->encodePoint($geometry, $precision);
47 47
     }
48 48
     else {
@@ -74,30 +74,30 @@  discard block
 block discarded – undo
74 74
    * @author algorithm based on code by Alexander Songe <[email protected]>
75 75
    * @see https://github.com/asonge/php-geohash/issues/1
76 76
    */
77
-  private function encodePoint($point, $precision = NULL){
77
+  private function encodePoint($point, $precision = NULL) {
78 78
     if ($precision === NULL) {
79
-      $lap = strlen($point->y())-strpos($point->y(),".");
80
-      $lop = strlen($point->x())-strpos($point->x(),".");
81
-      $precision = pow(10,-max($lap-1,$lop-1,0))/2;
79
+      $lap = strlen($point->y()) - strpos($point->y(), ".");
80
+      $lop = strlen($point->x()) - strpos($point->x(), ".");
81
+      $precision = pow(10, -max($lap - 1, $lop - 1, 0))/2;
82 82
     }
83 83
 
84
-    $minlat =  -90;
85
-    $maxlat =   90;
84
+    $minlat = -90;
85
+    $maxlat = 90;
86 86
     $minlon = -180;
87
-    $maxlon =  180;
88
-    $latE   =   90;
89
-    $lonE   =  180;
87
+    $maxlon = 180;
88
+    $latE   = 90;
89
+    $lonE   = 180;
90 90
     $i = 0;
91 91
     $error = 180;
92
-    $hash='';
93
-    while($error>=$precision) {
92
+    $hash = '';
93
+    while ($error >= $precision) {
94 94
       $chr = 0;
95
-      for($b=4;$b>=0;--$b) {
96
-        if((1&$b) == (1&$i)) {
95
+      for ($b = 4; $b >= 0; --$b) {
96
+        if ((1&$b) == (1&$i)) {
97 97
           // even char, even bit OR odd char, odd bit...a lon
98
-          $next = ($minlon+$maxlon)/2;
99
-          if($point->x()>$next) {
100
-            $chr |= pow(2,$b);
98
+          $next = ($minlon + $maxlon)/2;
99
+          if ($point->x() > $next) {
100
+            $chr |= pow(2, $b);
101 101
             $minlon = $next;
102 102
           } else {
103 103
             $maxlon = $next;
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
           $lonE /= 2;
106 106
         } else {
107 107
           // odd char, even bit OR even char, odd bit...a lat
108
-          $next = ($minlat+$maxlat)/2;
109
-          if($point->y()>$next) {
110
-            $chr |= pow(2,$b);
108
+          $next = ($minlat + $maxlat)/2;
109
+          if ($point->y() > $next) {
110
+            $chr |= pow(2, $b);
111 111
             $minlat = $next;
112 112
           } else {
113 113
             $maxlat = $next;
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
       }
118 118
       $hash .= $this->table[$chr];
119 119
       $i++;
120
-      $error = min($latE,$lonE);
120
+      $error = min($latE, $lonE);
121 121
     }
122 122
     return $hash;
123 123
   }
@@ -127,30 +127,30 @@  discard block
 block discarded – undo
127 127
    * @author algorithm based on code by Alexander Songe <[email protected]>
128 128
    * @see https://github.com/asonge/php-geohash/issues/1
129 129
    */
130
-  private function decode($hash){
130
+  private function decode($hash) {
131 131
     $ll = array();
132
-    $minlat =  -90;
133
-    $maxlat =   90;
132
+    $minlat = -90;
133
+    $maxlat = 90;
134 134
     $minlon = -180;
135
-    $maxlon =  180;
136
-    $latE   =   90;
137
-    $lonE   =  180;
138
-    for($i=0,$c=strlen($hash);$i<$c;$i++) {
139
-      $v = strpos($this->table,$hash[$i]);
140
-      if(1&$i) {
141
-        if(16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
142
-        if(8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
143
-        if(4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
144
-        if(2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
145
-        if(1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
135
+    $maxlon = 180;
136
+    $latE   = 90;
137
+    $lonE   = 180;
138
+    for ($i = 0, $c = strlen($hash); $i < $c; $i++) {
139
+      $v = strpos($this->table, $hash[$i]);
140
+      if (1&$i) {
141
+        if (16&$v)$minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
142
+        if (8&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
143
+        if (4&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
144
+        if (2&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
145
+        if (1&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
146 146
         $latE /= 8;
147 147
         $lonE /= 4;
148 148
       } else {
149
-        if(16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
150
-        if(8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
151
-        if(4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
152
-        if(2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
153
-        if(1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
149
+        if (16&$v)$minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
150
+        if (8&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
151
+        if (4&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
152
+        if (2&$v) $minlat = ($minlat + $maxlat)/2; else $maxlat = ($minlat + $maxlat)/2;
153
+        if (1&$v) $minlon = ($minlon + $maxlon)/2; else $maxlon = ($minlon + $maxlon)/2;
154 154
         $latE /= 4;
155 155
         $lonE /= 8;
156 156
       }
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
     $ll['minlon'] = $minlon;
160 160
     $ll['maxlat'] = $maxlat;
161 161
     $ll['maxlon'] = $maxlon;
162
-    $ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
163
-    $ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
162
+    $ll['medlat'] = round(($minlat + $maxlat)/2, max(1, -round(log10($latE))) - 1);
163
+    $ll['medlon'] = round(($minlon + $maxlon)/2, max(1, -round(log10($lonE))) - 1);
164 164
     return $ll;
165 165
   }
166 166
 }
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/GPX.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -45,21 +45,21 @@  discard block
 block discarded – undo
45 45
   public function geomFromText($text) {
46 46
     // Change to lower-case and strip all CDATA
47 47
     $text = strtolower($text);
48
-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
48
+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);
49 49
     
50 50
     // Load into DOMDocument
51 51
     $xmlobj = new DOMDocument();
52 52
     @$xmlobj->loadXML($text);
53 53
     if ($xmlobj === false) {
54
-      throw new Exception("Invalid GPX: ". $text);
54
+      throw new Exception("Invalid GPX: ".$text);
55 55
     }
56 56
     
57 57
     $this->xmlobj = $xmlobj;
58 58
     try {
59 59
       $geom = $this->geomFromXML();
60
-    } catch(InvalidText $e) {
61
-        throw new Exception("Cannot Read Geometry From GPX: ". $text);
62
-    } catch(Exception $e) {
60
+    } catch (InvalidText $e) {
61
+        throw new Exception("Cannot Read Geometry From GPX: ".$text);
62
+    } catch (Exception $e) {
63 63
         throw $e;
64 64
     }
65 65
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
           $components[] = new Point($lon, $lat);
113 113
         }
114 114
       }
115
-      if ($components) {$lines[] = new LineString($components);}
115
+      if ($components) {$lines[] = new LineString($components); }
116 116
     }
117 117
     return $lines;
118 118
   }
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/GeoJSON.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
     if ($type == 'GeometryCollection') {
51 51
       return $this->objToGeometryCollection($obj);
52 52
     }
53
-    $method = 'arrayTo' . $type;
53
+    $method = 'arrayTo'.$type;
54 54
     return $this->$method($obj->coordinates);
55 55
   }
56 56
 
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/WKB.class.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
30 30
    */
31 31
   public function read($wkb, $is_hex_string = FALSE) {
32 32
     if ($is_hex_string) {
33
-      $wkb = pack('H*',$wkb);
33
+      $wkb = pack('H*', $wkb);
34 34
     }
35 35
 
36 36
     if (empty($wkb)) {
37
-      throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));
37
+      throw new Exception('Cannot read empty WKB geometry. Found '.gettype($wkb));
38 38
     }
39 39
 
40 40
     $mem = fopen('php://memory', 'r+');
@@ -74,37 +74,37 @@  discard block
 block discarded – undo
74 74
       case 3:
75 75
         return $this->getPolygon($mem);
76 76
       case 4:
77
-        return $this->getMulti($mem,'point');
77
+        return $this->getMulti($mem, 'point');
78 78
       case 5:
79
-        return $this->getMulti($mem,'line');
79
+        return $this->getMulti($mem, 'line');
80 80
       case 6:
81
-        return $this->getMulti($mem,'polygon');
81
+        return $this->getMulti($mem, 'polygon');
82 82
       case 7:
83
-        return $this->getMulti($mem,'geometry');
83
+        return $this->getMulti($mem, 'geometry');
84 84
     }
85 85
   }
86 86
 
87 87
   function getPoint(&$mem) {
88
-    $point_coords = unpack("d*", fread($mem,$this->dimension*8));
89
-    return new Point($point_coords[1],$point_coords[2]);
88
+    $point_coords = unpack("d*", fread($mem, $this->dimension*8));
89
+    return new Point($point_coords[1], $point_coords[2]);
90 90
   }
91 91
 
92 92
   function getLinstring(&$mem) {
93 93
     // Get the number of points expected in this string out of the first 4 bytes
94
-    $line_length = unpack('L',fread($mem,4));
94
+    $line_length = unpack('L', fread($mem, 4));
95 95
 
96 96
     // Return an empty linestring if there is no line-length
97 97
     if (!$line_length[1]) return new LineString();
98 98
 
99 99
     // Read the nubmer of points x2 (each point is two coords) into decimal-floats
100
-    $line_coords = unpack('d*', fread($mem,$line_length[1]*$this->dimension*8));
100
+    $line_coords = unpack('d*', fread($mem, $line_length[1]*$this->dimension*8));
101 101
 
102 102
     // We have our coords, build up the linestring
103 103
     $components = array();
104 104
     $i = 1;
105 105
     $num_coords = count($line_coords);
106 106
     while ($i <= $num_coords) {
107
-      $components[] = new Point($line_coords[$i],$line_coords[$i+1]);
107
+      $components[] = new Point($line_coords[$i], $line_coords[$i + 1]);
108 108
       $i += 2;
109 109
     }
110 110
     return new LineString($components);
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
   function getPolygon(&$mem) {
114 114
     // Get the number of linestring expected in this poly out of the first 4 bytes
115
-    $poly_length = unpack('L',fread($mem,4));
115
+    $poly_length = unpack('L', fread($mem, 4));
116 116
 
117 117
     $components = array();
118 118
     $i = 1;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
   function getMulti(&$mem, $type) {
127 127
     // Get the number of items expected in this multi out of the first 4 bytes
128
-    $multi_length = unpack('L',fread($mem,4));
128
+    $multi_length = unpack('L', fread($mem, 4));
129 129
 
130 130
     $components = array();
131 131
     $i = 1;
@@ -154,41 +154,41 @@  discard block
 block discarded – undo
154 154
    */
155 155
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
156 156
     // We always write into NDR (little endian)
157
-    $wkb = pack('c',1);
157
+    $wkb = pack('c', 1);
158 158
 
159 159
     switch ($geometry->getGeomType()) {
160 160
       case 'Point';
161
-        $wkb .= pack('L',1);
161
+        $wkb .= pack('L', 1);
162 162
         $wkb .= $this->writePoint($geometry);
163 163
         break;
164 164
       case 'LineString';
165
-        $wkb .= pack('L',2);
165
+        $wkb .= pack('L', 2);
166 166
         $wkb .= $this->writeLineString($geometry);
167 167
         break;
168 168
       case 'Polygon';
169
-        $wkb .= pack('L',3);
169
+        $wkb .= pack('L', 3);
170 170
         $wkb .= $this->writePolygon($geometry);
171 171
         break;
172 172
       case 'MultiPoint';
173
-        $wkb .= pack('L',4);
173
+        $wkb .= pack('L', 4);
174 174
         $wkb .= $this->writeMulti($geometry);
175 175
         break;
176 176
       case 'MultiLineString';
177
-        $wkb .= pack('L',5);
177
+        $wkb .= pack('L', 5);
178 178
         $wkb .= $this->writeMulti($geometry);
179 179
         break;
180 180
       case 'MultiPolygon';
181
-        $wkb .= pack('L',6);
181
+        $wkb .= pack('L', 6);
182 182
         $wkb .= $this->writeMulti($geometry);
183 183
         break;
184 184
       case 'GeometryCollection';
185
-        $wkb .= pack('L',7);
185
+        $wkb .= pack('L', 7);
186 186
         $wkb .= $this->writeMulti($geometry);
187 187
         break;
188 188
     }
189 189
 
190 190
     if ($write_as_hex) {
191
-      $unpacked = unpack('H*',$wkb);
191
+      $unpacked = unpack('H*', $wkb);
192 192
       return $unpacked[1];
193 193
     }
194 194
     else {
@@ -198,18 +198,18 @@  discard block
 block discarded – undo
198 198
 
199 199
   function writePoint($point) {
200 200
     // Set the coords
201
-    $wkb = pack('dd',$point->x(), $point->y());
201
+    $wkb = pack('dd', $point->x(), $point->y());
202 202
 
203 203
     return $wkb;
204 204
   }
205 205
 
206 206
   function writeLineString($line) {
207 207
     // Set the number of points in this line
208
-    $wkb = pack('L',$line->numPoints());
208
+    $wkb = pack('L', $line->numPoints());
209 209
 
210 210
     // Set the coords
211 211
     foreach ($line->getComponents() as $point) {
212
-      $wkb .= pack('dd',$point->x(), $point->y());
212
+      $wkb .= pack('dd', $point->x(), $point->y());
213 213
     }
214 214
 
215 215
     return $wkb;
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 
218 218
   function writePolygon($poly) {
219 219
     // Set the number of lines in this poly
220
-    $wkb = pack('L',$poly->numGeometries());
220
+    $wkb = pack('L', $poly->numGeometries());
221 221
 
222 222
     // Write the lines
223 223
     foreach ($poly->getComponents() as $line) {
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 
230 230
   function writeMulti($geometry) {
231 231
     // Set the number of components
232
-    $wkb = pack('L',$geometry->numGeometries());
232
+    $wkb = pack('L', $geometry->numGeometries());
233 233
 
234 234
     // Write the components
235 235
     foreach ($geometry->getComponents() as $component) {
Please login to merge, or discard this patch.