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

Timestamp:

Dec 11, 2011, 8:55:04 PM (12 years ago)

Author:

rvelices

Message:

rv_gmaps can show now different markers based on number of photos at the location

File:

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

extensions/rv_gmaps/trunk/include/cluster_maker.php

@@ -3 +3 @@
 function cluster_area_compare( &$a, &$b )
 {
-        $aa = bounds_lat_range($a['bounds']) * bounds_lon_range($a['bounds']);
-        $ab = bounds_lat_range($b['bounds']) * bounds_lon_range($b['bounds']);
+        $aa = bounds_lat_range($a->bounds) * bounds_lon_range($a->bounds);
+        $ab = bounds_lat_range($b->bounds) * bounds_lon_range($b->bounds);
         return -$aa+$ab; // biggest first
+}
+
+final class Cluster
+{
+        public $bounds;
+        public $items;
+
+        function __construct($b = array(), $i = array())
+        {
+                $this->bounds = $b;
+                $this->items = $i;
+        }
 }
 
@@ -30 +42 @@
                         $this->bounds = bounds_add($this->bounds, $img['lat'], $img['lon'] );
 
-                $pending_split = array(
-                                array(
-                                        'bounds' => $this->bounds,
-                                        'items' => array_keys( $this->_image_map ),
-                                )
-                        );
+                $pending_split = array( new Cluster($this->bounds, array_keys($this->_image_map) ) );
                 $result = array();
 
@@ -51 +58 @@
                                         foreach( $splitted as $k => $split )
                                                 echo("sub $k: " . var_export($split['bounds'],true)."\n" );*/
-                                        $total_iterations += count($current['items']);
+                                        $total_iterations += count($current->items);
                                         $next_level_to_split = array_merge($next_level_to_split, $splitted );
                                         if ( count($result)+count($pending_split)+count($next_level_to_split) >= $maxNbMarkers )
@@ -66 +73 @@
                         usort( $pending_split, 'cluster_area_compare' );
                 }
+
                 $merged = $this->_try_merge_clusters( $result, $maxLatPrecision, $maxLonPrecision );
                 $this->debug_str = get_elapsed_time($start, get_moment()) .' gen:'.$total_generations.' alg:'.count($this->_image_map).'+'.$total_iterations;
@@ -79 +87 @@
                 for ($i=0; $i<count($clusters)-1; $i++)
                 {
-                        $ci = bounds_center( $clusters[$i]['bounds'] );
+                        $ci = bounds_center( $clusters[$i]->bounds );
                         for ($j=$i+1; $j<count($clusters); $j++)
                         {
-                                $cj = bounds_center( $clusters[$j]['bounds'] );
-                                if ( abs($ci['lat']-$cj['lat']) < $maxLatPrecision/2
-                                        and abs($ci['lon']-$cj['lon']) < $maxLonPrecision/2 )
+                                $cj = bounds_center( $clusters[$j]->bounds );
+                                $rlat = abs($ci['lat']-$cj['lat']) / $maxLatPrecision;
+                                $rlon = abs($ci['lon']-$cj['lon']) / $maxLonPrecision;
+                                if ( $rlat<1 && $rlon<1 
+                                                && $rlat+$rlon<1.1)
                                 {
                                         //print_r( "i=$i; j=$j \n"); var_export( $clusters[$i]['bounds'] ); var_export( $clusters[$j]['bounds'] );
-                                        $clusters[$i]['items'] = array_merge( $clusters[$i]['items'], $clusters[$j]['items'] );
+                                        $clusters[$i]->items = array_merge( $clusters[$i]->items, $clusters[$j]->items );
                                         if ( empty($this->_image_ranks) )
                                                 $this->_image_ranks = array_flip( array_keys($this->_image_map) );
-                                        usort( $clusters[$i]['items'], array($this, '_image_rank_compare') );
-                                        $clusters[$i]['bounds'] = bounds_union($clusters[$i]['bounds'], $clusters[$j]['bounds'] );
+                                        usort( $clusters[$i]->items, array($this, '_image_rank_compare') );
+                                        $clusters[$i]->bounds = bounds_union($clusters[$i]->bounds, $clusters[$j]->bounds );
                                         array_splice( $clusters, $j, 1);
                                         $j--;
-                                        $ci = bounds_center( $clusters[$i]['bounds'] );
+                                        $ci = bounds_center( $clusters[$i]->bounds );
                                         $ret++;
                                 }
@@ -109 +119 @@
         function _split_cluster($cluster, $maxLatPrecision, $maxLonPrecision)
         {
-                $latRange = bounds_lat_range($cluster['bounds']);
-                $lonRange = bounds_lon_range($cluster['bounds']);
+                $latRange = bounds_lat_range($cluster->bounds);
+                $lonRange = bounds_lon_range($cluster->bounds);
 
                 $lat_nb_tiles = max( 1, $latRange/$maxLatPrecision );
@@ -146 +156 @@
                 }
 
-                if ( $cluster['bounds']['count'] > 200 )
+                if ( $cluster->bounds['count'] > 200 )
                 {
                         if ($lat_step>4*$maxLatPrecision) $lat_step = $lat_step/2;
@@ -159 +169 @@
 
                 $clusters = array();
-                foreach ( $cluster['items'] as $id )
+                foreach ( $cluster->items as $id )
                 {
                         $lon = $this->_image_map[$id]['lon'];
                         $lat = $this->_image_map[$id]['lat'];
 
-                        $idx_lon = floor ( ( $lon - $cluster['bounds']['w'] ) / $lon_step );
-                        $idx_lat = floor ( ( $lat - $cluster['bounds']['s'] ) / $lat_step );
+                        $idx_lon = floor ( ( $lon - $cluster->bounds['w'] ) / $lon_step );
+                        $idx_lat = floor ( ( $lat - $cluster->bounds['s'] ) / $lat_step );
 
                         $idx = $lon_nb_tiles * $idx_lat + $idx_lon;
@@ -171 +181 @@
                         if ( !isset($clusters[$idx]) )
                         {
-                                $clusters[$idx] = array(
-                                        'bounds'  => array(),
-                                        'items'   => array(),
-                                        );
+                                $clusters[$idx] = new Cluster();
                         }
-                        array_push( $clusters[$idx]['items'], $id );
-                        $clusters[$idx]['bounds'] = bounds_add( $clusters[$idx]['bounds'] , $lat, $lon );
+                        array_push( $clusters[$idx]->items, $id );
+                        $clusters[$idx]->bounds = bounds_add( $clusters[$idx]->bounds , $lat, $lon );
                 }
                 return $clusters;