Changeset 18578 for extensions/rv_gmaps/trunk/map_data.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/map_data.php (modified) (4 diffs)

extensions/rv_gmaps/trunk/map_data.php

@@ -31 +31 @@
 $where_sql = rvm_bounds_to_sql( $page['box'] );
 
-$img_fields = ' i.id,i.representative_ext,i.name,i.comment,i.path,i.lat,i.lon';
+$img_fields = ' i.id,i.representative_ext,i.name,i.comment,i.file,i.path,i.lat,i.lon';
 
 $was_flat = @$page['flat'];
@@ -79 +79 @@
 $out='';
 function rvo($s) {
-  global $out; $out.=$s;
+  //global $out; $out.=$s;
+        echo $s;
 }
 
 function rvf() {
-  global $out; echo $out; $out='';
-  ob_flush();
+  //global $out; echo $out; $out=''; ob_flush();
 }
 
 $start_output = get_moment();
 
-rvo( '{' );
 
-rvo( "\ntitle:".jsgm_str( strip_tags(trigger_event('render_element_description', $page['title']) ) ) );
-rvo( ",\n" );
+rvo( "{\ntitle:".jsgm_str( strip_tags(trigger_event('render_element_description', $page['title']) ) ) );
 
-rvo( "page_url:".jsgm_str( duplicate_index_url( array('start'=>0) ) ) );
-rvo( ",\n" );
+rvo( ",\npage_url:".jsgm_str( duplicate_index_url( array('start'=>0) ) ) );
 
-rvo( "blowup_url:".jsgm_str( rvm_duplicate_blowup_url( array('start'=>0) ) ) );
-rvo( ",\n" );
+rvo( ",\nblowup_url:".jsgm_str( rvm_duplicate_blowup_url( array('start'=>0) ) ) );
 
-rvo( "kml_url:".jsgm_str( rvm_duplicate_kml_index_url( array('start'=>0, 'flat'=>1) ) ) );
-rvo( ",\n" );
+rvo( ",\nkml_url:".jsgm_str( rvm_duplicate_kml_index_url( array('start'=>0, 'flat'=>1) ) ) );
 
-rvo( "nb_items:".count($page['items']) );
-rvo( ",\n" );
+rvo( ",\nnb_items:".count($page['items']) );
 
-rvo( "bounds:" );
+rvo( ",\nbounds:" );
 if ( isset($cm) )
   rvo( jsgm_bounds( $cm->bounds ) );
 else
   rvo( "null" );
-rvo( ",\n" );
 
+rvo( ",\n\nnb_clusters:".count($clusters) );
 
-rvo( "\nnb_clusters:".count($clusters) );
-rvo( "," );
-
-rvo( "\nimage_clusters:[\n" );
+rvo( ",\nimage_clusters:[\n" );
 $i=0;
 $thumb_params = ImageStdParams::get_by_type(IMG_THUMB);
+$page_url_model = duplicate_picture_url(
+                array(
+                        'image_id' => 123456789,
+                        'image_file' => 'dummy_file.txt',
+                        'flat' => 1,
+                ),
+                array('start')
+        );
+
 foreach( $clusters as $c )
 {
   if ($i) rvo( ",\n\n" );
-  rvo( "{" );
-  rvo( 'position:'. jsgm_position( bounds_center($c->bounds) ) );
-  rvo( ",\n" );
-  rvo( 'bounds:'. jsgm_bounds( $c->bounds ) );
-  rvo( ",\n" );
-  rvo( 'nb_items:'.count($c->items) );
+  rvo( '{position:'. jsgm_position( bounds_center($c->bounds) ) );
+  rvo( ",\nbounds:". jsgm_bounds( $c->bounds ) );
+  rvo( ",\nnb_items:".count($c->items) );
   rvo( ",\n" );
 
   rvo( 'blowup_url:"'.rvm_duplicate_blowup_url(array('box'=>$c->bounds), array('start') ). '"' );
-  rvo( ",\n" );
 
   $max_per_cluster = rvm_get_config_var('nb_images_per_marker',20);
@@ -139 +135 @@
     $c->items = array_slice($c->items, 0, $max_per_cluster);
   }
-  rvo( 'items:[' );
+  rvo( ",\nitems:[" );
   for ($j=0; $j<count($c->items); $j++)
   {
     $img = $page['items'] [ $c->items[$j] ];
-    $img['file'] = basename( $img['path'] );
 
-    $params = array(
-        'image_id' => $img['id'],
-        'image_file' => $img['file'],
-        'flat' => 1,
-      );
-    $page_url = duplicate_picture_url($params, array('start') );
+                $page_url = str_replace(array('123456789','dummy_file'), array($img['id'], get_filename_wo_extension($img['file'])), $page_url_model);
 
     if ($j) rvo( "," );
-    rvo( "{" );
-    rvo( "tn:".jsgm_str( DerivativeImage::url( $thumb_params,$img ) ) );
+    rvo( "{tn:".jsgm_str( DerivativeImage::url( $thumb_params,$img ) ) );
     rvo( ",name:".jsgm_str( render_element_name($img) ) );
     rvo( ",comment:".jsgm_str( render_element_description($img) ) );
@@ -160 +149 @@
     rvo( "}" );
   }
-  rvo( ']' );
-  rvo( "\n" );
-  rvo( "}" );
+  rvo( "]\n}" );
   rvf();
   $i++;