Completed
Push — master ( d44f1f...2285a7 )
by Yannick
09:57
created
require/libs/geoPHP/tests/tests/20120702Test.php 1 patch
Indentation   +268 added lines, -268 removed lines patch added patch discarded remove patch
@@ -9,281 +9,281 @@
 block discarded – undo
9 9
   }
10 10
 
11 11
   function testMethods() {
12
-    $format = 'gpx';
13
-    $value = file_get_contents('./input/20120702.gpx');
14
-    $geometry = geoPHP::load($value, $format);
12
+	$format = 'gpx';
13
+	$value = file_get_contents('./input/20120702.gpx');
14
+	$geometry = geoPHP::load($value, $format);
15 15
 
16
-    $methods = array(
17
-      array('name' => 'area'),
18
-      array('name' => 'boundary'),
19
-      array('name' => 'getBBox'),
20
-      array('name' => 'centroid'),
21
-      array('name' => 'length'),
22
-      array('name' => 'greatCircleLength', 'argument' => 6378137),
23
-      array('name' => 'haversineLength'),
24
-      array('name' => 'y'),
25
-      array('name' => 'x'),
26
-      array('name' => 'numGeometries'),
27
-      array('name' => 'geometryN', 'argument' => '1'),
28
-      array('name' => 'startPoint'),
29
-      array('name' => 'endPoint'),
30
-      array('name' => 'isRing'),
31
-      array('name' => 'isClosed'),
32
-      array('name' => 'numPoints'),
33
-      array('name' => 'pointN', 'argument' => '1'),
34
-      array('name' => 'exteriorRing'),
35
-      array('name' => 'numInteriorRings'),
36
-      array('name' => 'interiorRingN', 'argument' => '1'),
37
-      array('name' => 'dimension'),
38
-      array('name' => 'geometryType'),
39
-      array('name' => 'SRID'),
40
-      array('name' => 'setSRID', 'argument' => '4326'),
41
-    );
16
+	$methods = array(
17
+	  array('name' => 'area'),
18
+	  array('name' => 'boundary'),
19
+	  array('name' => 'getBBox'),
20
+	  array('name' => 'centroid'),
21
+	  array('name' => 'length'),
22
+	  array('name' => 'greatCircleLength', 'argument' => 6378137),
23
+	  array('name' => 'haversineLength'),
24
+	  array('name' => 'y'),
25
+	  array('name' => 'x'),
26
+	  array('name' => 'numGeometries'),
27
+	  array('name' => 'geometryN', 'argument' => '1'),
28
+	  array('name' => 'startPoint'),
29
+	  array('name' => 'endPoint'),
30
+	  array('name' => 'isRing'),
31
+	  array('name' => 'isClosed'),
32
+	  array('name' => 'numPoints'),
33
+	  array('name' => 'pointN', 'argument' => '1'),
34
+	  array('name' => 'exteriorRing'),
35
+	  array('name' => 'numInteriorRings'),
36
+	  array('name' => 'interiorRingN', 'argument' => '1'),
37
+	  array('name' => 'dimension'),
38
+	  array('name' => 'geometryType'),
39
+	  array('name' => 'SRID'),
40
+	  array('name' => 'setSRID', 'argument' => '4326'),
41
+	);
42 42
 
43
-    foreach($methods as $method) {
44
-      $argument = NULL;
45
-      $method_name = $method['name'];
46
-      if (isset($method['argument'])) {
47
-        $argument = $method['argument'];
48
-      }
49
-      $this->_methods_tester($geometry, $method_name, $argument);
50
-    }
43
+	foreach($methods as $method) {
44
+	  $argument = NULL;
45
+	  $method_name = $method['name'];
46
+	  if (isset($method['argument'])) {
47
+		$argument = $method['argument'];
48
+	  }
49
+	  $this->_methods_tester($geometry, $method_name, $argument);
50
+	}
51 51
   }
52 52
 
