jon48 / webtrees-lib

src/Webtrees/Module/GeoDispersion/Model/GeoAnalysis.php

Indentation +175 added lines, -175 removed lines

@@ -25,64 +25,64 @@ 
 	 * Geo Analysis ID
 	 * @var int $id
 	 */
-    protected $id;
+	protected $id;
     
 	/**
 	 * Geo Analysis Title
 	 * @var string $title
 	 */
-    protected $title;
+	protected $title;
     
 	/**
 	 * Level of the Gedcom hierarchy for the analysis
 	 * @var int $analysis_level
 	 */
-    protected $analysis_level;
+	protected $analysis_level;
     
-    /**
-     * Display options
-     * @var GeoDisplayOptions $options
-     */
-    protected $options;
+	/**
+	 * Display options
+	 * @var GeoDisplayOptions $options
+	 */
+	protected $options;
     
-    /**
-     * Reference tree
-     * @var Tree $tree
-     */
-    protected $tree;
+	/**
+	 * Reference tree
+	 * @var Tree $tree
+	 */
+	protected $tree;
     
-    /**
-     * Is the analysis enabled
-     * @var bool $enabled
-     */
-    protected $enabled;
+	/**
+	 * Is the analysis enabled
+	 * @var bool $enabled
+	 */
+	protected $enabled;
     
-    /**
-     * Constructor for GeoAnalysis.
-     *
-     * @param Tree $tree Reference tree
+	/**
+	 * Constructor for GeoAnalysis.
+	 *
+	 * @param Tree $tree Reference tree
 	 * @param int $id GeoAnalysis ID
 	 * @param string $title GeoAnalysis title
 	 * @param int $analysis_level Analysis level
 	 * @param (GeoDisplayOptions|null) $options Display options
 	 * @param bool $enabled Is analysis enabled
-     */
-    public function __construct(Tree $tree, $id, $title, $analysis_level, GeoDisplayOptions $options = null, $enabled = true) {
-        $this->tree = $tree;
-        $this->id = $id;
-        $this->title = $title;
-        $this->analysis_level = $analysis_level;
-        $this->options = $options;
-        $this->enabled = $enabled;
-    }
+	 */
+	public function __construct(Tree $tree, $id, $title, $analysis_level, GeoDisplayOptions $options = null, $enabled = true) {
+		$this->tree = $tree;
+		$this->id = $id;
+		$this->title = $title;
+		$this->analysis_level = $analysis_level;
+		$this->options = $options;
+		$this->enabled = $enabled;
+	}
     
 	/**
 	 * Get the analysis title
 	 * @return string
 	 */
-    public function getTitle() {
-        return $this->title;
-    }
+	public function getTitle() {
+		return $this->title;
+	}
     
 	/**
 	 * Set the analysis title
@@ -90,53 +90,53 @@ 
 	 * @param string $title
 	 * @return self Enable method-chaining
 	 */
-    public function setTitle($title) {
-        $this->title = $title;
-        return $this;
-    }
+	public function setTitle($title) {
+		$this->title = $title;
+		return $this;
+	}
     
 	/**
 	 * Get the analysis ID
 	 * @return int
 	 */
-    public function getId() {
-        return $this->id;
-    }
+	public function getId() {
+		return $this->id;
+	}
     
 	/**
 	 * Get the analysis status (enabled/disabled)
 	 * @return bool
 	 */
-    public function isEnabled() {
-        return $this->enabled;
-    }
+	public function isEnabled() {
+		return $this->enabled;
+	}
     
-    /**
-     * Get analysis options
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions
-     */
-    public function getOptions() {
-        return $this->options;
-    }
+	/**
+	 * Get analysis options
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions
+	 */
+	public function getOptions() {
+		return $this->options;
+	}
     
 	/**
-     * Set analysis options
+	 * Set analysis options
 	 *
-     * @param \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions $options
+	 * @param \MyArtJaub\Webtrees\Module\GeoDispersion\Model\GeoDisplayOptions $options
 	 * @return self Enable method-chaining
-     */
-    public function setOptions(GeoDisplayOptions $options) {
-        $this->options = $options;
-        return $this;
-    }
+	 */
+	public function setOptions(GeoDisplayOptions $options) {
+		$this->options = $options;
+		return $this;
+	}
     
 	/**
 	 * Get analysis level
 	 * @return int
 	 */
-    public function getAnalysisLevel() {
-        return $this->analysis_level;
-    }
+	public function getAnalysisLevel() {
+		return $this->analysis_level;
+	}
     
 	/**
 	 * Get analysis level
@@ -144,19 +144,19 @@ 
 	 * @param int $analysis_level
 	 * @return self Enable method-chaining
 	 */
-    public function setAnalysisLevel($analysis_level) {
-        $this->analysis_level = $analysis_level;
-        return $this;
-    }
+	public function setAnalysisLevel($analysis_level) {
+		$this->analysis_level = $analysis_level;
+		return $this;
+	}
     
 	/**
 	 * Check whether the analysis has a linked map
 	 *
 	 * @return bool
 	 */
-    public function hasMap() {
-        return $this->options && $this->options->getMap();
-    }
+	public function hasMap() {
+		return $this->options && $this->options->getMap();
+	}
     
 	/**
 	 * Get the URL for the GeoAnalysis.
@@ -164,117 +164,117 @@ 
 	 * @return string
 	 */
 	 public function getHtmlUrl() {
-        return 'module.php?mod='. Constants::MODULE_MAJ_GEODISP_NAME . '&mod_action=GeoAnalysis&ga_id=' . $this->getId() . '&ged=' . $this->tree->getNameUrl();
-    }
+		return 'module.php?mod='. Constants::MODULE_MAJ_GEODISP_NAME . '&mod_action=GeoAnalysis&ga_id=' . $this->getId() . '&ged=' . $this->tree->getNameUrl();
+	}
     
-    /**
-     * Return the dispersion analysis tables.
-     * Two arrays are returned :
-     * 	- the General analysis, which returns the number of ancestors for each place found, plus 4 additional indicators :
-     * 		- knownsum : Number of known places
-     * 		- unknown : Number of unknown places
-     * 		- max : Maximum count of ancestors within a place
-     * 		- other : Other places (not in the top level area)
-     * - the Generations analysis, which returns the number of ancestors for each place found for each generation, plus 3 additional indicators within each generation :
-     * 		- sum : Number of known places
-     * 		- unknown : Number of unknown places
-     * 		- other : Other places (not in the top level area)
-     *
-     * @param array $sosalist List of all sosas
-     * @return array Array of the general and generations table
-     */
-    public function getAnalysisResults($sosalist) {
-        $placesDispGeneral = null;
-        $placesDispGenerations = null;
+	/**
+	 * Return the dispersion analysis tables.
+	 * Two arrays are returned :
+	 * 	- the General analysis, which returns the number of ancestors for each place found, plus 4 additional indicators :
+	 * 		- knownsum : Number of known places
+	 * 		- unknown : Number of unknown places
+	 * 		- max : Maximum count of ancestors within a place
+	 * 		- other : Other places (not in the top level area)
+	 * - the Generations analysis, which returns the number of ancestors for each place found for each generation, plus 3 additional indicators within each generation :
+	 * 		- sum : Number of known places
+	 * 		- unknown : Number of unknown places
+	 * 		- other : Other places (not in the top level area)
+	 *
+	 * @param array $sosalist List of all sosas
+	 * @return array Array of the general and generations table
+	 */
+	public function getAnalysisResults($sosalist) {
+		$placesDispGeneral = null;
+		$placesDispGenerations = null;
         
-        if($sosalist && count($sosalist) > 0) {
-            $placesDispGeneral['knownsum'] = 0;
-            $placesDispGeneral['unknown'] = 0;
-            $placesDispGeneral['max'] = 0;
-            $placesDispGeneral['places'] = array();
-            foreach($sosalist as $sosaid => $gens) {
-                $sosa = Individual::getIntance($sosaid, $this->tree);
-                $place =$sosa->getSignificantPlace();
-                $genstab = explode(',', $gens);
-                $isUnknown=true;
-                if($sosa->getDerivedRecord()->canShow() && !is_null($place)){
-                    $levels = array_reverse(array_map('trim',explode(',', $place)));
-                    if(count($levels)>= $this->analysis_level){                        
-                        $toplevelvalues = array();
-                        if($this->hasMap() && $toplevelvalue = $this->options->getMap()->getTopLevelName()) {
-                            $toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
-                        }
-                        if(!$this->hasMap() 
-                            || is_null($this->options->getMapLevel()) 
-                            || $this->options->getMap()->getTopLevelName() == '*' 
-                            || (
-                                $this->options->getMapLevel() <= $this->analysis_level 
-                                && $this->options->getMapLevel() > 0
-                                && count($levels) >= $this->options->getMapLevel()
-                                && in_array(strtolower($levels[$this->options->getMapLevel()-1]), $toplevelvalues)
-                            )
-                        ) {
-                            $placest = implode(I18N::$list_separator, array_slice($levels, 0, $this->analysis_level));
-                            if(isset($placesDispGeneral['places'][$placest])) {
-                                $placesDispGeneral['places'][$placest] += 1;
-                            }
-                            else { 
-                                $placesDispGeneral['places'][$placest] = 1;
-                            }
-                            if($placesDispGeneral['places'][$placest]>$placesDispGeneral['max'])
-                                $placesDispGeneral['max'] = $placesDispGeneral['places'][$placest];
-                            foreach($genstab as $gen) {
-                                if(isset($placesDispGenerations[$gen]['places'][$placest])) {
-                                    $placesDispGenerations[$gen]['places'][$placest] += 1;
-                                }
-                                else { 
-                                    $placesDispGenerations[$gen]['places'][$placest] = 1;
-                                }
-                                if(isset($placesDispGenerations[$gen]['sum'])) {
-                                    $placesDispGenerations[$gen]['sum'] += 1;
-                                }
-                                else { 
-                                    $placesDispGenerations[$gen]['sum'] = 1;
-                                }
-                            }
-                        }
-                        else{
-                            if(isset($placesDispGeneral['other'])) {
-                                $placesDispGeneral['other'] += 1;
-                            }
-                            else { 
-                                $placesDispGeneral['other'] = 1;
-                            }
-                            foreach($genstab as $gen) {
-                                if(isset($placesDispGenerations[$gen]['other'])) {
-                                    $placesDispGenerations[$gen]['other'] += 1;
-                                }
-                                else { 
-                                    $placesDispGenerations[$gen]['other'] = 1;
-                                }
-                            }
-                        }
-                        $placesDispGeneral['knownsum'] += 1;
-                        $isUnknown = false;
-                    }
-                }
-                if($isUnknown){
-                    $placesDispGeneral['unknown'] += 1;
-                    foreach($genstab as $gen) {
-                        if(isset($placesDispGenerations[$gen]['unknown'])) { 
-                            $placesDispGenerations[$gen]['unknown'] += 1;
-                        }
-                        else { 
-                            $placesDispGenerations[$gen]['unknown'] = 1; 
-                        }
-                    }
-                }
-            }
+		if($sosalist && count($sosalist) > 0) {
+			$placesDispGeneral['knownsum'] = 0;
+			$placesDispGeneral['unknown'] = 0;
+			$placesDispGeneral['max'] = 0;
+			$placesDispGeneral['places'] = array();
+			foreach($sosalist as $sosaid => $gens) {
+				$sosa = Individual::getIntance($sosaid, $this->tree);
+				$place =$sosa->getSignificantPlace();
+				$genstab = explode(',', $gens);
+				$isUnknown=true;
+				if($sosa->getDerivedRecord()->canShow() && !is_null($place)){
+					$levels = array_reverse(array_map('trim',explode(',', $place)));
+					if(count($levels)>= $this->analysis_level){                        
+						$toplevelvalues = array();
+						if($this->hasMap() && $toplevelvalue = $this->options->getMap()->getTopLevelName()) {
+							$toplevelvalues = array_map('trim',explode(',', strtolower($toplevelvalue)));
+						}
+						if(!$this->hasMap() 
+							|| is_null($this->options->getMapLevel()) 
+							|| $this->options->getMap()->getTopLevelName() == '*' 
+							|| (
+								$this->options->getMapLevel() <= $this->analysis_level 
+								&& $this->options->getMapLevel() > 0
+								&& count($levels) >= $this->options->getMapLevel()
+								&& in_array(strtolower($levels[$this->options->getMapLevel()-1]), $toplevelvalues)
+							)
+						) {
+							$placest = implode(I18N::$list_separator, array_slice($levels, 0, $this->analysis_level));
+							if(isset($placesDispGeneral['places'][$placest])) {
+								$placesDispGeneral['places'][$placest] += 1;
+							}
+							else { 
+								$placesDispGeneral['places'][$placest] = 1;
+							}
+							if($placesDispGeneral['places'][$placest]>$placesDispGeneral['max'])
+								$placesDispGeneral['max'] = $placesDispGeneral['places'][$placest];
+							foreach($genstab as $gen) {
+								if(isset($placesDispGenerations[$gen]['places'][$placest])) {
+									$placesDispGenerations[$gen]['places'][$placest] += 1;
+								}
+								else { 
+									$placesDispGenerations[$gen]['places'][$placest] = 1;
+								}
+								if(isset($placesDispGenerations[$gen]['sum'])) {
+									$placesDispGenerations[$gen]['sum'] += 1;
+								}
+								else { 
+									$placesDispGenerations[$gen]['sum'] = 1;
+								}
+							}
+						}
+						else{
+							if(isset($placesDispGeneral['other'])) {
+								$placesDispGeneral['other'] += 1;
+							}
+							else { 
+								$placesDispGeneral['other'] = 1;
+							}
+							foreach($genstab as $gen) {
+								if(isset($placesDispGenerations[$gen]['other'])) {
+									$placesDispGenerations[$gen]['other'] += 1;
+								}
+								else { 
+									$placesDispGenerations[$gen]['other'] = 1;
+								}
+							}
+						}
+						$placesDispGeneral['knownsum'] += 1;
+						$isUnknown = false;
+					}
+				}
+				if($isUnknown){
+					$placesDispGeneral['unknown'] += 1;
+					foreach($genstab as $gen) {
+						if(isset($placesDispGenerations[$gen]['unknown'])) { 
+							$placesDispGenerations[$gen]['unknown'] += 1;
+						}
+						else { 
+							$placesDispGenerations[$gen]['unknown'] = 1; 
+						}
+					}
+				}
+			}
            
-        }        
+		}        
         
-        return array($placesDispGeneral, $placesDispGenerations);        
-    }
+		return array($placesDispGeneral, $placesDispGenerations);        
+	}
     
                    
 }

src/Webtrees/Module/GeoDispersion/Model/OutlineMap.php

Indentation +124 added lines, -124 removed lines

@@ -21,175 +21,175 @@
 	 * Name of the file containing the description of the map.
 	 * @var string $filename
 	 */
-    protected $filename;
+	protected $filename;
     
 	/**
 	 * Indicates whether the description has been loaded from the file.
 	 * @var bool $is_loaded
 	 */
-    protected $is_loaded;
+	protected $is_loaded;
     
 	/**
 	 * Description/title of the map.
 	 * @var string $description
 	 */
-    protected $description;
+	protected $description;
     
 	/**
 	 * Name(s) of the parent level(s) of the map.
 	 * @var string $is_loaded
 	 */
-    protected $top_level_name;
+	protected $top_level_name;
     
-    /**
-     * Map canvas
-     * @var OutlineMapCanvas $canvas
-     */
-    protected $canvas;
+	/**
+	 * Map canvas
+	 * @var OutlineMapCanvas $canvas
+	 */
+	protected $canvas;
     
-    /**
-     * Map subdivisions
-     * @var array $subdivisions
-     */
-    protected $subdivisions;
+	/**
+	 * Map subdivisions
+	 * @var array $subdivisions
+	 */
+	protected $subdivisions;
     
-    /**
-     * Places mappings
-     * @var array $subdivisions
-     */
-    protected $mappings;
+	/**
+	 * Places mappings
+	 * @var array $subdivisions
+	 */
+	protected $mappings;
     
-    /**
-     * Constructor for GeoAnalysisMap.
-     *
-     * @param string $filename Outline map file name
-     * @param bool $load Should the map be loaded immediately
-     */
-    public function __construct($filename, $load = false) {
-        $this->filename = $filename;
-        $this->is_loaded = false;
-        $this->subdivisions = array();
-        $this->mappings = array();
-        if($load) $this->load();
-    }
+	/**
+	 * Constructor for GeoAnalysisMap.
+	 *
+	 * @param string $filename Outline map file name
+	 * @param bool $load Should the map be loaded immediately
+	 */
+	public function __construct($filename, $load = false) {
+		$this->filename = $filename;
+		$this->is_loaded = false;
+		$this->subdivisions = array();
+		$this->mappings = array();
+		if($load) $this->load();
+	}
     
-    /**
-     * Load the map settings contained within its XML representation
-     *
-     * XML structure :
-     * 	- displayName : Display name of the map
-     * 	- topLevel : Values of the top level subdivisions (separated by commas, if multiple)
-     * 	- canvas : all settings related to the map canvas.
-     * 		- width : canvas width, in px
-     * 		- height : canvas height, in px
-     * 		- maxcolor : color to identify places with ancestors, RGB hexadecimal
-     * 		- hovercolor : same as previous, color when mouse is hovering the place, RGB hexadecimal
-     * 		- bgcolor : map background color, RGB hexadecimal
-     * 		- bgstroke : map stroke color, RGB hexadecimal
-     * 		- defaultcolor : default color of places, RGB hexadecimal
-     * 		- defaultstroke : default stroke color, RGB hexadecimal
-     * 	- subdvisions : for each subdivision :
+	/**
+	 * Load the map settings contained within its XML representation
+	 *
+	 * XML structure :
+	 * 	- displayName : Display name of the map
+	 * 	- topLevel : Values of the top level subdivisions (separated by commas, if multiple)
+	 * 	- canvas : all settings related to the map canvas.
+	 * 		- width : canvas width, in px
+	 * 		- height : canvas height, in px
+	 * 		- maxcolor : color to identify places with ancestors, RGB hexadecimal
+	 * 		- hovercolor : same as previous, color when mouse is hovering the place, RGB hexadecimal
+	 * 		- bgcolor : map background color, RGB hexadecimal
+	 * 		- bgstroke : map stroke color, RGB hexadecimal
+	 * 		- defaultcolor : default color of places, RGB hexadecimal
+	 * 		- defaultstroke : default stroke color, RGB hexadecimal
+	 * 	- subdvisions : for each subdivision :
 	 *		- id : Subdivision id, must be compatible with PHP variable constraints, and unique
-     * 		- name: Display name for the place
+	 * 		- name: Display name for the place
 	 *		- parent: if any, describe to which parent level the place if belonging to
-     * 		- <em>Element value<em> : SVG description of the subdvision shape
+	 * 		- <em>Element value<em> : SVG description of the subdvision shape
 	 *	- mapping : for each subdivision :
 	 *		- name : Name of the place to map
-     * 		- mapto: Name of the place to map to
+	 * 		- mapto: Name of the place to map to
 	 * 
-     */
-    protected function load() {
-        if(file_exists(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename)){
-            $xml = simplexml_load_file(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename);
-            if($xml){
-                $this->description = trim($xml->displayName);
-                $this->top_level_name = trim($xml->topLevel);
-                $this->canvas = new OutlineMapCanvas(
-                    trim($xml->canvas->width),
-                    trim($xml->canvas->height), 
-                    trim($xml->canvas->maxcolor), 
-                    trim($xml->canvas->hovercolor), 
-                    trim($xml->canvas->bgcolor),
-                    trim($xml->canvas->bgstroke),
-                    trim($xml->canvas->defaultcolor), 
-                    trim($xml->canvas->defaultstroke)
-                );
-                foreach($xml->subdivisions->children() as $subdivision){
-                    $attributes = $subdivision->attributes();
-                    $key = trim($attributes['name']);
-                    if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
-                    $this->subdivisions[$key] = array(
-                        'id' => trim($attributes['id']),
-                        'displayname' => trim($attributes['name']),
-                        'coord' => trim($subdivision[0])
-                    );
-                }
-                if(isset($xml->mappings)) {
-                    foreach($xml->mappings->children() as $mappings){
-                        $attributes = $mappings->attributes();
-                        $this->mappings[trim($attributes['name'])] = trim($attributes['mapto']);
-                    }
-                }
-                $this->is_loaded = true;
-                return;
-            }
-        }        
-        throw new \Exception('The Outline Map could not be loaded from XML.');
-    }
+	 */
+	protected function load() {
+		if(file_exists(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename)){
+			$xml = simplexml_load_file(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename);
+			if($xml){
+				$this->description = trim($xml->displayName);
+				$this->top_level_name = trim($xml->topLevel);
+				$this->canvas = new OutlineMapCanvas(
+					trim($xml->canvas->width),
+					trim($xml->canvas->height), 
+					trim($xml->canvas->maxcolor), 
+					trim($xml->canvas->hovercolor), 
+					trim($xml->canvas->bgcolor),
+					trim($xml->canvas->bgstroke),
+					trim($xml->canvas->defaultcolor), 
+					trim($xml->canvas->defaultstroke)
+				);
+				foreach($xml->subdivisions->children() as $subdivision){
+					$attributes = $subdivision->attributes();
+					$key = trim($attributes['name']);
+					if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
+					$this->subdivisions[$key] = array(
+						'id' => trim($attributes['id']),
+						'displayname' => trim($attributes['name']),
+						'coord' => trim($subdivision[0])
+					);
+				}
+				if(isset($xml->mappings)) {
+					foreach($xml->mappings->children() as $mappings){
+						$attributes = $mappings->attributes();
+						$this->mappings[trim($attributes['name'])] = trim($attributes['mapto']);
+					}
+				}
+				$this->is_loaded = true;
+				return;
+			}
+		}        
+		throw new \Exception('The Outline Map could not be loaded from XML.');
+	}
     
 	/**
 	 * Get the map file name.
 	 * @return string
 	 */
-    public function getFileName() {
-        if(!$this->is_loaded) $this->load();
-        return $this->filename;
-    }
+	public function getFileName() {
+		if(!$this->is_loaded) $this->load();
+		return $this->filename;
+	}
     
 	/**
 	 * Get the map file name.
 	 * @return string
 	 */
-    public function getDescription() {
-        if(!$this->is_loaded) $this->load();
-        return $this->description;
-    }
+	public function getDescription() {
+		if(!$this->is_loaded) $this->load();
+		return $this->description;
+	}
     
 	/**
 	 * Get the name of the map parent level. 
 	 * @return string
 	 */
-    public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
-        return $this->top_level_name;
-    }    
+	public function getTopLevelName() {
+		if(!$this->is_loaded) $this->load();
+		return $this->top_level_name;
+	}    
     
-    /**
-     * Get the Outline Map canvas.
-     * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
-     */
-    public function getCanvas() {
-        if(!$this->is_loaded) $this->load();
-        return $this->canvas;
-    }
+	/**
+	 * Get the Outline Map canvas.
+	 * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
+	 */
+	public function getCanvas() {
+		if(!$this->is_loaded) $this->load();
+		return $this->canvas;
+	}
     
 	/**
-     * Get the subdivisions of the map.
-     * @return array
-     */
-    public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
-        return $this->subdivisions;
-    }
+	 * Get the subdivisions of the map.
+	 * @return array
+	 */
+	public function getSubdivisions() {
+		if(!$this->is_loaded) $this->load();
+		return $this->subdivisions;
+	}
     
 	/**
-     * Get the places mappings of the map.
-     * @return array
-     */
-    public function getPlacesMappings() {
-        if(!$this->is_loaded) $this->load();
-        return $this->mappings;
-    }
+	 * Get the places mappings of the map.
+	 * @return array
+	 */
+	public function getPlacesMappings() {
+		if(!$this->is_loaded) $this->load();
+		return $this->mappings;
+	}
                    
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Schema/Migration0.php

Indentation +12 added lines, -12 removed lines

@@ -24,18 +24,18 @@
 	 */
 	public function upgrade() {
 		Database::exec(
-            'CREATE TABLE IF NOT EXISTS `##maj_geodispersion` ('.
-            ' majgd_id       	INTEGER AUTO_INCREMENT NOT NULL,'.
-            ' majgd_file      	INTEGER 	 		NOT NULL,'.
-            ' majgd_descr		VARCHAR(70)			NOT NULL,'.
-            ' majgd_sublevel	TINYINT				NOT NULL,'.
-            ' majgd_map			VARCHAR(70)			NULL,'.
-            ' majgd_toplevel	TINYINT				NULL,'.
-            ' majgd_status      ENUM(\'enabled\', \'disabled\') NOT NULL DEFAULT \'enabled\','.
-            ' majgd_useflagsgen	ENUM(\'yes\', \'no\') NOT NULL DEFAULT \'no\','.
-            ' majgd_detailsgen	TINYINT				NOT NULL DEFAULT 0,'.
-            ' PRIMARY KEY (majgd_id)'.
-            ') COLLATE utf8_unicode_ci ENGINE=InnoDB'
+			'CREATE TABLE IF NOT EXISTS `##maj_geodispersion` ('.
+			' majgd_id       	INTEGER AUTO_INCREMENT NOT NULL,'.
+			' majgd_file      	INTEGER 	 		NOT NULL,'.
+			' majgd_descr		VARCHAR(70)			NOT NULL,'.
+			' majgd_sublevel	TINYINT				NOT NULL,'.
+			' majgd_map			VARCHAR(70)			NULL,'.
+			' majgd_toplevel	TINYINT				NULL,'.
+			' majgd_status      ENUM(\'enabled\', \'disabled\') NOT NULL DEFAULT \'enabled\','.
+			' majgd_useflagsgen	ENUM(\'yes\', \'no\') NOT NULL DEFAULT \'no\','.
+			' majgd_detailsgen	TINYINT				NOT NULL DEFAULT 0,'.
+			' PRIMARY KEY (majgd_id)'.
+			') COLLATE utf8_unicode_ci ENGINE=InnoDB'
 		);
 	}
 }

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisEditView.php

Indentation +7 added lines, -7 removed lines

@@ -25,14 +25,14 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var GeoAnalysis $ga */
-        $ga = $this->data->get('geo_analysis');
-        $is_new = is_null($ga);
+		/** @var GeoAnalysis $ga */
+		$ga = $this->data->get('geo_analysis');
+		$is_new = is_null($ga);
         
-        $places_hierarchy = $this->data->get('places_hierarchy');
-        ?>        
+		$places_hierarchy = $this->data->get('places_hierarchy');
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -155,7 +155,7 @@ 
     	</form>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisView.php

Indentation +6 added lines, -6 removed lines

@@ -24,16 +24,16 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        ?>                
+	protected function renderContent() {        
+		?>                
         <div id="maj-geodisp-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
 			if($this->data->get('has_analysis', false)) { 
-			    /** @var GeoAnalysis $ga  */
-    		    $ga = $this->data->get('geoanalysis');
-    		?>
+				/** @var GeoAnalysis $ga  */
+				$ga = $this->data->get('geoanalysis');
+			?>
     		
     		<div id="geodispersion-panel">
     			<h3><?php echo $ga->getTitle() ?></h3>
@@ -66,7 +66,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisTabGeneralMapView.php

Indentation +27 added lines, -27 removed lines

@@ -25,17 +25,17 @@ 
 	 * {@inheritDoc}
 	 * @see \MyArtJaub\Webtrees\Module\GeoDispersion\Views\AbstractGeoAnalysisTabGeneralView::htmlAnalysisData()
 	 */
-    protected function htmlAnalysisData() {
+	protected function htmlAnalysisData() {
         
-        /** @var OutlineMap $map */
-        $map = $this->data->get('map');
-        $canvas = $map->getCanvas();
-        $subdvisions_results = $this->data->get('results_by_subdivisions');
+		/** @var OutlineMap $map */
+		$map = $this->data->get('map');
+		$canvas = $map->getCanvas();
+		$subdvisions_results = $this->data->get('results_by_subdivisions');
         
-        $nb_found = $this->data->get('stats_gen_nb_found');
-        $nb_other = $this->data->get('stats_gen_nb_other');
+		$nb_found = $this->data->get('stats_gen_nb_found');
+		$nb_other = $this->data->get('stats_gen_nb_other');
         
-        $html = '<script>
+		$html = '<script>
 			var tip = null;
 			var tipText = "";
 			var over = false;
@@ -82,29 +82,29 @@ 
 				var map = {};
 		';
         
-        foreach($subdvisions_results as $name => $location){
-            $html.= 'map.area'.$location['id'].' = paper.path("'.$location['coord'].'").attr(attr);';
-            if(isset($location['transparency'])) {
-                $textToolTip = '<strong>'.$location['displayname'].'</strong><br/>';
-                if($this->data->get('use_flags') && $location['flag'] != '') $textToolTip .= '<span class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($location['place'], $location['flag']).'</span><br/>';
-                $textToolTip .= I18N::translate('%d individuals', $location['count']).'<br/>'.I18N::percentage(Functions::safeDivision($location['count'], $nb_found - $nb_other), 1);
-                $html.= 'addTip(map.area'.$location['id'].'.node, "'.Filter::escapeJs($textToolTip).'");';
-                $html.= 'map.area'.$location['id'].'.attr({"fill" : "'. $canvas->max_color .'", "fill-opacity" : '.$location['transparency'].' });';
-                $html.= 'map.area'.$location['id'].'.mouseover(function () {'.
-                    'map.area'.$location['id'].'.stop().animate({"fill" : "'. $canvas->hover_color .'", "fill-opacity" : 1}, 100, "linear");'.
-                    '});'.
-                    'map.area'.$location['id'].'.mouseout(function () {'.
-                    'map.area'.$location['id'].'.stop().animate({"fill" : "'.$canvas->max_color.'", "fill-opacity" : '.$location['transparency'].'}, 100, "linear");'.
-                    '});';
-            }
-        }
-        $html .= '});
+		foreach($subdvisions_results as $name => $location){
+			$html.= 'map.area'.$location['id'].' = paper.path("'.$location['coord'].'").attr(attr);';
+			if(isset($location['transparency'])) {
+				$textToolTip = '<strong>'.$location['displayname'].'</strong><br/>';
+				if($this->data->get('use_flags') && $location['flag'] != '') $textToolTip .= '<span class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($location['place'], $location['flag']).'</span><br/>';
+				$textToolTip .= I18N::translate('%d individuals', $location['count']).'<br/>'.I18N::percentage(Functions::safeDivision($location['count'], $nb_found - $nb_other), 1);
+				$html.= 'addTip(map.area'.$location['id'].'.node, "'.Filter::escapeJs($textToolTip).'");';
+				$html.= 'map.area'.$location['id'].'.attr({"fill" : "'. $canvas->max_color .'", "fill-opacity" : '.$location['transparency'].' });';
+				$html.= 'map.area'.$location['id'].'.mouseover(function () {'.
+					'map.area'.$location['id'].'.stop().animate({"fill" : "'. $canvas->hover_color .'", "fill-opacity" : 1}, 100, "linear");'.
+					'});'.
+					'map.area'.$location['id'].'.mouseout(function () {'.
+					'map.area'.$location['id'].'.stop().animate({"fill" : "'.$canvas->max_color.'", "fill-opacity" : '.$location['transparency'].'}, 100, "linear");'.
+					'});';
+			}
+		}
+		$html .= '});
             </script>
             
             <div id="geodispersion_map"></div>
     	   <div id="geodispersion_tip"></div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
 } 
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Views/AdminConfigView.php

Indentation +25 added lines, -25 removed lines

@@ -23,14 +23,14 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
+	protected function renderContent() {
         
-        /** @var Tree $tree  */
-        $tree = $this->data->get('tree');
-        $root_url = $this->data->get('root_url');
-        $other_trees = $this->data->get('other_trees');
-        $table_id = $this->data->get('table_id');
-        ?>        
+		/** @var Tree $tree  */
+		$tree = $this->data->get('tree');
+		$root_url = $this->data->get('root_url');
+		$other_trees = $this->data->get('other_trees');
+		$table_id = $this->data->get('table_id');
+		?>        
         <ol class="breadcrumb small">
         	<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -63,23 +63,23 @@ 
 		<p>
 		<?php $places_hierarchy = $this->data->get('places_hierarchy'); 
 		if($places_hierarchy) {
-		    switch ($places_hierarchy['type']) {
-		        case 'header':
-		            echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
-		            break;
-		        case 'data':
-		            echo I18N::translate('Your GEDCOM header does not contain any indication of place structure.').
-		            '<br/>'.
-		            I18N::translate('Here is an example of your place data: ');
-		            break;
-		        default:
-		            break;
-		    }
-		    $str_hierarchy = array();
-		    foreach($places_hierarchy['hierarchy'] as $key => $level) {
-		        $str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
-		    }
-		    echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
+			switch ($places_hierarchy['type']) {
+				case 'header':
+					echo I18N::translate('According to the GEDCOM header, the places within your file follows the structure: ');
+					break;
+				case 'data':
+					echo I18N::translate('Your GEDCOM header does not contain any indication of place structure.').
+					'<br/>'.
+					I18N::translate('Here is an example of your place data: ');
+					break;
+				default:
+					break;
+			}
+			$str_hierarchy = array();
+			foreach($places_hierarchy['hierarchy'] as $key => $level) {
+				$str_hierarchy[] = I18N::translate('(%d) %s', $key + 1, $level);
+			}
+			echo '<strong>' . implode(I18N::$list_separator, $str_hierarchy) . '</strong>';
 		}
 		?>
 		</p>
@@ -109,7 +109,7 @@ 
         </a>
 		
 		<?php        
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Views/GeoAnalysisListView.php

Indentation +5 added lines, -5 removed lines

@@ -23,15 +23,15 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {        
-        ?>                
+	protected function renderContent() {        
+		?>                
         <div id="maj-geodisp-list-page" class="center">
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
 			if($this->data->get('has_list', false)) { 
-    		    $galist = $this->data->get('geoanalysislist');
-    		?>
+				$galist = $this->data->get('geoanalysislist');
+			?>
     		
     		<p class="center"><?php echo I18N::translate('Choose a geographical dispersion analysis:'); ?><p>
 			
@@ -58,7 +58,7 @@ 
     	</div>
     	
     	<?php 
-    }
+	}
     
 }
  
\ No newline at end of file

src/Webtrees/Module/GeoDispersion/Views/AbstractGeoAnalysisTabGeneralView.php

Indentation +15 added lines, -15 removed lines

@@ -25,27 +25,27 @@ 
 	 * {@inhericDoc}
 	 * @see \MyArtJaub\Webtrees\Mvc\View\AbstractView::renderContent()
 	 */
-    protected function renderContent() {
-        $nb_found = $this->data->get('stats_gen_nb_found');
-        $nb_other = $this->data->get('stats_gen_nb_other');
-        $nb_unknown = $this->data->get('stats_gen_nb_unknown');
-        $perc_known = Functions::safeDivision($nb_found - $nb_other, $nb_found + $nb_unknown);
+	protected function renderContent() {
+		$nb_found = $this->data->get('stats_gen_nb_found');
+		$nb_other = $this->data->get('stats_gen_nb_other');
+		$nb_unknown = $this->data->get('stats_gen_nb_unknown');
+		$perc_known = Functions::safeDivision($nb_found - $nb_other, $nb_found + $nb_unknown);
 
-        $html = '<div id="geodispersion_summary">
+		$html = '<div id="geodispersion_summary">
         	<div class="maj-table center">
         		<div class="maj-row">
         			<div class="label">' . I18N::translate('Places found'). '</div>
         			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_found - $nb_other, I18N::percentage($perc_known)). '</div>
         		</div>';
-        if($nb_other > 0){
-            $perc_other = Functions::safeDivision($nb_other, $nb_found + $nb_unknown);
-            $html .=
-        		'<div class="maj-row">
+		if($nb_other > 0){
+			$perc_other = Functions::safeDivision($nb_other, $nb_found + $nb_unknown);
+			$html .=
+				'<div class="maj-row">
         			<div class="label">' . I18N::translate('Other places'). '</div>
         			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_other, I18N::percentage($perc_other)). '</div>
         		</div>';
-        }
-        $html .= '<div class="maj-row">
+		}
+		$html .= '<div class="maj-row">
         			<div class="label">' . I18N::translate('Places not found'). '</div>
         			<div class="value">' . I18N::translate('%1$d (%2$s)',$nb_unknown, I18N::percentage(1 - $perc_known)). '</div>
         		</div>
@@ -56,8 +56,8 @@ 
 		' . $this->htmlAnalysisData(). '
 		</div>';
         
-        return $html;
-    }
+		return $html;
+	}
     
 	/**
 	 * Returns HTML code to display the analysis data, under the appropriate format.
@@ -65,7 +65,7 @@ 
 	 * @return string HTML Code for analysis display
 	 * @abstract
 	 */
-    protected abstract function htmlAnalysisData();        
+	protected abstract function htmlAnalysisData();        
     
 }
  
\ No newline at end of file