Changeset 249

Timestamp:

11/17/07 16:39:22 (15 years ago)

Author:

exi

Message:

Patched the area linker to use proper start/end counts and therefore fix that issue in the Goonswarm area.
Sovereignty changes in station systems now have a border around the entry in the legend.

Files:

• sovereignty/gen_map.php5 (modified) (12 diffs)

sovereignty/gen_map.php5

@@ -17 +17 @@
 include('evedb.php');
 
-set_time_limit(330);
+set_time_limit(390);
 error_reporting(E_ALL ^ E_NOTICE);
 
@@ -364 +364 @@
 function paintRow($y)
 {
-    global $image, $alliances, $curBorder, $curRow, $prevRow, $opt, $nameStack, $segID;
+    global $image, $alliances, $curBorder, $curRow, $prevRow, $opt, $nameStack, $segID, $segGID;
 
     $curA = -1;
@@ -435 +435 @@
         {
             // make sure we dont connect bubbles on the same x when they're spread apart
-            if ($curSegment['lasty'] - $segment['lasty'] > 5)
+            if ($curSegment['lasty'] - $segment['lasty'] > 2)
             {
                 continue;
             }
 
-            if (($segment['lstart']-30 < $curSegment['start']) && ($segment['lend']+30 > $curSegment['end']))
+            if (($segment['lstart']-10 < $curSegment['start']) && ($segment['lend']+10 > $curSegment['end']))
             {
                 // the current segment fits into this from the alliance
                 $validSegs[] = $id;
             }
-            elseif (($segment['lstart']+30 > $curSegment['start']) && ($segment['lend']-30 < $curSegment['end']))
+            elseif (($segment['lstart']+10 > $curSegment['start']) && ($segment['lend']-10 < $curSegment['end']))
             {
                 // the alliance segment fits into the current one
@@ -454 +454 @@
         if (count($validSegs) > 1)
         {
-            $tmp = array_shift($validSegs);
+            // get the biggest chunk and set the id to that parent
+            $max = 0;
             foreach ($validSegs as $id)
             {
+                if ($alliances[$alliance]['segments'][$id]['count'] > $max)
+                {
+                    $max = $alliances[$alliance]['segments'][$id]['count'];
+                    $maxid = $id;
+                }
+            }
+
+            foreach ($validSegs as $id)
+            {
                 // set all ids to the same value so they are merged
-                $alliances[$alliance]['segments'][$id]['id'] = $tmp;
+                $alliances[$alliance]['segments'][$id]['id'] = $maxid;
              }
-             $curSegment['id'] = $tmp;
+             $curSegment['id'] = $maxid;
              $alliances[$alliance]['segments'][] = $curSegment;
         }
@@ -472 +482 @@
         else
         {
+            $curSegment['id'] = ++$segGID;
             $alliances[$alliance]['segments'][] = $curSegment;
         }
+
+        // set start x for this line/segment
+        if (!isset($alliances[$alliance]['lasty'][$y][$curSegment['id']]))
+        {
+            $alliances[$alliance]['lasty'][$y][$curSegment['id']] = $curSegment['start'];
+        }
+        $alliances[$alliance]['lasty'][$y][$curSegment['id']] = min($alliances[$alliance]['lasty'][$y][$curSegment['id']], $curSegment['start']);
+        if (!isset($alliances[$alliance]['lastyend'][$y][$curSegment['id']]))
+        {
+            $alliances[$alliance]['lastyend'][$y][$curSegment['id']] = $curSegment['end'];
+        }
+        $alliances[$alliance]['lastyend'][$y][$curSegment['id']] = max($alliances[$alliance]['lastyend'][$y][$curSegment['id']], $curSegment['end']);
     }
 
@@ -497 +520 @@
             $array[$segment['id']]['count'] += $segment['count'];
             $array[$segment['id']]['Tcount'] += $segment['Tcount'];
-            $array[$segment['id']]['lstart'] = $segment['start'];
-            $array[$segment['id']]['lend'] = $segment['end'];
+            $array[$segment['id']]['lend'] = $alliances[$alliance]['lastyend'][$y][$segment['id']];
+            $array[$segment['id']]['lstart'] = $alliances[$alliance]['lasty'][$y][$segment['id']];
 
             if (!isset($segment['firsty']))
             {
                 $segment['firsty'] = $segment['lasty'];
+            }
+            if (!$segment['lstart'])
+            {
+                $segment['lstart'] = $segment['start'];
+            }
+            if (!$segment['lend'])
+            {
+                $segment['lend'] = $segment['end'];
             }
             if (isset($array[$segment['id']]['start']))
@@ -510 +541 @@
                 $array[$segment['id']]['end'] = max($segment['end'], $array[$segment['id']]['end']);
                 $array[$segment['id']]['firsty'] = min($segment['firsty'], $array[$segment['id']]['firsty']);
+                #echo 'segstrt::'.$segment['start'].' def::'.$array[$segment['id']]['lstart']."\n";
             }
             else
@@ -656 +688 @@
 function printSegments($alliance)
 {
-    global $image;
-    $red = imagecolorallocate($image, 255, 0, 0);
+    global $image, $opt;
+    #$red = imagecolorallocate($image, 255, 0, 0);
     foreach ($alliance['segments'] as $segment)
     {
@@ -664 +696 @@
         $x = round($segment['x']/$segment['count']);
         $y = round($segment['y']/$segment['count']);
-        imagefilledellipse($image, $x, $y, 10, 10, $color);
-        imagefilledellipse($image, $x, $y, 4, 4, $red);
+        #imagefilledellipse($image, $x, $y, 10, 10, $color);
+        #imagefilledellipse($image, $x, $y, 4, 4, $red);
         imagerectangle($image, $segment['start'], $segment['firsty'], $segment['end'], $segment['lasty'], $color);
+        imagettftext($image, 10, 0, $segment['start'], $segment['firsty'], $color, $opt['sov_font'], $segment['id']);
     }
 }
@@ -709 +742 @@
     $white = imagecolorallocate($image, 255, 255, 255);
 
+    if ($row['toAlliance'] == 0)
+    {
+        $toc = imagecolorallocate($image, 80, 80, 80);
+    }
+    else
+    {
+        $a = &$alliances[$allianceIDtoA[$row['toAlliance']]]['color'];
+        $toc = imagecolorallocate($image, $a['r'], $a['g'], $a['b']);
+    }
+
+    // normal system change, print the icon and a circle around the system on the map
+    if ($systems_id[$row['solarSystemID']]['outpost'] == null)
+    {
+        $a = &$alliances[$allianceIDtoA[$row['fromAlliance']]]['color'];
+        $color = imagecolorallocate($image, $a['r'], $a['g'], $a['b']);
+        imageellipse($image, $systems_id[$row['solarSystemID']]['x'], $systems_id[$row['solarSystemID']]['y'], 7, 7, $color);
+
+        imagefilledellipse($image, $x, $y-5, 4, 3, $toc);
+    }
+    else
+    {
+        // this is an outpost change, print the outpost icon
+        imagefilledellipse($image, $x-1, $y-1-5, 2, 1, $toc);
+        imagerectangle($image, $x-2, $y-3-5, $x+2, $y+1-5, $toc);
+
+        $a = &$alliances[$allianceIDtoA[$row['fromAlliance']]]['color'];
+        $color = imagecolorallocate($image, $a['r'], $a['g'], $a['b']);
+        imageellipse($image, $systems_id[$row['solarSystemID']]['x'], $systems_id[$row['solarSystemID']]['y']-1, 9, 9, $color);
+
+        // depending on the change
+        // display the box around it in the appropiate color
+        if ($row['toAlliance'] == 0)
+        {
+            $a = &$alliances[$allianceIDtoA[$row['fromAlliance']]]['color'];
+            $color = imagecolorallocatealpha($image, $a['r'], $a['g'], $a['b'], 20);
+            imagerectangle($image, $x-7, $y-15, $sovRstart+80, $y, $color);
+        }
+        elseif ($row['fromAlliance'] == 0)
+        {
+            $a = &$alliances[$allianceIDtoA[$row['toAlliance']]]['color'];
+            $color = imagecolorallocatealpha($image, $a['r'], $a['g'], $a['b'], 20);
+            imagerectangle($image, $x-7, $y-13, $sovRstart+80, $y+2, $color);
+        }
+        else
+        {
+            $a = &$alliances[$allianceIDtoA[$row['fromAlliance']]]['color'];
+            $color1 = imagecolorallocatealpha($image, $a['r'], $a['g'], $a['b'], 20);
+            $a = &$alliances[$allianceIDtoA[$row['toAlliance']]]['color'];
+            $color2 = imagecolorallocatealpha($image, $a['r'], $a['g'], $a['b'], 20);
+
+            imagesetstyle($image, array($color1, $color1, $color2, $color2, $color2));
+            imagerectangle($image, $x-7, $y-13, $sovRstart+80, $y+2, IMG_COLOR_STYLED);
+        }
+    }
+
     $a = &$alliances[$allianceIDtoA[$row['fromAlliance']]]['color'];
     $color = imagecolorallocate($image, $a['r'], $a['g'], $a['b']);
@@ -715 +803 @@
     $a = &$alliances[$allianceIDtoA[$row['toAlliance']]]['color'];
     $color = imagecolorallocate($image, $a['r'], $a['g'], $a['b']);
-    $toc = $color;
     imagettftext($image, $opt['sovSize'], 0, $sovGstart, $y, $color, $opt['sov_font'], $alliances[$allianceIDtoA[$row['toAlliance']]]['name']);
 
@@ -721 +808 @@
     imagettftext($image, $opt['sovSize'], 0, $sovSstart, $y, $color, $opt['sov_font'], $row['solarSystemName']);
     imagettftext($image, $opt['sovSize'], 0, $sovRstart, $y, $white, $opt['sov_font'], $systems_id[$row['solarSystemID']]['regionName']);
-
-    if ($row['toAlliance'] == 0)
-    {
-        $toc = imagecolorallocate($image, 80, 80, 80);
-    }
-
-    if ($systems_id[$row['solarSystemID']]['outpost'] == null)
-    {
-        $a = &$alliances[$allianceIDtoA[$row['fromAlliance']]]['color'];
-        $color = imagecolorallocate($image, $a['r'], $a['g'], $a['b']);
-        imageellipse($image, $systems_id[$row['solarSystemID']]['x'], $systems_id[$row['solarSystemID']]['y'], 7, 7, $color);
-
-        imagefilledellipse($image, $x, $y-5, 4, 3, $toc);
-    }
-    else
-    {
-        imagefilledellipse($image, $x-1, $y-1-5, 2, 1, $toc);
-        imagerectangle($image, $x-2, $y-3-5, $x+2, $y+1-5, $toc);
-
-        $a = &$alliances[$allianceIDtoA[$row['fromAlliance']]]['color'];
-        $color = imagecolorallocate($image, $a['r'], $a['g'], $a['b']);
-        imageellipse($image, $systems_id[$row['solarSystemID']]['x'], $systems_id[$row['solarSystemID']]['y']-1, 9, 9, $color);
-    }
 
     imageline($image, $x+7, $y-15, $x+7, $y, $white);