53 53
   function _methods_tester($geometry, $method_name, $argument) {
54 54
 
55
-    if (!method_exists($geometry, $method_name)) {
56
-      $this->fail("Method ".$method_name.'() doesn\'t exists.');
57
-      return;
58
-    }
55
+	if (!method_exists($geometry, $method_name)) {
56
+	  $this->fail("Method ".$method_name.'() doesn\'t exists.');
57
+	  return;
58
+	}
59 59
 
60
-    switch ($method_name) {
61
-      case 'y':
62
-      case 'x':
63
-        if ($geometry->geometryType() == 'Point') {
64
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
65
-        }
66
-        if ($geometry->geometryType() == 'LineString') {
67
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
68
-        }
69
-        if ($geometry->geometryType() == 'MultiLineString') {
70
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
71
-        }
72
-        break;
73
-      case 'geometryN':
74
-        if ($geometry->geometryType() == 'Point') {
75
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
76
-        }
77
-        if ($geometry->geometryType() == 'LineString') {
78
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
79
-        }
80
-        if ($geometry->geometryType() == 'MultiLineString') {
81
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
82
-        }
83
-        break;
84
-      case 'startPoint':
85
-        if ($geometry->geometryType() == 'Point') {
86
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
87
-        }
88
-        if ($geometry->geometryType() == 'LineString') {
89
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
90
-        }
91
-        if ($geometry->geometryType() == 'MultiLineString') {
92
-          //TODO: Add a method startPoint() to MultiLineString.
93
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
94
-        }
95
-        break;
96
-      case 'endPoint':
97
-        if ($geometry->geometryType() == 'Point') {
98
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
99
-        }
100
-        if ($geometry->geometryType() == 'LineString') {
101
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
102
-        }
103
-        if ($geometry->geometryType() == 'MultiLineString') {
104
-          //TODO: Add a method endPoint() to MultiLineString.
105
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
106
-        }
107
-        break;
108
-      case 'isRing':
109
-        if ($geometry->geometryType() == 'Point') {
110
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
111
-        }
112
-        if ($geometry->geometryType() == 'LineString') {
113
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
114
-        }
115
-        if ($geometry->geometryType() == 'MultiLineString') {
116
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
117
-        }
118
-        break;
119
-      case 'isClosed':
120
-        if ($geometry->geometryType() == 'Point') {
121
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
122
-        }
123
-        if ($geometry->geometryType() == 'LineString') {
124
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
125
-        }
126
-        if ($geometry->geometryType() == 'MultiLineString') {
127
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
128
-        }
129
-        break;
130
-      case 'pointN':
131
-        if ($geometry->geometryType() == 'Point') {
132
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
133
-        }
134
-        if ($geometry->geometryType() == 'LineString') {
135
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
136
-        }
137
-        if ($geometry->geometryType() == 'MultiLineString') {
138
-          //TODO: Add a method pointN() to MultiLineString.
139
-          //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
140
-        }
141
-        break;
142
-      case 'exteriorRing':
143
-        if ($geometry->geometryType() == 'Point') {
144
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
145
-        }
146
-        if ($geometry->geometryType() == 'LineString') {
147
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
148
-        }
149
-        if ($geometry->geometryType() == 'MultiLineString') {
150
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
151
-        }
152
-        break;
153
-      case 'numInteriorRings':
154
-        if ($geometry->geometryType() == 'Point') {
155
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
156
-        }
157
-        if ($geometry->geometryType() == 'LineString') {
158
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
159
-        }
160
-        if ($geometry->geometryType() == 'MultiLineString') {
161
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
162
-        }
163
-        break;
164
-      case 'interiorRingN':
165
-        if ($geometry->geometryType() == 'Point') {
166
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
167
-        }
168
-        if ($geometry->geometryType() == 'LineString') {
169
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
170
-        }
171
-        if ($geometry->geometryType() == 'MultiLineString') {
172
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
173
-        }
174
-        break;
175
-      case 'setSRID':
176
-        //TODO: The method setSRID() should return TRUE.
177
-        break;
178
-      case 'SRID':
179
-        if ($geometry->geometryType() == 'Point') {
180
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
181
-        }
182
-        if ($geometry->geometryType() == 'LineString') {
183
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
184
-        }
185
-        if ($geometry->geometryType() == 'MultiLineString') {
186
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
187
-        }
188
-        break;
189
-      case 'getBBox':
190
-        if ($geometry->geometryType() == 'Point') {
191
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
192
-        }
193
-        if ($geometry->geometryType() == 'LineString') {
194
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
195
-        }
196
-        if ($geometry->geometryType() == 'MultiLineString') {
197
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
198
-        }
199
-        break;
200
-      case 'centroid':
201
-        if ($geometry->geometryType() == 'Point') {
202
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
203
-        }
204
-        if ($geometry->geometryType() == 'LineString') {
205
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
206
-        }
207
-        if ($geometry->geometryType() == 'MultiLineString') {
208
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
209
-        }
210
-        break;
211
-      case 'length':
212
-        if ($geometry->geometryType() == 'Point') {
213
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
214
-        }
215
-        if ($geometry->geometryType() == 'LineString') {
216
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
217
-        }
218
-        if ($geometry->geometryType() == 'MultiLineString') {
219
-          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
220
-        }
221
-        break;
222
-      case 'numGeometries':
223
-        if ($geometry->geometryType() == 'Point') {
224
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
225
-        }
226
-        if ($geometry->geometryType() == 'LineString') {
227
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
228
-        }
229
-        if ($geometry->geometryType() == 'MultiLineString') {
230
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
231
-        }
232
-        break;
233
-      case 'numPoints':
234
-        if ($geometry->geometryType() == 'Point') {
235
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
236
-        }
237
-        if ($geometry->geometryType() == 'LineString') {
238
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
239
-        }
240
-        if ($geometry->geometryType() == 'MultiLineString') {
241
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
242
-        }
243
-        break;
244
-      case 'dimension':
245
-        if ($geometry->geometryType() == 'Point') {
246
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
247
-        }
248
-        if ($geometry->geometryType() == 'LineString') {
249
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
250
-        }
251
-        if ($geometry->geometryType() == 'MultiLineString') {
252
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
253
-        }
254
-        break;
255
-      case 'boundary':
256
-        if ($geometry->geometryType() == 'Point') {
257
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
258
-        }
259
-        if ($geometry->geometryType() == 'LineString') {
260
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
261
-        }
262
-        if ($geometry->geometryType() == 'MultiLineString') {
263
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
264
-        }
265
-        break;
266
-      case 'greatCircleLength':
267
-        if ($geometry->geometryType() == 'Point') {
268
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
269
-        }
270
-        if ($geometry->geometryType() == 'LineString') {
271
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
272
-        }
273
-        if ($geometry->geometryType() == 'MultiLineString') {
274
-          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
275
-        }
276
-        break;
277
-      case 'haversineLength':
278
-      case 'area':
279
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
280
-        break;
281
-      case 'geometryType':
282
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
283
-        break;
284
-      default:
285
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
286
-    }
60
+	switch ($method_name) {
61
+	  case 'y':
62
+	  case 'x':
63
+		if ($geometry->geometryType() == 'Point') {
64
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
65
+		}
66
+		if ($geometry->geometryType() == 'LineString') {
67
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
68
+		}
69
+		if ($geometry->geometryType() == 'MultiLineString') {
70
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
71
+		}
72
+		break;
73
+	  case 'geometryN':
74
+		if ($geometry->geometryType() == 'Point') {
75
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
76
+		}
77
+		if ($geometry->geometryType() == 'LineString') {
78
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
79
+		}
80
+		if ($geometry->geometryType() == 'MultiLineString') {
81
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
82
+		}
83
+		break;
84
+	  case 'startPoint':
85
+		if ($geometry->geometryType() == 'Point') {
86
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
87
+		}
88
+		if ($geometry->geometryType() == 'LineString') {
89
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
90
+		}
91
+		if ($geometry->geometryType() == 'MultiLineString') {
92
+		  //TODO: Add a method startPoint() to MultiLineString.
93
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
94
+		}
95
+		break;
96
+	  case 'endPoint':
97
+		if ($geometry->geometryType() == 'Point') {
98
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
99
+		}
100
+		if ($geometry->geometryType() == 'LineString') {
101
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
102
+		}
103
+		if ($geometry->geometryType() == 'MultiLineString') {
104
+		  //TODO: Add a method endPoint() to MultiLineString.
105
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
106
+		}
107
+		break;
108
+	  case 'isRing':
109
+		if ($geometry->geometryType() == 'Point') {
110
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
111
+		}
112
+		if ($geometry->geometryType() == 'LineString') {
113
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
114
+		}
115
+		if ($geometry->geometryType() == 'MultiLineString') {
116
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
117
+		}
118
+		break;
119
+	  case 'isClosed':
120
+		if ($geometry->geometryType() == 'Point') {
121
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
122
+		}
123
+		if ($geometry->geometryType() == 'LineString') {
124
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
125
+		}
126
+		if ($geometry->geometryType() == 'MultiLineString') {
127
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
128
+		}
129
+		break;
130
+	  case 'pointN':
131
+		if ($geometry->geometryType() == 'Point') {
132
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
133
+		}
134
+		if ($geometry->geometryType() == 'LineString') {
135
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
136
+		}
137
+		if ($geometry->geometryType() == 'MultiLineString') {
138
+		  //TODO: Add a method pointN() to MultiLineString.
139
+		  //$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
140
+		}
141
+		break;
142
+	  case 'exteriorRing':
143
+		if ($geometry->geometryType() == 'Point') {
144
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
145
+		}
146
+		if ($geometry->geometryType() == 'LineString') {
147
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
148
+		}
149
+		if ($geometry->geometryType() == 'MultiLineString') {
150
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
151
+		}
152
+		break;
153
+	  case 'numInteriorRings':
154
+		if ($geometry->geometryType() == 'Point') {
155
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
156
+		}
157
+		if ($geometry->geometryType() == 'LineString') {
158
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
159
+		}
160
+		if ($geometry->geometryType() == 'MultiLineString') {
161
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
162
+		}
163
+		break;
164
+	  case 'interiorRingN':
165
+		if ($geometry->geometryType() == 'Point') {
166
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
167
+		}
168
+		if ($geometry->geometryType() == 'LineString') {
169
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
170
+		}
171
+		if ($geometry->geometryType() == 'MultiLineString') {
172
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
173
+		}
174
+		break;
175
+	  case 'setSRID':
176
+		//TODO: The method setSRID() should return TRUE.
177
+		break;
178
+	  case 'SRID':
179
+		if ($geometry->geometryType() == 'Point') {
180
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
181
+		}
182
+		if ($geometry->geometryType() == 'LineString') {
183
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
184
+		}
185
+		if ($geometry->geometryType() == 'MultiLineString') {
186
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
187
+		}
188
+		break;
189
+	  case 'getBBox':
190
+		if ($geometry->geometryType() == 'Point') {
191
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
192
+		}
193
+		if ($geometry->geometryType() == 'LineString') {
194
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
195
+		}
196
+		if ($geometry->geometryType() == 'MultiLineString') {
197
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
198
+		}
199
+		break;
200
+	  case 'centroid':
201
+		if ($geometry->geometryType() == 'Point') {
202
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
203
+		}
204
+		if ($geometry->geometryType() == 'LineString') {
205
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
206
+		}
207
+		if ($geometry->geometryType() == 'MultiLineString') {
208
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
209
+		}
210
+		break;
211
+	  case 'length':
212
+		if ($geometry->geometryType() == 'Point') {
213
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
214
+		}
215
+		if ($geometry->geometryType() == 'LineString') {
216
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
217
+		}
218
+		if ($geometry->geometryType() == 'MultiLineString') {
219
+		  $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
220
+		}
221
+		break;
222
+	  case 'numGeometries':
223
+		if ($geometry->geometryType() == 'Point') {
224
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
225
+		}
226
+		if ($geometry->geometryType() == 'LineString') {
227
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
228
+		}
229
+		if ($geometry->geometryType() == 'MultiLineString') {
230
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
231
+		}
232
+		break;
233
+	  case 'numPoints':
234
+		if ($geometry->geometryType() == 'Point') {
235
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
236
+		}
237
+		if ($geometry->geometryType() == 'LineString') {
238
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
239
+		}
240
+		if ($geometry->geometryType() == 'MultiLineString') {
241
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
242
+		}
243
+		break;
244
+	  case 'dimension':
245
+		if ($geometry->geometryType() == 'Point') {
246
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
247
+		}
248
+		if ($geometry->geometryType() == 'LineString') {
249
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
250
+		}
251
+		if ($geometry->geometryType() == 'MultiLineString') {
252
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
253
+		}
254
+		break;
255
+	  case 'boundary':
256
+		if ($geometry->geometryType() == 'Point') {
257
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
258
+		}
259
+		if ($geometry->geometryType() == 'LineString') {
260
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
261
+		}
262
+		if ($geometry->geometryType() == 'MultiLineString') {
263
+		  $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
264
+		}
265
+		break;
266
+	  case 'greatCircleLength':
267
+		if ($geometry->geometryType() == 'Point') {
268
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
269
+		}
270
+		if ($geometry->geometryType() == 'LineString') {
271
+		  $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
272
+		}
273
+		if ($geometry->geometryType() == 'MultiLineString') {
274
+		  $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
275
+		}
276
+		break;
277
+	  case 'haversineLength':
278
+	  case 'area':
279
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
280
+		break;
281
+	  case 'geometryType':
282
+		$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
283
+		break;
284
+	  default:
285
+		$this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
286
+	}
287 287
   }
