fisharebest / webtrees

app/Module/OpenStreetMapModule.php

Braces +6 added lines, -3 removed lines

@@ -1067,9 +1067,11 @@ 
 		$delimiter   = '';
 		$field_names = ['pl_level', 'pl_long', 'pl_lati', 'pl_zoom', 'pl_icon', 'fqpn'];
 
-		if ($serverfile !== '') {  // first choice is file on server
+		if ($serverfile !== '') {
+// first choice is file on server
 			$filename = WT_MODULES_DIR . $this->getName() . '/extra/' . $serverfile;
-		} elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+		} elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
 			$filename = $_FILES['localfile']['tmp_name'];
 		}
 
@@ -1090,7 +1092,8 @@ 
 					$delimiter = ',';
 				}
 				if ($delimiter !== '') {
-					if (!is_numeric($record[0])) { // lose the header
+					if (!is_numeric($record[0])) {
+// lose the header
 						array_shift($input_array);
 					}
 

Indentation +7 added lines, -7 removed lines

@@ -529,8 +529,8 @@ 
 			case 'BaseData':
 				$varName = (self::$map_selections['style'] === '') ? '' : self::$map_providers[self::$map_selections['provider']]['styles'][self::$map_selections['style']];
 				$payload = ['selectedProvIndex' => self::$map_selections['provider'],
-				            'selectedProvName'  => self::$map_providers[self::$map_selections['provider']]['name'],
-				            'selectedStyleName' => $varName,
+										'selectedProvName'  => self::$map_providers[self::$map_selections['provider']]['name'],
+										'selectedStyleName' => $varName,
 				];
 				break;
 			case 'ProviderStyles':
@@ -543,9 +543,9 @@ 
 					$providers[$key] = $provider['name'];
 				}
 				$payload = ['providers'     => $providers,
-				            'selectedProv'  => self::$map_selections['provider'],
-				            'styles'        => self::$map_providers[self::$map_selections['provider']]['styles'],
-				            'selectedStyle' => self::$map_selections['style'],
+										'selectedProv'  => self::$map_selections['provider'],
+										'styles'        => self::$map_providers[self::$map_selections['provider']]['styles'],
+										'selectedStyle' => self::$map_selections['style'],
 				];
 				break;
 			default:
@@ -1105,8 +1105,8 @@ 
 					$row    = explode($delimiter, $input_array[0]);
 					$fields = count($row);
 					if ($fields >= 6 &&
-					    (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
-					    (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
+							(bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
+							(bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
 						$filetype = 'csv';
 					}
 				}

Spacing +50 added lines, -50 removed lines

@@ -297,7 +297,7 @@ 
 						$color            = self::LINE_COLORS[log($id, 2) % $color_count];
 						$icon['color']    = $color; //make icon color the same as the line
 						$sosa_points[$id] = $event->getLatLonJSArray();
-						$sosa_parent      = (int)floor($id / 2);
+						$sosa_parent      = (int) floor($id / 2);
 						if (array_key_exists($sosa_parent, $sosa_points)) {
 							// Would like to use a GeometryCollection to hold LineStrings
 							// rather than generate polylines but the MarkerCluster library
@@ -329,7 +329,7 @@ 
 								'modules/openstreetmap/event-sidebar',
 								$event->shortSummary($mapType, $id)
 							),
-							'zoom'     => (int)$event->getZoom(),
+							'zoom'     => (int) $event->getZoom(),
 						],
 					];
 				}
@@ -399,7 +399,7 @@ 
 							'stats'    => $placeStats,
 						]
 					),
-					'zoom'    => (int)($location->getZoom() ?? 2),
+					'zoom'    => (int) ($location->getZoom() ?? 2),
 				],
 			];
 		}
@@ -451,7 +451,7 @@ 
 		$xref        = $request->get('reference');
 		$tree        = $request->attributes->get('tree');
 		$individual  = Individual::getInstance($xref, $tree);
-		$generations = (int)$request->get(
+		$generations = (int) $request->get(
 			'generations',
 			$tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS')
 		);
@@ -500,14 +500,14 @@ 
 						function ($item) {
 							return preg_replace('/[^a-z\d]/i', '', strtolower($item));
 						},
-						(array)$provider->styles
+						(array) $provider->styles
 					);
 
