OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed and improved gpx child waypoints

Browse Source
This commit is contained in:
following
2013-02-10 22:51:28 +01:00
parent 29ace6a3af
commit 1dc8526aa1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/lib/search.gpx.inc.php
+4 -3
View File
@@ -581,6 +581,7 @@
// additional waypoints, including personal cache note // additional waypoints, including personal cache note
$childWaypoints = $childwphandler->getChildWps($r['cacheid']); $childWaypoints = $childwphandler->getChildWps($r['cacheid']);
$n = 1; $n = 1;
$digits = "%0" . (floor(log10(count($childWaypoints))) + 1) . "d";
foreach ($childWaypoints as $childWaypoint) foreach ($childWaypoints as $childWaypoint)
{ {
@@ -588,14 +589,14 @@
$thiswp = str_replace('{wp_lat}', sprintf('%01.5f', $childWaypoint['latitude']), $thiswp); $thiswp = str_replace('{wp_lat}', sprintf('%01.5f', $childWaypoint['latitude']), $thiswp);
$thiswp = str_replace('{wp_lon}', sprintf('%01.5f', $childWaypoint['longitude']), $thiswp); $thiswp = str_replace('{wp_lon}', sprintf('%01.5f', $childWaypoint['longitude']), $thiswp);
$thiswp = str_replace('{time}', $time, $thiswp); $thiswp = str_replace('{time}', $time, $thiswp);
$thiswp = str_replace('{name}', $r['waypoint'].'W'.$n , $thiswp); $thiswp = str_replace('{name}', $r['waypoint'].'W'.sprintf($digits,$n) , $thiswp);
$thiswp = str_replace('{cachename}', xmlentities($r['name']), $thiswp); $thiswp = str_replace('{cachename}', xmlentities($r['name']), $thiswp);
$thiswp = str_replace('{comment}',xmlentities($childWaypoint['description']), $thiswp); $thiswp = str_replace('{comment}',xmlentities($childWaypoint['description']), $thiswp);
$thiswp = str_replace('{desc}', $translate->t('Waypoint','','',0).' '.$n, $thiswp); $thiswp = str_replace('{desc}', $translate->t('Waypoint','','',0).' '.$n, $thiswp);
switch ($childWaypoint['type']) switch ($childWaypoint['type'])
{ {
case 1: $wp_typename = "Parking Area"; case 1: $wp_typename = "Parking Area"; break;
defailt: $wp_typename = "Reference Point"; default: $wp_typename = "Reference Point";
} }
$thiswp = str_replace('{type}', $wp_typename, $thiswp); $thiswp = str_replace('{type}', $wp_typename, $thiswp);
$thiswp = str_replace('{parent}', $r['waypoint'], $thiswp); $thiswp = str_replace('{parent}', $r['waypoint'], $thiswp);
lib/classes/ChildWp/Handler.php
+1 -1
View File
@@ -36,7 +36,7 @@ class ChildWp_Handler
public function getChildWp($childid) public function getChildWp($childid)
{ {
$rs = sql("SELECT id, cache_id, type, subtype, latitude, longitude, description FROM coordinates WHERE id = &1", $childid); $rs = sql("SELECT id, cache_id, subtype, latitude, longitude, description FROM coordinates WHERE id = &1", $childid);
$ret = $this->recordToArray(sql_fetch_array($rs)); $ret = $this->recordToArray(sql_fetch_array($rs));
mysql_free_result($rs); mysql_free_result($rs);