288 288
 }
289 289
 
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/geosTest.php 1 patch
Indentation   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -9,78 +9,78 @@
 block discarded – undo
9 9
   }
10 10
 
11 11
   function testGeos() {
12
-    foreach (scandir('./input') as $file) {
13
-      $parts = explode('.',$file);
14
-      if ($parts[0]) {
15
-        $format = $parts[1];
16
-        $value = file_get_contents('./input/'.$file);
17
-        $geometry = geoPHP::load($value, $format);
12
+	foreach (scandir('./input') as $file) {
13
+	  $parts = explode('.',$file);
14
+	  if ($parts[0]) {
15
+		$format = $parts[1];
16
+		$value = file_get_contents('./input/'.$file);
17
+		$geometry = geoPHP::load($value, $format);
18 18
 
19
-        $geosMethods = array(
20
-          array('name' => 'geos'),
21
-          array('name' => 'setGeos', 'argument' => $geometry->geos()),
22
-          array('name' => 'PointOnSurface'),
23
-          array('name' => 'equals', 'argument' => $geometry),
24
-          array('name' => 'equalsExact', 'argument' => $geometry),
25
-          array('name' => 'relate', 'argument' => $geometry),
26
-          array('name' => 'checkValidity'),
27
-          array('name' => 'isSimple'),
28
-          array('name' => 'buffer', 'argument' => '10'),
29
-          array('name' => 'intersection', 'argument' => $geometry),
30
-          array('name' => 'convexHull'),
31
-          array('name' => 'difference', 'argument' => $geometry),
32
-          array('name' => 'symDifference', 'argument' => $geometry),
33
-          array('name' => 'union', 'argument' => $geometry),
34
-          array('name' => 'simplify', 'argument' => '0'),
35
-          array('name' => 'disjoint', 'argument' => $geometry),
36
-          array('name' => 'touches', 'argument' => $geometry),
37
-          array('name' => 'intersects', 'argument' => $geometry),
38
-          array('name' => 'crosses', 'argument' => $geometry),
39
-          array('name' => 'within', 'argument' => $geometry),
40
-          array('name' => 'contains', 'argument' => $geometry),
41
-          array('name' => 'overlaps', 'argument' => $geometry),
42
-          array('name' => 'covers', 'argument' => $geometry),
43
-          array('name' => 'coveredBy', 'argument' => $geometry),
44
-          array('name' => 'distance', 'argument' => $geometry),
45
-          array('name' => 'hausdorffDistance', 'argument' => $geometry),
46
-        );
19
+		$geosMethods = array(
20
+		  array('name' => 'geos'),
21
+		  array('name' => 'setGeos', 'argument' => $geometry->geos()),
22
+		  array('name' => 'PointOnSurface'),
23
+		  array('name' => 'equals', 'argument' => $geometry),
24
+		  array('name' => 'equalsExact', 'argument' => $geometry),
25
+		  array('name' => 'relate', 'argument' => $geometry),
26
+		  array('name' => 'checkValidity'),
27
+		  array('name' => 'isSimple'),
28
+		  array('name' => 'buffer', 'argument' => '10'),
29
+		  array('name' => 'intersection', 'argument' => $geometry),
30
+		  array('name' => 'convexHull'),
31
+		  array('name' => 'difference', 'argument' => $geometry),
32
+		  array('name' => 'symDifference', 'argument' => $geometry),
33
+		  array('name' => 'union', 'argument' => $geometry),
34
+		  array('name' => 'simplify', 'argument' => '0'),
35
+		  array('name' => 'disjoint', 'argument' => $geometry),
36
+		  array('name' => 'touches', 'argument' => $geometry),
37
+		  array('name' => 'intersects', 'argument' => $geometry),
38
+		  array('name' => 'crosses', 'argument' => $geometry),
39
+		  array('name' => 'within', 'argument' => $geometry),
40
+		  array('name' => 'contains', 'argument' => $geometry),
41
+		  array('name' => 'overlaps', 'argument' => $geometry),
42
+		  array('name' => 'covers', 'argument' => $geometry),
43
+		  array('name' => 'coveredBy', 'argument' => $geometry),
44
+		  array('name' => 'distance', 'argument' => $geometry),
45
+		  array('name' => 'hausdorffDistance', 'argument' => $geometry),
46
+		);
47 47
 
48
-        foreach($geosMethods as $method) {
49
-          $argument = NULL;
50
-          $method_name = $method['name'];
51
-          if (isset($method['argument'])) {
52
-            $argument = $method['argument'];
53
-          }
48
+		foreach($geosMethods as $method) {
49
+		  $argument = NULL;
50
+		  $method_name = $method['name'];
51
+		  if (isset($method['argument'])) {
52
+			$argument = $method['argument'];
53
+		  }
54 54
 
55
-          switch ($method_name) {
56
-            case 'isSimple':
57
-            case 'equals':
58
-            case 'geos':
59
-              if ($geometry->geometryType() == 'Point') {
60
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
61
-              }
62
-              if ($geometry->geometryType() == 'LineString') {
63
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
64
-              }
65
-              if ($geometry->geometryType() == 'MultiLineString') {
66
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
67
-              }
68
-              break;
69
-            default:
70
-              if ($geometry->geometryType() == 'Point') {
71
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
72
-              }
73
-              if ($geometry->geometryType() == 'LineString') {
74
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
75
-              }
76
-              if ($geometry->geometryType() == 'MultiLineString') {
77
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
78
-              }
79
-          }
80
-        }
55
+		  switch ($method_name) {
56
+			case 'isSimple':
57
+			case 'equals':
58
+			case 'geos':
59
+			  if ($geometry->geometryType() == 'Point') {
60
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
61
+			  }
62
+			  if ($geometry->geometryType() == 'LineString') {
63
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
64
+			  }
65
+			  if ($geometry->geometryType() == 'MultiLineString') {
66
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
67
+			  }
68
+			  break;
69
+			default:
70
+			  if ($geometry->geometryType() == 'Point') {
71
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
72
+			  }
73
+			  if ($geometry->geometryType() == 'LineString') {
74
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
75
+			  }
76
+			  if ($geometry->geometryType() == 'MultiLineString') {
77
+				$this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
78
+			  }
79
+		  }
80
+		}
81 81
 
82
-      }
83
-    }
82
+	  }
83
+	}
84 84
   }
85 85
 
86 86
 }
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/aliasesTest.php 1 patch
Indentation   +91 added lines, -91 removed lines patch added patch discarded remove patch
@@ -9,101 +9,101 @@
 block discarded – undo
9 9
   }
10 10
 
11 11
   function testAliases() {
12
-    foreach (scandir('./input') as $file) {
13
-      $parts = explode('.',$file);
14
-      if ($parts[0]) {
15
-        $format = $parts[1];
16
-        $value = file_get_contents('./input/'.$file);
17
-        $geometry = geoPHP::load($value, $format);
12
+	foreach (scandir('./input') as $file) {
13
+	  $parts = explode('.',$file);
14
+	  if ($parts[0]) {
15
+		$format = $parts[1];
16
+		$value = file_get_contents('./input/'.$file);
17
+		$geometry = geoPHP::load($value, $format);
18 18
 
19
-        $aliases = array(
20
-          array('name' => 'getCentroid'),
21
-          array('name' => 'getArea'),
22
-          array('name' => 'getX'),
23
-          array('name' => 'getY'),
24
-          array('name' => 'getGeos'),
25
-          array('name' => 'getGeomType'),
26
-          array('name' => 'getSRID'),
27
-          array('name' => 'asText'),
28
-          array('name' => 'asBinary'),
29
-        );
19
+		$aliases = array(
20
+		  array('name' => 'getCentroid'),
21
+		  array('name' => 'getArea'),
22
+		  array('name' => 'getX'),
23
+		  array('name' => 'getY'),
24
+		  array('name' => 'getGeos'),
25
+		  array('name' => 'getGeomType'),
26
+		  array('name' => 'getSRID'),
27
+		  array('name' => 'asText'),
28
+		  array('name' => 'asBinary'),
29
+		);
30 30
 
31
-        foreach($aliases as $alias) {
32
-          $argument = NULL;
33
-          $alias_name = $alias['name'];
34
-          if (isset($alias['argument'])) {
35
-            $argument = $alias['argument'];
36
-          }
31
+		foreach($aliases as $alias) {
32
+		  $argument = NULL;
33
+		  $alias_name = $alias['name'];
34
+		  if (isset($alias['argument'])) {
35
+			$argument = $alias['argument'];
36
+		  }
37 37
 
38
-          switch ($alias_name) {
39
-            case 'getSRID':
40
-              if ($geometry->geometryType() == 'Point') {
41
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
42
-              }
43
-              if ($geometry->geometryType() == 'LineString') {
44
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
45
-              }
46
-              if ($geometry->geometryType() == 'MultiLineString') {
47
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
48
-              }
49
-              break;
50
-            case 'getGeos':
51
-              if ($geometry->geometryType() == 'Point') {
52
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
53
-              }
54
-              if ($geometry->geometryType() == 'LineString') {
55
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
56
-              }
57
-              if ($geometry->geometryType() == 'MultiLineString') {
58
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
59
-              }
60
-              break;
61
-            case 'getX':
62
-            case 'getY':
63
-              if ($geometry->geometryType() == 'Point') {
64
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
65
-              }
66
-              if ($geometry->geometryType() == 'LineString') {
67
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
68
-              }
69
-              if ($geometry->geometryType() == 'MultiLineString') {
70
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
71
-              }
72
-              break;
73
-            case 'getArea':
74
-              if ($geometry->geometryType() == 'Point') {
75
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
76
-              }
77
-              if ($geometry->geometryType() == 'LineString') {
78
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
79
-              }
80
-              if ($geometry->geometryType() == 'MultiLineString') {
81
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
82
-              }
83
-              break;
84
-            case 'getCentroid':
85
-              if ($geometry->geometryType() == 'Point') {
86
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
87
-              }
88
-              if ($geometry->geometryType() == 'LineString') {
89
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
90
-              }
91
-              if ($geometry->geometryType() == 'MultiLineString') {
92
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
93
-              }
94
-              break;
95
-            case 'asText':
96
-            case 'asBinary':
97
-            case 'getGeomType':
98
-              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
99
-              break;
100
-            default:
101
-              $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
102
-          }
103
-        }
38
+		  switch ($alias_name) {
39
+			case 'getSRID':
40
+			  if ($geometry->geometryType() == 'Point') {
41
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
42
+			  }
43
+			  if ($geometry->geometryType() == 'LineString') {
44
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
45
+			  }
46
+			  if ($geometry->geometryType() == 'MultiLineString') {
47
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
48
+			  }
49
+			  break;
50
+			case 'getGeos':
51
+			  if ($geometry->geometryType() == 'Point') {
52
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
53
+			  }
54
+			  if ($geometry->geometryType() == 'LineString') {
55
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
56
+			  }
57
+			  if ($geometry->geometryType() == 'MultiLineString') {
58
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
59
+			  }
60
+			  break;
61
+			case 'getX':
62
+			case 'getY':
63
+			  if ($geometry->geometryType() == 'Point') {
64
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
65
+			  }
66
+			  if ($geometry->geometryType() == 'LineString') {
67
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
68
+			  }
69
+			  if ($geometry->geometryType() == 'MultiLineString') {
70
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
71
+			  }
72
+			  break;
73
+			case 'getArea':
74
+			  if ($geometry->geometryType() == 'Point') {
75
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
76
+			  }
77
+			  if ($geometry->geometryType() == 'LineString') {
78
+				$this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
79
+			  }
80
+			  if ($geometry->geometryType() == 'MultiLineString') {
81
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
82
+			  }
83
+			  break;
84
+			case 'getCentroid':
85
+			  if ($geometry->geometryType() == 'Point') {
86
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
87
+			  }
88
+			  if ($geometry->geometryType() == 'LineString') {
89
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
90
+			  }
91
+			  if ($geometry->geometryType() == 'MultiLineString') {
92
+				$this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
93
+			  }
94
+			  break;
95
+			case 'asText':
96
+			case 'asBinary':
97
+			case 'getGeomType':
98
+			  $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
99
+			  break;
100
+			default:
101
+			  $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
102
+		  }
103
+		}
104 104
 
105
-      }
106
-    }
105
+	  }
106
+	}
107 107
   }
108 108
 
109 109
 }
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/adaptersTest.php 1 patch
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -9,56 +9,56 @@
 block discarded – undo
9 9
   }
10 10
 
11 11
   function testAdapters() {
12
-    foreach (scandir('./input') as $file) {
13
-      $parts = explode('.',$file);
14
-      if ($parts[0]) {
15
-        $format = $parts[1];
16
-        $input = file_get_contents('./input/'.$file);
17
-        $geometry = geoPHP::load($input, $format);
12
+	foreach (scandir('./input') as $file) {
13
+	  $parts = explode('.',$file);
14
+	  if ($parts[0]) {
15
+		$format = $parts[1];
16
+		$input = file_get_contents('./input/'.$file);
17
+		$geometry = geoPHP::load($input, $format);
18 18
 
19
-        // Test adapter output and input. Do a round-trip and re-test
20
-        foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
21
-          if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
22
-            $output = $geometry->out($adapter_key);
23
-            $this->assertNotNull($output, "Empty output on "  . $adapter_key);
24
-            if ($output) {
25
-              $adapter_loader = new $adapter_class();
26
-              $test_geom_1 = $adapter_loader->read($output);
27
-              $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
28
-              $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class);
29
-            }
30
-          }
31
-        }
19
+		// Test adapter output and input. Do a round-trip and re-test
20
+		foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
21
+		  if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
22
+			$output = $geometry->out($adapter_key);
23
+			$this->assertNotNull($output, "Empty output on "  . $adapter_key);
24
+			if ($output) {
25
+			  $adapter_loader = new $adapter_class();
26
+			  $test_geom_1 = $adapter_loader->read($output);
27
+			  $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
28
+			  $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output in ".$adapter_class);
29
+			}
30
+		  }
31
+		}
32 32
 
33
-        // Test to make sure adapter work the same wether GEOS is ON or OFF
34
-        // Cannot test methods if GEOS is not intstalled
35
-        if (!geoPHP::geosInstalled()) return;
33
+		// Test to make sure adapter work the same wether GEOS is ON or OFF
34
+		// Cannot test methods if GEOS is not intstalled
35
+		if (!geoPHP::geosInstalled()) return;
36 36
 
37
-        foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
38
-          if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
39
-            // Turn GEOS on
40
-            geoPHP::geosInstalled(TRUE);
37
+		foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
38
+		  if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
39
+			// Turn GEOS on
40
+			geoPHP::geosInstalled(TRUE);
41 41
 
42
-            $output = $geometry->out($adapter_key);
43
-            if ($output) {
44
-              $adapter_loader = new $adapter_class();
42
+			$output = $geometry->out($adapter_key);
43
+			if ($output) {
44
+			  $adapter_loader = new $adapter_class();
45 45
 
46
-              $test_geom_1 = $adapter_loader->read($output);
46
+			  $test_geom_1 = $adapter_loader->read($output);
47 47
 
48
-              // Turn GEOS off
49
-              geoPHP::geosInstalled(FALSE);
48
+			  // Turn GEOS off
49
+			  geoPHP::geosInstalled(FALSE);
50 50
 
51
-              $test_geom_2 = $adapter_loader->read($output);
51
+			  $test_geom_2 = $adapter_loader->read($output);
52 52
 
53
-              // Turn GEOS back On
54
-              geoPHP::geosInstalled(TRUE);
53
+			  // Turn GEOS back On
54
+			  geoPHP::geosInstalled(TRUE);
55 55
 
56
-              // Check to make sure a both are the same with geos and without
57
-              $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class);
58
-            }
59
-          }
60
-        }
61
-      }
62
-    }
56
+			  // Check to make sure a both are the same with geos and without
57
+			  $this->assertEquals($test_geom_1->out('wkt'), $test_geom_2->out('wkt'), "Mismatched adapter output between GEOS and NORM in ".$adapter_class);
58
+			}
59
+		  }
60
+		}
61
+	  }
62
+	}
63 63
   }
