$widgets = array('Actions' => array(),
'Tags' => array('view' => 'gallery'),
'OtherGalleries' => array(),
- 'Geodata' => array(),
+ 'Geotag' => array(),
'Links' => array(),
'GalleryFaces' => array(),
'OwnerFaces' => array());
$this->addWidget(Ansel_Widget::factory('SimilarPhotos'));
// Geolocation
- $this->addWidget(Ansel_Widget::factory('Geodata', array('images' => array($this->resource->id))));
+ $this->addWidget(Ansel_Widget::factory('Geotag', array('images' => array($this->resource->id))));
// Faces
if ($conf['faces']['driver']) {
+++ /dev/null
-<?php
-/**
- * Ansel_Widget_Geodata:: class to wrap the display of a Google map showing
- * images with geolocation data.
- *
- * Copyright 2009 The Horde Project (http://www.horde.org)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @TODO: Refactor the JS out to a seperate file, output needed values in the
- * GLOBAL Ansel javascript object.
- *
- * @author Michael J. Rubinsky <mrubinsk@horde.org>
- * @package Ansel
- */
-class Ansel_Widget_Geodata extends Ansel_Widget_Base
-{
- protected $_supported_views = array('Image', 'Gallery');
- protected $_params = array('default_zoom' => 15,
- 'max_auto_zoom' => 15);
-
- public function __construct($params)
- {
- parent::__construct($params);
- $this->_title = _("Location");
- }
-
- public function attach($view)
- {
- // Don't even try if we don't have an api key
- if (empty($GLOBALS['conf']['api']['googlemaps'])) {
- return false;
- }
- parent::attach($view);
-
- return true;
- }
-
- public function html()
- {
- global $ansel_storage;
-
- $geodata = $ansel_storage->getImagesGeodata($this->_params['images']);
- $url = Horde::applicationUrl('map_edit.php', true);
- $rtext = _("Relocate this image");
- $dtext = _("Delete geotag");
-
- $imple = Horde_Ajax_Imple::factory(array('ansel', 'ImageSaveGeotag'), array());
- $impleUrl = $imple->getUrl();
-
- $permsEdit = $this->_view->gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT);
- $viewType = $this->_view->viewType();
-
- if (count($geodata) == 0 && $viewType != 'Image') {
- return '';
- } elseif (count($geodata) == 0) {
- $noGeotag = true;
- }
-
- // Bring in googlemap.js now that we know we need it.
- Horde::addExternalScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel');
- Horde::addExternalScriptFile('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/1.1/src/markermanager.js', 'ansel');
- Horde::addScriptFile('googlemap.js');
- Horde::addScriptFile('popup.js', 'horde', true);
-
- $html = $this->_htmlBegin() . "\n";
- $content = '<div id="ansel_geo_widget">';
-
- // Add extra information to the JSON data to be sent:
- foreach ($geodata as $id => $data) {
- $geodata[$id]['icon'] = Ansel::getImageUrl($geodata[$id]['image_id'], 'mini', true);
- $geodata[$id]['markerOnly'] = ($viewType == 'Image');
- $geodata[$id]['link'] = Ansel::getUrlFor('view', array('view' => 'Image',
- 'gallery' => $this->_view->gallery->id,
- 'image' => $geodata[$id]['image_id']), true);
- }
-
- // If this is an image view, get the other gallery images
- if ($viewType == 'Image') {
- $image_id = $this->_view->resource->id;
- $others = $this->_getGalleryImagesWithGeodata();
- foreach ($others as $id => $data) {
- if ($id != $image_id) {
- $others[$id]['icon'] = Ansel::getImageUrl($others[$id]['image_id'], 'mini', true);
- $others[$id]['link'] = Ansel::getUrlFor('view', array('view' => 'Image',
- 'gallery' => $this->_view->gallery->id,
- 'image' => $others[$id]['image_id']), true);
- } else {
- unset($others[$id]);
- }
- }
- $geodata = array_values(array_merge($geodata, $others));
-
- if (empty($noGeotag)) {
- $content .= '<div id="ansel_map"></div>';
- $content .= '<div class="ansel_geolocation">';
- $content .= '<div id="ansel_locationtext"></div>';
- $content .= '<div id="ansel_latlng"></div>';
- $content .= '<div id="ansel_relocate"></div><div id="ansel_deleteGeotag"></div></div>';
- $content .= '<div id="ansel_map_small"></div>';
-
- } elseif ($permsEdit) {
- // Image view, but no geotags, provide ability to add it.
- $addurl = Horde_Util::addParameter(Horde::applicationUrl('map_edit.php'), 'image', $this->_params['images'][0]);
- $addLink = Horde::link($addurl, '', '', '', Horde::popupJs(Horde::applicationUrl('map_edit.php'), array('params' => array('image' => $this->_params['images'][0]), 'urlencode' => true)) . 'return false;');
- $imgs = $ansel_storage->getRecentImagesGeodata(Horde_Auth::getAuth());
- if (count($imgs) > 0) {
- $imgsrc = '<div class="ansel_location_sameas">';
- foreach ($imgs as $id => $data) {
- if (!empty($data['image_location'])) {
- $title = $data['image_location'];
- } else {
- $title = $this->_point2Deg($data['image_latitude'], true) . ' ' . $this->_point2Deg($data['image_longitude']);
- }
- $imgsrc .= Horde::link($addurl, $title, '', '', "setLocation('" . $data['image_latitude'] . "', '" . $data['image_longitude'] . "');return false") . '<img src="' . Ansel::getImageUrl($id, 'mini', true) . '" alt="[image]" /></a>';
- }
- $imgsrc .= '</div>';
- $content .= sprintf(_("No location data present. Place using %s map %s or click on image to place at the same location."), $addLink, '</a>') . $imgsrc;
- } else {
- $content .= _("No location data present. You may add some ") . $addLink . _("here") . '</a>';
- }
- } else {
- // For now, just put up a notice. In future, maybe provide a link
- // to suggest a location using the Report API?
- $content .= _("No location data present.");
- }
-
- } else {
- // Gallery view-------------
- // Avoids undefined error when we build the js function below.
- $image_id = 0;
- $content .= '<div id="ansel_map"></div><div id="ansel_locationtext" style="min-height: 20px;"></div><div id="ansel_map_small"></div>';
-
- }
-
- $content .= '</div>';
- $json = Horde_Serialize::serialize(array_values($geodata), Horde_Serialize::JSON);
- $html .= <<<EOT
- <script type="text/javascript">
- var map = {};
- var pageImages = {$json};
- options = {
- smallMap: 'ansel_map_small',
- mainMap: 'ansel_map',
- viewType: '{$viewType}',
- relocateUrl: '{$url}',
- relocateText: '{$rtext}',
- deleteGeotagText: '{$dtext}',
- hasEdit: {$permsEdit},
- calculateMaxZoom: true,
- updateEndpoint: '{$impleUrl}',
- deleteGeotagCallback: function() {deleteLocation();}
- };
-
- function setLocation(lat, lng)
- {
- params = {
- type: 'geotag',
- img: {$image_id},
- lat: lat,
- lng: lng};
-
- url = "{$impleUrl}";
- new Ajax.Request(url, {
- method: 'post',
- parameters: params,
- onComplete: function(transport) {
- if (typeof Horde_ToolTips != 'undefined') {
- Horde_ToolTips.out();
- }
- if (transport.responseJSON.response == 1) {
- w = new Element('div');
- w.appendChild(new Element('div', {id: 'ansel_map'}));
- ag = new Element('div', {'class': 'ansel_geolocation'});
- ag.appendChild(new Element('div', {id: 'ansel_locationtext'}));
- ag.appendChild(new Element('div', {id: 'ansel_latlng'}));
- ag.appendChild(new Element('div', {id: 'ansel_relocate'}));
- ag.appendChild(new Element('div', {id: 'ansel_deleteGeotag'}));
- w.appendChild(ag);
- w.appendChild(new Element('div', {id: 'ansel_map_small'}));
- $('ansel_geo_widget').update(w);
- pageImages.unshift({image_id: {$image_id}, image_latitude: lat, image_longitude: lng, image_location:'', markerOnly:true});
- doMap(pageImages);
- }
- }
- });
- }
-
- function deleteLocation() {
- params = {
- type: 'untag',
- img: {$image_id}};
-
- url = "{$impleUrl}";
- new Ajax.Request(url, {
- method: 'post',
- parameters: params,
- onComplete: function(transport) {
- if (transport.responseJSON.response == 1) {
- $('ansel_geo_widget').update(transport.responseJSON.message);
- }
- }
- });
-
- }
-
- function doMap(points) {
- map = new Ansel_GMap(options);
- map.getLocationCallback_ = map.getLocationCallback;
- map.getLocationCallback = function(points, marker) {
- map.getLocationCallback_(points, marker, (typeof points.NoUpdate == 'undefined'));
- }.bind(map);
- map.addPoints(points);
- map.display();
- }
-EOT;
-
- if (empty($noGeotag)) {
- $html .= "\n" . 'Event.observe(window, "load", function() {doMap(pageImages);});' . "\n";
- }
- $html .= '</script>' . "\n";
- $html .= $content. $this->_htmlEnd();
-
- return $html;
- }
-
- protected function _getGalleryImagesWithGeodata()
- {
- return $GLOBALS['ansel_storage']->getImagesGeodata(array(), $this->_view->gallery->id);
- }
-
- protected function _point2Deg($value, $lat = false)
- {
- $letter = $lat ? ($value > 0 ? "N" : "S") : ($value > 0 ? "E" : "W");
- $value = abs($value);
- $deg = floor($value);
- $min = floor(($value - $deg) * 60);
- $sec = ($value - $deg - $min / 60) * 3600;
- return $deg . "° " . $min . '\' ' . round($sec, 2) . '" ' . $letter;
- }
-
-}
--- /dev/null
+<?php
+/**
+ * Ansel_Widget_Geotag:: class to wrap the display of a Google map showing
+ * images with geolocation data.
+ *
+ * Copyright 2009 The Horde Project (http://www.horde.org)
+ *
+ * See the enclosed file COPYING for license information (GPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
+ *
+ * @TODO: Refactor the JS out to a seperate file, output needed values in the
+ * GLOBAL Ansel javascript object.
+ *
+ * @author Michael J. Rubinsky <mrubinsk@horde.org>
+ * @package Ansel
+ */
+class Ansel_Widget_Geotag extends Ansel_Widget_Base
+{
+ protected $_supported_views = array('Image', 'Gallery');
+ protected $_params = array('default_zoom' => 15,
+ 'max_auto_zoom' => 15);
+
+ public function __construct($params)
+ {
+ parent::__construct($params);
+ $this->_title = _("Location");
+ }
+
+ public function attach($view)
+ {
+ // Don't even try if we don't have an api key
+ if (empty($GLOBALS['conf']['api']['googlemaps'])) {
+ return false;
+ }
+ parent::attach($view);
+
+ return true;
+ }
+
+ public function html()
+ {
+ global $ansel_storage;
+
+ $geodata = $ansel_storage->getImagesGeodata($this->_params['images']);
+ $url = Horde::applicationUrl('map_edit.php', true);
+ $rtext = _("Relocate this image");
+ $dtext = _("Delete geotag");
+
+ $imple = Horde_Ajax_Imple::factory(array('ansel', 'ImageSaveGeotag'), array());
+ $impleUrl = $imple->getUrl();
+
+ $permsEdit = $this->_view->gallery->hasPermission(Horde_Auth::getAuth(), PERMS_EDIT);
+ $viewType = $this->_view->viewType();
+
+ if (count($geodata) == 0 && $viewType != 'Image') {
+ return '';
+ } elseif (count($geodata) == 0) {
+ $noGeotag = true;
+ }
+
+ // Bring in googlemap.js now that we know we need it.
+ Horde::addExternalScriptFile('http://maps.google.com/maps?file=api&v=2&sensor=false&key=' . $GLOBALS['conf']['api']['googlemaps'], 'ansel');
+ Horde::addExternalScriptFile('http://gmaps-utility-library.googlecode.com/svn/trunk/markermanager/1.1/src/markermanager.js', 'ansel');
+ Horde::addScriptFile('googlemap.js');
+ Horde::addScriptFile('popup.js', 'horde', true);
+
+ $html = $this->_htmlBegin() . "\n";
+ $content = '<div id="ansel_geo_widget">';
+
+ // Add extra information to the JSON data to be sent:
+ foreach ($geodata as $id => $data) {
+ $geodata[$id]['icon'] = Ansel::getImageUrl($geodata[$id]['image_id'], 'mini', true);
+ $geodata[$id]['markerOnly'] = ($viewType == 'Image');
+ $geodata[$id]['link'] = Ansel::getUrlFor('view', array('view' => 'Image',
+ 'gallery' => $this->_view->gallery->id,
+ 'image' => $geodata[$id]['image_id']), true);
+ }
+
+ // If this is an image view, get the other gallery images
+ if ($viewType == 'Image') {
+ $image_id = $this->_view->resource->id;
+ $others = $this->_getGalleryImagesWithGeodata();
+ foreach ($others as $id => $data) {
+ if ($id != $image_id) {
+ $others[$id]['icon'] = Ansel::getImageUrl($others[$id]['image_id'], 'mini', true);
+ $others[$id]['link'] = Ansel::getUrlFor('view', array('view' => 'Image',
+ 'gallery' => $this->_view->gallery->id,
+ 'image' => $others[$id]['image_id']), true);
+ } else {
+ unset($others[$id]);
+ }
+ }
+ $geodata = array_values(array_merge($geodata, $others));
+
+ if (empty($noGeotag)) {
+ $content .= '<div id="ansel_map"></div>';
+ $content .= '<div class="ansel_geolocation">';
+ $content .= '<div id="ansel_locationtext"></div>';
+ $content .= '<div id="ansel_latlng"></div>';
+ $content .= '<div id="ansel_relocate"></div><div id="ansel_deleteGeotag"></div></div>';
+ $content .= '<div id="ansel_map_small"></div>';
+
+ } elseif ($permsEdit) {
+ // Image view, but no geotags, provide ability to add it.
+ $addurl = Horde_Util::addParameter(Horde::applicationUrl('map_edit.php'), 'image', $this->_params['images'][0]);
+ $addLink = Horde::link($addurl, '', '', '', Horde::popupJs(Horde::applicationUrl('map_edit.php'), array('params' => array('image' => $this->_params['images'][0]), 'urlencode' => true)) . 'return false;');
+ $imgs = $ansel_storage->getRecentImagesGeodata(Horde_Auth::getAuth());
+ if (count($imgs) > 0) {
+ $imgsrc = '<div class="ansel_location_sameas">';
+ foreach ($imgs as $id => $data) {
+ if (!empty($data['image_location'])) {
+ $title = $data['image_location'];
+ } else {
+ $title = $this->_point2Deg($data['image_latitude'], true) . ' ' . $this->_point2Deg($data['image_longitude']);
+ }
+ $imgsrc .= Horde::link($addurl, $title, '', '', "setLocation('" . $data['image_latitude'] . "', '" . $data['image_longitude'] . "');return false") . '<img src="' . Ansel::getImageUrl($id, 'mini', true) . '" alt="[image]" /></a>';
+ }
+ $imgsrc .= '</div>';
+ $content .= sprintf(_("No location data present. Place using %s map %s or click on image to place at the same location."), $addLink, '</a>') . $imgsrc;
+ } else {
+ $content .= _("No location data present. You may add some ") . $addLink . _("here") . '</a>';
+ }
+ } else {
+ // For now, just put up a notice. In future, maybe provide a link
+ // to suggest a location using the Report API?
+ $content .= _("No location data present.");
+ }
+
+ } else {
+ // Gallery view-------------
+ // Avoids undefined error when we build the js function below.
+ $image_id = 0;
+ $content .= '<div id="ansel_map"></div><div id="ansel_locationtext" style="min-height: 20px;"></div><div id="ansel_map_small"></div>';
+
+ }
+
+ $content .= '</div>';
+ $json = Horde_Serialize::serialize(array_values($geodata), Horde_Serialize::JSON);
+ $html .= <<<EOT
+ <script type="text/javascript">
+ var map = {};
+ var pageImages = {$json};
+ options = {
+ smallMap: 'ansel_map_small',
+ mainMap: 'ansel_map',
+ viewType: '{$viewType}',
+ relocateUrl: '{$url}',
+ relocateText: '{$rtext}',
+ deleteGeotagText: '{$dtext}',
+ hasEdit: {$permsEdit},
+ calculateMaxZoom: true,
+ updateEndpoint: '{$impleUrl}',
+ deleteGeotagCallback: function() {deleteLocation();}
+ };
+
+ function setLocation(lat, lng)
+ {
+ params = {
+ type: 'geotag',
+ img: {$image_id},
+ lat: lat,
+ lng: lng};
+
+ url = "{$impleUrl}";
+ new Ajax.Request(url, {
+ method: 'post',
+ parameters: params,
+ onComplete: function(transport) {
+ if (typeof Horde_ToolTips != 'undefined') {
+ Horde_ToolTips.out();
+ }
+ if (transport.responseJSON.response == 1) {
+ w = new Element('div');
+ w.appendChild(new Element('div', {id: 'ansel_map'}));
+ ag = new Element('div', {'class': 'ansel_geolocation'});
+ ag.appendChild(new Element('div', {id: 'ansel_locationtext'}));
+ ag.appendChild(new Element('div', {id: 'ansel_latlng'}));
+ ag.appendChild(new Element('div', {id: 'ansel_relocate'}));
+ ag.appendChild(new Element('div', {id: 'ansel_deleteGeotag'}));
+ w.appendChild(ag);
+ w.appendChild(new Element('div', {id: 'ansel_map_small'}));
+ $('ansel_geo_widget').update(w);
+ pageImages.unshift({image_id: {$image_id}, image_latitude: lat, image_longitude: lng, image_location:'', markerOnly:true});
+ doMap(pageImages);
+ }
+ }
+ });
+ }
+
+ function deleteLocation() {
+ params = {
+ type: 'untag',
+ img: {$image_id}};
+
+ url = "{$impleUrl}";
+ new Ajax.Request(url, {
+ method: 'post',
+ parameters: params,
+ onComplete: function(transport) {
+ if (transport.responseJSON.response == 1) {
+ $('ansel_geo_widget').update(transport.responseJSON.message);
+ }
+ }
+ });
+
+ }
+
+ function doMap(points) {
+ map = new Ansel_GMap(options);
+ map.getLocationCallback_ = map.getLocationCallback;
+ map.getLocationCallback = function(points, marker) {
+ map.getLocationCallback_(points, marker, (typeof points.NoUpdate == 'undefined'));
+ }.bind(map);
+ map.addPoints(points);
+ map.display();
+ }
+EOT;
+
+ if (empty($noGeotag)) {
+ $html .= "\n" . 'Event.observe(window, "load", function() {doMap(pageImages);});' . "\n";
+ }
+ $html .= '</script>' . "\n";
+ $html .= $content. $this->_htmlEnd();
+
+ return $html;
+ }
+
+ protected function _getGalleryImagesWithGeodata()
+ {
+ return $GLOBALS['ansel_storage']->getImagesGeodata(array(), $this->_view->gallery->id);
+ }
+
+ protected function _point2Deg($value, $lat = false)
+ {
+ $letter = $lat ? ($value > 0 ? "N" : "S") : ($value > 0 ? "E" : "W");
+ $value = abs($value);
+ $deg = floor($value);
+ $min = floor(($value - $deg) * 60);
+ $sec = ($value - $deg - $min / 60) * 3600;
+ return $deg . "° " . $min . '\' ' . round($sec, 2) . '" ' . $letter;
+ }
+
+}
projects / horde.git / commitdiff