/ - Diff - Application: gvSIG desktop - gvSIG

Revision 28311

     import org.gvsig.fmap.crs.CRSFactory;
     import org.gvsig.fmap.dal.DataStoreNotification;
     import org.gvsig.fmap.dal.feature.FeatureStoreNotification;
     import org.gvsig.fmap.geom.Geometry;
     import org.gvsig.fmap.geom.GeometryLocator;
     import org.gvsig.fmap.geom.GeometryManager;
     import org.gvsig.fmap.geom.Geometry.SUBTYPES;
-...
     public class MapControl extends JComponent implements ComponentListener, Observer {
     	private static final GeometryManager geomManager = GeometryLocator.getGeometryManager();
     	private static final Logger logger = LoggerFactory.getLogger(GeometryManager.class);
     	/**
     	 * <p>One of the possible status of <code>MapControl</code>. Determines that all visible information has been
     	 * drawn and its updated.</p>
-...
     	 * @return distance from <code>point</code> to the adjusted one. If there is no
     	 *  adjustment, returns <code>Double.MAX_VALUE</code>.
     	 */
     	private double adjustToHandler(Point2D point,
     			Point2D mapHandlerAdjustedPoint) {
     		if (!isRefentEnabled()) {
     			return Double.MAX_VALUE;
+    		}
     //		ILayerEdited aux = CADExtension.getEditionManager().getActiveLayerEdited();
     //		if (!(aux instanceof VectorialLayerEdited))
     //			return Double.MAX_VALUE;
     //		VectorialLayerEdited vle = (VectorialLayerEdited) aux;
     	private double adjustToHandler(Point2D point,
                 Point2D mapHandlerAdjustedPoint) {
     		ArrayList layersToSnap = getMapContext().getLayersToSnap();
             if (!isRefentEnabled())
                 return Double.MAX_VALUE;
     		ArrayList snappers=new ArrayList(selected.keySet());
             ArrayList snappers=new ArrayList(selected.keySet());
             ArrayList layersToSnap = getMapContext().getLayersToSnap();
     		double mapTolerance = vp.toMapDistance(MapControl.tolerance);
     		double minDist = mapTolerance;
     //		double rw = getMapControl().getViewPort().toMapDistance(5);
     		Point2D mapPoint = point;
     		double middleTol=mapTolerance * 0.5;
     		org.gvsig.fmap.geom.primitive.Envelope r;
             double mapTolerance = vp.toMapDistance(MapControl.tolerance);
             double minDist = mapTolerance;
             double middleTol=mapTolerance * 0.5;
             Point2D mapPoint = point;
             org.gvsig.fmap.geom.primitive.Envelope r;
     		com.vividsolutions.jts.geom.Envelope e = null;
     		try {
     			r = geomManager.createEnvelope(mapPoint.getX() - middleTol,
-...
     					mapPoint.getX() + middleTol,
     					mapPoint.getY() + middleTol,
     					SUBTYPES.GEOM2D);
     			e = Converter.convertEnvelopeToJTS(r);
     		} catch (CreateEnvelopeException e1) {
     			logger.error("Error creating the envelope", e1);
+    		}
             usedSnap = null;
             Point2D lastPoint = null;
             if (previousPoint != null)
+            {
                 lastPoint = new Point2D.Double(previousPoint[0], previousPoint[1]);
+            }
             for (int j = 0; j < layersToSnap.size(); j++)
+            {
                 FLyrVect lyrVect = (FLyrVect) layersToSnap.get(j);
                 SpatialCache cache = lyrVect.getSpatialCache();
                 if (lyrVect.isVisible())
+                {
                     // La lista de snappers est? siempre ordenada por prioridad. Los de mayor
                     // prioridad est?n primero.
                     java.util.List geoms = cache.query(e);
                     for (int n=0; n < geoms.size(); n++) {
                         Geometry geom = (Geometry) geoms.get(n);
                         for (int i = 0; i < snappers.size(); i++)
+                        {
                             ISnapper theSnapper = (ISnapper) snappers.get(i);
     		usedSnap = null;
     		Point2D lastPoint = null;
     		if (previousPoint != null)
+    		{
     			lastPoint = new Point2D.Double(previousPoint[0], previousPoint[1]);
+    		}
     		for (int j = 0; j < layersToSnap.size(); j++)
+    		{
     			FLyrVect lyrVect = (FLyrVect) layersToSnap.get(j);
     			SpatialCache cache = lyrVect.getSpatialCache();
     			if (lyrVect.isVisible())
+    			{
     				// La lista de snappers est? siempre ordenada por prioridad. Los de mayor
     				// prioridad est?n primero.
     				for (int i = 0; i < snappers.size(); i++)
+    				{
     					ISnapper theSnapper = (ISnapper) snappers.get(i);
                             if (usedSnap != null)
+                            {
                                 // Si ya tenemos un snap y es de alta prioridad, cogemos ese. (A no ser que en otra capa encontremos un snapper mejor)
                                 if (theSnapper.getPriority() > usedSnap.getPriority())
                                     break;
+                            }
     //                        SnappingVisitor snapVisitor = null;
                             Point2D theSnappedPoint = null;
                             if (theSnapper instanceof ISnapperVectorial)
+                            {
                                 theSnappedPoint = ((ISnapperVectorial) theSnapper).getSnapPoint(point, geom, mapTolerance, lastPoint);
+                            }
                             if (theSnapper instanceof ISnapperRaster)
+                            {
                                 ISnapperRaster snapRaster = (ISnapperRaster) theSnapper;
                                 theSnappedPoint = snapRaster.getSnapPoint(this, point, mapTolerance, lastPoint);
+                            }
     					if (usedSnap != null)
+    					{
     						// Si ya tenemos un snap y es de alta prioridad, cogemos ese. (A no ser que en otra capa encontremos un snapper mejor)
     						if (theSnapper.getPriority() < usedSnap.getPriority()) {
     							break;
+    						}
+    					}
     					SnappingVisitor snapVisitor = null;
     					Point2D theSnappedPoint = null;
     					if (theSnapper instanceof ISnapperVectorial)
+    					{
     						if (theSnapper instanceof ISnapperGeometriesVectorial) {
     							snapVisitor=new GeometriesSnappingVisitor((ISnapperGeometriesVectorial) theSnapper,point,mapTolerance,lastPoint);
     						}else {
     							snapVisitor = new SnappingVisitor((ISnapperVectorial) theSnapper, point, mapTolerance, lastPoint);
+    						}
     						// System.out.println("Cache size = " + cache.size());
     						cache.query(e, snapVisitor);
     						theSnappedPoint = snapVisitor.getSnapPoint();
                             if (theSnappedPoint != null) {
                                 double distAux = theSnappedPoint.distance(point);
                                 if (minDist > distAux)
+                                {
                                     minDist = distAux;
                                     usedSnap = theSnapper;
                                     mapHandlerAdjustedPoint.setLocation(theSnappedPoint);
+                                }
+                            }
+                        }
                     } // for n
                 } // visible
+            }
             if (usedSnap != null)
                 return minDist;
             return Double.MAX_VALUE;
+    					}
     					if (theSnapper instanceof ISnapperRaster)
+    					{
     						ISnapperRaster snapRaster = (ISnapperRaster) theSnapper;
     						theSnappedPoint = snapRaster.getSnapPoint(this, point, mapTolerance, lastPoint);
+    					}
     					if (theSnappedPoint != null) {
     						double distAux = theSnappedPoint.distance(point);
     						if (minDist > distAux)
+    						{
     							minDist = distAux;
     							usedSnap = theSnapper;
     							mapHandlerAdjustedPoint.setLocation(theSnappedPoint);
+    						}
+    					}
+    				}
     			} // visible
+    		}
     		if (usedSnap != null) {
     			return minDist;
+    		}
     		return Double.MAX_VALUE;
+    	}
+        }
     	/**
     	 * Determines if snap tools are enabled or disabled.
+    	 *

Also available in: Unified diff