DRY

6 files changed, 8 insertions, 11 deletions

diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php
index 26afd7046b..40d27e0522 100644
--- a/app/Census/AbstractCensusColumn.php
+++ b/app/Census/AbstractCensusColumn.php
@@ -61,7 +61,7 @@ class AbstractCensusColumn {
 	 *
 	 * @return string - e.g. "England"
 	 */
-	protected function country($place) {
+	protected function lastPartOfPlace($place) {
 		$place = explode(', ', $place);
 
 		return end($place);
diff --git a/app/Census/CensusColumnBirthPlaceSimple.php b/app/Census/CensusColumnBirthPlaceSimple.php
index 0a2af0dfd6..6bfcc429fd 100644
--- a/app/Census/CensusColumnBirthPlaceSimple.php
+++ b/app/Census/CensusColumnBirthPlaceSimple.php
@@ -31,9 +31,6 @@ class CensusColumnBirthPlaceSimple extends CensusColumnBirthPlace implements Cen
 	 * @return string
 	 */
 	public function generate(Individual $individual, Individual $head = null) {
-		$birth_place = parent::generate($individual, $head);
-		$tmp         = explode(', ', $birth_place);
-
-		return end($tmp);
+		return $this->lastPartOfPlace(parent::generate($individual, $head));
 	}
 }
diff --git a/app/Census/CensusColumnFatherBirthPlaceSimple.php b/app/Census/CensusColumnFatherBirthPlaceSimple.php
index 4df4d8566d..a16587bd79 100644
--- a/app/Census/CensusColumnFatherBirthPlaceSimple.php
+++ b/app/Census/CensusColumnFatherBirthPlaceSimple.php
@@ -21,7 +21,7 @@ use Fisharebest\Webtrees\Individual;
 /**
  * The individual's father's birth place.
  */
-class CensusColumnFatherBirthPlaceSimple extends CensusColumnBirthPlaceSimple implements CensusColumnInterface {
+class CensusColumnFatherBirthPlaceSimple extends CensusColumnFatherBirthPlace implements CensusColumnInterface {
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -31,6 +31,6 @@ class CensusColumnFatherBirthPlaceSimple extends CensusColumnBirthPlaceSimple im
 	 * @return string
 	 */
 	public function generate(Individual $individual, Individual $head = null) {
-		return parent::generate($this->father($individual), $head);
+		return $this->lastPartOfPlace(parent::generate($individual, $head));
 	}
 }
diff --git a/app/Census/CensusColumnFatherForeign.php b/app/Census/CensusColumnFatherForeign.php
index c77b0b70a7..0e8398787f 100644
--- a/app/Census/CensusColumnFatherForeign.php
+++ b/app/Census/CensusColumnFatherForeign.php
@@ -32,7 +32,7 @@ class CensusColumnFatherForeign extends AbstractCensusColumn implements CensusCo
 	public function generate(Individual $individual, Individual $head = null) {
 		$father = $this->father($individual);
 
-		if ($father && $this->country($father->getBirthPlace()) !== $this->place()) {
+		if ($father && $this->lastPartOfPlace($father->getBirthPlace()) !== $this->place()) {
 			return 'Y';
 		} else {
 			return '';
diff --git a/app/Census/CensusColumnMotherBirthPlaceSimple.php b/app/Census/CensusColumnMotherBirthPlaceSimple.php
index 2889cc6fd7..e87ef3d802 100644
--- a/app/Census/CensusColumnMotherBirthPlaceSimple.php
+++ b/app/Census/CensusColumnMotherBirthPlaceSimple.php
@@ -21,7 +21,7 @@ use Fisharebest\Webtrees\Individual;
 /**
  * The individual's mother's birth place.
  */
-class CensusColumnMotherBirthPlaceSimple extends CensusColumnBirthPlaceSimple implements CensusColumnInterface {
+class CensusColumnMotherBirthPlaceSimple extends CensusColumnMotherBirthPlace implements CensusColumnInterface {
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
@@ -31,6 +31,6 @@ class CensusColumnMotherBirthPlaceSimple extends CensusColumnBirthPlaceSimple im
 	 * @return string
 	 */
 	public function generate(Individual $individual, Individual $head = null) {
-		return parent::generate($this->mother($individual), $head);
+		return $this->lastPartOfPlace(parent::generate($individual, $head));
 	}
 }
diff --git a/app/Census/CensusColumnMotherForeign.php b/app/Census/CensusColumnMotherForeign.php
index 64a344c6a9..2fb05952f1 100644
--- a/app/Census/CensusColumnMotherForeign.php
+++ b/app/Census/CensusColumnMotherForeign.php
@@ -32,7 +32,7 @@ class CensusColumnMotherForeign extends AbstractCensusColumn implements CensusCo
 	public function generate(Individual $individual, Individual $head = null) {
 		$mother = $this->mother($individual);
 
-		if ($mother && $this->country($mother->getBirthPlace()) !== $this->place()) {
+		if ($mother && $this->lastPartOfPlace($mother->getBirthPlace()) !== $this->place()) {
 			return 'Y';
 		} else {
 			return '';