Changeset 26331 for extensions/rv_gmaps/trunk/include

Timestamp:

Dec 29, 2013, 3:14:42 PM (10 years ago)

Author:

rvelices

Message:

rv_gmaps compatible with nez latitude/longitude fields in piwigo core 2.6

Location:

extensions/rv_gmaps/trunk/include

Files:

• functions.php (modified) (1 diff)
• functions_map.php (modified) (4 diffs)
• picture_map.inc.php (modified) (1 diff)

extensions/rv_gmaps/trunk/include/functions.php

@@ -29 +29 @@
   $query = '
 SELECT id FROM '.IMAGES_TABLE.'
-WHERE lat IS NOT NULL
+WHERE latitude IS NOT NULL
   AND id IN ('.implode(',', $items).')
 ORDER BY NULL

extensions/rv_gmaps/trunk/include/functions_map.php

@@ -129 +129 @@
   if ( !isset($b) or empty($b) )
     return null;
-  $sql_where = 'i.lat BETWEEN '.$b['s'].' AND '.($b['n']);
+  $sql_where = 'i.latitude BETWEEN '.$b['s'].' AND '.($b['n']);
   $sql_where .= ' AND ';
   if ($b['e'] >= $b['w'])
-    $sql_where .= 'i.lon BETWEEN '.$b['w'].' AND '.($b['e']);
+    $sql_where .= 'i.longitude BETWEEN '.$b['w'].' AND '.($b['e']);
   else
-    $sql_where .= 'i.lon NOT BETWEEN '.($b['e']+1e-7).' AND '.($b['w']-1e-7);
+    $sql_where .= 'i.longitude NOT BETWEEN '.($b['e']+1e-7).' AND '.($b['w']-1e-7);
   return $sql_where;
 }
@@ -172 +172 @@
   if ($bounds['e']>180) $bounds['e']-=360;
   $where_sql = rvm_bounds_to_sql( $bounds );
-  $order_by = 'ORDER BY POW('.$ll['lat'].'-i.lat,2)+POW('.$cos_lat.'*('.$ll['lon'].'-i.lon),2)';
+  $order_by = 'ORDER BY POW('.$ll['lat'].'-i.latitude,2)+POW('.$cos_lat.'*('.$ll['lon'].'-i.longitude),2)';
   return $where_sql;
 }
@@ -300 +300 @@
 
   $query = '
-SELECT category_id cat_id, uppercats, MAX(lat) AS n, MIN(lat) AS s, MAX(lon) AS e, MIN(lon) AS w, COUNT(i.id) count, MIN(i.date_creation) min_date, MAX(i.date_creation) max_date
+SELECT category_id cat_id, uppercats, MAX(latitude) AS n, MIN(latitude) AS s, MAX(longitude) AS e, MIN(longitude) AS w, COUNT(i.id) count, MIN(i.date_creation) min_date, MAX(i.date_creation) max_date
   FROM
     '.CATEGORIES_TABLE.' as c
@@ -369 +369 @@
 
   if (empty($where_sql))
-    $where_sql .= 'i.lat IS NOT NULL';
+    $where_sql .= 'i.latitude IS NOT NULL';
   $where_sql_images_only = $where_sql;
   $where_sql .= get_sql_condition_FandF(

extensions/rv_gmaps/trunk/include/picture_map.inc.php

@@ -36 +36 @@
                         'MAP_TYPE' => rvm_get_config_var('map_type', 'ROADMAP'),
       'U_NO_MAP' => duplicate_picture_url(),
-      'U_BLOWUP' => rvm_make_blowup_url( array('ll'=>$picture), array('start','box') ),
+      'U_BLOWUP' => rvm_make_blowup_url( array('ll'=> array('lat'=>$picture['latitude'],'lon'=>$picture['longitude'])), array('start','box') ),
       'COMMENT_IMG' => trigger_event('render_element_description', $picture['comment'])
     )
   );
-  if ( isset($picture['lat']) )
+  if ( isset($picture['latitude']) )
   {
     $template->assign( 'coordinates',
         array(
-          'LAT' => $picture['lat'],
-          'LON' => $picture['lon'],
+          'LAT' => $picture['latitude'],
+          'LON' => $picture['longitude'],
         )
       );