64 64
 }
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/placeholdersTest.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -9,65 +9,65 @@
 block discarded – undo
9 9
   }
10 10
 
11 11
   function testPlaceholders() {
12
-    foreach (scandir('./input') as $file) {
13
-      $parts = explode('.',$file);
14
-      if ($parts[0]) {
15
-        $format = $parts[1];
16
-        $value = file_get_contents('./input/'.$file);
17
-        $geometry = geoPHP::load($value, $format);
12
+	foreach (scandir('./input') as $file) {
13
+	  $parts = explode('.',$file);
14
+	  if ($parts[0]) {
15
+		$format = $parts[1];
16
+		$value = file_get_contents('./input/'.$file);
17
+		$geometry = geoPHP::load($value, $format);
18 18
 
19
-        $placeholders = array(
20
-          array('name' => 'hasZ'),
21
-          array('name' => 'is3D'),
22
-          array('name' => 'isMeasured'),
23
-          array('name' => 'isEmpty'),
24
-          array('name' => 'coordinateDimension'),
25
-          array('name' => 'z'),
26
-          array('name' => 'm'),
27
-        );
19
+		$placeholders = array(
20
+		  array('name' => 'hasZ'),
21
+		  array('name' => 'is3D'),
22
+		  array('name' => 'isMeasured'),
23
+		  array('name' => 'isEmpty'),
24
+		  array('name' => 'coordinateDimension'),
25
+		  array('name' => 'z'),
26
+		  array('name' => 'm'),
27
+		);
28 28
 
29
-        foreach($placeholders as $method) {
30
-          $argument = NULL;
31
-          $method_name = $method['name'];
32
-          if (isset($method['argument'])) {
33
-            $argument = $method['argument'];
34
-          }
29
+		foreach($placeholders as $method) {
30
+		  $argument = NULL;
31
+		  $method_name = $method['name'];
32
+		  if (isset($method['argument'])) {
33
+			$argument = $method['argument'];
34
+		  }
35 35
 
36
-          switch ($method_name) {
37
-            case 'm':
38
-            case 'z':
39
-              if ($geometry->geometryType() == 'Point') {
40
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
41
-              }
42
-              if ($geometry->geometryType() == 'LineString') {
43
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
44
-              }
45
-              if ($geometry->geometryType() == 'MultiLineString') {
46
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
47
-              }
48
-              break;
49
-            case 'coordinateDimension':
50
-            case 'isEmpty':
51
-            case 'isMeasured':
52
-            case 'is3D':
53
-            case 'hasZ':
54
-              if ($geometry->geometryType() == 'Point') {
55
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
56
-              }
57
-              if ($geometry->geometryType() == 'LineString') {
58
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
59
-              }
60
-              if ($geometry->geometryType() == 'MultiLineString') {
61
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
62
-              }
63
-              break;
64
-            default:
65
-              $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
66
-          }
67
-        }
36
+		  switch ($method_name) {
37
+			case 'm':
38
+			case 'z':
39
+			  if ($geometry->geometryType() == 'Point') {
40
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
41
+			  }
42
+			  if ($geometry->geometryType() == 'LineString') {
43
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
44
+			  }
45
+			  if ($geometry->geometryType() == 'MultiLineString') {
46
+				$this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
47
+			  }
48
+			  break;
49
+			case 'coordinateDimension':
50
+			case 'isEmpty':
51
+			case 'isMeasured':
52
+			case 'is3D':
53
+			case 'hasZ':
54
+			  if ($geometry->geometryType() == 'Point') {
55
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
56
+			  }
57
+			  if ($geometry->geometryType() == 'LineString') {
58
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
59
+			  }
60
+			  if ($geometry->geometryType() == 'MultiLineString') {
61
+				$this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
62
+			  }
63
+			  break;
64
+			default:
65
+			  $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
66
+		  }
67
+		}
68 68
 
69
-      }
70
-    }
69
+	  }
70
+	}
71 71
 
72 72
   }
73 73
 }
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/test.php 1 patch
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -11,24 +11,24 @@  discard block
 block discarded – undo
11 11
   include_once('../geoPHP.inc');
12 12
 
13 13
   if (geoPHP::geosInstalled()) {
14
-    print "GEOS is installed.\n";
14
+	print "GEOS is installed.\n";
15 15
   }
16 16
   else {
17
-    print "GEOS is not installed.\n";
17
+	print "GEOS is not installed.\n";
18 18
   }
19 19
 
20 20
   foreach (scandir('./input') as $file) {
21
-    $parts = explode('.',$file);
22
-    if ($parts[0]) {
23
-      $format = $parts[1];
24
-      $value = file_get_contents('./input/'.$file);
25
-      print '---- Testing '.$file."\n";
26
-      $geometry = geoPHP::load($value, $format);
27
-      test_adapters($geometry, $format, $value);
28
-      test_methods($geometry);
29
-      test_geometry($geometry);
30
-      test_detection($value, $format, $file);
31
-    }
21
+	$parts = explode('.',$file);
22
+	if ($parts[0]) {
23
+	  $format = $parts[1];
24
+	  $value = file_get_contents('./input/'.$file);
25
+	  print '---- Testing '.$file."\n";
26
+	  $geometry = geoPHP::load($value, $format);
27
+	  test_adapters($geometry, $format, $value);
28
+	  test_methods($geometry);
29
+	  test_geometry($geometry);
30
+	  test_detection($value, $format, $file);
31
+	}
32 32
   }
33 33
   print "Testing Done!";
34 34
 }
@@ -115,21 +115,21 @@  discard block
 block discarded – undo
115 115
 function test_adapters($geometry, $format, $input) {
116 116
   // Test adapter output and input. Do a round-trip and re-test
117 117
   foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
118
-    if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
119
-      $output = $geometry->out($adapter_key);
120
-      if ($output) {
121
-        $adapter_loader = new $adapter_class();
122
-        $test_geom_1 = $adapter_loader->read($output);
123
-        $test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
124
-
125
-        if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
126
-          print "Mismatched adapter output in ".$adapter_class."\n";
127
-        }
128
-      }
129
-      else {
130
-        print "Empty output on "  . $adapter_key . "\n";
131
-      }
132
-    }
118
+	if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
119
+	  $output = $geometry->out($adapter_key);
120
+	  if ($output) {
121
+		$adapter_loader = new $adapter_class();
122
+		$test_geom_1 = $adapter_loader->read($output);
123
+		$test_geom_2 = $adapter_loader->read($test_geom_1->out($adapter_key));
124
+
125
+		if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
126
+		  print "Mismatched adapter output in ".$adapter_class."\n";
127
+		}
128
+	  }
129
+	  else {
130
+		print "Empty output on "  . $adapter_key . "\n";
131
+	  }
132
+	}
133 133
   }
134 134
 
135 135
   // Test to make sure adapter work the same wether GEOS is ON or OFF
@@ -137,30 +137,30 @@  discard block
 block discarded – undo
137 137
   if (!geoPHP::geosInstalled()) return;
138 138
 
139 139
   foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
140
-    if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
141
-      // Turn GEOS on
142
-      geoPHP::geosInstalled(TRUE);
140
+	if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
141
+	  // Turn GEOS on
142
+	  geoPHP::geosInstalled(TRUE);
143 143
 
