chillerlan / php-geojson-helpers

src/PolylineSimplifyer.php

Spacing +18 added lines, -18 removed lines

@@ -14,7 +14,7 @@ 
 
 use function array_fill, array_keys, array_pop, array_push, array_values, count, is_array;
 
-class PolylineSimplifyer{
+class PolylineSimplifyer {
 
 	protected array $coords;
 	protected array $coordKeys;
@@ -22,7 +22,7 @@ 
 	/**
 	 * PolylineSimplifyer constructor.
 	 */
-	public function __construct(array $polylineCoords){
+	public function __construct(array $polylineCoords) {
 		$this->coords = $polylineCoords;
 	}
 
@@ -32,18 +32,18 @@ 
 	public function simplify(float $tolerance = 1, bool $highestQuality = false):array{
 		$coords = array_values($this->coords ?? []);
 
-		if(count($coords) < 2){
+		if (count($coords) < 2) {
 			throw new GeoJSONException('not enough points');
 		}
 
 		$this->coordKeys = array_keys($this->coords[0]);
 
-		if(count($this->coordKeys) < 2){
+		if (count($this->coordKeys) < 2) {
 			throw new GeoJSONException('invalid coordinate keys');
 		}
 
-		foreach($this->coords as $coord){
-			if(!is_array($coord) || count($coord) < 2){
+		foreach ($this->coords as $coord) {
+			if (!is_array($coord) || count($coord) < 2) {
 				throw new GeoJSONException('invalid coords found');
 			}
 		}
@@ -63,16 +63,16 @@ 
 		$point     = null;
 		$len       = count($points);
 
-		for($i = 1; $i < $len; $i++){
+		for ($i = 1; $i < $len; $i++) {
 			$point = $points[$i];
 
-			if($this->getSqDist(array_values($point), array_values($prevPoint)) > $sqTolerance){
+			if ($this->getSqDist(array_values($point), array_values($prevPoint)) > $sqTolerance) {
 				$newPoints[] = $point;
 				$prevPoint   = $point;
 			}
 		}
 
-		if($prevPoint !== $point){
+		if ($prevPoint !== $point) {
 			$newPoints[] = $point;
 		}
 
@@ -103,24 +103,24 @@ 
 
 		$markers[$first] = $markers[$last] = 1;
 
-		while($last){
+		while ($last) {
 
 			$maxSqDist = 0;
 
-			for($i = $first + 1; $i < $last; $i++){
+			for ($i = $first + 1; $i < $last; $i++) {
 				$sqDist = $this->getSqSegDist(
 					array_values($points[$i]),
 					array_values($points[$first]),
 					array_values($points[$last])
 				);
 
-				if($sqDist > $maxSqDist){
+				if ($sqDist > $maxSqDist) {
 					$index     = $i;
 					$maxSqDist = $sqDist;
 				}
 			}
 
-			if($maxSqDist > $sqTolerance){
+			if ($maxSqDist > $sqTolerance) {
 				$markers[$index] = 1;
 				array_push($stack, $first, $index, $index, $last);
 			}
@@ -129,8 +129,8 @@ 
 			$first = array_pop($stack);
 		}
 
-		foreach($points as $i => $point){
-			if($markers[$i]){
+		foreach ($points as $i => $point) {
+			if ($markers[$i]) {
 				$newPoints[] = $point;
 			}
 		}
@@ -147,16 +147,16 @@ 
 		$dx = $p2[0] - $x;
 		$dy = $p2[1] - $y;
 
-		if((int)$dx !== 0 || (int)$dy !== 0){
+		if ((int) $dx !== 0 || (int) $dy !== 0) {
 
 			$t = (($p[0] - $x) * $dx + ($p[1] - $y) * $dy) / ($dx * $dx + $dy * $dy);
 
-			if($t > 1){
+			if ($t > 1) {
 				$x = $p2[0];
 				$y = $p2[1];
 
 			}
-			elseif($t > 0){
+			elseif ($t > 0) {
 				$x += $dx * $t;
 				$y += $dy * $t;
 			}

Braces +1 added lines, -2 removed lines

@@ -155,8 +155,7 @@
 				$x = $p2[0];
 				$y = $p2[1];
 
-			}
-			elseif($t > 0){
+			} elseif($t > 0){
 				$x += $dx * $t;
 				$y += $dy * $t;
 			}

src/ContinentRect.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
 namespace chillerlan\GeoJSON;
 
-class ContinentRect{
+class ContinentRect {
 
 	protected array $rect;
 
@@ -19,7 +19,7 @@ 
 	 *
 	 * @param array $continent_rect (NW/SE corners [[nw_x, nw_y],[se_x, se_y]])
 	 */
-	public function __construct(array $continent_rect){
+	public function __construct(array $continent_rect) {
 		$this->rect = $continent_rect;
 	}
 

src/FeatureCollection.php

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 
 use function array_map;
 
-class FeatureCollection extends GeoJSONAbstract{
+class FeatureCollection extends GeoJSONAbstract {
 
 	protected array $features = [];
 
@@ -23,9 +23,9 @@ 
 	 *
 	 * @param \chillerlan\GeoJSON\Feature[]|null $features
 	 */
-	public function __construct(iterable $features = null){
+	public function __construct(iterable $features = null) {
 
-		if(!empty($features)){
+		if (!empty($features)) {
 			$this->addFeatures($features);
 		}
 
@@ -49,8 +49,8 @@ 
 	 */
 	public function addFeatures(iterable $features):FeatureCollection{
 
-		foreach($features as $feature){
-			if($feature instanceof Feature){
+		foreach ($features as $feature) {
+			if ($feature instanceof Feature) {
 				$this->addFeature($feature);
 			}
 		}
@@ -73,7 +73,7 @@ 
 	public function toArray():array{
 		$arr = ['type' => 'FeatureCollection'];
 
-		if(!empty($this->bbox)){
+		if (!empty($this->bbox)) {
 			$arr['bbox'] = $this->bbox;
 		}
 

src/Feature.php

Spacing +12 added lines, -12 removed lines

@@ -16,7 +16,7 @@ 
 use function is_int;
 use function is_string;
 
-class Feature extends GeoJSONAbstract{
+class Feature extends GeoJSONAbstract {
 
 	public const types = [
 		'Point',
@@ -43,18 +43,18 @@ 
 	 *
 	 * @throws \chillerlan\GeoJSON\GeoJSONException
 	 */
-	public function __construct(array $coords = null, string $type = null, $id = null){
+	public function __construct(array $coords = null, string $type = null, $id = null) {
 
-		if($coords !== null){
+		if ($coords !== null) {
 
-			if($type === null){
+			if ($type === null) {
 				throw new GeoJSONException('got coords but no feature type');
 			}
 
 			$this->setGeometry($coords, $type);
 		}
 
-		if($id !== null){
+		if ($id !== null) {
 			$this->setID($id);
 		}
 
@@ -65,11 +65,11 @@ 
 	 */
 	public function setGeometry(array $coords, string $type):Feature{
 
-		if(empty($coords)){
+		if (empty($coords)) {
 			throw new GeoJSONException('invalid coords array');
 		}
 
-		if(!in_array($type, $this::types, true)){
+		if (!in_array($type, $this::types, true)) {
 			throw new GeoJSONException('invalid geometry type');
 		}
 
@@ -95,7 +95,7 @@ 
 	 */
 	public function setID($id):Feature{
 
-		if(!is_string($id) && !is_int($id)){
+		if (!is_string($id) && !is_int($id)) {
 			throw new GeoJSONException('invalid id');
 		}
 
@@ -110,7 +110,7 @@ 
 	public function toArray():array{
 		$arr = ['type' => 'Feature'];
 
-		if(empty($this->coords) || empty($this->type)){
+		if (empty($this->coords) || empty($this->type)) {
 			throw new GeoJSONException('invalid feature');
 		}
 
@@ -119,15 +119,15 @@ 
 			'coordinates' => $this->coords,
 		];
 
-		if(!empty($this->bbox)){
+		if (!empty($this->bbox)) {
 			$arr['bbox'] = $this->bbox;
 		}
 
-		if(!empty($this->properties)){
+		if (!empty($this->properties)) {
 			$arr['properties'] = $this->properties;
 		}
 
-		if(!empty($this->id)){
+		if (!empty($this->id)) {
 			$arr['properties']['id'] = $this->id; // leaflet
 #			$arr['id']               = $this->id; // GMaps
 		}

src/GeoJSONAbstract.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 use function in_array;
 use function json_encode;
 
-abstract class GeoJSONAbstract implements JsonSerializable{
+abstract class GeoJSONAbstract implements JsonSerializable {
 
 	protected array $bbox;
 
@@ -24,7 +24,7 @@ 
 	 */
 	public function setBbox(array $bbox):GeoJSONAbstract{
 
-		if(!in_array(count($bbox), [4, 6], true)){
+		if (!in_array(count($bbox), [4, 6], true)) {
 			throw new GeoJSONException('invalid bounding box array');
 		}