Completed
Pull Request — master (#926)
by Mark
11:28
created
app/Module/GoogleMapsModule.php 3 patches
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -2035,18 +2035,18 @@
 block discarded – undo
2035 2035
 								'tooltip'      => $birth->getPlace()->getGedcomName(),
2036 2036
 							);
2037 2037
 \							switch ($child->getSex()) {
2038
-							case'F':
2039
-								$gmark['fact_label'] = I18N::translate('daughter');
2040
-								$gmark['class']      = 'person_boxF';
2041
-								break;
2042
-							case 'M':
2043
-								$gmark['fact_label'] = I18N::translate('son');
2044
-								$gmark['class']      = 'person_box';
2045
-								break;
2046
-							default:
2047
-								$gmark['fact_label'] = I18N::translate('child');
2048
-								$gmark['class']      = 'person_boxNN';
2049
-								break;
2038
+case'F':
2039
+	$gmark['fact_label'] = I18N::translate('daughter');
2040
+	$gmark['class']      = 'person_boxF';
2041
+	break;
2042
+case 'M':
2043
+	$gmark['fact_label'] = I18N::translate('son');
2044
+	$gmark['class']      = 'person_box';
2045
+	break;
2046
+default:
2047
+	$gmark['fact_label'] = I18N::translate('child');
2048
+	$gmark['class']      = 'person_boxNN';
2049
+	break;
2050 2050
 							}
2051 2051
 							$gmarks[] = $gmark;
2052 2052
 						} else {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2469,7 +2469,7 @@
 block discarded – undo
2469 2469
 			if ($key == 0) {
2470 2470
 				$key_mark = 0;
2471 2471
 			}
2472
-			else if ($gmark['place'] == $gmarks[$key-1]['place']) {
2472
+			else if ($gmark['place'] == $gmarks[$key - 1]['place']) {
2473 2473
 				$key_mark = $key_mark;
2474 2474
 			} else {
2475 2475
 				$key_mark++;
Please login to merge, or discard this patch.
Braces   +20 added lines, -8 removed lines patch added patch discarded remove patch
@@ -2468,8 +2468,7 @@  discard block
 block discarded – undo
2468 2468
 			echo '<td class="facts_label">';
2469 2469
 			if ($key == 0) {
2470 2470
 				$key_mark = 0;
2471
-			}
2472
-			else if ($gmark['place'] == $gmarks[$key-1]['place']) {
2471
+			} else if ($gmark['place'] == $gmarks[$key-1]['place']) {
2473 2472
 				$key_mark = $key_mark;
2474 2473
 			} else {
2475 2474
 				$key_mark++;
@@ -3024,7 +3023,8 @@  discard block
 block discarded – undo
3024 3023
 		ob_start(); // TODO: rewrite print_gm_markers, and the functions called therein, to either return text or add JS directly.
3025 3024
 
3026 3025
 		if ($numfound == 0 && $level > 0) {
3027
-			if (isset($levelo[($level - 1)])) {  // ** BH not sure yet what this if statement is for ... TODO **
3026
+			if (isset($levelo[($level - 1)])) {
3027
+// ** BH not sure yet what this if statement is for ... TODO **
3028 3028
 				// show the current place on the map
3029 3029
 
3030 3030
 				$place = Database::prepare("SELECT pl_id AS place_id, pl_place AS place, pl_lati AS lati, pl_long AS `long`, pl_zoom AS zoom, pl_icon AS icon FROM `##placelocation` WHERE pl_id=?")
@@ -3857,7 +3857,8 @@  discard block
 block discarded – undo
3857 3857
 			}
3858 3858
 
3859 3859
 			function showLocation_level(address) {
3860
-				address += '<?php if ($level > 0) echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
3860
+				address += '<?php if ($level > 0) {
3861
+	echo ', ', addslashes(implode(', ', array_reverse($where_am_i, true))) ?>';
3861 3862
 				geocoder.geocode({'address': address}, addAddressToMap);
3862 3863
 			}
3863 3864
 
@@ -3902,8 +3903,13 @@  discard block
 block discarded – undo
3902 3903
 				<td class="optionbox" colspan="2">
3903 3904
 					<input type="text" id="NEW_PLACE_LATI" name="NEW_PLACE_LATI" placeholder="<?php echo /* I18N: Measure of latitude/longitude */ I18N::translate('degrees') ?>" value="<?php echo abs($place_lati) ?>" size="20" onchange="updateMap();">
3904 3905
 					<select name="LATI_CONTROL" id="LATI_CONTROL" onchange="updateMap();">
3905
-						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected"; echo ">", I18N::translate('north') ?></option>
3906
-						<option value="PL_S" <?php if ($place_lati < 0) echo "selected"; echo ">", I18N::translate('south') ?></option>
3906
+						<option value="PL_N" <?php if ($place_lati >= 0) echo "selected";
3907
+}
3908
+echo ">", I18N::translate('north') ?></option>
3909
+						<option value="PL_S" <?php if ($place_lati < 0) {
3910
+	echo "selected";
3911
+}
3912
+echo ">", I18N::translate('south') ?></option>
3907 3913
 					</select>
3908 3914
 				</td>
3909 3915
 			</tr>
@@ -3912,8 +3918,14 @@  discard block
 block discarded – undo
3912 3918
 				<td class="optionbox" colspan="2">
3913 3919
 					<input type="text" id="NEW_PLACE_LONG" name="NEW_PLACE_LONG" placeholder="<?php echo I18N::translate('degrees') ?>" value="<?php echo abs($place_long) ?>" size="20" onchange="updateMap();">
3914 3920
 					<select name="LONG_CONTROL" id="LONG_CONTROL" onchange="updateMap();">
3915
-						<option value="PL_E" <?php if ($place_long >= 0) echo "selected"; echo ">", I18N::translate('east') ?></option>
3916
-						<option value="PL_W" <?php if ($place_long < 0) echo "selected"; echo ">", I18N::translate('west') ?></option>
3921
+						<option value="PL_E" <?php if ($place_long >= 0) {
3922
+	echo "selected";
3923
+}
3924
+echo ">", I18N::translate('east') ?></option>
3925
+						<option value="PL_W" <?php if ($place_long < 0) {
3926
+	echo "selected";
3927
+}
3928
+echo ">", I18N::translate('west') ?></option>
3917 3929
 					</select>
3918 3930
 				</td>
3919 3931
 			</tr>
Please login to merge, or discard this patch.