144
-      $output = $geometry->out($adapter_key);
145
-      if ($output) {
146
-        $adapter_loader = new $adapter_class();
144
+	  $output = $geometry->out($adapter_key);
145
+	  if ($output) {
146
+		$adapter_loader = new $adapter_class();
147 147
 
148
-        $test_geom_1 = $adapter_loader->read($output);
148
+		$test_geom_1 = $adapter_loader->read($output);
149 149
 
150
-        // Turn GEOS off
151
-        geoPHP::geosInstalled(FALSE);
150
+		// Turn GEOS off
151
+		geoPHP::geosInstalled(FALSE);
152 152
 
153
-        $test_geom_2 = $adapter_loader->read($output);
153
+		$test_geom_2 = $adapter_loader->read($output);
154 154
 
155
-        // Turn GEOS back On
156
-        geoPHP::geosInstalled(TRUE);
155
+		// Turn GEOS back On
156
+		geoPHP::geosInstalled(TRUE);
157 157
 
158
-        // Check to make sure a both are the same with geos and without
159
-        if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
160
-          print "Mismatched adapter output between GEOS and NORM in ".$adapter_class."\n";
161
-        }
162
-      }
163
-    }
158
+		// Check to make sure a both are the same with geos and without
159
+		if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
160
+		  print "Mismatched adapter output between GEOS and NORM in ".$adapter_class."\n";
161
+		}
162
+	  }
163
+	}
164 164
   }
165 165
 }
166 166
 
@@ -170,75 +170,75 @@  discard block
 block discarded – undo
170 170
   if (!geoPHP::geosInstalled()) return;
171 171
 
172 172
   $methods = array(
173
-    //'boundary', //@@TODO: Uncomment this and fix errors
174
-    'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
175
-    'getBBox',
176
-    'x',
177
-    'y',
178
-    'startPoint',
179
-    'endPoint',
180
-    'isRing',
181
-    'isClosed',
182
-    'numPoints',
173
+	//'boundary', //@@TODO: Uncomment this and fix errors
174
+	'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
175
+	'getBBox',
176
+	'x',
177
+	'y',
178
+	'startPoint',
179
+	'endPoint',
180
+	'isRing',
181
+	'isClosed',
182
+	'numPoints',
183 183
   );
184 184
 
185 185
   foreach ($methods as $method) {
186
-    // Turn GEOS on
187
-    geoPHP::geosInstalled(TRUE);
188
-    $geos_result = $geometry->$method();
189
-
190
-    // Turn GEOS off
191
-    geoPHP::geosInstalled(FALSE);
192
-    $norm_result = $geometry->$method();
193
-
194
-    // Turn GEOS back On
195
-    geoPHP::geosInstalled(TRUE);
196
-
197
-    $geos_type = gettype($geos_result);
198
-    $norm_type = gettype($norm_result);
199
-
200
-    if ($geos_type != $norm_type) {
201
-      print 'Type mismatch on '.$method."\n";
202
-      continue;
203
-    }
204
-
205
-    // Now check base on type
206
-    if ($geos_type == 'object') {
207
-      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
208
-
209
-      // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
210
-      // Using Pythagorean theorem
211
-      $bb = $geos_result->getBBox();
212
-      $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
213
-
214
-      // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
215
-      if ($haus_dist / $scale > 0.5) {
216
-        print 'Output mismatch on '.$method.":\n";
217
-        print 'GEOS : '.$geos_result->out('wkt')."\n";
218
-        print 'NORM : '.$norm_result->out('wkt')."\n";
219
-        continue;
220
-      }
221
-    }
222
-
223
-    if ($geos_type == 'boolean' || $geos_type == 'string') {
224
-      if ($geos_result !== $norm_result) {
225
-        print 'Output mismatch on '.$method.":\n";
226
-        print 'GEOS : '.(string) $geos_result."\n";
227
-        print 'NORM : '.(string) $norm_result."\n";
228
-        continue;
229
-      }
230
-    }
231
-
232
-    //@@TODO: Run tests for output of types arrays and float
233
-    //@@TODO: centroid function is non-compliant for collections and strings
186
+	// Turn GEOS on
187
+	geoPHP::geosInstalled(TRUE);
188
+	$geos_result = $geometry->$method();
189
+
190
+	// Turn GEOS off
191
+	geoPHP::geosInstalled(FALSE);
192
+	$norm_result = $geometry->$method();
193
+
194
+	// Turn GEOS back On
195
+	geoPHP::geosInstalled(TRUE);
196
+
197
+	$geos_type = gettype($geos_result);
198
+	$norm_type = gettype($norm_result);
199
+
200
+	if ($geos_type != $norm_type) {
201
+	  print 'Type mismatch on '.$method."\n";
202
+	  continue;
203
+	}
204
+
205
+	// Now check base on type
206
+	if ($geos_type == 'object') {
207
+	  $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
208
+
209
+	  // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
210
+	  // Using Pythagorean theorem
211
+	  $bb = $geos_result->getBBox();
212
+	  $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
213
+
214
+	  // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
215
+	  if ($haus_dist / $scale > 0.5) {
216
+		print 'Output mismatch on '.$method.":\n";
217
+		print 'GEOS : '.$geos_result->out('wkt')."\n";
218
+		print 'NORM : '.$norm_result->out('wkt')."\n";
219
+		continue;
220
+	  }
221
+	}
222
+
223
+	if ($geos_type == 'boolean' || $geos_type == 'string') {
224
+	  if ($geos_result !== $norm_result) {
225
+		print 'Output mismatch on '.$method.":\n";
226
+		print 'GEOS : '.(string) $geos_result."\n";
227
+		print 'NORM : '.(string) $norm_result."\n";
228
+		continue;
229
+	  }
230
+	}
231
+
232
+	//@@TODO: Run tests for output of types arrays and float
233
+	//@@TODO: centroid function is non-compliant for collections and strings
234 234
   }
235 235
 }
236 236
 
237 237
 function test_detection($value, $format, $file) {
238 238
   $detected = geoPHP::detectFormat($value);
239 239
   if ($detected != $format) {
240
-    if ($detected) print 'detected as ' . $detected . "\n";
241
-    else print "not detected\n";
240
+	if ($detected) print 'detected as ' . $detected . "\n";
241
+	else print "not detected\n";
242 242
   }
243 243
   // Make sure it loads using auto-detect
244 244
   geoPHP::load($value);
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/postgis.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
25 25
   // ----------------------------
26 26
   
27 27
   foreach (scandir('./input') as $file) {
28
-    $parts = explode('.',$file);
29
-    if ($parts[0]) {
30
-      $name = $parts[0];
31
-      $format = $parts[1];
32
-      $value = file_get_contents('./input/'.$file);
33
-      print '---- Testing '.$file."\n";
34
-      flush();
35
-      $geometry = geoPHP::load($value, $format);
36
-      test_postgis($name, $format, $geometry, $connection, 'wkb');
37
-      $geometry->setSRID(4326);
38
-      test_postgis($name, $format, $geometry, $connection, 'ewkb');
39
-    }
28
+	$parts = explode('.',$file);
29
+	if ($parts[0]) {
30
+	  $name = $parts[0];
31
+	  $format = $parts[1];
32
+	  $value = file_get_contents('./input/'.$file);
33
+	  print '---- Testing '.$file."\n";
34
+	  flush();
35
+	  $geometry = geoPHP::load($value, $format);
36
+	  test_postgis($name, $format, $geometry, $connection, 'wkb');
37
+	  $geometry->setSRID(4326);
38
+	  test_postgis($name, $format, $geometry, $connection, 'ewkb');
39
+	}
40 40
   }
41 41
   print "Testing Done!";
42 42
 }
@@ -51,32 +51,32 @@  discard block
 block discarded – undo
51 51
   // SELECT using asBinary PostGIS
52 52
   $result = pg_fetch_all(pg_query($connection, "SELECT asBinary(geom) as geom FROM $table WHERE name='$name'"));
53 53
   foreach ($result as $item) {
54
-    $wkb = pg_unescape_bytea($item['geom']); // Make sure to unescape the hex blob
55
-    $geom = geoPHP::load($wkb, $format); // We now a full geoPHP Geometry object
54
+	$wkb = pg_unescape_bytea($item['geom']); // Make sure to unescape the hex blob
55
+	$geom = geoPHP::load($wkb, $format); // We now a full geoPHP Geometry object
56 56
   }
57 57
   
58 58
   // SELECT and INSERT directly, with no wrapping functions
59 59
   $result = pg_fetch_all(pg_query($connection, "SELECT geom as geom FROM $table WHERE name='$name'"));
