mprins / dokuwiki-plugin-geophp

vendor/funiq/geophp/src/geoPHP.php

Spacing +8 added lines, -8 removed lines

@@ -115,9 +115,9 @@ 
         }
 
         if (!array_key_exists($type, self::$adapterMap)) {
-            throw new \Exception('geoPHP could not find an adapter of type ' . htmlentities($type));
+            throw new \Exception('geoPHP could not find an adapter of type '.htmlentities($type));
         }
-        $adapterType = self::CLASS_NAMESPACE . 'Adapter\\' . self::$adapterMap[$type];
+        $adapterType = self::CLASS_NAMESPACE.'Adapter\\'.self::$adapterMap[$type];
 
         $adapter = new $adapterType();
 
@@ -235,9 +235,9 @@ 
             if (count($reducedGeometries) == 1) {
                 return $reducedGeometries[0];
             } else {
-                $class = self::CLASS_NAMESPACE .
-                    'Geometry\\' .
-                    (strstr($geometryTypes[0], 'Multi') ? '' : 'Multi') .
+                $class = self::CLASS_NAMESPACE.
+                    'Geometry\\'.
+                    (strstr($geometryTypes[0], 'Multi') ? '' : 'Multi').
                     $geometryTypes[0];
                 return new $class($reducedGeometries);
             }
@@ -314,13 +314,13 @@ 
             if (count($geometries) == 1) {
                 return $geometries[0];
             } else {
-                $newType = (strpos($geometryTypes[0], 'Multi') !== false ? '' : 'Multi') . $geometryTypes[0];
+                $newType = (strpos($geometryTypes[0], 'Multi') !== false ? '' : 'Multi').$geometryTypes[0];
                 foreach ($geometries as $geometry) {
                     if ($geometry->isEmpty()) {
                         return new GeometryCollection($geometries);
                     }
                 }
-                $class = self::CLASS_NAMESPACE . 'Geometry\\' . $newType;
+                $class = self::CLASS_NAMESPACE.'Geometry\\'.$newType;
                 return new $class($geometries);
             }
         } else {
@@ -422,7 +422,7 @@ 
         $string = trim(fread($mem, 8));
 
         // Detect geohash - geohash ONLY contains lowercase chars and numerics
-        preg_match('/[' . GeoHash::$characterTable . ']+/', $string, $matches);
+        preg_match('/['.GeoHash::$characterTable.']+/', $string, $matches);
         if (isset($matches[0]) && $matches[0] == $string && strlen($input) <= 13) {
             return 'geohash';
         }

vendor/funiq/geophp/src/Adapter/GeoJSON.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         if ($type == 'GeometryCollection') {
             return $this->geoJSONObjectToGeometryCollection($obj);
         }
-        $method = 'arrayTo' . $type;
+        $method = 'arrayTo'.$type;
         /** @var GeometryCollection $geometry */
         $geometry = $this->$method($obj->coordinates);
         $geometry->setSRID($this->getSRID($obj));

vendor/funiq/geophp/src/Adapter/WKT.php

Spacing +15 added lines, -15 removed lines

@@ -102,10 +102,10 @@ 
             $dataString = $m['data'] ?: $m['data_empty'];
 
             if ($geometryType) {
-                $method = 'parse' . $geometryType;
+                $method = 'parse'.$geometryType;
                 return call_user_func([$this, $method], $dataString);
             }
-            throw new \Exception('Invalid WKT type "' . $m[1] . '"');
+            throw new \Exception('Invalid WKT type "'.$m[1].'"');
         }
         throw new \Exception('Cannot parse WKT');
     }
@@ -180,7 +180,7 @@ 
          * MULTIPOINT (1 2, 3 4)
          */
         foreach (explode(',', $dataString) as $part) {
-            $points[] =  $this->parsePoint(trim($part, ' ()'));
+            $points[] = $this->parsePoint(trim($part, ' ()'));
         }
         return new MultiPoint($points);
     }
