sebsauvage · totetmatt · Jul 10, 2013
diff --git a/inc/landmark.js b/inc/landmark.js
@@ -0,0 +1,37 @@
+function enableLandmark()
+{
+	navigator.geolocation.getCurrentPosition(function(position) {
+
+	  var infopos = "  > Lat : "+position.coords.latitude +"  ";
+	  infopos += "Lon: "+position.coords.longitude+"  ";
+	  infopos += "Alt : "+position.coords.altitude +"  ";
+	  $("#infolandmark").html(infopos);  
+	  $('input[name=lf_land_lat]').val(position.coords.latitude);
+	  $('input[name=lf_land_lon]').val(position.coords.longitude);
+	  $('input[name=lf_land_alt]').val(position.coords.altitude);
+	  $('textarea[name=lf_description]').val($('textarea[name=lf_description]').val()+" "+$('input[name=lf_url]').val());
+	  $('input[name=tmp_landmark_url]').val($('input[name=lf_url]').val());
+	  $('input[name=lf_url]').val("http://www.openstreetmap.org/?mlat="+position.coords.latitude+"&mlon="+position.coords.longitude+"&zoom=18&layers=Q");
+
+	});
+}
+function disableLandmark()
+{
+	$("#infolandmark").html("");
+	$('input[name=lf_land_lat]').val("");
+	$('input[name=lf_land_lon]').val("");
+	$('input[name=lf_land_alt]').val("");
+	$('input[name=lf_url]').val($('input[name=tmp_landmark_url]').val());
+}
+$(document).ready(function() {
+		$('#landmark').change(function() {
+		if($('#landmark').attr('checked'))
+		{
+			enableLandmark();
+		}
+		else
+		{
+			disableLandmark();
+		}
+	});
+});
diff --git a/index.php b/index.php
@@ -681,6 +681,7 @@ public function renderPage($page)
        private : Is this link private ? 0=no, other value=yes
        linkdate : date of the creation of this entry, in the form YYYYMMDD_HHMMSS (eg.'20110914_192317')
        tags : tags attached to this entry (separated by spaces)
+	   landmark : latitute and longitude if activated, null otherwise
 
    We implement 3 interfaces:
      - ArrayAccess so that this object behaves like an associative array.
@@ -1463,6 +1464,17 @@ function renderPage()
             $url = 'http://'.$url;
         $link = array('title'=>trim($_POST['lf_title']),'url'=>$url,'description'=>trim($_POST['lf_description']),'private'=>(isset($_POST['lf_private']) ? 1 : 0),
                       'linkdate'=>$linkdate,'tags'=>str_replace(',',' ',$tags));
+		// Landmark		
+		if(isset($_POST['lf_landmark']))
+		{
+			$landmark = array('lat'=>$_POST['lf_land_lat'],'lon'=>$_POST['lf_land_lon'],'alt'=>$_POST['lf_land_alt']);
+		}
+		else
+		{
+			$landmark = null;
+		}
+		$link['landmark']=$landmark;
+
         if ($link['title']=='') $link['title']=$link['url']; // If title is empty, use the URL as title.
         $LINKSDB[$linkdate] = $link;
         $LINKSDB->savedb(); // save to disk

diff --git a/tpl/editlink.html b/tpl/editlink.html
@@ -9,23 +9,43 @@
 	{include="page.header"}
 	<div id="editlinkform">
 	    <form method="post" name="linkform">
+
 	        <input type="hidden" name="lf_linkdate" value="{$link.linkdate}">
