From cc2f479f71ea6764fade3fa220549a21484fad1e Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 12 Jan 2018 14:10:20 -0200
Subject: [PATCH] i3geo/i3geo#87 correção Ao criar uma cópia, a acentuação do METADATA "tema" fica errada (sistema de administração)

---
 admin/admin.db                     | Bin 352256 -> 0 bytes
 admin/catalogo/mapfile/funcoes.php |   4 ++++
 temas/_lbiomashpcopia.map          | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 119 insertions(+), 0 deletions(-)
 create mode 100644 temas/_lbiomashpcopia.map

diff --git a/admin/admin.db b/admin/admin.db
index b80710b..d5e6180 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/catalogo/mapfile/funcoes.php b/admin/catalogo/mapfile/funcoes.php
index f7b7f26..a564778 100755
--- a/admin/catalogo/mapfile/funcoes.php
+++ b/admin/catalogo/mapfile/funcoes.php
@@ -538,6 +538,10 @@ function clonarMapfile($codigo,$novocodigo,$titulo,$dbh,$dbhw){
 	$mapa = ms_newMapObj($arq);
 	$layer = @$mapa->getlayerbyname($codigo);
 	$layer->set("name",$novocodigo);
+
+	if (mb_detect_encoding ( $titulo, 'UTF-8, ISO-8859-1' ) == "UTF-8") {
+	    $titulo = utf8_decode ( $titulo );
+	}
 	$layer->setmetadata("TEMA",$titulo);
 	$mapa->save($arqnovo);
 	\admin\php\funcoesAdmin\removeCabecalhoMapfile($arqnovo);
diff --git a/temas/_lbiomashpcopia.map b/temas/_lbiomashpcopia.map
new file mode 100644
index 0000000..c696896
--- /dev/null
+++ b/temas/_lbiomashpcopia.map
@@ -0,0 +1,115 @@
+MAP
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolosv6.sym"
+  LAYER
+    COMPOSITE
+      OPACITY 50
+    END # COMPOSITE
+    CONNECTION ""
+    DATA "/var/www/i3geo/aplicmap/dados/biomas.shp"
+    METADATA
+      "TIP"	"CD_LEGENDA"
+      "cache"	"nao"
+      "olopacity"	""
+      "CLASSE"	"SIM"
+      "animagif"	""
+      "permitekmz"	"SIM"
+      "gmopacity"	""
+      "gmstatus"	""
+      "ITENSDESC"	"Teste de acentuação"
+      "TILES"	"SIM"
+      "ESCALA"	"250000"
+      "editavel"	""
+      "arquivotemaoriginal"	""
+      "extensao"	"-73.990940816816 -33.74827031115 -34.822855820777 5.272224303909"
+      "olstatus"	""
+      "nomeoriginal"	""
+      "FUNCOESJS"	'[{"titulo":"teste fake"},{"titulo":"teste de nome de uma função","script":"../aplicmap/dados/testefuncaojs.js","funcao":"funcao1","parametros":["CD_LEGENDA"]}]'
+      "permitedownload"	"SIM"
+      "permitecomentario"	"NAO"
+      "FILTROORIGINAL"	""
+      "escondido"	"NAO"
+      "DATAORIGINAL"	""
+      "download"	"SIM"
+      "esquematabelaeditavel"	""
+      "itembuscarapida"	"CD_LEGENDA"
+      "ITENS"	"CD_LEGENDA"
+      "tme"	""
+      "permitekml"	"SIM"
+      "permiteogc"	"SIM"
+      "transitioneffect"	"NAO"
+      "convcaracter"	"SIM"
+      "TEMA"	"Cópia para testar acentuação"
+      "colunaidunico"	""
+      "colunageometria"	""
+      "identifica"	"sim"
+      "tabelaeditavel"	""
+      "storymap"	""
+    END # METADATA
+    NAME "_lbiomashpcopia"
+    PROCESSING "ITEMS=CD_LEGENDA"
+    PROCESSING "LABEL_NO_CLIP=True"
+    PROCESSING "POLYLINE_NO_CLIP=True"
+    STATUS DEFAULT
+    TEMPLATE "none.htm"
+    TILEITEM "location"
+    TYPE POLYGON
+    UNITS METERS
+    CLASS
+      NAME "CAATINGA"
+      EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA')
+      STYLE
+        COLOR 50 247 169
+        OUTLINECOLOR 255 255 255
+      END # STYLE
+      TITLE ""
+    END # CLASS
+    CLASS
+      NAME "PAMPA area > 5"
+      EXPRESSION ('[CD_LEGENDA]'eq'PAMPA area > 5')
+      STYLE
+        COLOR 239 22 152
+        OUTLINECOLOR 255 255 255
+      END # STYLE
+      TITLE ""
+    END # CLASS
+    CLASS
+      NAME "CERRADO"
+      EXPRESSION ('[CD_LEGENDA]'eq'CERRADO')
+      STYLE
+        COLOR 202 223 14
+        OUTLINECOLOR 255 255 255
+      END # STYLE
+      TITLE ""
+    END # CLASS
+    CLASS
+      NAME "PANTANAL"
+      EXPRESSION ('[CD_LEGENDA]'eq'PANTANAL')
+      STYLE
+        COLOR 214 107 232
+        OUTLINECOLOR 255 255 255
+      END # STYLE
+      TITLE ""
+    END # CLASS
+    CLASS
+      NAME "AMAZÔNIA"
+      EXPRESSION ('[CD_LEGENDA]'eq'AMAZÔNIA')
+      STYLE
+        COLOR 16 67 6
+        OUTLINECOLOR 255 255 255
+      END # STYLE
+      TITLE ""
+    END # CLASS
+    CLASS
+      NAME "MATA ATLÂNTICA"
+      EXPRESSION ('[CD_LEGENDA]'eq'MATA ATLÂNTICA')
+      STYLE
+        COLOR 44 215 49
+        OUTLINECOLOR 255 255 255
+      END # STYLE
+      TITLE ""
+    END # CLASS
+  END # LAYER
+
+END # MAP
+
--
libgit2 0.21.2