@@ -199,7 +199,7 @@ 
         $lines = [];
         if (preg_match_all('/(\([^(]+\)|EMPTY)/', $dataString, $m)) {
             foreach ($m[1] as $part) {
-                $lines[] =  $this->parseLineString(trim($part, ' ()'));
+                $lines[] = $this->parseLineString(trim($part, ' ()'));
             }
         }
         return new MultiLineString($lines);
@@ -220,7 +220,7 @@ 
         $polygons = [];
         if (preg_match_all('/(\(\([^(].+\)\)|EMPTY)/', $dataString, $m)) {
             foreach ($m[0] as $part) {
-                $polygons[] =  $this->parsePolygon($part);
+                $polygons[] = $this->parsePolygon($part);
             }
         }
         return new MultiPolygon($polygons);
@@ -251,10 +251,10 @@ 
                 // something weird happened, we stop here before running in an infinite loop
                 break;
             }
-            $cutPosition = strlen($m[0][0]) + $m[0][1];
+            $cutPosition = strlen($m[0][0])+$m[0][1];
             $geometry = $this->parseTypeAndGetData(trim(substr($dataString, 0, $cutPosition)));
             $geometries[] = $geometry;
-            $dataString = trim(substr($dataString, $cutPosition + 1));
+            $dataString = trim(substr($dataString, $cutPosition+1));
         }
 
         return new GeometryCollection($geometries);
@@ -285,7 +285,7 @@ 
         $this->hasZ     = $geometry->hasZ();
 
         if ($geometry->isEmpty()) {
-            return strtoupper($geometry->geometryType()) . ' EMPTY';
+            return strtoupper($geometry->geometryType()).' EMPTY';
         }
 
         if ($data = $this->extractData($geometry)) {
@@ -296,7 +296,7 @@ 
             if ($this->measured) {
                 $extension .= 'M';
             }
-            return strtoupper($geometry->geometryType()) . ($extension ? ' ' . $extension : '') . ' (' . $data . ')';
+            return strtoupper($geometry->geometryType()).($extension ? ' '.$extension : '').' ('.$data.')';
         }
         return '';
     }
@@ -313,13 +313,13 @@ 
         $parts = [];
         switch ($geometry->geometryType()) {
             case Geometry::POINT:
-                $p = $geometry->x() . ' ' . $geometry->y();
+                $p = $geometry->x().' '.$geometry->y();
                 if ($geometry->hasZ()) {
-                    $p .= ' ' . $geometry->getZ();
+                    $p .= ' '.$geometry->getZ();
                     $this->hasZ = $this->hasZ || $geometry->hasZ();
                 }
                 if ($geometry->isMeasured()) {
-                    $p .= ' ' . $geometry->getM();
+                    $p .= ' '.$geometry->getM();
                     $this->measured = $this->measured || $geometry->isMeasured();
                 }
                 return $p;
@@ -336,7 +336,7 @@ 
                     if ($component->isEmpty()) {
                         $parts[] = 'EMPTY';
                     } else {
-                        $parts[] = '(' . $this->extractData($component) . ')';
+                        $parts[] = '('.$this->extractData($component).')';
                     }
                 }
                 return implode(', ', $parts);
@@ -354,8 +354,8 @@ 
                     }
                     $data = $this->extractData($component);
                     $parts[] = strtoupper($component->geometryType())
-                            . ($extension ? ' ' . $extension : '')
-                            . ($data ? ' (' . $data . ')' : ' EMPTY');
+                            . ($extension ? ' '.$extension : '')
+                            . ($data ? ' ('.$data.')' : ' EMPTY');
                 }
                 return implode(', ', $parts);
         }

vendor/funiq/geophp/src/Adapter/BinaryReader.php

Spacing +1 added lines, -1 removed lines

@@ -151,6 +151,6 @@
      */
     public static function zigZagDecode($value)
     {
-        return ($value & 1) === 0 ? $value >> 1 : -($value >> 1) - 1;
+        return ($value & 1) === 0 ? $value >> 1 : -($value >> 1)-1;
     }
 }

