Skip to content

Commit c3b8025

Browse files
author
Max Staack
committed
cleanup namespaces
1 parent 4e60b4a commit c3b8025

14 files changed

+101
-69
lines changed

‎README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,15 @@ Laravel postgis extension
55

66
## Features
77

8-
* Work with geometry classes instead of arrays. (`$myModel->myPoint = new Point(1,2)`)
9-
* Adds helpers in migrations. (`$table->polygon('myColumn')`)
8+
* Work with geometry classes instead of arrays.
9+
```php
10+
$model->myPoint = new Point(1,2); //lat, long
11+
```
12+
13+
* Adds helpers in migrations.
14+
```php
15+
$table->polygon('myColumn');
16+
```
1017

1118
## Versions
1219
- Use 4.* for Laravel 5
@@ -19,6 +26,8 @@ Thanks to :
1926
- https://github.com/phaza
2027
- https://github.com/mirzap
2128

29+
Fluent in Laravel Packages and Postgres/Postgis? Consider contributing! We are looking for anyone that wants to help out!
30+
2231
## Installation
2332

2433
```bash

‎src/DatabaseServiceProvider.php

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
<?php namespace MStaack\LaravelPostgis;
1+
<?php
22

3+
namespace MStaack\LaravelPostgis;
4+
5+
use Bosnadev\Database\DatabaseServiceProvider as PostgresDatabaseServiceProvider;
36
use Illuminate\Database\DatabaseManager;
47
use MStaack\LaravelPostgis\Connectors\ConnectionFactory;
5-
use Bosnadev\Database\DatabaseServiceProvider as PostgresDatabaseServiceProvider;
68

7-
/**
8-
* Class DatabaseServiceProvider
9-
* @package MStaack\LaravelPostgis
10-
*/
119
class DatabaseServiceProvider extends PostgresDatabaseServiceProvider
1210
{
13-
public function boot() {
14-
// Load the config
15-
$config_path = __DIR__ . '/../config/postgis.php';
16-
$this->publishes([$config_path => config_path('postgis.php')], 'postgis');
17-
$this->mergeConfigFrom($config_path, 'postgis');
11+
public function boot()
12+
{
13+
// Load the config
14+
$config_path = __DIR__ . '/../config/postgis.php';
15+
$this->publishes([$config_path => config_path('postgis.php')], 'postgis');
16+
$this->mergeConfigFrom($config_path, 'postgis');
1817
}
1918

2019
/**

‎src/Geometries/Factory.php

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,46 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
22

3-
class Factory implements \GeoIO\Factory {
4-
public function createPoint( $dimension, array $coordinates, $srid = null )
3+
namespace MStaack\LaravelPostgis\Geometries;
4+
5+
class Factory implements \GeoIO\Factory
6+
{
7+
public function createPoint($dimension, array $coordinates, $srid = null)
58
{
6-
return new Point( $coordinates['y'], $coordinates['x'], isset($coordinates['z']) ? $coordinates['z'] : null );
9+
return new Point($coordinates['y'], $coordinates['x'], $coordinates['z'] ?? null);
710
}
811

9-
public function createLineString( $dimension, array $points, $srid = null )
12+
public function createLineString($dimension, array $points, $srid = null)
1013
{
11-
return new LineString( $points );
14+
return new LineString($points);
1215
}
1316

14-
public function createLinearRing( $dimension, array $points, $srid = null )
17+
public function createLinearRing($dimension, array $points, $srid = null)
1518
{
16-
return new LineString( $points );
19+
return new LineString($points);
1720
}
1821

19-
public function createPolygon( $dimension, array $lineStrings, $srid = null )
22+
public function createPolygon($dimension, array $lineStrings, $srid = null)
2023
{
21-
return new Polygon( $lineStrings );
24+
return new Polygon($lineStrings);
2225
}
2326

24-
public function createMultiPoint( $dimension, array $points, $srid = null )
27+
public function createMultiPoint($dimension, array $points, $srid = null)
2528
{
26-
return new MultiPoint( $points );
29+
return new MultiPoint($points);
2730
}
2831

29-
public function createMultiLineString( $dimension, array $lineStrings, $srid = null )
32+
public function createMultiLineString($dimension, array $lineStrings, $srid = null)
3033
{
31-
return new MultiLineString( $lineStrings );
34+
return new MultiLineString($lineStrings);
3235
}
3336

34-
public function createMultiPolygon( $dimension, array $polygons, $srid = null )
37+
public function createMultiPolygon($dimension, array $polygons, $srid = null)
3538
{
36-
return new MultiPolygon( $polygons );
39+
return new MultiPolygon($polygons);
3740
}
3841

39-
public function createGeometryCollection( $dimension, array $geometries, $srid = null )
42+
public function createGeometryCollection($dimension, array $geometries, $srid = null)
4043
{
41-
return new GeometryCollection( $geometries );
44+
return new GeometryCollection($geometries);
4245
}
43-
4446
}

‎src/Geometries/Geometry.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
use GeoIO\WKB\Parser\Parser;
46
use MStaack\LaravelPostgis\Exceptions\UnknownWKTTypeException;

‎src/Geometries/GeometryCollection.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
use Countable;
4-
use GeoJson\GeoJson;
56
use InvalidArgumentException;
67

78
class GeometryCollection extends Geometry implements Countable

‎src/Geometries/GeometryInterface.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
interface GeometryInterface
46
{

‎src/Geometries/LineString.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
class LineString extends PointCollection implements GeometryInterface
46
{
57
public function is3d()
68
{
7-
if(count($this->points) === 0) return false;
9+
if (count($this->points) === 0) return false;
810
return $this->points[0]->is3d();
911
}
1012

1113
public function toWKT()
1214
{
1315
$wktType = 'LINESTRING';
14-
if($this->is3d()) $wktType .= ' Z';
16+
if ($this->is3d()) $wktType .= ' Z';
1517
return sprintf('%s(%s)', $wktType, $this->toPairList());
1618
}
1719

‎src/Geometries/MultiLineString.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
use Countable;
46
use InvalidArgumentException;
@@ -37,14 +39,14 @@ public function getLineStrings()
3739

3840
public function is3d()
3941
{
40-
if(count($this->linestrings) === 0) return false;
42+
if (count($this->linestrings) === 0) return false;
4143
return $this->linestrings[0]->is3d();
4244
}
4345

4446
public function toWKT()
4547
{
4648
$wktType = 'MULTILINESTRING';
47-
if($this->is3d()) $wktType .= ' Z';
49+
if ($this->is3d()) $wktType .= ' Z';
4850
return sprintf('%s(%s)', $wktType, (string)$this);
4951
}
5052

‎src/Geometries/MultiPoint.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
class MultiPoint extends PointCollection implements GeometryInterface, \JsonSerializable
46
{
@@ -21,14 +23,14 @@ public function __construct(array $points)
2123

2224
public function is3d()
2325
{
24-
if(count($this->points) === 0) return false;
26+
if (count($this->points) === 0) return false;
2527
return $this->points[0]->is3d();
2628
}
2729

2830
public function toWKT()
2931
{
3032
$wktType = 'MULTIPOINT';
31-
if($this->is3d()) $wktType .= ' Z';
33+
if ($this->is3d()) $wktType .= ' Z';
3234
return sprintf('%s(%s)', $wktType, (string)$this);
3335
}
3436

‎src/Geometries/MultiPolygon.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
use Countable;
46
use InvalidArgumentException;
@@ -27,27 +29,27 @@ public function __construct(array $polygons)
2729

2830
public function is3d()
2931
{
30-
if(count($this->polygons) === 0) return false;
32+
if (count($this->polygons) === 0) return false;
3133
return $this->polygons[0]->is3d();
3234
}
3335

3436
public function toWKT()
3537
{
3638
$wktType = 'MULTIPOLYGON';
37-
if($this->is3d()) $wktType .= ' Z';
38-
return sprintf('%s(%s)', $wktType, (string) $this);
39+
if ($this->is3d()) $wktType .= ' Z';
40+
return sprintf('%s(%s)', $wktType, (string)$this);
3941
}
4042

4143
public function __toString()
4244
{
4345
return implode(',', array_map(function (Polygon $polygon) {
44-
return sprintf('(%s)', (string) $polygon);
46+
return sprintf('(%s)', (string)$polygon);
4547
}, $this->polygons));
4648
}
4749

4850
public static function fromString($wktArgument)
4951
{
50-
$parts = preg_split('/(\)\s*\)\s*,\s*\(\s*\()/', $wktArgument, -1, PREG_SPLIT_DELIM_CAPTURE);
52+
$parts = preg_split('/(\)\s*\)\s*,\s*\(\s*\()/', $wktArgument, -1, PREG_SPLIT_DELIM_CAPTURE);
5153
$polygons = static::assembleParts($parts);
5254

5355
return new static(array_map(function ($polygonString) {
@@ -99,7 +101,7 @@ public function getPolygons()
99101
protected static function assembleParts(array $parts)
100102
{
101103
$polygons = [];
102-
$count = count($parts);
104+
$count = count($parts);
103105

104106
for ($i = 0; $i < $count; $i++) {
105107
if ($i % 2 !== 0) {

‎src/Geometries/Point.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
22

3-
use GeoJson\GeoJson;
3+
namespace MStaack\LaravelPostgis\Geometries;
44

55
class Point extends Geometry
66
{
@@ -53,7 +53,7 @@ public function is3d()
5353
public function toPair()
5454
{
5555
$pair = self::stringifyFloat($this->getLng()) . ' ' . self::stringifyFloat($this->getLat());
56-
if($this->is3d()) {
56+
if ($this->is3d()) {
5757
$pair .= ' ' . self::stringifyFloat($this->getAlt());
5858
}
5959
return $pair;
@@ -71,7 +71,7 @@ public static function fromPair($pair)
7171
$splits = explode(' ', trim($pair));
7272
$lng = $splits[0];
7373
$lat = $splits[1];
74-
if(count($splits) > 2) {
74+
if (count($splits) > 2) {
7575
$alt = $splits[2];
7676
}
7777

@@ -81,7 +81,7 @@ public static function fromPair($pair)
8181
public function toWKT()
8282
{
8383
$wktType = 'POINT';
84-
if($this->is3d()) $wktType .= ' Z';
84+
if ($this->is3d()) $wktType .= ' Z';
8585
return sprintf('%s(%s)', $wktType, (string)$this);
8686
}
8787

@@ -103,7 +103,7 @@ public function __toString()
103103
public function jsonSerialize()
104104
{
105105
$position = [$this->getLng(), $this->getLat()];
106-
if($this->is3d()) $position[] = $this->getAlt();
106+
if ($this->is3d()) $position[] = $this->getAlt();
107107
return new \GeoJson\Geometry\Point($position);
108108
}
109109
}

‎src/Geometries/PointCollection.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
2+
3+
namespace MStaack\LaravelPostgis\Geometries;
24

35
use ArrayAccess;
46
use ArrayIterator;

‎src/Geometries/Polygon.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
<?php namespace MStaack\LaravelPostgis\Geometries;
1+
<?php
22

3-
use Countable;
3+
namespace MStaack\LaravelPostgis\Geometries;
44

5-
class Polygon extends MultiLineString implements Countable
5+
use GeoJson\Geometry\LinearRing;
6+
7+
class Polygon extends MultiLineString
68
{
79
public function is3d()
810
{
9-
if(count($this->linestrings) === 0) return false;
11+
if (count($this->linestrings) === 0) return false;
1012
return $this->linestrings[0]->is3d();
1113
}
1214

1315
public function toWKT()
1416
{
1517
$wktType = 'POLYGON';
16-
if($this->is3d()) $wktType .= ' Z';
18+
if ($this->is3d()) $wktType .= ' Z';
1719
return sprintf('%s(%s)', $wktType, (string)$this);
1820
}
1921

@@ -26,7 +28,7 @@ public function jsonSerialize()
2628
{
2729
$linearrings = [];
2830
foreach ($this->linestrings as $linestring) {
29-
$linearrings[] = new \GeoJson\Geometry\LinearRing($linestring->jsonSerialize()->getCoordinates());
31+
$linearrings[] = new LinearRing($linestring->jsonSerialize()->getCoordinates());
3032
}
3133

3234
return new \GeoJson\Geometry\Polygon($linearrings);

‎src/PostgisConnection.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
<?php namespace MStaack\LaravelPostgis;
1+
<?php
22

3-
class PostgisConnection extends \Bosnadev\Database\PostgresConnection
3+
namespace MStaack\LaravelPostgis;
4+
5+
use Bosnadev\Database\PostgresConnection;
6+
use MStaack\LaravelPostgis\Schema\Grammars\PostgisGrammar;
7+
8+
class PostgisConnection extends PostgresConnection
49
{
510
public function __construct($pdo, $database = '', $tablePrefix = '', array $config = [])
611
{
@@ -18,13 +23,13 @@ public function __construct($pdo, $database = '', $tablePrefix = '', array $conf
1823
*/
1924
protected function getDefaultSchemaGrammar()
2025
{
21-
return $this->withTablePrefix(new Schema\Grammars\PostgisGrammar);
26+
return $this->withTablePrefix(new PostgisGrammar());
2227
}
2328

2429

2530
public function getSchemaBuilder()
2631
{
27-
if (is_null($this->schemaGrammar)) {
32+
if ($this->schemaGrammar === null) {
2833
$this->useDefaultSchemaGrammar();
2934
}
3035

0 commit comments

Comments
 (0)