60 60
   foreach ($result as $item) {
61
-    $wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
62
-    $geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
61
+	$wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
62
+	$geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
63 63
   
64
-    // Let's re-insert directly into postGIS
65
-    // We need to unpack the WKB
66
-    $unpacked = unpack('H*', $geom->out($format));
67
-    $insert_string = $unpacked[1];
68
-    pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', '$insert_string')");
64
+	// Let's re-insert directly into postGIS
65
+	// We need to unpack the WKB
66
+	$unpacked = unpack('H*', $geom->out($format));
67
+	$insert_string = $unpacked[1];
68
+	pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', '$insert_string')");
69 69
   }
70 70
 
71 71
   // SELECT and INSERT using as EWKT (ST_GeomFromEWKT and ST_AsEWKT)
72 72
   $result = pg_fetch_all(pg_query($connection, "SELECT ST_AsEWKT(geom) as geom FROM $table WHERE name='$name'"));
73 73
   foreach ($result as $item) {
74
-    $wkt = $item['geom']; // Make sure to unescape the hex blob
75
-    $geom = geoPHP::load($wkt, 'ewkt'); // We now a full geoPHP Geometry object
74
+	$wkt = $item['geom']; // Make sure to unescape the hex blob
75
+	$geom = geoPHP::load($wkt, 'ewkt'); // We now a full geoPHP Geometry object
76 76
 
77
-    // Let's re-insert directly into postGIS
78
-    $insert_string = $geom->out('ewkt');
79
-    pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', ST_GeomFromEWKT('$insert_string'))");
77
+	// Let's re-insert directly into postGIS
78
+	$insert_string = $geom->out('ewkt');
79
+	pg_query($connection, "INSERT INTO $table (name, type, geom) values ('$name', '$type', ST_GeomFromEWKT('$insert_string'))");
80 80
   }
81 81
 }
82 82
 
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/EWKT.class.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -13,15 +13,15 @@
 block discarded – undo
13 13
    * @return string The Extended-WKT string representation of the input geometries
14 14
    */
15 15
   public function write(Geometry $geometry) {
16
-    $srid = $geometry->SRID();
17
-    $wkt = '';
18
-    if ($srid) {
19
-      $wkt = 'SRID=' . $srid . ';';
20
-      $wkt .= $geometry->out('wkt');
21
-      return $wkt;
22
-    }
23
-    else {
24
-      return $geometry->out('wkt');
25
-    }
16
+	$srid = $geometry->SRID();
17
+	$wkt = '';
18
+	if ($srid) {
19
+	  $wkt = 'SRID=' . $srid . ';';
20
+	  $wkt .= $geometry->out('wkt');
21
+	  return $wkt;
22
+	}
23
+	else {
24
+	  return $geometry->out('wkt');
25
+	}
26 26
   }
27 27
 }
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/GeoRSS.class.php 1 patch
Indentation   +140 added lines, -140 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
    * @return Geometry|GeometryCollection
24 24
    */
25 25
   public function read($gpx) {
26
-    return $this->geomFromText($gpx);
26
+	return $this->geomFromText($gpx);
27 27
   }
28 28
 
29 29
   /**
@@ -34,195 +34,195 @@  discard block
 block discarded – undo
34 34
    * @return string The georss string representation of the input geometries
35 35
    */
36 36
   public function write(Geometry $geometry, $namespace = FALSE) {
37
-    if ($namespace) {
38
-      $this->namespace = $namespace;
39
-      $this->nss = $namespace.':';    
40
-    }
41
-    return $this->geometryToGeoRSS($geometry);
37
+	if ($namespace) {
38
+	  $this->namespace = $namespace;
39
+	  $this->nss = $namespace.':';    
40
+	}
41
+	return $this->geometryToGeoRSS($geometry);
42 42
   }
43 43
   
44 44
   public function geomFromText($text) {
45
-    // Change to lower-case, strip all CDATA, and de-namespace
46
-    $text = strtolower($text);
47
-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
45
+	// Change to lower-case, strip all CDATA, and de-namespace
46
+	$text = strtolower($text);
47
+	$text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);
48 48
         
49
-    // Load into DOMDOcument
50
-    $xmlobj = new DOMDocument();
51
-    @$xmlobj->loadXML($text);
52
-    if ($xmlobj === false) {
53
-      throw new Exception("Invalid GeoRSS: ". $text);
54
-    }
49
+	// Load into DOMDOcument
50
+	$xmlobj = new DOMDocument();
51
+	@$xmlobj->loadXML($text);
52
+	if ($xmlobj === false) {
53
+	  throw new Exception("Invalid GeoRSS: ". $text);
54
+	}
55 55
     
56
-    $this->xmlobj = $xmlobj;
57
-    try {
58
-      $geom = $this->geomFromXML();
59
-    } catch(InvalidText $e) {
60
-        throw new Exception("Cannot Read Geometry From GeoRSS: ". $text);
61
-    } catch(Exception $e) {
62
-        throw $e;
63
-    }
56
+	$this->xmlobj = $xmlobj;
57
+	try {
58
+	  $geom = $this->geomFromXML();
59
+	} catch(InvalidText $e) {
60
+		throw new Exception("Cannot Read Geometry From GeoRSS: ". $text);
61
+	} catch(Exception $e) {
62
+		throw $e;
63
+	}
64 64
 
65
-    return $geom;
65
+	return $geom;
66 66
   }
67 67
   
68 68
   protected function geomFromXML() {
69
-    $geometries = array();
70
-    $geometries = array_merge($geometries, $this->parsePoints());
71
-    $geometries = array_merge($geometries, $this->parseLines());
72
-    $geometries = array_merge($geometries, $this->parsePolygons());
73
-    $geometries = array_merge($geometries, $this->parseBoxes());
74
-    $geometries = array_merge($geometries, $this->parseCircles());
69
+	$geometries = array();
70
+	$geometries = array_merge($geometries, $this->parsePoints());
71
+	$geometries = array_merge($geometries, $this->parseLines());
72
+	$geometries = array_merge($geometries, $this->parsePolygons());
73
+	$geometries = array_merge($geometries, $this->parseBoxes());
74
+	$geometries = array_merge($geometries, $this->parseCircles());
75 75
     
76
-    if (empty($geometries)) {
77
-      throw new Exception("Invalid / Empty GeoRSS");
78
-    }
76
+	if (empty($geometries)) {
77
+	  throw new Exception("Invalid / Empty GeoRSS");
78
+	}
79 79
     
80
-    return geoPHP::geometryReduce($geometries); 
80
+	return geoPHP::geometryReduce($geometries); 
81 81
   }
82 82
   
83 83
   protected function getPointsFromCoords($string) {
84
-    $coords = array();
85
-    $latlon = explode(' ',$string);
86
-    foreach ($latlon as $key => $item) {
87
-      if (!($key % 2)) {
88
-        // It's a latitude
89
-        $lat = $item;
90
-      }
91
-      else {
92
-        // It's a longitude
93
-        $lon = $item;
94
-        $coords[] = new Point($lon, $lat);
95
-      }
96
-    }
97
-    return $coords;
84
+	$coords = array();
85
+	$latlon = explode(' ',$string);
86
+	foreach ($latlon as $key => $item) {
87
+	  if (!($key % 2)) {
88
+		// It's a latitude
89
+		$lat = $item;
90
+	  }
91
+	  else {
92
+		// It's a longitude
93
+		$lon = $item;
94
+		$coords[] = new Point($lon, $lat);
95
+	  }
96
+	}
97
+	return $coords;
98 98
   }
99 99
   
100 100
   protected function parsePoints() {
101
-    $points = array();
102
-    $pt_elements = $this->xmlobj->getElementsByTagName('point');
103
-    foreach ($pt_elements as $pt) {
104
-      $point_array = $this->getPointsFromCoords(trim($pt->firstChild->nodeValue));
105
-      $points[] = $point_array[0];
106
-    }
107
-    return $points;
101
+	$points = array();
102
+	$pt_elements = $this->xmlobj->getElementsByTagName('point');
103
+	foreach ($pt_elements as $pt) {
104
+	  $point_array = $this->getPointsFromCoords(trim($pt->firstChild->nodeValue));
105
+	  $points[] = $point_array[0];
106
+	}
107
+	return $points;
108 108
   }
109 109
   
