From 72cb87167a8a8214c377468d327e36dc5f26c3fb Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 10 Sep 2011 00:53:21 +0000
Subject: [PATCH] Adaptações dos códigos para a versão 6 do Mapserver

---
 pacotes/kmlmapserver/classes/layerserver.class.php  | 28 ++++++++++++++++++++++++----
 pacotes/kmlmapserver/classes/symbolserver.class.php |  4 +++-
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pacotes/kmlmapserver/classes/layerserver.class.php b/pacotes/kmlmapserver/classes/layerserver.class.php
index 42f6cee..b2a8529 100644
--- a/pacotes/kmlmapserver/classes/layerserver.class.php
+++ b/pacotes/kmlmapserver/classes/layerserver.class.php
@@ -264,6 +264,18 @@ class LayerServer {
     */
     function process_layer_request(&$layer_name){
 		error_reporting(0);
+
+		$v = "5.0.0";
+		$vs = explode(" ",ms_GetVersion());
+		$cvs = count($vs);
+		for ($i=0;$i<$cvs;++$i)
+		{
+			if(trim(strtolower($vs[$i])) == "version")
+			{$v = $vs[$i+1];}
+		}
+		$v = explode(".",$v);
+		$versao = $v[0];
+
         $layer = @$this->map_object->getLayerByName($layer_name);
 		if(!$layer)
 		{$layer = $this->map_object->getlayer(0);}
@@ -355,8 +367,12 @@ class LayerServer {
                         for ($j=0; $j < $layer->getNumResults(); $j++)
                         {
                             // get next shape row
-                            $result = $layer->getResult($j);
-                            $shape  = $layer->getShape($result->tileindex, $result->shapeindex);
+							if($versao == 6)
+							{$shape  =  $layer->getShape($layer->getResult($j));}
+							else{
+								$result = $layer->getResult($j);
+								$shape  = $layer->getFeature($result->shapeindex,$result->tileindex);
+							}
                             $this->process_shape($layer, $shape, $class_list, $folder, $namecol);
                         // end for loop
                         }
@@ -372,8 +388,12 @@ class LayerServer {
                     for ($j=0; $j < $n; $j++)
                     {
                         // get next shape row
-                        $result = $layer->getResult($j);
-                        $shape  = $layer->getShape($result->tileindex, $result->shapeindex);
+						if($versao == 6)
+						{$shape  =  $layer->getShape($layer->getResult($j));}
+						else{
+							$result = $layer->getResult($j);
+							$shape  = $layer->getFeature($result->shapeindex,$result->tileindex);
+						}
                         $shape->classindex = $result->classindex;
                         $this->process_shape($layer, $shape, $class_list, $folder, $namecol);
                     }
diff --git a/pacotes/kmlmapserver/classes/symbolserver.class.php b/pacotes/kmlmapserver/classes/symbolserver.class.php
index e2f3cca..3994dfa 100644
--- a/pacotes/kmlmapserver/classes/symbolserver.class.php
+++ b/pacotes/kmlmapserver/classes/symbolserver.class.php
@@ -200,7 +200,9 @@ class SymbolServer {
     function send_icon(){
         header('Content-type:image/png');
         // Set transparency (needs imageformat RBGA in the mapfile too)
-        $this->map_object->set('transparent', 'on');
+		$o = $this->map_object->outputformat;
+		$o->set("transparent",MS_ON);		
+        //$this->map_object->set('transparent', 'on');
         $img = $this->map_object->draw();
         $this->iconpoint->draw($this->map_object, $this->icon_layer, $img, $this->classindex, '');
         $img->saveImage('');
--
libgit2 0.21.2