From adc1e8e86a5b1de0aa11b52f3709c8644431aed5 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Tue, 14 Apr 2015 20:13:13 +0000
Subject: [PATCH] Inclusão de novo preview de mapas no editor de mapfiles

---
 .project                                                            |   8 ++++----
 admin/admin.db                                                      | Bin 278528 -> 0 bytes
 init/applications-development.png                                   | Bin 0 -> 3919 bytes
 init/dicionario.js                                                  |   7 +++++++
 init/index.php                                                      |   4 ++++
 pacotes/utils/.buildpath                                            |   5 +++++
 pacotes/utils/.project                                              |  28 ++++++++++++++++++++++++++++
 pacotes/utils/.settings/.jsdtscope                                  |   4 ++++
 pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.container |   1 +
 pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.name      |   1 +
 pacotes/utils/colorbrewer.png                                       | Bin 0 -> 14576 bytes
 pacotes/utils/index.php                                             | 247 +++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 pacotes/utils/rgbcolors.html                                        |   2 +-
 temas/_lbiomashp.map                                                |   2 +-
 14 files changed, 93 insertions(+), 216 deletions(-)
 create mode 100644 init/applications-development.png
 create mode 100644 pacotes/utils/.buildpath
 create mode 100644 pacotes/utils/.project
 create mode 100644 pacotes/utils/.settings/.jsdtscope
 create mode 100644 pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.container
 create mode 100644 pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.name
 create mode 100644 pacotes/utils/colorbrewer.png

diff --git a/.project b/.project
index 35562da..57f27a6 100644
--- a/.project
+++ b/.project
@@ -27,7 +27,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1418296414935</id>
+			<id>1428952996735</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
@@ -36,7 +36,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1418296414941</id>
+			<id>1428952996736</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
@@ -45,7 +45,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1418296414947</id>
+			<id>1428952996777</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -54,7 +54,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1418296414954</id>
+			<id>1428952996779</id>
 			<name></name>
 			<type>14</type>
 			<matcher>
diff --git a/admin/admin.db b/admin/admin.db
index 740e64d..2661615 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/init/applications-development.png b/init/applications-development.png
new file mode 100644
index 0000000..58903ae
Binary files /dev/null and b/init/applications-development.png differ
diff --git a/init/dicionario.js b/init/dicionario.js
index ef66b72..c44e44f 100644
--- a/init/dicionario.js
+++ b/init/dicionario.js
@@ -223,5 +223,12 @@ g_traducao_init =
 				en : "",
 				es : ""
 			}
+		],
+		33 : [
+			{
+				pt : "Utilit&aacute;rios",
+				en : "",
+				es : ""
+			}
 		]
 	};