110 110
   protected function parseLines() {
111
-    $lines = array();
112
-    $line_elements = $this->xmlobj->getElementsByTagName('line');
113
-    foreach ($line_elements as $line) {
114
-      $components = $this->getPointsFromCoords(trim($line->firstChild->nodeValue));
115
-      $lines[] = new LineString($components);
116
-    }
117
-    return $lines;
111
+	$lines = array();
112
+	$line_elements = $this->xmlobj->getElementsByTagName('line');
113
+	foreach ($line_elements as $line) {
114
+	  $components = $this->getPointsFromCoords(trim($line->firstChild->nodeValue));
115
+	  $lines[] = new LineString($components);
116
+	}
117
+	return $lines;
118 118
   }
119 119
   
120 120
   protected function parsePolygons() {
121
-    $polygons = array();
122
-    $poly_elements = $this->xmlobj->getElementsByTagName('polygon');
123
-    foreach ($poly_elements as $poly) {
124
-      if ($poly->hasChildNodes()) {
125
-        $points = $this->getPointsFromCoords(trim($poly->firstChild->nodeValue));
126
-        $exterior_ring = new LineString($points);
127
-        $polygons[] = new Polygon(array($exterior_ring));
128
-      }
129
-      else {
130
-        // It's an EMPTY polygon
131
-        $polygons[] = new Polygon(); 
132
-      }
133
-    }
134
-    return $polygons;
121
+	$polygons = array();
122
+	$poly_elements = $this->xmlobj->getElementsByTagName('polygon');
123
+	foreach ($poly_elements as $poly) {
124
+	  if ($poly->hasChildNodes()) {
125
+		$points = $this->getPointsFromCoords(trim($poly->firstChild->nodeValue));
126
+		$exterior_ring = new LineString($points);
127
+		$polygons[] = new Polygon(array($exterior_ring));
128
+	  }
129
+	  else {
130
+		// It's an EMPTY polygon
131
+		$polygons[] = new Polygon(); 
132
+	  }
133
+	}
134
+	return $polygons;
135 135
   }
136 136
   
137 137
   // Boxes are rendered into polygons
138 138
   protected function parseBoxes() {
139
-    $polygons = array();
140
-    $box_elements = $this->xmlobj->getElementsByTagName('box');
141
-    foreach ($box_elements as $box) {
142
-      $parts = explode(' ',trim($box->firstChild->nodeValue));
143
-      $components = array(
144
-        new Point($parts[3], $parts[2]),
145
-        new Point($parts[3], $parts[0]),
146
-        new Point($parts[1], $parts[0]),
147
-        new Point($parts[1], $parts[2]),
148
-        new Point($parts[3], $parts[2]),
149
-      );
150
-      $exterior_ring = new LineString($components);
151
-      $polygons[] = new Polygon(array($exterior_ring));
152
-    }
153
-    return $polygons;
139
+	$polygons = array();
140
+	$box_elements = $this->xmlobj->getElementsByTagName('box');
141
+	foreach ($box_elements as $box) {
142
+	  $parts = explode(' ',trim($box->firstChild->nodeValue));
143
+	  $components = array(
144
+		new Point($parts[3], $parts[2]),
145
+		new Point($parts[3], $parts[0]),
146
+		new Point($parts[1], $parts[0]),
147
+		new Point($parts[1], $parts[2]),
148
+		new Point($parts[3], $parts[2]),
149
+	  );
150
+	  $exterior_ring = new LineString($components);
151
+	  $polygons[] = new Polygon(array($exterior_ring));
152
+	}
153
+	return $polygons;
154 154
   }
155 155
 
156 156
   // Circles are rendered into points
157 157
   // @@TODO: Add good support once we have circular-string geometry support
158 158
   protected function parseCircles() {
159
-    $points = array();
160
-    $circle_elements = $this->xmlobj->getElementsByTagName('circle');
161
-    foreach ($circle_elements as $circle) {
162
-      $parts = explode(' ',trim($circle->firstChild->nodeValue));
163
-      $points[] = new Point($parts[1], $parts[0]);
164
-    }
165
-    return $points;
159
+	$points = array();
160
+	$circle_elements = $this->xmlobj->getElementsByTagName('circle');
161
+	foreach ($circle_elements as $circle) {
162
+	  $parts = explode(' ',trim($circle->firstChild->nodeValue));
163
+	  $points[] = new Point($parts[1], $parts[0]);
164
+	}
165
+	return $points;
166 166
   }
167 167
   
168 168
   protected function geometryToGeoRSS($geom) {
169
-    $type = strtolower($geom->getGeomType());
170
-    switch ($type) {
171
-      case 'point':
172
-        return $this->pointToGeoRSS($geom);
173
-        break;
174
-      case 'linestring':
175
-        return $this->linestringToGeoRSS($geom);
176
-        break;
177
-      case 'polygon':
178
-        return $this->PolygonToGeoRSS($geom);
179
-        break;
180
-      case 'multipoint':
181
-      case 'multilinestring':
182
-      case 'multipolygon':
183
-      case 'geometrycollection':
184
-        return $this->collectionToGeoRSS($geom);
185
-        break;
186
-    }
187
-    return $output;
169
+	$type = strtolower($geom->getGeomType());
170
+	switch ($type) {
171
+	  case 'point':
172
+		return $this->pointToGeoRSS($geom);
173
+		break;
174
+	  case 'linestring':
175
+		return $this->linestringToGeoRSS($geom);
176
+		break;
177
+	  case 'polygon':
178
+		return $this->PolygonToGeoRSS($geom);
179
+		break;
180
+	  case 'multipoint':
181
+	  case 'multilinestring':
182
+	  case 'multipolygon':
183
+	  case 'geometrycollection':
184
+		return $this->collectionToGeoRSS($geom);
185
+		break;
186
+	}
187
+	return $output;
188 188
   }
189 189
   
190 190
   private function pointToGeoRSS($geom) {
191
-    return '<'.$this->nss.'point>'.$geom->getY().' '.$geom->getX().'</'.$this->nss.'point>';
191
+	return '<'.$this->nss.'point>'.$geom->getY().' '.$geom->getX().'</'.$this->nss.'point>';
192 192
   }
193 193
   
194 194
 
195 195
   private function linestringToGeoRSS($geom) {
196
-    $output = '<'.$this->nss.'line>';
197
-    foreach ($geom->getComponents() as $k => $point) {
198
-      $output .= $point->getY().' '.$point->getX();
199
-      if ($k < ($geom->numGeometries() -1)) $output .= ' ';
200
-    }
201
-    $output .= '</'.$this->nss.'line>';
202
-    return $output;
196
+	$output = '<'.$this->nss.'line>';
197
+	foreach ($geom->getComponents() as $k => $point) {
198
+	  $output .= $point->getY().' '.$point->getX();
199
+	  if ($k < ($geom->numGeometries() -1)) $output .= ' ';
200
+	}
201
+	$output .= '</'.$this->nss.'line>';
202
+	return $output;
203 203
   }
204 204
 
205 205
   private function polygonToGeoRSS($geom) {
206
-    $output = '<'.$this->nss.'polygon>';
207
-    $exterior_ring = $geom->exteriorRing();
208
-    foreach ($exterior_ring->getComponents() as $k => $point) {
209
-      $output .= $point->getY().' '.$point->getX();
210
-      if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';
211
-    }
212
-    $output .= '</'.$this->nss.'polygon>';
213
-    return $output;
206
+	$output = '<'.$this->nss.'polygon>';
207
+	$exterior_ring = $geom->exteriorRing();
208
+	foreach ($exterior_ring->getComponents() as $k => $point) {
209
+	  $output .= $point->getY().' '.$point->getX();
210
+	  if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';
211
+	}
212
+	$output .= '</'.$this->nss.'polygon>';
213
+	return $output;
214 214
   }
215 215
   
216 216
   public function collectionToGeoRSS($geom) {
217
-    $georss = '<'.$this->nss.'where>';
218
-    $components = $geom->getComponents();
219
-    foreach ($geom->getComponents() as $comp) {
220
-      $georss .= $this->geometryToGeoRSS($comp);
221
-    }
217
+	$georss = '<'.$this->nss.'where>';
218
+	$components = $geom->getComponents();
219
+	foreach ($geom->getComponents() as $comp) {
220
+	  $georss .= $this->geometryToGeoRSS($comp);
221
+	}
222 222
     
223
-    $georss .= '</'.$this->nss.'where>';
223
+	$georss .= '</'.$this->nss.'where>';
224 224
     
225
-    return $georss;
225
+	return $georss;
226 226
   }
227 227
 
228 228
 }
Please login to merge, or discard this patch.