From 5625e412b4b47d9a93f8f8e7c38b5804a18ac028 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 26 Sep 2013 01:02:32 +0000 Subject: [PATCH] $1 --- admin/php/editortexto.php | 2 +- mashups/openlayers.js | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- mashups/openlayers.php | 13 ++++++++----- ogc.php | 6 ++++++ temas/_lbiomashp.map | 2 +- 5 files changed, 67 insertions(+), 59 deletions(-) diff --git a/admin/php/editortexto.php b/admin/php/editortexto.php index ac2aedd..2c9bcd5 100644 --- a/admin/php/editortexto.php +++ b/admin/php/editortexto.php @@ -65,7 +65,7 @@ body { echo ""; $mapfile = str_replace("\\","/",$mapfile); $mapa = ms_newMapObj($mapfile); - echo ""; echo ""; diff --git a/mashups/openlayers.js b/mashups/openlayers.js index 765c433..bdb6ca3 100755 --- a/mashups/openlayers.js +++ b/mashups/openlayers.js @@ -1,4 +1,3 @@ -/*çjslint white:false,undef: false, rhino: true, onevar: true, evil: false */ $i = function(id) {return document.getElementById(id);}; //seta as variáveis navn e navm @@ -418,10 +417,10 @@ i3GEO.editorOL = { return i3GEO.editorOL.layersLigados()[id]; }, listaItens: function(layer,idonde,idobj){ - if(!layer){return;} - if(!layer.params){return;} - var u = layer.url+"&request=describefeaturetype&service=wfs&version=1.0.0"; - u += "&typename="+layer.params.LAYERS; + if(!layer){return;} + if(!layer.params){return;} + var u = layer.url+"&request=describefeaturetype&service=wfs&version=1.0.0"; + u += "&typename="+layer.params.LAYERS; document.body.style.cursor="wait"; document.getElementById("i3geoMapa").style.cursor = "wait"; OpenLayers.Request.issue({ @@ -454,9 +453,9 @@ i3GEO.editorOL = { busca: function(layer,item,palavra,onde){ document.body.style.cursor="wait"; document.getElementById("i3geoMapa").style.cursor = "wait"; - var u = layer.url+"&request=getfeature&service=wfs&version=1.0.0"; - u += "&OUTPUTFORMAT=gml2&typename="+layer.params.LAYERS; - u += "&filter="+item+"*"+palavra+"*"; + var u = layer.url+"&request=getfeature&service=wfs&version=1.0.0"; + u += "&OUTPUTFORMAT=gml2&typename="+layer.params.LAYERS; + u += "&filter="+item+"*"+palavra+"*"; document.body.style.cursor="wait"; document.getElementById("i3geoMapa").style.cursor = "wait"; document.getElementById(onde).innerHTML = "..."; @@ -534,9 +533,9 @@ i3GEO.editorOL = { var layers = [i3GEO.editorOL.layerAtivo()], xy = lonlat.split(","), u = layers[0].url+"&request=getfeature&service=wfs&version=1.0.0"; - u += "&OUTPUTFORMAT=gml2&typename="+layers[0].params.LAYERS; + u += "&OUTPUTFORMAT=gml2&typename="+layers[0].params.LAYERS; - //u += "&filter=Geometry"+lonlat+""; + //u += "&filter=Geometry"+lonlat+""; xy[0] = xy[0] * 1; xy[1] = xy[1] * 1; @@ -618,9 +617,9 @@ i3GEO.editorOL = { ins += "Atributos: "+i+"
"; var a = geos[i].attributes; for(key in a){ - if(a[key]){ - ins += key+" = "+a[key]+"
"; - } + if(a[key]){ + ins += key+" = "+a[key]+"
"; + } } } var w = window.open(); @@ -632,28 +631,28 @@ i3GEO.editorOL = { }, criaBotoes: function(botoes){ var sketchSymbolizers = { - "Point": { - pointRadius: 4, - graphicName: "square", - fillColor: "white", - fillOpacity: 1, - strokeWidth: 1, - strokeOpacity: 1, - strokeColor: "#333333" - }, - "Line": { - strokeWidth: 3, - strokeOpacity: 1, - strokeColor: "#666666", - strokeDashstyle: "dash" - }, - "Polygon": { - strokeWidth: 2, - strokeOpacity: 1, - strokeColor: "#666666", - fillColor: "white", - fillOpacity: 0.3 - } + "Point": { + pointRadius: 4, + graphicName: "square", + fillColor: "white", + fillOpacity: 1, + strokeWidth: 1, + strokeOpacity: 1, + strokeColor: "#333333" + }, + "Line": { + strokeWidth: 3, + strokeOpacity: 1, + strokeColor: "#666666", + strokeDashstyle: "dash" + }, + "Polygon": { + strokeWidth: 2, + strokeOpacity: 1, + strokeColor: "#666666", + fillColor: "white", + fillOpacity: 0.3 + } }, style = new OpenLayers.Style(), styleMap = new OpenLayers.StyleMap({"default": style}), @@ -661,7 +660,7 @@ i3GEO.editorOL = { button, controles = []; style.addRules([ - new OpenLayers.Rule({symbolizer: sketchSymbolizers}) + new OpenLayers.Rule({symbolizer: sketchSymbolizers}) ]); i3GEOpanelEditor = new OpenLayers.Control.Panel({ displayClass: "olControlEditingToolbar1 noprint", @@ -1248,24 +1247,24 @@ i3GEO.editorOL = { {return;} var SHADOW_Z_INDEX = 10, MARKER_Z_INDEX = 11, - layer = new OpenLayers.Layer.Vector( - "pontos", - { - styleMap: new OpenLayers.StyleMap({ - externalGraphic: i3GEO.editorOL.marca, - backgroundGraphic: "../pacotes/openlayers/img/marker_shadow.png", - backgroundXOffset: 0, - backgroundYOffset: -7, - graphicZIndex: MARKER_Z_INDEX, - backgroundGraphicZIndex: SHADOW_Z_INDEX, - pointRadius: 10 - }), - isBaseLayer: false, - rendererOptions: {yOrdering: true}, + layer = new OpenLayers.Layer.Vector( + "pontos", + { + styleMap: new OpenLayers.StyleMap({ + externalGraphic: i3GEO.editorOL.marca, + backgroundGraphic: "../pacotes/openlayers/img/marker_shadow.png", + backgroundXOffset: 0, + backgroundYOffset: -7, + graphicZIndex: MARKER_Z_INDEX, + backgroundGraphicZIndex: SHADOW_Z_INDEX, + pointRadius: 10 + }), + isBaseLayer: false, + rendererOptions: {yOrdering: true}, displayInLayerSwitcher:true, visibility:true - } - ), + } + ), index, x = [], y = [], diff --git a/mashups/openlayers.php b/mashups/openlayers.php index 044eb27..0bebcfa 100644 --- a/mashups/openlayers.php +++ b/mashups/openlayers.php @@ -1,4 +1,7 @@ getViewsNames(); - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$gvsigview[0].'", "../ogc.php?tema='.$tema.'&",{layers:"'.$tema.'",transparent: "true", format: "image/png"},{singleTile:false,visibility:true,isBaseLayer:false})'; + $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$gvsigview[0].'", "../ogc.php?tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$tema.'",transparent: "true", format: "image/png"},{singleTile:false,visibility:true,isBaseLayer:false})'; } else{ $nomeMap = ""; @@ -213,12 +216,12 @@ if($temas != ""){ if($nlayers == 1 && strtoupper($layern->getmetadata("cache")) == "SIM"){ //nesse caso o layer e adicionado como TMS //tms leva os parametros do TMS - $objOpenLayers[] = 'new OpenLayers.Layer.TMS("'.$tituloLayer.'", "../ogc.php?tema='.$tema.'",{tileOrigin: new OpenLayers.LonLat(-180, -90),serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png"})'; + $objOpenLayers[] = 'new OpenLayers.Layer.TMS("'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'",{tileOrigin: new OpenLayers.LonLat(-180, -90),serviceVersion:"&tms=",visibility:'.$visivel.',isBaseLayer:'.$ebase.',layername:"'.$nomeLayer.'",type:"png"})'; //cria um clone WMS para efeitos de getfeatureinfo - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&",{cloneTMS:"'.$nomeLayer.'",layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{displayInLayerSwitcher:false,singleTile:true,visibility:false,isBaseLayer:false})'; + $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{cloneTMS:"'.$nomeLayer.'",layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{displayInLayerSwitcher:false,singleTile:true,visibility:false,isBaseLayer:false})'; } else{ - $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})'; + $objOpenLayers[] = 'new OpenLayers.Layer.WMS( "'.$tituloLayer.'", "../ogc.php?tema='.$tema.'&DESLIGACACHE='.$DESLIGACACHE.'&",{layers:"'.$nomeLayer.'",transparent: "true", format: "image/png"},{singleTile:true,visibility:'.$visivel.',isBaseLayer:'.$ebase.'})'; } //var_dump($objOpenLayers);exit; } diff --git a/ogc.php b/ogc.php index 02430b9..2b7673e 100644 --- a/ogc.php +++ b/ogc.php @@ -48,6 +48,8 @@ format - (opcional) pode ser utilizado a opção &format=application id_medida_variavel - id da medida de variavel - utilizado apenas quando a fonte para definicao do layer for o sistema de metadados estatisticos nao deve ser utilizado junto com tema + +DESLIGACACHE (opcional) {sim|nao} - forca a nao usar o cache de imagens qd definido como "sim", do contrário, o uso ou não do cache será definido automaticamente Exemplos: @@ -189,6 +191,10 @@ if(isset($_GET["tms"])){ } if(isset($_GET["Z"]) && isset($_GET["X"])){ $agora .= "google"; +} +if(isset($_GET["DESLIGACACHE"]) && $_GET["DESLIGACACHE"] == "sim"){ + $agora = time(); + $cache = false; } $nomeMapfileTmp = $dir_tmp."/ogc_".md5($tema)."_".$agora.".map"; $nomeMapfileTmp = str_replace(",","",$nomeMapfileTmp); diff --git a/temas/_lbiomashp.map b/temas/_lbiomashp.map index 0ea9f61..6d814af 100644 --- a/temas/_lbiomashp.map +++ b/temas/_lbiomashp.map @@ -31,7 +31,7 @@ MAP EXPRESSION ('[CD_LEGENDA]'eq'CAATINGA') STYLE ANGLE 0 - COLOR 100 0 0 + COLOR 200 0 0 OFFSET 0 0 END # STYLE END # CLASS -- libgit2 0.21.2