Changeset 7033 for extensions/rv_gmaps

Timestamp:

Sep 28, 2010, 10:20:33 PM (14 years ago)

Author:

rvelices

Message:

• allow gps exif metadata synchronisation with high resolution images

Location:

extensions/rv_gmaps/trunk

Files:

• admin/admin_sync.php (modified) (7 diffs)
• admin/admin_sync.tpl (modified) (1 diff)
• changelog.txt (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/rv_gmaps/trunk/admin/admin_sync.php

@@ -19 +19 @@
 if ( isset($_POST['submit']) )
   $sync_options = array(
-//    'no_overwrite' => isset($_POST['no_overwrite']),
     'simulate' => is_adviser() ? true : isset($_POST['simulate']),
+                'use_high' => isset($_POST['use_high']),
     'cat_id' => isset($_POST['cat_id']) ? (int)$_POST['cat_id'] : 0,
     'subcats_included' => isset($_POST['subcats_included']),
@@ -26 +26 @@
 else
   $sync_options = array(
-//    'no_overwrite' => true,
     'simulate' => true,
+                'use_high' => true,
     'cat_id' => 0,
     'subcats_included' => true,
@@ -35 +35 @@
 if ( isset($_POST['submit']) )
 {
+        include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
+
   $where_clauses = array();
   if ( $sync_options['cat_id']!=0 )
@@ -48 +50 @@
 
     $query='
-SELECT id,path,lat,lon
+SELECT id,path,lat,lon,has_high
   FROM '.IMAGES_TABLE.' INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id=image_id
   WHERE category_id IN ('.implode(',', $cat_ids).')
@@ -56 +58 @@
   {
     $query='
-SELECT id,path,lat,lon
+SELECT id,path,lat,lon,has_high
   FROM '.IMAGES_TABLE;
   }
@@ -65 +67 @@
   foreach ($images as $image)
   {
-    $exif = @read_exif_data( $image['path'] );
-    if ( empty($exif) )
-      continue;
-    $exif = array_intersect_key( $exif, array_flip( array('GPSLatitudeRef', 'GPSLatitude', 'GPSLongitudeRef', 'GPSLongitude') ) );
-    if ( count($exif)!=4 )
-      continue;
-    if ( !in_array($exif['GPSLatitudeRef'], array('S', 'N') ) )
-    {
-      $errors[] = $image['path']. ': GPSLatitudeRef not S or N';
-      continue;
-    }
-    if ( !in_array($exif['GPSLongitudeRef'], array('W', 'E') ) )
-    {
-      $errors[] = $image['path']. ': GPSLongitudeRef not W or E';
-      continue;
-    }
-    if (!is_array($exif['GPSLatitude']) or !is_array($exif['GPSLongitude']) )
-    {
-      $errors[] = $image['path']. ': GPSLatitude and GPSLongitude are not arrays';
-      continue;
-    }
-    $lat = parse_lat_lon( $exif['GPSLatitude'] );
-    if ( $exif['GPSLatitudeRef']=='S' )
-      $lat = -$lat;
-    $lon = parse_lat_lon( $exif['GPSLongitude'] );
-    if ( $exif['GPSLongitudeRef']=='W' )
-      $lon = -$lon;
-    $datas[] = array (
-      'id' => $image['id'],
-      'lat' => $lat,
-      'lon' => $lon,
-      );
+                $filename = $image['path'];
+                if ($sync_options['use_high'] and $image['has_high']=='true')
+                        $filename = get_high_path($image);
+                $exif = @read_exif_data( $filename );
+                if ( empty($exif) )
+                        continue;
+                $exif = array_intersect_key( $exif, array_flip( array('GPSLatitudeRef', 'GPSLatitude', 'GPSLongitudeRef', 'GPSLongitude') ) );
+                if ( count($exif)!=4 )
+                        continue;
+                if ( !in_array($exif['GPSLatitudeRef'], array('S', 'N') ) )
+                {
+                        $errors[] = $filename. ': GPSLatitudeRef not S or N';
+                        continue;
+                }
+                if ( !in_array($exif['GPSLongitudeRef'], array('W', 'E') ) )
+                {
+                        $errors[] = $filename. ': GPSLongitudeRef not W or E';
+                        continue;
+                }
+                if (!is_array($exif['GPSLatitude']) or !is_array($exif['GPSLongitude']) )
+                {
+                        $errors[] = $filename. ': GPSLatitude and GPSLongitude are not arrays';
+                        continue;
+                }
+                $lat = parse_lat_lon( $exif['GPSLatitude'] );
+                if ( $exif['GPSLatitudeRef']=='S' )
+                        $lat = -$lat;
+                $lon = parse_lat_lon( $exif['GPSLongitude'] );
+                if ( $exif['GPSLongitudeRef']=='W' )
+                        $lon = -$lon;
+                $datas[] = array (
+                        'id' => $image['id'],
+                        'lat' => $lat,
+                        'lon' => $lon,
+                        );
   }
   $template->assign( 'sync_errors', $errors );
@@ -135 +140 @@
 $template->assign(
     array(
-      'SUBCATS_INCLUDED_CHECKED' => $sync_options['subcats_included'] ? 'checked="checked"' : ''
+      'SUBCATS_INCLUDED_CHECKED' => $sync_options['subcats_included'] ? 'checked="checked"' : '',
+                        'USE_HIGH_CHECKED' => $sync_options['use_high'] ? 'checked="checked"' : ''
     )
   );

extensions/rv_gmaps/trunk/admin/admin_sync.tpl

@@ -27 +27 @@
     <ul>
       <li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED} /> {'only perform a simulation (no change in database will be made)'|@translate}</label></li>
+                        <li><label><input type="checkbox" name="use_high" value="1" {$USE_HIGH_CHECKED} /> use high resolution images if available</label></li>
     </ul>
   </fieldset>

extensions/rv_gmaps/trunk/changelog.txt

@@ -1 +1 @@
 2.1.b
+- allow gps exif metadata synchronisation with high resolution images
 - fixed admin navigation bar
 - compatible with extended description
 - upgrade prototype
+- language updates
 
 2.1.a

extensions/rv_gmaps/trunk/main.inc.php

@@ -1 +1 @@
 <?php /*
 Plugin Name: RV Maps&Earth
-Version: 2.1.a
+Version: 2.1.b
 Description: Extend your gallery with Google Maps and Google Earth ...
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=122
@@ -7 +7 @@
 Author URI: http://www.modusoptimus.com/
 */
-define( 'RVM_PLUGIN_VERSION', '2.1.a');
+define( 'RVM_PLUGIN_VERSION', '2.1.b');
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');