Changeset 1788

Timestamp:

09/06/10 14:27:57 (17 months ago)

Author:

spf

Message:

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

Location:

trunk

Files:

• lib/phpcommon/functions.php (modified) (1 diff)
• lib/phpcommon/races.class.php (modified) (2 diffs)
• site/ics.php (modified) (1 diff)
• site/myboat.php (modified) (1 diff)

trunk/lib/phpcommon/functions.php

@@ -1662 +1662 @@
 }
 
+function getWaypointHTMLSymbols($wpformat) {
+  $wpsymbols = "";
+  switch ($wpformat & (WP_CROSS_CLOCKWISE|WP_CROSS_ANTI_CLOCKWISE)) {
+  case WP_CROSS_ANTI_CLOCKWISE:
+    $wpsymbols .= "↺ ";
+    break;
+  case WP_CROSS_CLOCKWISE:
+    $wpsymbols .= "↻ ";
+    break;
+  default:
+  }
+  if (($wpformat & WP_CROSS_ONCE) == WP_CROSS_ONCE) {
+    $wpsymbols .= "⊅ ";
+  } 
+  
+  switch ($wpformat & (WP_ICE_GATE_N|WP_ICE_GATE_S)) {
+  case WP_ICE_GATE_S:
+    $wpsymbols .= "⥴";
+    break;
+  case WP_ICE_GATE_N:
+    $wpsymbols .= "⥲";
+  default:
+  }
+  return trim($wpsymbols);
+}
+
 // For a finished race, to give the Palmares
 function getRaceRanking($idusers, $idraces) {

trunk/lib/phpcommon/races.class.php

@@ -312 +312 @@
     function htmlWayPoints($startstring) {
         $ret  = "<table class=\"waypoints\">\n";
-        $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>";
+        $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>";
         $ret .= "<tr>\n";
         $ret .= "<td>WP0</td>"; 
-        $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);
+        $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);
         $ret .= "</tr>\n";
 
@@ -321 +321 @@
             $ret .= "<tr>\n";
             $ret .= "<td>WP".$num."</td>";
+            $wpsymbols = getWaypointHTMLSymbols($wp['wpformat']);
             switch($wp['wpformat'] & 0xF) {
             case WP_ONE_BUOY:
-              $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td colspan=\"2\">&nbsp;</td><td>%.0f&deg;</td><td>%s</td><td>%s</td>", 
+              $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>", 
                               $wp['latitude1']/1000., $wp['longitude1']/1000., 
-                              $wp['laisser_au'],  $wp['wptypelabel'], htmlentities($wp['libelle']));
+                              $wp['laisser_au'], $wpsymbols, $wp['wptypelabel'], htmlentities($wp['libelle']));
               break;
             case WP_TWO_BUOYS:
             default:
-              $ret .= sprintf("<td>%.3f</td><td>%.3f</td><td>%.3f</td><td>%.3f</td><td>&nbsp;</td><td>%s</td><td>%s</td>", 
+              $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>", 
                               $wp['latitude1']/1000., $wp['longitude1']/1000., 
-                              $wp['latitude2']/1000., $wp['longitude2']/1000.,  $wp['wptypelabel'], htmlentities($wp['libelle']));
+                              $wp['latitude2']/1000., $wp['longitude2']/1000., $wpsymbols, $wp['wptypelabel'], htmlentities($wp['libelle']));
             }
             $ret .= "</tr>\n";

trunk/site/ics.php

@@ -4 +4 @@
 
     if ($idraces != 0) {
-        $ro = new Races($idraces);
+        $ro = new races($idraces);
         echo $ro->htmlRaceDescription();
     }

trunk/site/myboat.php

@@ -167 +167 @@
          $wp_maparea=$wp['maparea'];
   
-         $wpsymbols = "";
-         switch ($wp['wpformat'] & (WP_CROSS_CLOCKWISE|WP_CROSS_ANTI_CLOCKWISE)) {
-         case WP_CROSS_ANTI_CLOCKWISE:
-           $wpsymbols .= "↺ ";
-           break;
-         case WP_CROSS_CLOCKWISE:
-           $wpsymbols .= "↻ ";
-           break;
-         default:
-         }
-         if (($wp['wpformat'] & WP_CROSS_ONCE) == WP_CROSS_ONCE) {
-           $wpsymbols .= "⊅";
-         } 
-         
-         switch ($wp['wpformat'] & (WP_ICE_GATE_N|WP_ICE_GATE_S)) {
-         case WP_ICE_GATE_S:
-           $wpsymbols .= "⥴";
-           break;
-         case WP_ICE_GATE_N:
-           $wpsymbols .= "⥲";
-         default:
-         }
+         $wpsymbols = getWaypointHTMLSymbols($wp['wpformat']);
 
          $status_content="<div class="infobulle"><b>WP" . $wp_num . " ".$wpsymbols."</b><br />";