-	        <i>URL</i><br><input type="text" name="lf_url" value="{$link.url|htmlspecialchars}" style="width:100%"><br>
-	        <i>Title</i><br><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br>
-	        <i>Description</i><br><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br>
-	        <i>Tags</i><br><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br>
-	        {if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
+	        <i>URL</i><br/><input type="text" name="lf_url" value="{$link.url|htmlspecialchars}" style="width:100%"><br/>
+	        <i>Title</i><br/><input type="text" name="lf_title" value="{$link.title|htmlspecialchars}" style="width:100%"><br/>
+	        <i>Description</i><br/><textarea name="lf_description" rows="4" cols="25" style="width:100%">{$link.description|htmlspecialchars}</textarea><br/>
+	        <i>Tags</i><br/><input type="text" id="lf_tags" name="lf_tags" value="{$link.tags|htmlspecialchars}" style="width:100%"><br/>
+			<!-- Landmark option -->
+			{if condition="($link_is_new || $link.landmark==null)"}
+	        <input type="checkbox" name="lf_landmark" id="landmark">&nbsp;<label for="landmark"><i>Landmark</i></label><i id="infolandmark"></i><br/>
+			<input type="hidden" name="lf_land_lat" value="">
+			<input type="hidden" name="lf_land_lon" value="">
+			<input type="hidden" name="lf_land_alt" value="">
+			<input type="hidden" name="tmp_landmark_url" value=""/>
+		    {else}
+			<input type="checkbox" checked="checked" name="lf_landmark" id="landmark">&nbsp;<label for="landmark"><i>Landmark</i></label><i id="infolandmark">> Lat : {$link.landmark.lat} Lon: {$link.landmark.lon} Alt : {$link.landmark.alt} </i><br/>
+			<input type="hidden" name="lf_land_lat" value="{$link.landmark.lat}">
+			<input type="hidden" name="lf_land_lon" value="{$link.landmark.lon}">
+			<input type="hidden" name="lf_land_alt" value="{$link.landmark.alt}">
+			<input type="hidden" name="tmp_landmark_url" value=""/>
+			{/if}
+			{if condition="($link_is_new && $GLOBALS['privateLinkByDefault']==true) || $link.private == true"}
             <input type="checkbox" checked="checked" name="lf_private" id="lf_private">
-            &nbsp;<label for="lf_private"><i>Private</i></label><br>
+            &nbsp;<label for="lf_private"><i>Private</i></label><br/>
             {else}
             <input type="checkbox"  name="lf_private" id="lf_private">
-            &nbsp;<label for="lf_private"><i>Private</i></label><br>
+            &nbsp;<label for="lf_private"><i>Private</i></label><br/>
             {/if}
+
 	        <input type="submit" value="Save" name="save_edit" class="bigbutton" style="margin-left:40px;">
 	        <input type="submit" value="Cancel" name="cancel_edit" class="bigbutton" style="margin-left:40px;">
 	        {if condition="!$link_is_new"}<input type="submit" value="Delete" name="delete_link" class="bigbutton" style="margin-left:180px;" onClick="return confirmDeleteLink();">{/if}
 	        <input type="hidden" name="token" value="{$token}">
+
+
 	        {if condition="$http_referer"}<input type="hidden" name="returnurl" value="{$http_referer|htmlspecialchars}">{/if}
+
+
 	    </form>
 	</div>
 </div>

diff --git a/tpl/includes.html b/tpl/includes.html
@@ -7,4 +7,8 @@
 <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
 <link type="text/css" rel="stylesheet" href="inc/shaarli.css?version={$version|urlencode}#" />
 {if condition="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css?version={$version}#" />{/if}
-{if="empty($GLOBALS['disablejquery'])"}<script src="inc/jquery.min.js#"></script><script src="inc/jquery-ui.min.js#"></script>{/if}
+{if="empty($GLOBALS['disablejquery'])"}
+	<script src="inc/jquery.min.js#"></script>
+	<script src="inc/jquery-ui.min.js#"></script>
+	<script src="inc/landmark.js#"></script>
+{/if}
diff --git a/tpl/linklist.html b/tpl/linklist.html
@@ -31,7 +31,12 @@
         {loop="links"}
         <li{if="$value.class"} class="{$value.class}"{/if}>
             <a name="{$value.linkdate|smallHash}" id="{$value.linkdate|smallHash}"></a>
-            <div class="thumbnail">{$value.url|thumbnail}</div>
+            <div class="thumbnail">{$value.url|thumbnail}
+			{if="isset($value.landmark)"}
+				<img width="90" height="90" alt="Latitude:{$value.landmark['lat']} | Longitude:{$value.landmark['lon']} |Altitude:{$value.landmark['alt']}" src="http://ojw.dev.openstreetmap.org/StaticMap/?mlat={$value.landmark['lat']}&mlon={$value.landmark['lon']}&z=14&layer=hiking&mode=Location&show=1" />
+			{/if}
+
+			</div>
             <div class="linkcontainer">
                 {if="isLoggedIn()"}
                     <div class="linkeditbuttons">
@@ -41,6 +46,7 @@
                     </div>
                 {/if}
                 <span class="linktitle"><a href="{$redirector}{$value.url|htmlspecialchars}">{$value.title|htmlspecialchars}</a></span>
+
                 <br>
                 {if="$value.description"}<div class="linkdescription"{if condition="$search_type=='permalink'"} style="max-height:none !important;"{/if}>{$value.description}</div>{/if}
                 {if="!$GLOBALS['config']['HIDE_TIMESTAMPS'] || isLoggedIn()"}