Merge pull request #162 from 7tonin/master

Reset default greenred iconAnchor xy in osm_get_js

Author: xbgmsharp

admin/admin_config.php

@@ -157,6 +157,7 @@
             'link'       => $_POST['osm_right_link'],
             'linkcss'    => $_POST['osm_right_linkcss'],
             'showosm'    => get_boolean($_POST['osm_showosm']),
+            'showlatlon'    => get_boolean($_POST['osm_showlatlon']),
 			),
 	'left_menu' => array(
             'enabled'           => get_boolean($_POST['osm_left_menu']),

admin/admin_config.tpl

@@ -68,6 +68,12 @@ Refer to the <a href="https://github.com/xbgmsharp/piwigo-openstreetmap/wiki" ta
 				<label><input type="radio" name="osm_showosm" value="false" {if not $right_panel.showosm}checked="checked"{/if}/> {'No'|@translate}</label>
 				<br/><small>{'SHOWOSM_DESC'|@translate}</small>
 			</li>
+			<li>
+				<label>{'SHOWLATLON'|@translate} : </label>
+				<label><input type="radio" name="osm_showlatlon" value="true" {if $right_panel.showlatlon}checked="checked"{/if}/> {'Yes'|@translate}</label>
+				<label><input type="radio" name="osm_showlatlon" value="false" {if not $right_panel.showlatlon}checked="checked"{/if}/> {'No'|@translate}</label>
+				<br/><small>{'SHOWLATLON_DESC'|@translate}</small>
+			</li>
 		</ul>
 	</fieldset>
 	<fieldset>

include/functions_map.php

@@ -398,8 +398,8 @@ function osm_get_js($conf, $local_conf, $js_data)
                 shadowUrl: 'plugins/piwigo-openstreetmap/leaflet/images/marker-shadow.png',
                 iconSize:     [25, 41],
                 shadowSize:   [41, 41],
-                iconAnchor:   [21, 21],
-                popupAnchor:  [-10, -10]
+                iconAnchor:   [12, 41],
+                popupAnchor:  [1, -34]
             }
         });
 

language/en_UK/plugin.lang.php

@@ -15,6 +15,8 @@
 $lang['RIGHTLINKCSS_DESC'] = 'Custom CSS style to apply to the location header.';
 $lang['SHOWOSM'] = "Display 'View on OpenStreetMap'";
 $lang['SHOWOSM_DESC'] = "Add a link after the map to view it on OpenStreetMap.";
+$lang['SHOWLATLON'] = "Display latitude and longitude";
+$lang['SHOWLATLON_DESC'] = "Add latitude and longitude values next to the map.";
 $lang['L_MAP'] = "Left menu configuration";
 $lang['SHOWWORLDMAPLEFT'] = "Add a world map menu on the left";
 $lang['SHOWWORLDMAPLEFT_DESC'] = 'Show a world map menu on the left menu, will display all the images in the gallery.';

language/fr_FR/plugin.lang.php

@@ -15,6 +15,8 @@
 $lang['RIGHTLINKCSS_DESC'] = 'Style de CSS à appliquer au titre.';
 $lang['SHOWOSM'] = 'Affiche \'Voir sur OpenStreetMap\'';
 $lang['SHOWOSM_DESC'] = 'Ajoute un lien après la carte pour être visualiser sur le site web OpenStreetMap.';
+$lang['SHOWLATLON'] = "Affiche la latitude et la longitude";
+$lang['SHOWLATLON_DESC'] = "Ajoute les valeurs de latitude et longitude à côté de la carte.";
 
 $lang['L_MAP'] = 'Configuration du menu de gauche';
 $lang['SHOWWORLDMAPLEFT'] = 'Ajoute un menu "carte mondiale" sur la gauche';
@@ -132,4 +134,4 @@
 $lang['OSM_NEW_PLACE'] = 'Nouveau lieu';
 $lang['OSM_ADD_PLACE'] = 'Ajouter un lieu';
 $lang['EDIT_PLACES'] = 'Éditer les lieux sélectionnés';
-$lang['DELETE_PLACES'] = 'Supprimer les lieux sélectionnés';
+$lang['DELETE_PLACES'] = 'Supprimer les lieux sélectionnés';

maintain.class.php

@@ -17,6 +17,7 @@ class piwigo_openstreetmap_maintain extends PluginMaintain
       'link' => 'Location',
       'linkcss' => null,
       'showosm' => true,
+      'showlatlon'    => false,
       ),
     'left_menu' => array(
       'enabled' => true,
@@ -216,4 +217,4 @@ function uninstall()
       @unlink(PHPWG_ROOT_PATH.'osmmap.php');
     }
   }
-}
+}

picture.inc.php

@@ -75,6 +75,10 @@ function osm_insert_map($content)
         {if $SHOWOSM}
         <a href="{$OSMLINK}" target="_blank">{"VIEW_OSM"|@translate}</a>
         {/if}
+        {if $SHOWLATLON}
+        <br><span class="h-geo">{$OSMNAME} : <span class="p-latitude">{$LAT}</span>, <span class="p-longitude">{$LON}</span>
+        </span>
+        {/if}
     </dd>
 </div>
 {/if}
@@ -111,6 +115,7 @@ function osm_render_element_content()
     $osmname = isset($conf['osm_conf']['right_panel']['link']) ? $conf['osm_conf']['right_panel']['link'] : 'Location';
     $osmnamecss = isset($conf['osm_conf']['right_panel']['linkcss']) ? $conf['osm_conf']['right_panel']['linkcss'] : '';
     $showosm = isset($conf['osm_conf']['right_panel']['showosm']) ? $conf['osm_conf']['right_panel']['showosm'] : 'true';
+    $showlatlon = isset($conf['osm_conf']['right_panel']['showlatlon']) ? $conf['osm_conf']['right_panel']['showlatlon'] : 'true';
     if (strlen($osmnamecss) != 0)
     {
         $osmnamecss = "style='".$osmnamecss."'";
@@ -145,6 +150,9 @@ function osm_render_element_content()
             'OSMNAMECSS'	=> $osmnamecss,
             'SHOWOSM'		=> $showosm,
             'OSMLINK'		=> $osmlink,
+            'SHOWLATLON'	=> $showlatlon,
+            'LAT'			=> $lat,
+            'LON'			=> $lon,
         )
     );
 

template/osm-map2.tpl

@@ -477,7 +477,7 @@ function toggle(arrow)
 
 		/* Update jcarousel and all witdh*/
 		if (nb_items>0) {
-			var nb_items_width = nb_items*45; /* img is 40px + margin 5px */
+			var nb_items_width = nb_items*55; /* img is 40px + margin 5px + ?? 10px */
 			var document_width = $( document ).width();
 			var nav_width = document.getElementById('ribbon-map-nav').offsetWidth;
 			var results_width = document.getElementById('ribbon-map-results').offsetWidth;