diff --git a/pacotes/kmlmapserver/classes/layerserver.class.php b/pacotes/kmlmapserver/classes/layerserver.class.php index 15997b5..b296b83 100644 --- a/pacotes/kmlmapserver/classes/layerserver.class.php +++ b/pacotes/kmlmapserver/classes/layerserver.class.php @@ -162,7 +162,6 @@ class LayerServer { $url = $imageObj->saveWebImage(); $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); $url = strtolower($protocolo[0]."://".$_SERVER['HTTP_HOST']).$url; - $legenda = " " . PHP_EOL . " Legenda" . PHP_EOL . " " . PHP_EOL @@ -180,9 +179,11 @@ class LayerServer { $this->out_proj = ms_newProjectionObj("init=epsg:4326"); // Set endpoint //die($_SERVER['REQUEST_URI']); + $protocolo = explode("/",$_SERVER['SERVER_PROTOCOL']); $protocolo = strtolower($protocolo[0]); $this->endpoint = $protocolo . '://'.$_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] ? ':'.$_SERVER['SERVER_PORT'] : '') . $_SERVER['PHP_SELF']; + // Process request if(!$this->has_error()) { $this->process_request(); @@ -192,6 +193,7 @@ class LayerServer { } return $this->send_stream($this->get_kml()); + } /** @@ -363,6 +365,7 @@ class LayerServer { {$namecol = explode(",",$namecol);$namecol = $namecol[0];} // Add classes $folder =& $this->_xml->Document->addChild('Folder'); + $class_list = $this->parse_classes($layer, $folder, $namecol, $title_field, $description_template); //die(print_r($class_list, true)); @@ -372,6 +375,7 @@ class LayerServer { //print("$searchfield && $searchstring"); if(!isset($searchfield)){$searchfield = false;} if(!isset($searchstring)){$searchstring = false;} + if($searchfield && $searchstring){ if(@$layer->queryByAttributes($searchfield, $searchstring, MS_MULTIPLE) == MS_SUCCESS){ $layer->open(); @@ -639,7 +643,9 @@ class LayerServer { $numclasses = $layer->numclasses; for($i = 0; $i < $numclasses; $i++){ $class = $layer->getClass($i); + $label = $class->label; + if($label){ $style['label_color'] = $label->color; $style['label_size'] = $label->size; @@ -1134,4 +1140,4 @@ function versao() return $versao; } } -?> \ No newline at end of file +?> diff --git a/temas/_lubs.map b/temas/_lubs.map index f2be158..8c0adb5 100755 --- a/temas/_lubs.map +++ b/temas/_lubs.map @@ -2,12 +2,12 @@ MAP FONTSET "../symbols/fontes.txt" SYMBOLSET "../symbols/simbolos.sym" LAYER - CONNECTION "user=guest_sala password= dbname=dbspo host=10.1.2.25 port=5432" + CONNECTION "user=guest_sala password=151617 dbname=dbspo host=10.1.2.25 port=5432" CONNECTIONTYPE POSTGIS DATA "the_geom from ( SELECT st_geomfromtext('POINT(' || dbgeral.tb_estab_geo.long || ' ' || dbgeral.tb_estab_geo.lat || ')', 4326) as the_geom, - 'UBS - '||dbsismob.tb_sismob_unid_func.no_unidade||' - cnes:'||tb_sismob_unid_func.co_cnes as nome, + 'Unidade Básica de Saúde - '||dbsismob.tb_sismob_unid_func.no_unidade as nome, dbgeral.tb_ibge.uf ||' ,' ||dbgeral.tb_ibge.cidade @@ -23,7 +23,7 @@ MAP ON dbsismob.tb_sismob_unid_func.co_ibge = dbgeral.tb_ibge.ibge INNER JOIN dbgeral.tb_estab_geo ON dbsismob.tb_sismob_unid_func.co_cnes = dbgeral.tb_estab_geo.co_cnes - WHERE dbsismob.tb_sismob_unid_func.co_sismob_programa = 1 limit 500 + WHERE dbsismob.tb_sismob_unid_func.co_sismob_programa = 1 limit 100 ) as foo using unique cnes using srid=4326" METADATA "METAESTAT_ID_MEDIDA_VARIAVEL" "" -- libgit2 0.21.2