@@ -1120,24 +1120,24 @@ |
||
| 1120 | 1120 | if ($latlongval[$i] == $latlongval[$k]) { |
| 1121 | 1121 | $dups++; |
| 1122 | 1122 | switch ($dups) { |
| 1123 | - case 1: |
|
| 1124 | - $marker_number = $curgen . 'L'; |
|
| 1125 | - break; |
|
| 1126 | - case 2: |
|
| 1127 | - $marker_number = $curgen . 'R'; |
|
| 1128 | - break; |
|
| 1129 | - case 3: |
|
| 1130 | - $marker_number = $curgen . 'Ls'; |
|
| 1131 | - break; |
|
| 1132 | - case 4: |
|
| 1133 | - $marker_number = $curgen . 'Rs'; |
|
| 1134 | - break; |
|
| 1135 | - case 5: //adjust position where markers have same coodinates |
|
| 1136 | - default: |
|
| 1137 | - $marker_number = $curgen; |
|
| 1138 | - $lon[$i] += 0.0025; |
|
| 1139 | - $lat[$i] += 0.0025; |
|
| 1140 | - break; |
|
| 1123 | + case 1: |
|
| 1124 | + $marker_number = $curgen . 'L'; |
|
| 1125 | + break; |
|
| 1126 | + case 2: |
|
| 1127 | + $marker_number = $curgen . 'R'; |
|
| 1128 | + break; |
|
| 1129 | + case 3: |
|
| 1130 | + $marker_number = $curgen . 'Ls'; |
|
| 1131 | + break; |
|
| 1132 | + case 4: |
|
| 1133 | + $marker_number = $curgen . 'Rs'; |
|
| 1134 | + break; |
|
| 1135 | + case 5: //adjust position where markers have same coodinates |
|
| 1136 | + default: |
|
| 1137 | + $marker_number = $curgen; |
|
| 1138 | + $lon[$i] += 0.0025; |
|
| 1139 | + $lat[$i] += 0.0025; |
|
| 1140 | + break; |
|
| 1141 | 1141 | } |
| 1142 | 1142 | } |
| 1143 | 1143 | } |
@@ -38,12 +38,12 @@ |
||
| 38 | 38 | */ |
| 39 | 39 | public function generate(Individual $individual, Individual $head = null) { |
| 40 | 40 | switch ($individual->getSex()) { |
| 41 | - case 'M': |
|
| 42 | - return $this->male; |
|
| 43 | - case 'F': |
|
| 44 | - return $this->female; |
|
| 45 | - default: |
|
| 46 | - return ''; |
|
| 41 | + case 'M': |
|
| 42 | + return $this->male; |
|
| 43 | + case 'F': |
|
| 44 | + return $this->female; |
|
| 45 | + default: |
|
| 46 | + return ''; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | } |