jon48 / webtrees-lib

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

Spacing +4 added lines, -4 removed lines

@@ -60,13 +60,13 @@
 							?>
 							<tr>
 								<td>
-									<input type="hidden" name="hook-<?php echo $hook->id;?>" value="yes" >
-									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status)=='enabled'); ?>
+									<input type="hidden" name="hook-<?php echo $hook->id; ?>" value="yes" >
+									<?php echo FunctionsEdit::twoStateCheckbox('status-'.($hook->id), ($hook->status) == 'enabled'); ?>
 								</td>
-								<td><?php echo (($hook->status)=='enabled'); ?></td>
+								<td><?php echo (($hook->status) == 'enabled'); ?></td>
 								<td><?php echo $hook->hook; ?></td>
 								<td><?php echo $hook->context; ?></td>
-								<td><?php if($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
+								<td><?php if ($mod = Module::getModuleByName($hook->module)) echo $mod->getTitle(); ?></td>
 								<td><input type="text" class="center" size="2" value="<?php echo $hook->priority; ?>" name="moduleorder-<?php echo $hook->id; ?>" /></td>
 								<td><?php echo $hook->priority; ?></td>
 							</tr>

src/Webtrees/Module/ModuleManager.php

Spacing +4 added lines, -4 removed lines

@@ -61,10 +61,10 @@
      * @see \MyArtJaub\Webtrees\Module\ModuleManagerInterface::isOperational()
      */
     public function isOperational($moduleName) {
-    	if(!array_key_exists($moduleName, $this->modules_list)) {
-    		if($module = fw\Module::getModuleByName($moduleName)) {
-    			if($module instanceof DependentInterface) {
-    				if($module->validatePrerequisites()) {
+    	if (!array_key_exists($moduleName, $this->modules_list)) {
+    		if ($module = fw\Module::getModuleByName($moduleName)) {
+    			if ($module instanceof DependentInterface) {
+    				if ($module->validatePrerequisites()) {
     					$this->modules_list[$moduleName] = TRUE;
     					return true;
     				} else {

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

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 	 *
      * @return (OutlineMap|null)
      */
-    public function getMap(){
+    public function getMap() {
         return $this->map;
     }
     
@@ -64,7 +64,7 @@ 
 	 *
 	 * @return int
 	 */
-    public function getMapLevel(){
+    public function getMapLevel() {
         return $this->map_level;
     }
     
@@ -84,7 +84,7 @@ 
 	 *
 	 * @return bool
 	 */
-    public function isUsingFlags(){
+    public function isUsingFlags() {
         return $this->use_flags;
     }
     
@@ -104,7 +104,7 @@ 
 	 *
 	 * @return int
 	 */
-    public function getMaxDetailsInGen(){
+    public function getMaxDetailsInGen() {
         return $this->max_details_in_gen;
     }
     

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

Spacing +24 added lines, -24 removed lines

@@ -164,7 +164,7 @@ 
 	 * @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();
     }
     
     /**
@@ -187,50 +187,50 @@ 
         $placesDispGeneral = null;
         $placesDispGenerations = null;
         
-        if($sosalist && count($sosalist) > 0) {
+        if ($sosalist && count($sosalist) > 0) {
             $placesDispGeneral['knownsum'] = 0;
             $placesDispGeneral['unknown'] = 0;
             $placesDispGeneral['max'] = 0;
             $placesDispGeneral['places'] = array();
-            foreach($sosalist as $sosaid => $gens) {
+            foreach ($sosalist as $sosaid => $gens) {
                 $sosa = Individual::getIntance($sosaid, $this->tree);
-                $place =$sosa->getSignificantPlace();
+                $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){                        
+                $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() && $toplevelvalue = $this->options->getMap()->getTopLevelName()) {
+                            $toplevelvalues = array_map('trim', explode(',', strtolower($toplevelvalue)));
                         }
-                        if(!$this->hasMap() 
+                        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)
+                                && 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])) {
+                            if (isset($placesDispGeneral['places'][$placest])) {
                                 $placesDispGeneral['places'][$placest] += 1;
                             }
                             else { 
                                 $placesDispGeneral['places'][$placest] = 1;
                             }
-                            if($placesDispGeneral['places'][$placest]>$placesDispGeneral['max'])
+                            if ($placesDispGeneral['places'][$placest] > $placesDispGeneral['max'])
                                 $placesDispGeneral['max'] = $placesDispGeneral['places'][$placest];
-                            foreach($genstab as $gen) {
-                                if(isset($placesDispGenerations[$gen]['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'])) {
+                                if (isset($placesDispGenerations[$gen]['sum'])) {
                                     $placesDispGenerations[$gen]['sum'] += 1;
                                 }
                                 else { 
@@ -238,15 +238,15 @@ 
                                 }
                             }
                         }
-                        else{
-                            if(isset($placesDispGeneral['other'])) {
+                        else {
+                            if (isset($placesDispGeneral['other'])) {
                                 $placesDispGeneral['other'] += 1;
                             }
                             else { 
                                 $placesDispGeneral['other'] = 1;
                             }
-                            foreach($genstab as $gen) {
-                                if(isset($placesDispGenerations[$gen]['other'])) {
+                            foreach ($genstab as $gen) {
+                                if (isset($placesDispGenerations[$gen]['other'])) {
                                     $placesDispGenerations[$gen]['other'] += 1;
                                 }
                                 else { 
@@ -258,10 +258,10 @@ 
                         $isUnknown = false;
                     }
                 }
-                if($isUnknown){
+                if ($isUnknown) {
                     $placesDispGeneral['unknown'] += 1;
-                    foreach($genstab as $gen) {
-                        if(isset($placesDispGenerations[$gen]['unknown'])) { 
+                    foreach ($genstab as $gen) {
+                        if (isset($placesDispGenerations[$gen]['unknown'])) { 
                             $placesDispGenerations[$gen]['unknown'] += 1;
                         }
                         else { 

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

Spacing +13 added lines, -13 removed lines

@@ -70,7 +70,7 @@ 
         $this->is_loaded = false;
         $this->subdivisions = array();
         $this->mappings = array();
-        if($load) $this->load();
+        if ($load) $this->load();
     }
     
     /**
@@ -99,9 +99,9 @@ 
 	 * 
      */
     protected function load() {
-        if(file_exists(WT_ROOT.WT_MODULES_DIR.Constants::MODULE_MAJ_GEODISP_NAME.'/maps/'.$this->filename)){
+        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){
+            if ($xml) {
                 $this->description = trim($xml->displayName);
                 $this->top_level_name = trim($xml->topLevel);
                 $this->canvas = new OutlineMapCanvas(
@@ -114,18 +114,18 @@ 
                     trim($xml->canvas->defaultcolor), 
                     trim($xml->canvas->defaultstroke)
                 );
-                foreach($xml->subdivisions->children() as $subdivision){
+                foreach ($xml->subdivisions->children() as $subdivision) {
                     $attributes = $subdivision->attributes();
                     $key = trim($attributes['name']);
-                    if(isset($attributes['parent'])) $key .= '@'.trim($attributes['parent']);
+                    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){
+                if (isset($xml->mappings)) {
+                    foreach ($xml->mappings->children() as $mappings) {
                         $attributes = $mappings->attributes();
                         $this->mappings[trim($attributes['name'])] = trim($attributes['mapto']);
                     }
@@ -142,7 +142,7 @@ 
 	 * @return string
 	 */
     public function getFileName() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->filename;
     }
     
@@ -151,7 +151,7 @@ 
 	 * @return string
 	 */
     public function getDescription() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->description;
     }
     
@@ -160,7 +160,7 @@ 
 	 * @return string
 	 */
     public function getTopLevelName() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->top_level_name;
     }    
     
@@ -169,7 +169,7 @@ 
      * @return \MyArtJaub\Webtrees\Module\GeoDispersion\Model\OutlineMapCanvas
      */
     public function getCanvas() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->canvas;
     }
     
@@ -178,7 +178,7 @@ 
      * @return array
      */
     public function getSubdivisions() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->subdivisions;
     }
     
@@ -187,7 +187,7 @@ 
      * @return array
      */
     public function getPlacesMappings() {
-        if(!$this->is_loaded) $this->load();
+        if (!$this->is_loaded) $this->load();
         return $this->mappings;
     }
                    

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

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 		
 		<form class="form-horizontal" name="newform" method="post" role="form" action="<?php echo $this->data->get('save_url'); ?>" autocomplete="off">
     		<?php echo Filter::getCsrf(); ?>
-    		<?php if(!$is_new) { ?>
+    		<?php if (!$is_new) { ?>
     		<input type="hidden" name="ga_id" value="<?php echo $ga->getId(); ?>">
     		<?php } ?>
     
@@ -54,7 +54,7 @@ 
     				<?php echo I18N::translate('Description'); ?>
     			</label>
     			<div class="col-sm-9">
-    				<input class="form-control" type="text" id="description" name="description" required maxlength="70" <?php if(!$is_new) echo 'value="' . Filter::escapeHtml($ga->getTitle()) .'"'; ?> dir="auto">
+    				<input class="form-control" type="text" id="description" name="description" required maxlength="70" <?php if (!$is_new) echo 'value="'.Filter::escapeHtml($ga->getTitle()).'"'; ?> dir="auto">
     				<p class="small text-muted">
     					<?php echo I18N::translate('Description to be given to the geographical dispersion analysis. It will be used as the page title for it.'); ?>
     				</p>
@@ -97,7 +97,7 @@ 
         				<?php echo I18N::translate('Map'); ?>
         			</label>
         			<div class="col-sm-9">
-        				<?php echo FunctionsEdit::selectEditControl('map_file', $this->data->get('map_list') , null, $is_new || ! $ga->hasMap() ? '' : base64_encode($ga->getOptions()->getMap()->getFileName()), 'class="form-control"'); ?>
+        				<?php echo FunctionsEdit::selectEditControl('map_file', $this->data->get('map_list'), null, $is_new || !$ga->hasMap() ? '' : base64_encode($ga->getOptions()->getMap()->getFileName()), 'class="form-control"'); ?>
         				<p class="small text-muted">
         					<?php echo I18N::translate('Map outline to be used for the result display.'); ?>
         				</p>
@@ -110,7 +110,7 @@ 
         				<?php echo I18N::translate('Map parent level'); ?>
         			</label>
         			<div class="col-sm-9">
-        				<?php echo FunctionsEdit::selectEditControl('map_top_level', $places_hierarchy['hierarchy'], null, $is_new || ! $ga->hasMap() ? '' : $ga->getOptions()->getMapLevel() - 1, 'class="form-control"'); ?>
+        				<?php echo FunctionsEdit::selectEditControl('map_top_level', $places_hierarchy['hierarchy'], null, $is_new || !$ga->hasMap() ? '' : $ga->getOptions()->getMapLevel() - 1, 'class="form-control"'); ?>
         				<p class="small text-muted">
         					<?php echo I18N::translate('Subdivision level of the parent subdivision(s) represented by the map.'); ?><br />
         					<?php echo I18N::translate('For instance, if the map is intended to represent a country by county analysis, then the map parent level would be “Country”, and the analysis level would be “County”.'); ?>

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 			<h2><?php echo $this->data->get('title'); ?></h2>
 			
 			<?php
-			if($this->data->get('has_analysis', false)) { 
+			if ($this->data->get('has_analysis', false)) { 
 			    /** @var GeoAnalysis $ga  */
     		    $ga = $this->data->get('geoanalysis');
     		?>

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

Spacing +30 added lines, -31 removed lines

@@ -38,39 +38,38 @@ 
         '<div id="geodispersion_gen">
         	<table id="geodispersion_gentable" class="center">';
             
-        foreach($results_by_gen as $gen => $genData){
+        foreach ($results_by_gen as $gen => $genData) {
             $html .= 
             '<tr>
                 <td class="descriptionbox">' .
                     I18N::translate("Generation %s", I18N::number($gen)).
                     ($display_all_places ? '<br />' : ' ').
-                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']),1)) . 
+                    I18N::translate('(%s)', I18N::percentage(Functions::safeDivision($genData['sum'] + $genData['other'], $genData['sum'] + $genData['other'] + $genData['unknown']), 1)). 
                 '</td>
                  <td class="optionbox left">'.
                     ($display_all_places ? 
-                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) :
-                        $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
-                     ) .
+                        $this->htmlGenerationAllPlacesRow($genData, $analysis_level) : $this->htmlGenerationTopPlacesRow($genData, $analysis_level)
+                     ).
                 '</ditdv>
             </tr>';
         }       
         
-        $html.= 
+        $html .= 
             '</table>
             <div class="left">
-                <strong>' . I18N::translate('Interpretation help:') . '</strong>
+                <strong>' . I18N::translate('Interpretation help:').'</strong>
                 <br />'.
-                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.') . 
+                I18N::translate('<strong>Generation X (yy %%)</strong>: The percentage indicates the number of found places compared to the total number of ancestors in this generation.'). 
                 '<br />';
-        if(!is_null($max_details_gen) && $max_details_gen == 0){
+        if (!is_null($max_details_gen) && $max_details_gen == 0) {
             $html .= I18N::translate('<strong><em>Place</em> or <em>Flag</em> aa (bb %%)</strong>: The first number indicates the total number of ancestors born in this place, the percentage relates this count to the total number of found places. No percentage means it is less than 10%%.').'<br />';
             $html .= I18N::translate('If any, the darker area indicates the number of unknown places within the generation or places outside the analysed area, and its percentage compared to the number of ancestors. No percentage means it is less than 10%%.');
         }
-        else{
+        else {
             $html .= I18N::translate('<strong><em>Place</em> [aa - bb %%]</strong>: The first number indicates the total number of ancestors born in this place, the percentage compares this count to the total number of found places.').'<br />';
             $html .= I18N::translate('Only the %d more frequent places for each generation are displayed.', $max_details_gen);
         }
-        $html.= 
+        $html .= 
             '</div>
         </div>';
         
@@ -92,25 +91,25 @@ 
         
         $sum_gen = $data['sum'];
         $unknownother = $data['unknown'] + $data['other'];
-        foreach($data['places'] as $placename=> $dataplace){
-            $levels = array_map('trim',explode(',', $placename));
+        foreach ($data['places'] as $placename=> $dataplace) {
+            $levels = array_map('trim', explode(',', $placename));
             $content = '';
-            if(isset($dataplace['flag'])){
-                $content .= '<td class="geodispersion_flag">'. FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']) .'</td><td>';
+            if (isset($dataplace['flag'])) {
+                $content .= '<td class="geodispersion_flag">'.FunctionsPrint::htmlPlaceIcon($dataplace['place'], $dataplace['flag']).'</td><td>';
             }
-            else{
-                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span><br/>';
+            else {
+                $content .= '<td><span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level - 1].'</span><br/>';
             }
             $count = $dataplace['count'];
             $content .= I18N::number($count);
             $perc = Functions::safeDivision($count, $sum_gen + $unknownother);
-            $perc2= Functions::safeDivision($count, $sum_gen);
-            if($perc2>=0.1) 
-                $content.= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
+            $perc2 = Functions::safeDivision($count, $sum_gen);
+            if ($perc2 >= 0.1) 
+                $content .= '<br/><span class="small">('.I18N::percentage($perc2, 1).')</span>';
             $content .= '</td>';
                
             $html .= '
-                <td class="geodispersion_rowitem" width="'.max(round(100*$perc, 0),1).'%">
+                <td class="geodispersion_rowitem" width="'.max(round(100 * $perc, 0), 1).'%">
                     <table>
                         <tr>
                             <td>
@@ -123,11 +122,11 @@ 
                 </td>';
         }
         
-        if($unknownother>0){
-            $perc= Functions::safeDivision($unknownother, $sum_gen + $unknownother);
-            $html .='<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
-            if($perc>=0.1) $html.= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
-            $html .='</td>';
+        if ($unknownother > 0) {
+            $perc = Functions::safeDivision($unknownother, $sum_gen + $unknownother);
+            $html .= '<td class="geodispersion_unknownitem left" >'.I18N::number($unknownother);
+            if ($perc >= 0.1) $html .= '<br/><span class="small">('.I18N::percentage($perc, 1).')</span>';
+            $html .= '</td>';
         }
         
         $html .= 
@@ -148,12 +147,12 @@ 
         $sum_gen = $data['sum'];
         $other = $data['other'];
         
-        foreach($data['places'] as $placename => $count) {
-            if($placename != 'other'){
-                $levels = array_map('trim',explode(',', $placename));
-                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level-1].'</span>';
+        foreach ($data['places'] as $placename => $count) {
+            if ($placename != 'other') {
+                $levels = array_map('trim', explode(',', $placename));
+                $placename = '<span title="'.implode(I18N::$list_separator, array_reverse($levels)).'">'.$levels[$analysis_level - 1].'</span>';
             }
-            else{
+            else {
                 $placename = I18N::translate('Other places');
             }
             $tmp_places[] = I18N::translate('<strong>%s</strong> [%d - %s]', $placename, $count, I18N::percentage(Functions::safeDivision($count, $sum_gen + $other), 1));         	

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

Spacing +12 added lines, -12 removed lines

@@ -75,23 +75,23 @@
 				    }
 				});
 
-				var paper = new Raphael(document.getElementById("geodispersion_map"), '. $canvas->width .', '. $canvas->height .');
-				var background = paper.rect(0, 0, ' . $canvas->width . ', '. $canvas->height . ');
-				background.attr({"fill" : "'. $canvas->background_color .'", "stroke" : "'. $canvas->background_stroke .'", "stroke-width": 1, "stroke-linejoin": "round" });
-				var attr = { fill: "'. $canvas->default_color .'", stroke: "'. $canvas->default_stroke .'", "stroke-width": 1, "stroke-linejoin": "round" };
+				var paper = new Raphael(document.getElementById("geodispersion_map"), '. $canvas->width.', '.$canvas->height.');
+				var background = paper.rect(0, 0, ' . $canvas->width.', '.$canvas->height.');
+				background.attr({"fill" : "'. $canvas->background_color.'", "stroke" : "'.$canvas->background_stroke.'", "stroke-width": 1, "stroke-linejoin": "round" });
+				var attr = { fill: "'. $canvas->default_color.'", stroke: "'.$canvas->default_stroke.'", "stroke-width": 1, "stroke-linejoin": "round" };
 				var map = {};
 		';
         
-        foreach($subdvisions_results as $name => $location){
-            $html.= 'map.area'.$location['id'].' = paper.path("'.$location['coord'].'").attr(attr);';
-            if(isset($location['transparency'])) {
+        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/>';
+                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");'.
+                $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");'.