diff --git a/init/index.php b/init/index.php
index 5a56b86..a7448d7 100755
--- a/init/index.php
+++ b/init/index.php
@@ -263,6 +263,10 @@ botoesIni.push({
 	"href":"../exemplos",
 	"titulo":$trad(14,g_traducao_init)
 	},{
+		"img":"applications-development.png",
+		"href":"../pacotes/utils/index.php",
+		"titulo":$trad(33,g_traducao_init)
+	},{
 	"img":"accessories-dictionary.png",
 	"href":"../guia_de_migracao.txt",
 	"titulo":$trad(17,g_traducao_init)
diff --git a/pacotes/utils/.buildpath b/pacotes/utils/.buildpath
new file mode 100644
index 0000000..8bcb4b5
--- /dev/null
+++ b/pacotes/utils/.buildpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buildpath>
+	<buildpathentry kind="src" path=""/>
+	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
+</buildpath>
diff --git a/pacotes/utils/.project b/pacotes/utils/.project
new file mode 100644
index 0000000..f5272ef
--- /dev/null
+++ b/pacotes/utils/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>utils 6.0</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.dltk.core.scriptbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>org.eclipse.php.core.PHPNature</nature>
+	</natures>
+</projectDescription>
diff --git a/pacotes/utils/.settings/.jsdtscope b/pacotes/utils/.settings/.jsdtscope
new file mode 100644
index 0000000..0e4b119
--- /dev/null
+++ b/pacotes/utils/.settings/.jsdtscope
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.container b/pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.container
new file mode 100644
index 0000000..49c8cd4
--- /dev/null
+++ b/pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.JRE_CONTAINER
\ No newline at end of file
diff --git a/pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.name b/pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.name
new file mode 100644
index 0000000..11006e2
--- /dev/null
+++ b/pacotes/utils/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Global
\ No newline at end of file
diff --git a/pacotes/utils/colorbrewer.png b/pacotes/utils/colorbrewer.png
new file mode 100644
index 0000000..fdac857
Binary files /dev/null and b/pacotes/utils/colorbrewer.png differ
diff --git a/pacotes/utils/index.php b/pacotes/utils/index.php
index 5a56b86..718b3f5 100755
--- a/pacotes/utils/index.php
+++ b/pacotes/utils/index.php
@@ -1,58 +1,9 @@
-<?php
-/**
- * Pagina inicial do i3Geo
- * Voce pode utilizar o parametro customDir para indicar a pasta onde
- * as interfaces de mapa estao. Nesse caso, os links utilizarao esse parametro
- * Exemplo: localhost/i3geo/init/index.php?customDir=minhaPasta
- *
- * minhaPasta deve estar dentor da pasta i3geo.
- *
- * Se dentro da pasta $customDir existir um arquivo chamado index.php sera feito o include
- * na pagina.
- */
-/**
- * Cria as pastas temporarias que o i3Geo precisa, caso nao existam
- */
-include(dirname(__FILE__)."/../ms_configura.php");
-if(!empty($_GET["customDir"])){
-	$customDir = strip_tags($_GET["customDir"]);
-}
-else if(empty($customDir)){
-	$customDir = "interface";
-}
-if(!file_exists($dir_tmp)){
-	@mkdir ($dir_tmp,0777);
-}
-if(file_exists($dir_tmp)){
-	@mkdir($dir_tmp."/comum",0777);
-	@mkdir($dir_tmp."/saiku-datasources",0777);
-	chmod($dir_tmp."/saiku-datasources",0777);
-	@mkdir($dir_tmp."/cache",0777);
-	chmod($dir_tmp."/cache",0777);
-	@mkdir($dir_tmp."/cache/googlemaps",0777);
-	chmod($dir_tmp."/cache/googlemaps",0777);
-}
-if(file_exists($locaplic."/".$customDir."/index.php")){
-	include($locaplic."/".$customDir."/index.php");
-}
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-<meta name="url" content="http://www.softwarepublico.gov.br" />
-<meta name="description" content="i3Geo" />
-<meta name="keywords" content="i3geo mapa geoprocessamento" />
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<?php
-$cache_expire = 1;
-header("Pragma: public");
-header("Cache-Control: max-age=".$cache_expire);
-header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$cache_expire) . ' GMT');
-?>
-<script type="text/javascript" src="../classesjs/i3geo.js"></script>
-<script type="text/javascript" src="dicionario.js"></script>
-<link rel="stylesheet" type="text/css" href="../admin/html/admin.css">
+<link rel="stylesheet" type="text/css" href="../../admin/html/admin.css">
 
 <style>
 body {
@@ -125,191 +76,67 @@ a {
 	<div class="borda">
 		<div id="bandeiras"></div>
 		<div>
-			<a href="http://www.softwarepublico.gov.br" target="_blank" style="color: white;"><b>i3Geo 6.0</b> </a>
+			<a href="http://www.softwarepublico.gov.br" target="_blank" style="color: white;">
+				<b>i3Geo 6.0</b>
+			</a>
 		</div>
 	</div>
 
 	<div id="conteudo" style="position: relative; top: -10px; margin: auto; max-width: 1000px; left: 10px;">
 		<div style="margin-top: 5px;">
-			<?php
-			if($i3geomaster[0]["usuario"] == "admin" && $i3geomaster[0]["senha"] == "admin" ){
-						echo "<p style='font-size:14px;color:red;margin-top:20px;'><script>document.write($"."trad(19,g_traducao_init));</script>";
-					}
-					?>
 			<br>
 			<div id="botoes" style=""></div>
 
-			<div class="r">
-				<table>
-					<tbody>
-						<tr>
-							<td>
-								<script type="text/javascript" src="http://www.openhub.net/p/150688/widgets/project_users.js?style=gray"></script>
-							</td>
-						</tr>
-					</tbody>
-				</table>
-			</div>
-		</div>
-		<div style="float: left">
-			<a href="#" class="r" style="width: 230px; height: 380px;">
-				<table>
-					<tr>
-						<td>
-							<a class="twitter-timeline" href="https://twitter.com/i3geo" data-widget-id="288061915689787392" width="220" height="350">Tweets @i3Geo</a>
-							<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-						</td>
-					</tr>
-				</table>
-			</a> <a href="#" class="r" style="width: 230px; height: 380px;">
-				<table>
-					<tr>
-						<td>
-							<a class="twitter-timeline" href="https://twitter.com/search?q=@i3geo" data-widget-id="288053202174222336" width="220" height="350">Tweets #i3Geo</a>
-							<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-						</td>
-					</tr>
-				</table>
-			</a> <a href="#" class="r" style="width: 345px; height: 220px;">
-				<table>
-					<tr>
-						<td>
-							<script type="text/javascript" src="http://www.openhub.net/p/150688/widgets/project_basic_stats.js"></script>
-						</td>
-					</tr>
-				</table>
-			</a>
 		</div>
 	</div>
 
 </body>
 <script>
 botoesIni = [];
-botoesIni.push({
-	"img":"start-here.png",
-	"href":"../testainstal.php",
-	"titulo":$trad(2,g_traducao_init)
-	},{
-	"img":"applications-development-web.png",
-	"href":"../admin",
-	"titulo":$trad(3,g_traducao_init)
-	},{
-	"img":"openlayers.png",
-	"href":"../<?php echo $customDir; ?>/black_ol.htm",
-	"titulo":$trad(4,g_traducao_init)
-	},{
-	"img":"openlayersdebug.png",
-	"href":"../<?php echo $customDir; ?>/openlayersdebug.htm",
-	"titulo":$trad(5,g_traducao_init)
-	},{
-		"img":"osm.png",
-		"href":"../<?php echo $customDir; ?>/black_osm.htm",
-		"titulo":$trad(23,g_traducao_init)
-	},{
-	"img":"mashup.png",
-	"href":"../mashups",
-	"titulo":$trad(18,g_traducao_init) + "<br><a href='../mashups/osm.php?temas=&largura=800&altura=500' target=_blank >OSM</a>" + " - <a href='../mashups/openlayers.php?temas=&largura=800&altura=500' target=_blank >OpenLayers</a>"
-	},{
-	"img":"googlemaps.png",
-	"href":"../<?php echo $customDir; ?>/black_gm.phtml",
-	"titulo":$trad(6,g_traducao_init)
-	},{
-	"img":"googlemaps_noite.png",
-	"href":"../<?php echo $customDir; ?>/googlemaps_noite.phtml",
-	"titulo":$trad(22,g_traducao_init)
-	},{
-	"img":"googleearth.png",
-	"href":"../<?php echo $customDir; ?>/googleearth.phtml",
-	"titulo":$trad(7,g_traducao_init)
-	},{
-	"img":"cartogramas.png",
-	"href":"../<?php echo $customDir; ?>/black_carto_ol.htm",
-	"titulo":$trad(8,g_traducao_init)
-	},{
-	"img":"editor.png",
-	"href":"../ferramentas/metaestat/editorlimites.php",
-	"titulo":$trad(9,g_traducao_init)
-	},{
-	"img":"svn-update.png",
-	"href":"../datadownload.htm",
-	"titulo":$trad(10,g_traducao_init)
-	},{
-	"img":"ogc_logo.jpg",
-	"href":"../ogc.htm",
-	"titulo":$trad(11,g_traducao_init)
-	},{
-	"img":"application-vnd-google-earth-kml.png",
-	"href":"../kml.php",
-	"titulo":$trad(12,g_traducao_init)
-	},{
-	"img":"../imagens/saiku_free_small.png",
-	"href":"../ferramentas/saiku/esquemaxml.php?locaplic="+window.location.href.replace("/init/index.php",""),
-	"titulo":$trad(25,g_traducao_init),
-	"subtitulo": " <a style='cursor:pointer;' target=_blank src='https://medium.com/innovative-business-intelligence/so-people-who-land-on-our-community-download-page-will-notice-a-subtle-difference-when-they-click-1b61aca316c5' >"+$trad(29,g_traducao_init)+"</a>",
-	},{
-	"img":"../imagens/gvsig.jpg",
-	"href":"../pacotes/gvsig/gvsig2mapfile/upload.htm",
-	"titulo":$trad(26,g_traducao_init)
-	},{
-	"img":"insert-link.png",
-	"href":"../geradordelinks.htm",
-	"titulo":$trad(13,g_traducao_init)
-	},{
-	"img":"atlas.png",
-	"href":"../atlas",
-	"titulo":$trad(27,g_traducao_init)
-	},{
-	"img":"folder-image.png",
-	"href":"../exemplos",
-	"titulo":$trad(14,g_traducao_init)
-	},{
-	"img":"accessories-dictionary.png",
-	"href":"../guia_de_migracao.txt",
-	"titulo":$trad(17,g_traducao_init)
-	},{
-	"img":"accessories-dictionary.png",
-	"href":"../documentacao",
-	"titulo":$trad(24,g_traducao_init)
-	},{
-	"img":"accessories-dictionary.png",
-	"href":"http://moodle.gvsig-training.com/course/view.php?id=11",
-	"titulo":$trad(28,g_traducao_init)
-	},{
-	"img":"tools-report-bug.png",
-	"href":"http://svn.softwarepublico.gov.br/trac/i3geo/newticket",
-	"titulo":$trad(16,g_traducao_init)
-	},{
-	"img":"trac_logo_mini.png",
-	"href":"http://svn.softwarepublico.gov.br/trac/i3geo/wiki",
-	"titulo":$trad(30,g_traducao_init)
-	},{
-	"img":"logo_psp.png",
-	"href":"http://www.softwarepublico.gov.br/ver-comunidade?community_id=1444332",
-	"titulo":$trad(31,g_traducao_init)
-	},{
-	"img":"mailman.jpg",
-	"href":"http://lists.osgeo.org/cgi-bin/mailman/listinfo/i3geo",
-	"titulo":$trad(32,g_traducao_init)
+botoesIni.push(
+	{
+		"img":"",
+		"href":"rgbcolors.html",
+		"titulo": "Lista de cores e conversor RGB/HEX/nome"
+	},
+	{
+		"img":"colorbrewer.png",
+		"href":"http://colorbrewer2.com/",
+		"titulo": "Escolha de conjunto de cores - Colorbrewer"
+	},
+	{
+		"img":"http://upload.wikimedia.org/wikipedia/commons/thumb/1/11/Wikimedia_labs_logo_with_text.svg/103px-Wikimedia_labs_logo_with_text.svg.png",
+		"href":"http://tools.wmflabs.org/geohack/",
+		"titulo": "GeoHack"
+	},
+	{
+		"img":"",
+		"href":"http://stevemorse.org/jcal/latlon.php",
+		"titulo": "Conversor de endere&ccedil;os to/from Latitude/Longitude/Altitude"
+	},
+	{
+		"img":"",
+		"href":"https://maptools.info/tools/converter/",
+		"titulo": "Conversor de coordenadas"
 	}
 );
 mostraBotoes();
 
-i3GEO.configura.locaplic = "..";
-i3GEO.idioma.IDSELETOR = "bandeiras";
-i3GEO.idioma.mostraSeletor();
-i3GEO.barraDeBotoes.ATIVA = false;
 function mostraBotoes(){
-	var ins = [],i,n = botoesIni.length,texto;
+	var ins = [],i,n = botoesIni.length,texto, img;
 	for(i=0;i<n;i++){
-		texto = '<div class="r" ><table ><tr><td><a target=_blank href="'+botoesIni[i].href+'" ><img src="'+botoesIni[i].img+'" /><br><br>'+botoesIni[i].titulo+'</a>';
+		img = "";
+		if(botoesIni[i].img != ""){
+			img = '<img src="'+botoesIni[i].img+'" /><br>';
+		}
+		texto = '<div class="r" ><table ><tr><td><a target=_blank href="'+botoesIni[i].href+'" >'+ img + botoesIni[i].titulo+'</a>';
 		if(botoesIni[i].subtitulo){
 			texto += botoesIni[i].subtitulo;
 		}
 		texto += '</td></tr></table></div>';
 		ins.push(texto);
 	}
-	$i("botoes").innerHTML = ins.join("");
-	$i("conteudo").style.height = i3GEO.util.getScrollHeight() + "px";
+	document.getElementById("botoes").innerHTML = ins.join("");
 }
 
 </script>
diff --git a/pacotes/utils/rgbcolors.html b/pacotes/utils/rgbcolors.html
index 8ff9a14..c7f3f7e 100644
--- a/pacotes/utils/rgbcolors.html
+++ b/pacotes/utils/rgbcolors.html
@@ -71,7 +71,7 @@ body {
 	</div>
 	<div id="result-text"></div>
 	<p />
-	<span onclick="showHelp()" style="cursor: pointer; text-decoration: underline">help?</span>
+	<span onclick="showHelp()" style="cursor: pointer; text-decoration: underline">List</span>
 	<div id="help"></div>
 
 </body>
diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map
index d14bb3d..b2d1450 100644
--- a/temas/_lbiomashp.map
+++ b/temas/_lbiomashp.map
@@ -25,7 +25,7 @@ MAP
     PROCESSING "ITEMS=CD_LEGENDA"
     PROCESSING "LABEL_NO_CLIP=True"
     PROCESSING "POLYLINE_NO_CLIP=True"
-    STATUS DEFAULT
+    STATUS OFF
     TEMPLATE "none.htm"
     TILEITEM "location"
     OPACITY 90
--
libgit2 0.21.2