Changeset 18578 for extensions/rv_gmaps/trunk/include/cluster_maker.php

Timestamp:

Oct 9, 2012, 9:33:42 PM (12 years ago)

Author:

rvelices

Message:

rv_gmaps:

• removed earth icon from index pages
• map icon text localized (for themes without icons)
• minor javascript changes for maps api v3.9
• code optimization

File:

• extensions/rv_gmaps/trunk/include/cluster_maker.php (modified) (5 diffs)

extensions/rv_gmaps/trunk/include/cluster_maker.php

@@ -30 +30 @@
         function make_clusters($images, $maxLatPrecision, $maxLonPrecision, $maxNbMarkers)
         {
+                $this->bounds = array();
+                foreach($images as &$img)
+                {
+                        $img['lat'] = floatval($img['lat']);
+                        $img['lon'] = floatval($img['lon']);
+                        $this->bounds = bounds_add($this->bounds, $img['lat'], $img['lon'] );
+                }
+                unset($img);
+
                 $this->_image_map = $images;
                 $this->_image_ranks = array();
@@ -37 +46 @@
                 $total_iterations = 0;
                 $total_generations = 0;
-
-                $this->bounds = array();
-                foreach($images as $img)
-                        $this->bounds = bounds_add($this->bounds, $img['lat'], $img['lon'] );
 
                 $pending_split = array( new Cluster($this->bounds, array_keys($this->_image_map) ) );
@@ -68 +73 @@
                                 }
                                 else
-                                        array_push( $result, $current );
+                                        $result[] = $current;
                         }
                         $pending_split = $next_level_to_split;
@@ -93 +98 @@
                                 $rlat = abs($ci['lat']-$cj['lat']) / $maxLatPrecision;
                                 $rlon = abs($ci['lon']-$cj['lon']) / $maxLonPrecision;
-                                if ( $rlat<1 && $rlon<1 
+                                if ( $rlat<1 && $rlon<1
                                                 && $rlat+$rlon<1.1)
                                 {
@@ -183 +188 @@
                                 $clusters[$idx] = new Cluster();
                         }
-                        array_push( $clusters[$idx]->items, $id );
+                        $clusters[$idx]->items[] = $id;
                         $clusters[$idx]->bounds = bounds_add( $clusters[$idx]->bounds , $lat, $lon );
                 }