feature 3009: Add 'latitude' and 'longitude' fields in images table

git-svn-id: http://piwigo.org/svn/trunk@25801 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 77 insertions, 2 deletions

diff --git a/install/db/139-database.php b/install/db/139-database.php
new file mode 100644
index 000000000..d8fc59419
--- /dev/null
+++ b/install/db/139-database.php
@@ -0,0 +1,72 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based photo gallery                                    |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2013 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+if (!defined('PHPWG_ROOT_PATH'))
+{
+  die('Hacking attempt!');
+}
+
+$upgrade_description = 'add "latitude" and "longitude" fields';
+
+// add fields
+$query = '
+ALTER TABLE '. IMAGES_TABLE .'
+  ADD `latitude` DOUBLE(8, 6) DEFAULT NULL,
+  ADD `longitude` DOUBLE(9, 6) DEFAULT NULL
+;';
+pwg_query($query);
+
+// add index
+$query = '
+ALTER TABLE '. IMAGES_TABLE .'
+  ADD INDEX `images_i6` (`latitude`) 
+;';
+pwg_query($query);
+
+// search for old "lat" field
+$query = 'SHOW COLUMNS FROM '. IMAGES_TABLE .' LIKE "lat";';
+
+if (pwg_db_num_rows(pwg_query($query)))
+{
+  // duplicate non-null values
+  $query = '
+UPDATE '. IMAGES_TABLE .'
+  SET latitude = lat,
+    longitude = lon
+  WHERE lat != NULL
+    AND lon != NULL
+;';
+  pwg_query($query);
+  
+  // delete old fields
+  $query = '
+ALTER TABLE '. IMAGES_TABLE .'
+  DROP `lat`,
+  DROP `lon`
+;';
+  pwg_query($query);
+}
+
+echo "\n".$upgrade_description."\n";
+
+?>
diff --git a/install/piwigo_structure-mysql.sql b/install/piwigo_structure-mysql.sql
index d161d40e3..dadad1d1b 100644
--- a/install/piwigo_structure-mysql.sql
+++ b/install/piwigo_structure-mysql.sql
@@ -196,13 +196,16 @@ CREATE TABLE `piwigo_images` (
   `level` tinyint unsigned NOT NULL default '0',
   `md5sum` char(32) default NULL,
   `added_by` smallint(5) NOT NULL default '0',
-  `rotation` tinyint unsigned default null,
+  `rotation` tinyint unsigned default NULL,
+  `latitude` double(8, 6) default NULL,
+  `longitude` double(9, 6) default NULL,
   PRIMARY KEY  (`id`),
   KEY `images_i2` (`date_available`),
   KEY `images_i3` (`rating_score`),
   KEY `images_i4` (`hit`),
   KEY `images_i5` (`date_creation`),
-  KEY `images_i1` (`storage_category_id`)
+  KEY `images_i1` (`storage_category_id`),
+  KEY `images_i6` (`latitude`)
 ) ENGINE=MyISAM;
 
 --