From 5f0f9b35289db382bb61126e77ce6c41841c75cc Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Fri, 12 Jan 2018 14:35:00 -0200
Subject: [PATCH] i3geo/i3geo#86 correção Ao apagar um mapfile, a lista não é atualizada (sistema de administração)

---
 admin/admin.db                  | Bin 352256 -> 0 bytes
 admin/catalogo/mapfile/index.js |  24 +++++++++++++++---------
 temas/_lbiomashpcopia.map       | 115 -------------------------------------------------------------------------------------------------------------------
 3 files changed, 15 insertions(+), 124 deletions(-)
 delete mode 100644 temas/_lbiomashpcopia.map

diff --git a/admin/admin.db b/admin/admin.db
index d5e6180..5e8849c 100755
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/catalogo/mapfile/index.js b/admin/catalogo/mapfile/index.js
index b27b571..700d2d0 100755
--- a/admin/catalogo/mapfile/index.js
+++ b/admin/catalogo/mapfile/index.js
@@ -230,8 +230,8 @@ Obt&eacute;m a lista
 			.done(
 					function(data, status){
 						i3GEOadmin.core.modalAguarde(false);
-						i3GEOadmin.mapfile.registraFavoritos(id);
 						i3GEOadmin.mapfile.lista("","");
+						i3GEOadmin.mapfile.registraFavoritos(id);
 					}
 			)
 			.fail(
@@ -274,16 +274,22 @@ Obt&eacute;m a lista
 			i3GEOadmin.mapfile.montaFavoritos();
 		},
 		montaFavoritos: function(){
-			var mapfile, i, conteudo = [], n, codigo, h;
-			n = i3GEOadmin.mapfile.favoritosArray.length;
-			for (i=0; i<n; i++){
-				codigo = i3GEOadmin.mapfile.favoritosArray[i];
-				h = $("#form-" + codigo).html();
-				if(h != undefined){
-					conteudo.push(h+"&nbsp;");
+			//o try aqui e necessario para evitar seletor com erro. Eventualmente.
+			try {
+				var mapfile, i, conteudo = [], n, codigo, h;
+				n = i3GEOadmin.mapfile.favoritosArray.length;
+				for (i=0; i<n; i++){
+					codigo = i3GEOadmin.mapfile.favoritosArray[i];
+					h = $("#form-" + codigo).html();
+					if(h != undefined){
+						conteudo.push(h+"&nbsp;");
+					}
 				}
+				$("#body-favoritos").html(conteudo.join("\n"));
+			} catch (e) {
+				i3GEOadmin.mapfile.favoritosArray = [];
 			}
-			$("#body-favoritos").html(conteudo.join("\n"));
+
 		},
 		limpaCacheDialogo: function(codigo){
 			var hash = {
diff --git a/temas/_lbiomashpcopia.map b/temas/_lbiomashpcopia.map
deleted file mode 100644
index c696896..0000000
--- a/temas/_lbiomashpcopia.map
+++ /dev/null
@@ -1,115 +0,0 @@
-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