-					$key = preg_replace('/[^a-z\d]/i', '', strtolower((string)$provider->name));
+					$key = preg_replace('/[^a-z\d]/i', '', strtolower((string) $provider->name));
 
 					self::$map_providers[$key] = [
-						'name'   => (string)$provider->name,
-						'styles' => array_combine($style_keys, (array)$provider->styles),
+						'name'   => (string) $provider->name,
+						'styles' => array_combine($style_keys, (array) $provider->styles),
 					];
 				}
 			} catch (\Exception $ex) {
@@ -516,7 +516,7 @@ 
 					'provider' => 'openstreetmap',
 					'style'    => 'mapnik',
 				];
-				self::$map_providers  = [
+				self::$map_providers = [
 					'openstreetmap' => [
 						'name'   => 'OpenStreetMap',
 						'styles' => ['mapnik' => 'Mapnik'],
@@ -569,7 +569,7 @@ 
 		$maxgenerations = $tree->getPreference('MAX_PEDIGREE_GENERATIONS');
 		$generations    = $request->get('generations', $tree->getPreference('DEFAULT_PEDIGREE_GENERATIONS'));
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/pedigreemap',
 			'data' => [
 				'assets'         => $this->assets(),
@@ -632,7 +632,7 @@ 
 	 * @return object
 	 */
 	public function getAdminConfigAction(Request $request) {
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-config',
 			'data' => [
 				'title'        => I18N::translate('Open Street Maps (Configuration)'),
@@ -688,8 +688,8 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminPlacesAction(Request $request) {
-		$parent_id   = (int)$request->get('parent_id', 0);
-		$inactive    = (bool)$request->get('inactive');
+		$parent_id   = (int) $request->get('parent_id', 0);
+		$inactive    = (bool) $request->get('inactive');
 		$hierarchy   = $this->gethierarchy($parent_id);
 		$title       = I18N::translate('Open Street Maps (Geographic data)');
 		$breadcrumbs = [
@@ -712,7 +712,7 @@ 
 		}
 		$breadcrumbs[] = array_pop($breadcrumbs);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-places',
 			'data' => [
 				'title'       => $title,
@@ -733,9 +733,9 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminPlaceEditAction(Request $request) {
-		$parent_id = (int)$request->get('parent_id', 0);
-		$place_id  = (int)$request->get('place_id');
-		$inactive  = (int)$request->get('inactive');
+		$parent_id = (int) $request->get('parent_id', 0);
+		$place_id  = (int) $request->get('place_id');
+		$inactive  = (int) $request->get('inactive');
 		$hierarchy = $this->gethierarchy($place_id);
 		$fqpn      = empty($hierarchy) ? '' : $hierarchy[0]->fqpn;
 		$location  = new Location($fqpn);
@@ -771,7 +771,7 @@ 
 		}
 		$breadcrumbs[] = $place_id === 0 ? I18N::translate('Add') : I18N::translate('Edit');
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-place-edit',
 			'data' => [
 				'module'      => $this->getName(),
@@ -797,9 +797,9 @@ 
 	 */
 	public function postAdminSaveAction(Request $request): RedirectResponse {
 		if (Filter::checkCsrf()) {
-			$parent_id = (int)$request->get('parent_id');
-			$place_id  = (int)$request->get('place_id');
-			$inactive  = (int)$request->get('inactive');
+			$parent_id = (int) $request->get('parent_id');
+			$place_id  = (int) $request->get('place_id');
+			$inactive  = (int) $request->get('inactive');
 			$lat       = round($request->get('new_place_lati'), 5); // 5 decimal places (locate to within about 1 metre)
 			$lat       = ($lat < 0 ? 'S' : 'N') . abs($lat);
 			$lng       = round($request->get('new_place_long'), 5);
@@ -818,7 +818,7 @@ 
 						  VALUES (:id, :parent, :level, :place, :lng, :lat, :zoom, :icon)"
 				)->execute(
 					[
-						'id'     => (int)Database::prepare("SELECT MAX(pl_id)+1 FROM `##placelocation`")->fetchOne(),
+						'id'     => (int) Database::prepare("SELECT MAX(pl_id)+1 FROM `##placelocation`")->fetchOne(),
 						'parent' => $parent_id,
 						'level'  => $level,
 						'place'  => $request->get('new_place_name'),
@@ -837,7 +837,7 @@ 
 						'place' => $request->get('new_place_name'),
 						'lat'   => $request->get('lati_control') . $lat,
 						'lng'   => $request->get('long_control') . $lng,
-						'zoom'  => (int)$request->get('new_zoom_factor'),
+						'zoom'  => (int) $request->get('new_zoom_factor'),
 						'icon'  => $icon,
 					]
 				);
@@ -870,9 +870,9 @@ 
 	 */
 	public function postAdminDeleteRecordAction(Request $request): RedirectResponse {
 		if (Filter::checkCsrf()) {
-			$place_id  = (int)$request->get('place_id');
-			$parent_id = (int)$request->get('parent_id');
-			$inactive  = (int)$request->get('inactive');
+			$place_id  = (int) $request->get('place_id');
+			$parent_id = (int) $request->get('parent_id');
+			$inactive  = (int) $request->get('inactive');
 
 			try {
 				Database::prepare(
@@ -891,7 +891,7 @@ 
 				);
 			}
 			// If after deleting there are no more places at this level then go up a level
-			$children = (int)Database::prepare(
+			$children = (int) Database::prepare(
 				"SELECT COUNT(pl_id) FROM `##placelocation` WHERE pl_parent_id = :parent_id"
 			)
 				->execute(['parent_id' => $parent_id])
@@ -924,9 +924,9 @@ 
 	 * @throws \Exception
 	 */
 	public function getAdminExportAction(Request $request): RedirectResponse {
-		$parent_id = (int)$request->get('parent_id');
+		$parent_id = (int) $request->get('parent_id');
 		$format    = $request->get('format', 'csv');
-		$maxlevel  = (int)Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
+		$maxlevel  = (int) Database::prepare("SELECT max(pl_level) FROM `##placelocation`")->execute()->fetchOne();
 		$startfqpn = [];
 		$hierarchy = $this->gethierarchy($parent_id);
 		$geojson   = [];
@@ -978,8 +978,8 @@ 
 							)
 						)
 					);
-					$long = (float)strtr($place['pl_long'], ['E' => '', 'W' => '-', ',' => '.']);
-					$lati = (float)strtr($place['pl_lati'], ['N' => '', 'S' => '-', ',' => '.']);
+					$long = (float) strtr($place['pl_long'], ['E' => '', 'W' => '-', ',' => '.']);
+					$lati = (float) strtr($place['pl_lati'], ['N' => '', 'S' => '-', ',' => '.']);
 
 					$geojson['features'][] = [
 						'type'       => 'Feature',
@@ -1015,8 +1015,8 @@ 
 	 * @return object
 	 */
 	public function getAdminImportFormAction(Request $request) {
-		$parent_id   = (int)$request->get('parent_id');
-		$inactive    = (int)$request->get('inactive');
+		$parent_id   = (int) $request->get('parent_id');
+		$inactive    = (int) $request->get('inactive');
 		$breadcrumbs = [
 			route('admin-control-panel') => I18N::translate('Control panel'),
 			route('admin-modules')       => I18N::translate('Module administration'),
@@ -1031,7 +1031,7 @@ 
 			)                            => $this->getTitle() . ' (' . I18N::translate('Geographic data') . ')',
 			I18N::translate('Import file'),
 		];
-		$files       = $this->findFiles(WT_MODULES_DIR . $this->getName() . '/extra', ['csv', 'geojson', 'json']);
+		$files = $this->findFiles(WT_MODULES_DIR . $this->getName() . '/extra', ['csv', 'geojson', 'json']);
 		uasort(
 			$files,
 			function ($a, $b) {
@@ -1042,7 +1042,7 @@ 
 			}
 		);
 
-		return (object)[
+		return (object) [
 			'name' => 'modules/openstreetmap/admin-import-form',
 			'data' => [
 				'title'       => I18N::translate('Import geographic data'),
@@ -1106,8 +1106,8 @@ 
 					$row    = explode($delimiter, $input_array[0]);
 					$fields = count($row);
 					if ($fields >= 6 &&
-					    (bool)preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
-					    (bool)preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
+					    (bool) preg_match("/[SN][0-9]*\.?[0-9]*/", $row[$fields - 3]) &&
+					    (bool) preg_match("/[EW][0-9]*\.?[0-9]*/", $row[$fields - 4])) {
 						$filetype = 'csv';
 					}
 				}
@@ -1147,7 +1147,7 @@ 
 							}
 						);
 						// convert separate place fields into a comma separated placename
-						$row[]    = implode(
+						$row[] = implode(
 							Place::GEDCOM_SEPARATOR,
 							array_filter(
 								array_reverse(
@@ -1163,7 +1163,7 @@ 
 			}
 
 			if ($filetype !== '?') {
-				if ((bool)$request->get('cleardatabase')) {
+				if ((bool) $request->get('cleardatabase')) {
 					Database::exec("TRUNCATE TABLE `##placelocation`");
 				}
 				//process places
@@ -1174,10 +1174,10 @@ 
 				usort(
 					$places,
 					function (array $a, array $b) {
-						if ((int)$a['pl_level'] === (int)$b['pl_level']) {
+						if ((int) $a['pl_level'] === (int) $b['pl_level']) {
 							return I18N::strcasecmp($a['fqpn'], $b['fqpn']);
 						} else {
-							return (int)$a['pl_level'] - (int)$b['pl_level'];
+							return (int) $a['pl_level'] - (int) $b['pl_level'];
 						}
 					}
 				);
@@ -1197,7 +1197,7 @@ 
 						)) {
 
 						// overwrite
-						$location->update((object)$place);
+						$location->update((object) $place);
 						$updated++;
 					} elseif (!$valid && $options !== 'update') {
 						//add
@@ -1267,7 +1267,7 @@ 
 	 */
 	public function postAdminImportPlacesAction(Request $request): RedirectResponse {
 		$gedcomName = $request->get('ged');
-		$inactive   = (int)$request->get('inactive');
+		$inactive   = (int) $request->get('inactive');
 		$tree       = Tree::findByName($gedcomName);
 
 		// Get all the places from the places table ...
@@ -1323,7 +1323,7 @@ 
 				"INSERT INTO `##placelocation` (pl_id, pl_parent_id, pl_level, pl_place)" .
 				" VALUES (:id, :parent, :level, :place)"
 			);
-			$checkRecordQry  = Database::prepare(
+			$checkRecordQry = Database::prepare(
 				"SELECT pl1.pl_id" .
 				" FROM	  `##placelocation` AS pl1" .
 				" LEFT JOIN `##placelocation` AS pl2 ON (pl1.pl_parent_id = pl2.pl_id)" .
@@ -1486,18 +1486,18 @@ 
 
 			if ($row['inactive']) {
 				$badge = 'danger';
-			} elseif ((int)$children->no_coord > 0) {
+			} elseif ((int) $children->no_coord > 0) {
 				$badge = 'warning';
-			} elseif ((int)$children->child_count > 0) {
+			} elseif ((int) $children->child_count > 0) {
 				$badge = 'info';
 			} else {
 				$badge = 'secondary';
 			}
 
-			$list[] = (object)array_merge(
+			$list[] = (object) array_merge(
 				$row,
 				[
-					'child_count' => (int)$children->child_count,
+					'child_count' => (int) $children->child_count,
 					'badge'       => $badge,
 				]
 			);
@@ -1519,7 +1519,7 @@ 
 			$row       = $statement->execute(['id' => $id])->fetchOneRow();
 			$fqpn[]    = $row->pl_place;
 			$row->fqpn = implode(Place::GEDCOM_SEPARATOR, $fqpn);
-			$id        = (int)$row->pl_parent_id;
+			$id        = (int) $row->pl_parent_id;
 			$arr[]     = $row;
 		}
 
@@ -1534,7 +1534,7 @@ 
 	 */
 	private function buildLevel($parent_id, $placename, &$places) {
 		$level = array_search('', $placename);
-		$rows  = (array)Database::prepare(
+		$rows  = (array) Database::prepare(
 			"SELECT pl_level, pl_id, pl_place, pl_long, pl_lati, pl_zoom, pl_icon FROM `##placelocation` WHERE pl_parent_id=? ORDER BY pl_place"
 		)
 			->execute([$parent_id])