Download as
Browse Code »

Commit fe59cd58e3e291117a69c6ac32712202047559f4

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

Corrigido bug na ferramenta de inclusão de pontos. Os pontos colados não estavam… 

… sendo todos inseridos. Aprimorada a crítica das coordenadas digitadas, evitando-se o uso de , no lugar de .
Showing 2 changed files with 39 additions and 19 deletions   Show diff stats
classesphp/classe_shp.php
  Diff comments   View file @fe59cd5
@@ -140,18 +140,22 @@ $xy - X e y do novo ponto, separados por espaços. Pode ser mais de um ponto. @@ -140,18 +140,22 @@ $xy - X e y do novo ponto, separados por espaços. Pode ser mais de um ponto.
140 $data = $this->layer->data; 140 $data = $this->layer->data;
141 $data = explode(".shp",$data); 141 $data = explode(".shp",$data);
142 $data = $data[0]; 142 $data = $data[0];
143 - if (@$shapefileObj = ms_newShapefileObj($data,-2)) 143 + $items = pegaItens($this->layer);
  144 + $dbname = $data.".dbf";
  145 + $db=xbase_open($dbname,2);
  146 + for($i=0;$i<(count($xy) / 2);$i++)
144 { 147 {
145 - $items = pegaItens($this->layer);  
146 - $dbname = $data.".dbf";  
147 - $db=xbase_open($dbname,2); 148 + $reg = array();
148 foreach ($items as $ni) 149 foreach ($items as $ni)
149 {$reg[] = "-";} 150 {$reg[] = "-";}
150 xbase_add_record($db,$reg); 151 xbase_add_record($db,$reg);
151 - xbase_close($db);  
152 - $poPoint = ms_newpointobj();  
153 - for($i=0;$i<(count($xy) / 2);$i=$i+2) 152 + }
  153 + xbase_close($db);
  154 + if (@$shapefileObj = ms_newShapefileObj($data,-2))
  155 + {
  156 + for($i=0;$i<(count($xy));$i=$i+2)
154 { 157 {
  158 + $poPoint = ms_newpointobj();
155 $poPoint->setXY($xy[$i],$xy[$i+1]); 159 $poPoint->setXY($xy[$i],$xy[$i+1]);
156 $shapefileObj->addpoint($poPoint); 160 $shapefileObj->addpoint($poPoint);
157 } 161 }
ferramentas/inserexy2/index.js
  Diff comments   View file @fe59cd5
@@ -181,32 +181,46 @@ function mostrawkt(retorno) @@ -181,32 +181,46 @@ function mostrawkt(retorno)
181 function inserir() 181 function inserir()
182 { 182 {
183 var reg = new RegExp("w|W|l|L|o|O|'|G|r", "g"); 183 var reg = new RegExp("w|W|l|L|o|O|'|G|r", "g");
  184 + var regv = new RegExp(",", "g");
184 if (!$i("longitude").value == "") 185 if (!$i("longitude").value == "")
185 { 186 {
186 var v = $i("longitude").value + " 0" + " 0" 187 var v = $i("longitude").value + " 0" + " 0"
187 v = v.replace(reg,""); 188 v = v.replace(reg,"");
  189 + v = v.replace(regv,".");
188 v = v.split(" "); 190 v = v.split(" ");
189 $i("xg").value = v[0] 191 $i("xg").value = v[0]
190 $i("xm").value = v[1] 192 $i("xm").value = v[1]
191 $i("xs").value = v[2] 193 $i("xs").value = v[2]
  194 + var xgv = v[0]
  195 + var xmv = v[1]
  196 + var xsv = v[2]
  197 + var xsv = xsv.replace(",",".");
  198 + }
  199 + else
  200 + {
  201 + var xgv = $i("xg").value;
  202 + var xmv = $i("xm").value;
  203 + var xsv = $i("xs").value;
  204 + var xsv = xsv.replace(regv,".");
192 } 205 }
193 - var xgv = $i("xg").value;  
194 - var xmv = $i("xm").value;  
195 - var xsv = $i("xs").value;  
196 - xsv = xsv.replace(",",".");  
197 if (!$i("latitude").value == "") 206 if (!$i("latitude").value == "")
198 { 207 {
199 var vv = $i("latitude").value + " 0" + " 0" 208 var vv = $i("latitude").value + " 0" + " 0"
200 vv = vv.replace(reg,""); 209 vv = vv.replace(reg,"");
  210 + vv = vv.replace(regv,".");
201 vv = vv.split(" "); 211 vv = vv.split(" ");
202 - $i("yg").value = vv[0]  
203 - $i("ym").value = vv[1]  
204 - $i("ys").value = vv[2] 212 + var ygv = vv[0]
  213 + var ymv = vv[1]
  214 + var ysv = vv[2]
  215 + var ysv = ysv.replace(regv,".");
  216 + }
  217 + else
  218 + {
  219 + var ygv = $i("yg").value;
  220 + var ymv = $i("ym").value;
  221 + var ysv = $i("ys").value;
  222 + var ysv = ysv.replace(regv,".");
205 } 223 }
206 - var ygv = $i("yg").value;  
207 - var ymv = $i("ym").value;  
208 - var ysv = $i("ys").value;  
209 - ysv = ysv.replace(",",".");  
210 var xxx = window.parent.convdmsddf(xgv,xmv,xsv); 224 var xxx = window.parent.convdmsddf(xgv,xmv,xsv);
211 var yyy = window.parent.convdmsddf(ygv,ymv,ysv); 225 var yyy = window.parent.convdmsddf(ygv,ymv,ysv);
212 var ins = $i("resultado").innerHTML 226 var ins = $i("resultado").innerHTML
@@ -222,8 +236,10 @@ function inserir() @@ -222,8 +236,10 @@ function inserir()
222 } 236 }
223 function colar() 237 function colar()
224 { 238 {
  239 + var regv = new RegExp(",", "g");
  240 + $i("colar").value = $i("colar").value.replace(regv,".")
225 var xys = $i("colar").value.split(" ") 241 var xys = $i("colar").value.split(" ")
226 - var p = g_locaplic+"/classesphp/mapa_controle.php?g_sid="+g_sid+"&"+window.parent.objmapa.sid+"&funcao=insereSHP&tema="+window.parent.g_nomepin+"&xy="+$i("colar").value; 242 + var p = g_locaplic+"/classesphp/mapa_controle.php?g_sid="+g_sid+"&funcao=insereSHP&tema="+window.parent.g_nomepin+"&xy="+$i("colar").value;
227 var cp = new cpaint(); 243 var cp = new cpaint();
228 //cp.set_debug(2) 244 //cp.set_debug(2)
229 cp.set_response_type("JSON"); 245 cp.set_response_type("JSON");