vendor/funiq/geophp/src/Adapter/GeoRSS.php

Spacing +14 added lines, -14 removed lines

@@ -56,7 +56,7 @@ 
     {
         if ($namespace) {
             $this->namespace = $namespace;
-            $this->nss = $namespace . ':';
+            $this->nss = $namespace.':';
         }
         return $this->geometryToGeoRSS($geometry) ?: '';
     }
@@ -71,14 +71,14 @@ 
         $xmlObject = new \DOMDocument();
         @$xmlObject->loadXML($text);
         if ($xmlObject === false) {
-            throw new \Exception("Invalid GeoRSS: " . $text);
+            throw new \Exception("Invalid GeoRSS: ".$text);
         }
 
         $this->xmlObject = $xmlObject;
         try {
             $geom = $this->geomFromXML();
         } catch (\Exception $e) {
-            throw new \Exception("Cannot Read Geometry From GeoRSS: " . $e->getMessage());
+            throw new \Exception("Cannot Read Geometry From GeoRSS: ".$e->getMessage());
         }
 
         return $geom;
@@ -223,7 +223,7 @@ 
      */
     private function pointToGeoRSS($geometry)
     {
-        return '<' . $this->nss . 'point>' . $geometry->y() . ' ' . $geometry->x() . '</' . $this->nss . 'point>';
+        return '<'.$this->nss.'point>'.$geometry->y().' '.$geometry->x().'</'.$this->nss.'point>';
     }
 
     /**
@@ -232,14 +232,14 @@ 
      */
     private function linestringToGeoRSS($geometry)
     {
-        $output = '<' . $this->nss . 'line>';
+        $output = '<'.$this->nss.'line>';
         foreach ($geometry->getComponents() as $k => $point) {
-            $output .= $point->y() . ' ' . $point->x();
-            if ($k < ($geometry->numGeometries() - 1)) {
+            $output .= $point->y().' '.$point->x();
+            if ($k < ($geometry->numGeometries()-1)) {
                 $output .= ' ';
             }
         }
-        $output .= '</' . $this->nss . 'line>';
+        $output .= '</'.$this->nss.'line>';
         return $output;
     }
 
@@ -249,15 +249,15 @@ 
      */
     private function polygonToGeoRSS($geometry)
     {
-        $output = '<' . $this->nss . 'polygon>';
+        $output = '<'.$this->nss.'polygon>';
         $exteriorRing = $geometry->exteriorRing();
         foreach ($exteriorRing->getComponents() as $k => $point) {
-            $output .= $point->y() . ' ' . $point->x();
-            if ($k < ($exteriorRing->numGeometries() - 1)) {
+            $output .= $point->y().' '.$point->x();
+            if ($k < ($exteriorRing->numGeometries()-1)) {
                 $output .= ' ';
             }
         }
-        $output .= '</' . $this->nss . 'polygon>';
+        $output .= '</'.$this->nss.'polygon>';
         return $output;
     }
 
@@ -267,13 +267,13 @@ 
      */
     public function collectionToGeoRSS($geometry)
     {
-        $georss = '<' . $this->nss . 'where>';
+        $georss = '<'.$this->nss.'where>';
         $components = $geometry->getComponents();
         foreach ($components as $component) {
             $georss .= $this->geometryToGeoRSS($component);
         }
 
-        $georss .= '</' . $this->nss . 'where>';
+        $georss .= '</'.$this->nss.'where>';
 
         return $georss;
     }

vendor/funiq/geophp/src/Adapter/EWKT.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     {
         $srid = $geometry->getSRID();
         if ($srid) {
-            $wkt = 'SRID=' . $srid . ';';
+            $wkt = 'SRID='.$srid.';';
             $wkt .= $geometry->out('wkt');
             return $wkt;
         } else {

vendor/funiq/geophp/src/Adapter/OSM.php

Spacing +22 added lines, -22 removed lines

@@ -54,14 +54,14 @@ 
         $xmlobj = new \DOMDocument();
         $xmlobj->loadXML($osm);
         if ($xmlobj === false) {
-            throw new \Exception("Invalid OSM XML: " . substr($osm, 0, 100));
+            throw new \Exception("Invalid OSM XML: ".substr($osm, 0, 100));
         }
 
         $this->xmlObj = $xmlobj;
         try {
             $geom = $this->geomFromXML();
         } catch (\Exception $e) {
-            throw new \Exception("Cannot read geometries from OSM XML: " . $e->getMessage());
+            throw new \Exception("Cannot read geometries from OSM XML: ".$e->getMessage());
         }
 
         return $geom;
@@ -122,7 +122,7 @@ 
                         'nodes' => $wayNodes,
                         'assigned' => false,
                         'tags' => $tags,
-                        'isRing' => ($wayNodes[0] === $wayNodes[count($wayNodes) - 1])
+                        'isRing' => ($wayNodes[0] === $wayNodes[count($wayNodes)-1])
                 ];
             }
         }
@@ -154,11 +154,11 @@ 
                 $memberType = $member->attributes->getNamedItem('type')->nodeValue;
                 $ref = $member->attributes->getNamedItem('ref')->nodeValue;
 
-                if ($memberType === 'node' &&  isset($nodes[$ref])) {
+                if ($memberType === 'node' && isset($nodes[$ref])) {
                     $nodes[$ref]['assigned'] = true;
                     $relationPoints[] = $nodes[$ref]['point'];
                 }
-                if ($memberType === 'way' &&  isset($ways[$ref])) {
+                if ($memberType === 'way' && isset($ways[$ref])) {
                     $ways[$ref]['assigned'] = true;
                     $relationWays[$ref] = $ways[$ref]['nodes'];
                 }
@@ -193,7 +193,7 @@ 
             if (
                 (!$way['assigned'] || !empty($way['tags']))
                 && !isset($way['tags']['boundary'])
-                && (!isset($way['tags']['natural'])  || $way['tags']['natural'] !== 'mountain_range')
+                && (!isset($way['tags']['natural']) || $way['tags']['natural'] !== 'mountain_range')
             ) {
                 $linePoints = [];
                 foreach ($way['nodes'] as $wayNode) {
@@ -231,23 +231,23 @@ 
         $lineStrings = [];
         while (count($relationWays) > 0) {
             $line = array_shift($relationWays);
-            if ($line[0] !== $line[count($line) - 1]) {
+            if ($line[0] !== $line[count($line)-1]) {
                 do {
                     $waysAdded = 0;
                     foreach ($relationWays as $id => $wayNodes) {
                         // Last node of ring = first node of way => put way to the end of ring
-                        if ($line[count($line) - 1] === $wayNodes[0]) {
+                        if ($line[count($line)-1] === $wayNodes[0]) {
                             $line = array_merge($line, array_slice($wayNodes, 1));
                             unset($relationWays[$id]);
                             $waysAdded++;
                         // Last node of ring = last node of way => reverse way and put to the end of ring
-                        } elseif ($line[count($line) - 1] === $wayNodes[count($wayNodes) - 1]) {
+                        } elseif ($line[count($line)-1] === $wayNodes[count($wayNodes)-1]) {
                             $line = array_merge($line, array_slice(array_reverse($wayNodes), 1));
                             unset($relationWays[$id]);
                             $waysAdded++;
                         // First node of ring = last node of way => put way to the beginning of ring
-                        } elseif ($line[0] === $wayNodes[count($wayNodes) - 1]) {
-                            $line = array_merge(array_slice($wayNodes, 0, count($wayNodes) - 1), $line);
+                        } elseif ($line[0] === $wayNodes[count($wayNodes)-1]) {
+                            $line = array_merge(array_slice($wayNodes, 0, count($wayNodes)-1), $line);
                             unset($relationWays[$id]);
                             $waysAdded++;
                         // First node of ring = first node of way => reverse way and put to the beginning of ring
@@ -285,23 +285,23 @@ 
         $rings = [];
         while (!empty($relationWays)) {
             $ring = array_shift($relationWays);
-            if ($ring[0] !== $ring[count($ring) - 1]) {
+            if ($ring[0] !== $ring[count($ring)-1]) {
                 do {
                     $waysAdded = 0;
                     foreach ($relationWays as $id => $wayNodes) {
                         // Last node of ring = first node of way => put way to the end of ring
-                        if ($ring[count($ring) - 1] === $wayNodes[0]) {
+                        if ($ring[count($ring)-1] === $wayNodes[0]) {
                             $ring = array_merge($ring, array_slice($wayNodes, 1));
                             unset($relationWays[$id]);
                             $waysAdded++;
                         // Last node of ring = last node of way => reverse way and put to the end of ring
-                        } elseif ($ring[count($ring) - 1] === $wayNodes[count($wayNodes) - 1]) {
+                        } elseif ($ring[count($ring)-1] === $wayNodes[count($wayNodes)-1]) {
                             $ring = array_merge($ring, array_slice(array_reverse($wayNodes), 1));
                             unset($relationWays[$id]);
                             $waysAdded++;
                         // First node of ring = last node of way => put way to the beginning of ring
-                        } elseif ($ring[0] === $wayNodes[count($wayNodes) - 1]) {
-                            $ring = array_merge(array_slice($wayNodes, 0, count($wayNodes) - 1), $ring);
+                        } elseif ($ring[0] === $wayNodes[count($wayNodes)-1]) {
+                            $ring = array_merge(array_slice($wayNodes, 0, count($wayNodes)-1), $ring);
                             unset($relationWays[$id]);
                             $waysAdded++;
                         // First node of ring = first node of way => reverse way and put to the beginning of ring
@@ -312,11 +312,11 @@ 
                         }
                     }
                 // If ring members are not ordered, we need to repeat end matching some times
-                } while ($waysAdded > 0 && $ring[0] !== $ring[count($ring) - 1]);
+                } while ($waysAdded > 0 && $ring[0] !== $ring[count($ring)-1]);
             }
             
             // Create the new Polygon
-            if ($ring[0] === $ring[count($ring) - 1]) {
+            if ($ring[0] === $ring[count($ring)-1]) {
                 $ringPoints = [];
                 foreach ($ring as $ringNode) {
                     $ringPoints[] = $nodes[$ringNode]['point'];
@@ -471,7 +471,7 @@ 
      */
     protected function processPoint($point, $isWayPoint = false)
     {
-        $nodePosition = sprintf(self::OSM_COORDINATE_PRECISION . '_' . self::OSM_COORDINATE_PRECISION, $point->y(), $point->x());
+        $nodePosition = sprintf(self::OSM_COORDINATE_PRECISION.'_'.self::OSM_COORDINATE_PRECISION, $point->y(), $point->x());
         if (!isset($this->nodes[$nodePosition])) {
             $this->nodes[$nodePosition] = ['id' => --$this->idCounter, "used" => $isWayPoint];
             return $this->idCounter;
@@ -519,7 +519,7 @@ 
     {
         /** @noinspection PhpUnusedParameterInspection */
         set_error_handler(
-            function ($errNO, $errStr, $errFile, $errLine, $errContext) {
+            function($errNO, $errStr, $errFile, $errLine, $errContext) {
                 if (isset($errContext['http_response_header'])) {
                     foreach ($errContext['http_response_header'] as $line) {
                         if (strpos($line, 'Error: ') > -1) {
@@ -533,12 +533,12 @@ 
         );
 
         try {
-            $osmFile = file_get_contents(self::OSM_API_URL . "map?bbox={$left},{$bottom},{$right},{$top}");
+            $osmFile = file_get_contents(self::OSM_API_URL."map?bbox={$left},{$bottom},{$right},{$top}");
             restore_error_handler();
             return $osmFile;
         } catch (\Exception $e) {
             restore_error_handler();
-            throw new \Exception("Failed to download from OSM. " . $e->getMessage());
+            throw new \Exception("Failed to download from OSM. ".$e->getMessage());
         }
     }
 }

vendor/funiq/geophp/src/Adapter/TWKB.php

Spacing +24 added lines, -24 removed lines

@@ -89,7 +89,7 @@ 
         }
 
         if (empty($twkb)) {
-            throw new \Exception('Cannot read empty TWKB. Found ' . gettype($twkb));
+            throw new \Exception('Cannot read empty TWKB. Found '.gettype($twkb));
         }
 
         $this->reader = new BinaryReader($twkb);
@@ -139,7 +139,7 @@ 
             $options['remainderSize'] = $this->reader->readUVarInt();
         }
         if ($options['hasBoundingBox']) {
-            $dimension = 2 + ($options['hasZ'] ? 1 : 0) + ($options['hasM'] ? 1 : 0);
+            $dimension = 2+($options['hasZ'] ? 1 : 0)+($options['hasM'] ? 1 : 0);
             $precisions = [
                 $options['precisionFactor'],
                 $options['precisionFactor'],
@@ -149,7 +149,7 @@ 
             $bBoxMin = $bBoxMax = [];
             for ($i = 0; $i < $dimension; $i++) {
                 $bBoxMin[$i] = $this->reader->readUVarInt() / $precisions[$i];
-                $bBoxMax[$i] = $this->reader->readUVarInt() / $precisions[$i] + $bBoxMin[$i];
+                $bBoxMax[$i] = $this->reader->readUVarInt() / $precisions[$i]+$bBoxMin[$i];
             }
             /** @noinspection PhpUndefinedVariableInspection (minimum 2 dimension) */
             $options['boundingBox'] = ['minXYZM' => $bBoxMin, 'maxXYZM' => $bBoxMax];
@@ -191,8 +191,8 @@ 
                 break;
             default:
                 throw new \Exception(
-                    'Geometry type ' . $geometryType .
-                        ' (' . (array_search($geometryType, self::$typeMap) ?: 'unknown') . ') not supported'
+                    'Geometry type '.$geometryType.
+                        ' ('.(array_search($geometryType, self::$typeMap) ?: 'unknown').') not supported'
                 );
         }
 
@@ -211,19 +211,19 @@ 
             return new Point();
         }
         $x = round(
-            $this->lastPoint->x() + $this->reader->readSVarInt() / $options['precisionFactor'],
+            $this->lastPoint->x()+$this->reader->readSVarInt() / $options['precisionFactor'],
             $options['precision']
         );
         $y = round(
-            $this->lastPoint->y() + $this->reader->readSVarInt() / $options['precisionFactor'],
+            $this->lastPoint->y()+$this->reader->readSVarInt() / $options['precisionFactor'],
             $options['precision']
         );
         $z = $options['hasZ'] ? round(
-            $this->lastPoint->z() + $this->reader->readSVarInt() / $options['zPrecisionFactor'],
+            $this->lastPoint->z()+$this->reader->readSVarInt() / $options['zPrecisionFactor'],
             $options['zPrecision']
         ) : null;
         $m = $options['hasM'] ? round(
-            $this->lastPoint->m() + $this->reader->readSVarInt() / $options['mPrecisionFactor'],
+            $this->lastPoint->m()+$this->reader->readSVarInt() / $options['mPrecisionFactor'],
             $options['mPrecision']
         ) : null;
 
@@ -295,7 +295,7 @@ 
         $components = [];
         for ($i = 0; $i < $multiLength; $i++) {
             if ($type !== 'Geometry') {
-                $func = 'get' . $type;
+                $func = 'get'.$type;
                 $components[] = $this->$func($options);
             } else {
                 $components[] = $this->getGeometry();
@@ -366,7 +366,7 @@ 
         $this->writeOptions['hasM'] = $geometry->isMeasured();
 
         // Type and precision
-        $type = self::$typeMap[$geometry->geometryType()] +
+        $type = self::$typeMap[$geometry->geometryType()]+
                 (BinaryWriter::zigZagEncode($this->writeOptions['decimalDigitsXY']) << 4);
         $twkbHead = $this->writer->writeUInt8($type);
 
@@ -415,32 +415,32 @@ 
             $bBox = $geometry->getBoundingBox();
             // X
             $twkbBox = $this->writer->writeSVarInt($bBox['minx'] * $this->writeOptions['xyFactor']);
-            $twkbBox .= $this->writer->writeSVarInt(($bBox['maxx'] - $bBox['minx']) * $this->writeOptions['xyFactor']);
+            $twkbBox .= $this->writer->writeSVarInt(($bBox['maxx']-$bBox['minx']) * $this->writeOptions['xyFactor']);
             // Y
             $twkbBox .= $this->writer->writeSVarInt($bBox['miny'] * $this->writeOptions['xyFactor']);
-            $twkbBox .= $this->writer->writeSVarInt(($bBox['maxy'] - $bBox['miny']) * $this->writeOptions['xyFactor']);
+            $twkbBox .= $this->writer->writeSVarInt(($bBox['maxy']-$bBox['miny']) * $this->writeOptions['xyFactor']);
             if ($geometry->hasZ()) {
                 $bBox['minz'] = $geometry->minimumZ();
                 $bBox['maxz'] = $geometry->maximumZ();
                 $twkbBox .= $this->writer->writeSVarInt(round($bBox['minz'] * $this->writeOptions['zFactor']));
-                $twkbBox .= $this->writer->writeSVarInt(round(($bBox['maxz'] - $bBox['minz']) * $this->writeOptions['zFactor']));
+                $twkbBox .= $this->writer->writeSVarInt(round(($bBox['maxz']-$bBox['minz']) * $this->writeOptions['zFactor']));
             }
             if ($geometry->isMeasured()) {
                 $bBox['minm'] = $geometry->minimumM();
                 $bBox['maxm'] = $geometry->maximumM();
                 $twkbBox .= $this->writer->writeSVarInt($bBox['minm'] * $this->writeOptions['mFactor']);
-                $twkbBox .= $this->writer->writeSVarInt(($bBox['maxm'] - $bBox['minm']) * $this->writeOptions['mFactor']);
+                $twkbBox .= $this->writer->writeSVarInt(($bBox['maxm']-$bBox['minm']) * $this->writeOptions['mFactor']);
             }
-            $twkbGeom = $twkbBox . $twkbGeom;
+            $twkbGeom = $twkbBox.$twkbGeom;
         }
 
         if ($geometry->hasZ() || $geometry->isMeasured()) {
             $extendedPrecision = 0;
             if ($geometry->hasZ()) {
-                $extendedPrecision |= ($geometry->hasZ() ? 0x1 : 0) | ($this->writeOptions['decimalDigitsZ'] << 2);
+                $extendedPrecision |= ($geometry->hasZ() ? 0x1 : 0)|($this->writeOptions['decimalDigitsZ'] << 2);
             }
             if ($geometry->isMeasured()) {
-                $extendedPrecision |= ($geometry->isMeasured() ? 0x2 : 0) | ($this->writeOptions['decimalDigitsM'] << 5);
+                $extendedPrecision |= ($geometry->isMeasured() ? 0x2 : 0)|($this->writeOptions['decimalDigitsM'] << 5);
             }
             $twkbHead .= $this->writer->writeUInt8($extendedPrecision);
         }
@@ -448,7 +448,7 @@ 
             $twkbHead .= $this->writer->writeUVarInt(strlen($twkbGeom));
         }
 
-        return $twkbHead . $twkbGeom;
+        return $twkbHead.$twkbGeom;
     }
 
     /**
@@ -462,13 +462,13 @@ 
         $z = round($geometry->z() * $this->writeOptions['zFactor']);
         $m = round($geometry->m() * $this->writeOptions['mFactor']);
 
-        $twkb = $this->writer->writeSVarInt($x - $this->lastPoint->x());
-        $twkb .= $this->writer->writeSVarInt($y - $this->lastPoint->y());
+        $twkb = $this->writer->writeSVarInt($x-$this->lastPoint->x());
+        $twkb .= $this->writer->writeSVarInt($y-$this->lastPoint->y());
         if ($this->writeOptions['hasZ']) {
-            $twkb .= $this->writer->writeSVarInt($z - $this->lastPoint->z());
+            $twkb .= $this->writer->writeSVarInt($z-$this->lastPoint->z());
         }
         if ($this->writeOptions['hasM']) {
-            $twkb .= $this->writer->writeSVarInt($m - $this->lastPoint->m());
+            $twkb .= $this->writer->writeSVarInt($m-$this->lastPoint->m());
         }
 
         $this->lastPoint = new Point($x, $y, $this->writeOptions['hasZ'] ? $z : null, $this->writeOptions['hasM'] ? $m : null);
@@ -516,7 +516,7 @@ 
         //}
         foreach ($geometry->getComponents() as $component) {
             if ($geometry->geometryType() !== Geometry::GEOMETRY_COLLECTION) {
-                $func = 'write' . $component->geometryType();
+                $func = 'write'.$component->geometryType();
                 $twkb .= $this->$func($component);
             } else {
                 $twkb .= $this->writeGeometry($component);

vendor/funiq/geophp/src/Adapter/GoogleGeocode.php

Spacing +7 added lines, -7 removed lines

@@ -56,14 +56,14 @@ 
             $bounds = $bounds->getBBox();
         }
         if (gettype($bounds) == 'array') {
-            $boundsString = '&bounds=' . $bounds['miny'] . ',' . $bounds['minx'] . '|' . $bounds['maxy'] . ',' . $bounds['maxx'];
+            $boundsString = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
         } else {
             $boundsString = '';
         }
 
         $url = "http://maps.googleapis.com/maps/api/geocode/json";
-        $url .= '?address=' . urlencode($address);
-        $url .= $boundsString . ($apiKey ? '&key=' . $apiKey : '');
+        $url .= '?address='.urlencode($address);
+        $url .= $boundsString.($apiKey ? '&key='.$apiKey : '');
         $this->result = json_decode(@file_get_contents($url));
 
         if ($this->result->status == 'OK') {
@@ -97,7 +97,7 @@ 
                 throw new \Exception(
                     'Error in Google Reverse Geocoder: '
                         . $this->result->status
-                    . (isset($this->result->error_message) ? '. ' . $this->result->error_message : '')
+                    . (isset($this->result->error_message) ? '. '.$this->result->error_message : '')
                 );
             } else {
                 throw new \Exception('Unknown error in Google Reverse Geocoder');
@@ -128,8 +128,8 @@ 
 
         $url = "http://maps.googleapis.com/maps/api/geocode/json";
         /** @noinspection SpellCheckingInspection */
-        $url .= '?latlng=' . $lat . ',' . $lon;
-        $url .= ($language ? '&language=' . $language : '') . ($apiKey ? '&key=' . $apiKey : '');
+        $url .= '?latlng='.$lat.','.$lon;
+        $url .= ($language ? '&language='.$language : '').($apiKey ? '&key='.$apiKey : '');
 
         $this->result = json_decode(@file_get_contents($url));
 
@@ -153,7 +153,7 @@ 
                 throw new \Exception(
                     'Error in Google Reverse Geocoder: '
                         . $this->result->status
-                    . (isset($this->result->error_message) ? '. ' . $this->result->error_message : '')
+                    . (isset($this->result->error_message) ? '. '.$this->result->error_message : '')
                 );
             } else {
                 throw new \Exception('Unknown error in Google Reverse Geocoder');