/org.gvsig.gazetteer/trunk/org.gvsig.gazetteer/org.gvsig.gazetteer.extension/src/main/java/org/gvsig/gazetteer/loaders/FeatureLoader.java - Diff - gvSIG tools: Gazetteer - gvSIG

Revision 102 org.gvsig.gazetteer/trunk/org.gvsig.gazetteer/org.gvsig.gazetteer.extension/src/main/java/org/gvsig/gazetteer/loaders/FeatureLoader.java

     /**
      * This class is used to load a new feature like a layer in gvSIG
+     *
+     *
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class FeatureLoader {
     public class FeatureLoader {
     	private static final Logger LOG =
             LoggerFactory.getLogger(FeatureLoader.class);
         private static GeometryManager geometryManager = GeometryLocator.getGeometryManager();
     	private static MapContextManager mapContextManager = MapContextLocator.getMapContextManager();
     	/**
     	 * Coordinates Transformer
     	 */
     	private ICoordTrans coordTrans;
     	private ICoordTrans coordTrans;
     	/**
     	 * @param projection
     	 * Server projection
     	 */
     	public FeatureLoader(String sProjection){
     		AbstractViewPanel activeView =
     		AbstractViewPanel activeView =
     			(AbstractViewPanel) PluginServices.getMDIManager().getActiveWindow();
     		IProjection projection = CRSFactory.getCRS(sProjection);
     		if (projection == null){
     			projection = activeView.getMapControl().getViewPort().getProjection();
+    		}
     		coordTrans=  projection.getCT(activeView.getMapControl().getViewPort().getProjection());
+    	}
     	/**
-...
     		if (query.getOptions().getAspect().isGoTo()){
     			focusCenter(feature);
+    		}
+    		}
     		return true;
+    	}
+    	}
     	/**
     	 * This method focus the toponim in the center of the view
     	 * This method focus the toponim in the center of the view
     	 * @param feature
     	 * Feature that contains the coordinates
     	 */
     	private void focusCenter(Feature feature){
     		AbstractViewPanel activeView =
     		AbstractViewPanel activeView =
     			(AbstractViewPanel) PluginServices.getMDIManager().getActiveWindow();
     		IProjection projection = activeView.getProjection();
     		ViewPort viewPort = activeView.getMapControl().getViewPort();
     		MapContext mapContext = activeView.getMapControl().getMapContext();
     		Point2D point = getReprojectedPoint(feature.getCoordinates());
     		if (viewPort.getAdjustedEnvelope() != null){
     			Toolkit kit = Toolkit.getDefaultToolkit();
     			double dpi = kit.getScreenResolution();
     			Envelope envelope = viewPort.getAdjustedEnvelope();
     			Rectangle2D rectangle = new Rectangle2D.Double(envelope.getLowerCorner().getX(),
     					envelope.getLowerCorner().getY(),
     					envelope.getUpperCorner().getX() - envelope.getLowerCorner().getX(),
     					envelope.getUpperCorner().getY() - envelope.getLowerCorner().getY());
     			Rectangle2D extent = projection.getExtent(rectangle,
     			        new Double(25000).doubleValue(),
     					new Double(viewPort.getImageWidth()).doubleValue(),
     					new Double(viewPort.getImageHeight()).doubleValue(),
     					viewPort.getMapUnits(),
     					viewPort.getDistanceUnits(),
     					dpi);
     					dpi);
     			if (extent != null){
     				try {
     					envelope = geometryManager.createEnvelope(SUBTYPES.GEOM2D);
-...
     							point.getY() + extent.getHeight()/2,
     							SUBTYPES.GEOM2D);
     					envelope.setLowerCorner(loweCorner);
     					envelope.setUpperCorner(upperCorner);
     					envelope.setUpperCorner(upperCorner);
     					mapContext.zoomToEnvelope(envelope);
     				} catch (CreateEnvelopeException e) {
     				    LOG.error("Error creating the envelope", e);
     				} catch (CreateGeometryException e) {
     				    LOG.error("Error creating the envelope", e);
+    				}
+    				}
+    			}
+    		}
+    	}
+    		}
+    	}
     	/**
     	 * It adds a new Label to the current view
-...
     	 * To remove or keep the old searches
     	 */
     	private void addAndDrawLabel(Feature feature,boolean isRemoveOldClicked,boolean isMarkedPlaceClicked){
     		AbstractViewPanel activeView =
     		AbstractViewPanel activeView =
     			(AbstractViewPanel) PluginServices.getMDIManager().getActiveWindow();
     		MapContext mc = activeView.getMapControl().getMapContext();
     		GraphicLayer lyr = mc.getGraphicsLayer();
     		if (isRemoveOldClicked){
     			lyr.clearAllGraphics();
+    		}
+    		}
     		if (isMarkedPlaceClicked){
     			int pointSymbol = lyr.addSymbol(getSymbol());
     			int textSymbol = lyr.addSymbol(getTextSymbol(feature.getName()));
     			Point2D point2d = getReprojectedPoint(feature.getCoordinates());
     			feature.setCoordinates(point2d);
     			Point point;
-...
     				PluginServices.getMainFrame().enableControls();
     			} catch (CreateGeometryException e) {
     			    LOG.error("Error creating the point", e);
+    			}
+    		}
+    			}
+    		}
     		mc.invalidate();
+    	}
     	/**
     	 * Creates a FSymbol
     	 * @return
-...
     		theSymbol.setText(text);
     		return theSymbol;
+    	}
     	/**
     	 * Creates a FSymbol
     	 * @return
-...
     		theSymbol.setSize(4);
     		return theSymbol;
+    	}
     	/**
     	 * Reprojects the new point
     	 * @param ptOrig
-...
     	 */
     	private Point2D getReprojectedPoint(Point2D ptOrigin){
     		Point2D ptDest = null;
     		return getCoordTrans().convert(ptOrigin, ptDest);
     		ICoordTrans ct = getCoordTrans();
     		if(ct != null) {
     		    return ct.convert(ptOrigin, ptDest);
+    		}
     		return ptOrigin;
+    	}
     	/**
     	 * @return the coordTrans

Also available in: Unified diff