Show
Ignore:
Timestamp:
09/06/10 14:27:57 (21 months ago)
Author:
spf
Message:

added races description + factorization of symbols for race special instructions [See #34]

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/lib/phpcommon/races.class.php

    r1767 r1788  
    312312    function htmlWayPoints($startstring) { 
    313313        $ret  = "<table class=\"waypoints\">\n"; 
    314         $ret .= "<tr><th>#</th><th>Lat1</th><th>Lon1</th><th>Lat2</th><th>Lon2</th><th>@</th><th>Type</th><th>Name</th></tr>"; 
     314        $ret .= "<tr><th>#</th><th>Lat1</th><th>Lon1</th><th>Lat2</th><th>Lon2</th><th>@</th><th>Spec</th><th>Type</th><th>Name</th></tr>"; 
    315315        $ret .= "<tr>\n"; 
    316316        $ret .= "<td>WP0</td>";  
    317         $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td colspan=\"2\">&nbsp;</td><td>&nbsp;</td><td>%s</td><td>&nbsp;</td>", $this->startlat/1000., $this->startlong/1000., $startstring); 
     317        $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td colspan=\"2\">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>%s</td><td>&nbsp;</td>", $this->startlat/1000., $this->startlong/1000., $startstring); 
    318318        $ret .= "</tr>\n"; 
    319319 
     
    321321            $ret .= "<tr>\n"; 
    322322            $ret .= "<td>WP".$num."</td>"; 
     323            $wpsymbols = getWaypointHTMLSymbols($wp['wpformat']); 
    323324            switch($wp['wpformat'] & 0xF) { 
    324325            case WP_ONE_BUOY: 
    325               $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td colspan=\"2\">&nbsp;</td><td>%.0f&deg;</td><td>%s</td><td>%s</td>",  
     326              $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td colspan=\"2\">&nbsp;</td><td>%.0f&deg;</td><td>%s</td><td>%s</td><td>%s</td>",  
    326327                              $wp['latitude1']/1000., $wp['longitude1']/1000.,  
    327                               $wp['laisser_au'], $wp['wptypelabel'], htmlentities($wp['libelle'])); 
     328                              $wp['laisser_au'], $wpsymbols, $wp['wptypelabel'], htmlentities($wp['libelle'])); 
    328329              break; 
    329330            case WP_TWO_BUOYS: 
    330331            default: 
    331               $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td>%.3f</td><td>%.3f</td><td>&nbsp;</td><td>%s</td><td>%s</td>",  
     332              $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td>%.3f</td><td>%.3f</td><td>&nbsp;</td><td>%s</td><td>%s</td><td>%s</td>",  
    332333                              $wp['latitude1']/1000., $wp['longitude1']/1000.,  
    333                               $wp['latitude2']/1000., $wp['longitude2']/1000., $wp['wptypelabel'], htmlentities($wp['libelle'])); 
     334                              $wp['latitude2']/1000., $wp['longitude2']/1000., $wpsymbols, $wp['wptypelabel'], htmlentities($wp['libelle'])); 
    334335            } 
    335336            $ret .= "</tr>\n";