Download as
Browse Code »

Commit 9688ca20df2335fc231bd5386a35c4b7b2620bf9

Authored by Edmar Moretti
1 parent 95b8ac3b
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correção nos botões da ferramenta de análise de geometria

Showing 4 changed files with 18 additions and 5 deletions   Show diff stats
admin/admin.db
View file @9688ca2
No preview for this file type
ferramentas/analisageometrias/template_mst.html
  Diff comments   View file @9688ca2
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 <input id='i3GEOanalisageometriasbotaocalculo' type='button' value='{{{aplicar}}}' /> 61 <input id='i3GEOanalisageometriasbotaocalculo' type='button' value='{{{aplicar}}}' />
62 </p> 62 </p>
63 <br> 63 <br>
64 - <p class='paragrafo'>{{{perimetro}}}:</p> 64 + <p class='paragrafo'>{{{operacaoGeom2}}}:</p>
65 <div class=styled-select> 65 <div class=styled-select>
66 <select id='i3GEOanalisageometriasselecaofuncoes' > 66 <select id='i3GEOanalisageometriasselecaofuncoes' >
67 <option value='' selected>---</option> 67 <option value='' selected>---</option>
@@ -71,9 +71,11 @@ @@ -71,9 +71,11 @@
71 <option value='symdifference'>{{{diferencaInversa}}}</option> 71 <option value='symdifference'>{{{diferencaInversa}}}</option>
72 <option value='convexhull'>{{{convexo}}}</option> 72 <option value='convexhull'>{{{convexo}}}</option>
73 </select> 73 </select>
74 - <input id='i3GEOanalisageometriasbotaofuncoes' type='button' value='{{{aplicar}}}' />  
75 - </div>  
76 74
  75 + </div>
  76 + <br><p class='paragrafo'>
  77 + <input id='i3GEOanalisageometriasbotaofuncoes' type='button' value='{{{aplicar}}}' />
  78 + </p>
77 <br> 79 <br>
78 <p class='paragrafo'>{{{operacaoGeom3}}}:</p> 80 <p class='paragrafo'>{{{operacaoGeom3}}}:</p>
79 <div class=styled-select> 81 <div class=styled-select>
@@ -82,8 +84,10 @@ @@ -82,8 +84,10 @@
82 <option value='convexhull'>{{{convexo}}}</option> 84 <option value='convexhull'>{{{convexo}}}</option>
83 <option value='boundary'>{{{entorno}}}</option> 85 <option value='boundary'>{{{entorno}}}</option>
84 </select> 86 </select>
85 - <input id='i3GEOanalisageometriasbotaofuncoes1' type='button' value='{{{aplicar}}}' />  
86 </div> 87 </div>
  88 + <br><p class='paragrafo'>
  89 + <input id='i3GEOanalisageometriasbotaofuncoes1' type='button' value='{{{aplicar}}}' />
  90 + </p>
87 <br> 91 <br>
88 <div id='i3GEOanalisageometriasmen2' style='text-align: left; left: 0px'> 92 <div id='i3GEOanalisageometriasmen2' style='text-align: left; left: 0px'>
89 <p class='paragrafo'>{{{ajuda3}}} 93 <p class='paragrafo'>{{{ajuda3}}}
interface/osmdebug.htm
  Diff comments   View file @9688ca2
@@ -210,7 +210,13 @@ @@ -210,7 +210,13 @@
210 url : "http://tile.openstreetmap.org/${z}/${x}/${y}.png" 210 url : "http://tile.openstreetmap.org/${z}/${x}/${y}.png"
211 }) 211 })
212 }); 212 });
213 - i3GEO.Interface.openlayers.LAYERSADICIONAIS = [osm]; 213 + tdb = new ol.layer.Tile({
  214 + source: new ol.source.TileDebug({
  215 + projection: 'EPSG:3857',
  216 + tileGrid: new ol.source.OSM().getTileGrid()
  217 + })
  218 + });
  219 + i3GEO.Interface.openlayers.LAYERSADICIONAIS = [osm,tdb];
214 220
215 /* 221 /*
216 222
js/interface.js
  Diff comments   View file @9688ca2
@@ -953,6 +953,9 @@ i3GEO.Interface = @@ -953,6 +953,9 @@ i3GEO.Interface =
953 // precisa disso? 953 // precisa disso?
954 // i3GEO.Interface.openlayers.parametrosView.extent = ol.proj.get('EPSG:4326').getExtent(); 954 // i3GEO.Interface.openlayers.parametrosView.extent = ol.proj.get('EPSG:4326').getExtent();
955 } 955 }
  956 + else{
  957 + i3GEO.Interface.openlayers.parametrosView.projection = "EPSG:3857";
  958 + }
956 i3GEO.Interface.openlayers.parametrosMap.view = new ol.View(i3GEO.Interface.openlayers.parametrosView); 959 i3GEO.Interface.openlayers.parametrosMap.view = new ol.View(i3GEO.Interface.openlayers.parametrosView);
957 i3GEO.Interface.openlayers.parametrosMap.interactions = i3GEO.Interface.openlayers.interacoes; 960 i3GEO.Interface.openlayers.parametrosMap.interactions = i3GEO.Interface.openlayers.interacoes;
958 // 961 //