Revision 12394

View differences:

trunk/libraries/libJCRS/src/org/gvsig/crs/gui/panels/EPSGpanel.java
312 312 
							data[3] = result2.getString("area_name");
313 313 
							data[4] = result2.getString("area_of_use");
314 314 
						}
315 
						if (data[0]!=null && validCRS(projection_conv_code) && valid(crs_kind)){
315 
						if (data[0]!=null /*&& validCRS(projection_conv_code)*/ && valid(crs_kind)){
316 316 
							dtm.addRow(data);
317 317 
						}
318 318 
					}
......
343 343 
							data[2] = result2.getString("coord_ref_sys_kind");
344 344 
							crs_kind = (String)data[2];
345 345 
							projection_conv_code = result2.getInt("projection_conv_code");
346
346 
							setProjectionCode(projection_conv_code);
347 347 
						}
348 348 
						/*
349 349 
						 * Buscaremos solo aquellos CRS cuyas proyecciones esten entre las
350 350 
						 * 16 soportadas por proj4 para ello creamos un metodo para validar
351 351 
						 * si esta entre estas proyecciones
352 352 
						 */
353 
						if (data[0]!=null && validCRS(projection_conv_code) && valid(crs_kind)){
353 
						if (data[0]!=null /*&& validCRS(projection_conv_code)*/ && valid(crs_kind)){
354 354 
							dtm.addRow(data);
355 355 
						}
356 356 
						if (notValid(crs_kind)){
......
762 762 
	public int getProjectionCode() {
763 763 
		return projectionCode;
764 764 
	}
765 
}
765 
}
trunk/libraries/libJCRS/src/org/gvsig/crs/gui/listeners/CRSSelectionDialogListener.java
242 242 
	        			soported2 = true;
243 243 
	        		}
244 244 
	        	}
245 
	        	if (crs_kind.equals("geographic 2D")) {
246 
	        		soported2 = true;
247 
	        	}
245 248 
	        	if (soported && soported2){
246 249 
	        		dialog.getCrsMainPanel().getEpsgPanel().setCodeCRS(Integer.parseInt((String)dialog.getCrsMainPanel().getEpsgPanel().sorter.getValueAt(dialog.getCrsMainPanel().getEpsgPanel().selectedRowTable,0)));
247 250 
	            	dialog.getCrsMainPanel().getEpsgPanel().setWKT();
trunk/libraries/libJCRS/src/org/gvsig/crs/gui/listeners/CRSMainTrPanelListener.java
395 395 
		}
396 396
397 397 
		if (e.getSource() == panel.getCrsMainPanel().getEpsgPanel().getJTable().getSelectionModel()){
398 
			String[] not_soported = {"engineering", "vertical", "compound", "geocentric"};
398 
			String[] not_soported = {"engineering", "vertical", "compound", "geocentric", "geographic 3D"};
399 
			int[] valid_method_code = {9800, 9801, 9802, 9803, 9804, 9805, 9806, 9807, 9808, 9809, 9810,
400 
					9811, 9812, 9813, 9814, 9815, 9816, 9817, 9602, 9659, 9818, 9819, 9820, 9822,
401 
					9827};
399 402 
			boolean soported = true;
403 
			boolean soported2 = false;
400 404 
			ListSelectionModel lsm = (ListSelectionModel)e.getSource();
401 405 
			if (lsm.isSelectionEmpty()) {
402 406 
				panel.getCrsMainPanel().getEpsgPanel().selectedRowTable = -1;
......
414 418 
	        		if (crs_kind.equals(not_soported[i]))
415 419 
	        			soported = false;
416 420 
	        	}
417 
	        	if (soported){
421 
	        	for (int i=0; i< valid_method_code.length;i++) {
422 
	        		if (panel.getCrsMainPanel().getEpsgPanel().getProjectionCode() == valid_method_code[i]) {
423 
	        			soported2 = true;
424 
	        		}
425 
	        	}
426 
	        	if (crs_kind.equals("geographic 2D")) {
427 
	        		soported2 = true;
428 
	        	}
429 
	        	if (soported && soported2){
418 430 
	        		panel.getCrsMainPanel().getEpsgPanel().setCodeCRS(Integer.parseInt((String)panel.getCrsMainPanel().getEpsgPanel().sorter.getValueAt(panel.getCrsMainPanel().getEpsgPanel().selectedRowTable,0)));
419 431 
	        		panel.getCrsMainPanel().getEpsgPanel().setWKT();
420 432 
	        		panel.getJButtonAccept().setEnabled(true);
......
584 596 
			CardLayout cl = (CardLayout)(panel.getCrsMainPanel().getJPanelMain().getLayout());
585 597 
			String op = (String)e.getItem();
586 598 
			if (op.equals("EPSG")){
587 
				String[] not_soported = {"engineering", "vertical", "compound", "geocentric"};
599 
				String[] not_soported = {"engineering", "vertical", "compound", "geocentric", "geographic 3D"};
600 
				int[] valid_method_code = {9800, 9801, 9802, 9803, 9804, 9805, 9806, 9807, 9808, 9809, 9810,
601 
						9811, 9812, 9813, 9814, 9815, 9816, 9817, 9602, 9659, 9818, 9819, 9820, 9822,
602 
						9827};
588 603 
				boolean soported = true;
604 
				boolean soported2 = false;
589 605 
				panel.getCrsMainPanel().getEpsgPanel().connection();
590 606 
				if(panel.getCrsMainPanel().getEpsgPanel().getJTable().getSelectedRowCount()>0) {
591 607 
					panel.getCrsMainPanel().getEpsgPanel().selectedRowTable = panel.getCrsMainPanel().getEpsgPanel().getJTable().getSelectedRow();
......
594 610 
		        		if (crs_kind.equals(not_soported[i]))
595 611 
		        			soported = false;
596 612 
		        	}
597 
		        	if (soported){
613 
		        	for (int i=0; i< valid_method_code.length;i++) {
614 
		        		if (panel.getCrsMainPanel().getEpsgPanel().getProjectionCode() == valid_method_code[i]) {
615 
		        			soported2 = true;
616 
		        		}
617 
		        	}
618 
		        	if (crs_kind.equals("geographic 2D")) {
619 
		        		soported2 = true;
620 
		        	}
621 
		        	if (soported && soported2){
598 622 
		        		panel.getCrsMainPanel().getEpsgPanel().setCodeCRS(Integer.parseInt((String)panel.getCrsMainPanel().getEpsgPanel().sorter.getValueAt(panel.getCrsMainPanel().getEpsgPanel().selectedRowTable,0)));
599 623 
		        		panel.getCrsMainPanel().getEpsgPanel().setWKT();
600 624 
		        		panel.getJButtonAccept().setEnabled(true);

Also available in: Unified diff