From ee62c86b5bf21d3938eca6417183f56db0ac026c Mon Sep 17 00:00:00 2001
From: edmarmoretti <edmar.moretti@gmail.com>
Date: Thu, 27 Jul 2017 14:06:33 -0300
Subject: [PATCH] Correções no upload de arquivo csv

---
 admin/admin.db                              | Bin 340992 -> 0 bytes
 admin1/upload/csv2pg/exec.php               |  5 +++--
 ferramentas/atalhosedicao/template_mst.html |  2 +-
 temas/murilo.map                            | 35 -----------------------------------
 temas/testecsv.map                          | 27 ---------------------------
 5 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100755 temas/murilo.map
 delete mode 100755 temas/testecsv.map

diff --git a/admin/admin.db b/admin/admin.db
index 9c8f98f..be1580e 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin1/upload/csv2pg/exec.php b/admin1/upload/csv2pg/exec.php
index 37044d5..645c67e 100755
--- a/admin1/upload/csv2pg/exec.php
+++ b/admin1/upload/csv2pg/exec.php
@@ -436,8 +436,9 @@ if (isset ( $_FILES ['i3GEOuploadcsv'] ['name'] )) {
 				$layer->setconnectiontype ( 6 );
 				$layer->set ( "type", $tipoLayer );
 				$c = $layer->getclass(0);
-				$s = $c->getsymbol(0);
-				$s->set("symbol","ponto");
+				$s = $c->getstyle(0);
+				//$s = $st->getsymbol(0);
+				$s->set("symbolname","ponto");
 				$mapa->save ( $_SESSION ["locaplic"] . "/temas/" . $_POST ["i3GEOuploadNomeTabela"] . ".map" );
 				\admin\php\funcoesAdmin\removeCabecalhoMapfile ( $_SESSION ["locaplic"] . "/temas/" . $_POST ["i3GEOuploadNomeTabela"] . ".map" );
 				echo "<div class='alert alert-success' role='alert'>Mapfile " . $_POST ["i3GEOuploadNomeTabela"] . " criado!!!</div>";
diff --git a/ferramentas/atalhosedicao/template_mst.html b/ferramentas/atalhosedicao/template_mst.html
index a3503d3..ce72de9 100755
--- a/ferramentas/atalhosedicao/template_mst.html
+++ b/ferramentas/atalhosedicao/template_mst.html
@@ -1,5 +1,5 @@
 <div class='container-fluid'>
-	<a onclick="i3GEOF.atalhosedicao.salva()" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
+	<a onclick="i3GEOF.atalhosedicao.salva()" class='btn btn-warning btn-lg btn-block btn-raised' href='javascript:void(0)' >
 	{{{salva}}}
 	</a>
 	<a onclick="i3GEO.temaAtivo = i3GEOF.atalhosedicao.tema;i3GEO.tema.dialogo.editaLegenda();" class='btn btn-primary btn-lg btn-block btn-raised' href='javascript:void(0)' >
diff --git a/temas/murilo.map b/temas/murilo.map
deleted file mode 100755
index 7f4f3c5..0000000
--- a/temas/murilo.map
+++ /dev/null
@@ -1,35 +0,0 @@
-MAP
-  FONTSET "../symbols/fontes.txt"
-  SYMBOLSET "../symbols/simbolosv6.sym"
-  LAYER
-    CONNECTION "i3geosaude"
-    CONNECTIONTYPE POSTGIS
-    DATA "the_geom from (select * from public.murilo) as foo using unique id using srid=4326"
-    METADATA
-      "CLASSE"	"SIM"
-      "permitekmz"	"NAO"
-      "TILES"	"SIM"
-      "permitedownload"	"NAO"
-      "permitekml"	"NAO"
-      "permiteogc"	"NAO"
-      "convcaracter"	"SIM"
-      "TEMA"	"murilo"
-    END # METADATA
-    NAME "murilo"
-    STATUS DEFAULT
-    TEMPLATE "none.htm"
-    TILEITEM "location"
-    TYPE POINT
-    UNITS METERS
-    CLASS
-      NAME ""
-      STYLE
-        COLOR 0 0 0
-        SIZE 12
-        SYMBOL "ponto"
-      END # STYLE
-    END # CLASS
-  END # LAYER
-
-END # MAP
-
diff --git a/temas/testecsv.map b/temas/testecsv.map
deleted file mode 100755
index 94a104d..0000000
--- a/temas/testecsv.map
+++ /dev/null
@@ -1,27 +0,0 @@
-MAP
-SYMBOLSET ../symbols/simbolosv6.sym
-FONTSET   "../symbols/fontes.txt"
-LAYER
-	NAME "testecsv"
-	TEMPLATE "none.htm"
-	TYPE line
-	DATA ""
-	CONNECTION ""
-	STATUS DEFAULT
-	METADATA
-		TEMA "testecsv"
-		CLASSE "SIM"
-		permiteogc "SIM"
-		permitedownload "SIM"
-		permitekml "SIM"
-		permitekmz "SIM"
-	END
-    CLASS
-        NAME ""
-        STYLE
-        	COLOR 0 0 0
-        	SIZE 12
-        END
-    END
-END
-END
--
libgit2 0.21.2