Revision 20861

View differences:

trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/GeometryManager.java
1
/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
2
 *
3
 * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
4
 *
5
 * This program is free software; you can redistribute it and/or
6
 * modify it under the terms of the GNU General Public License
7
 * as published by the Free Software Foundation; either version 2
8
 * of the License, or (at your option) any later version.
9
 *
10
 * This program is distributed in the hope that it will be useful,
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
 * GNU General Public License for more details.
14
 *
15
 * You should have received a copy of the GNU General Public License
16
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
18
 *
19
 * For more information, contact:
20
 *
21
 *  Generalitat Valenciana
22
 *   Conselleria d'Infraestructures i Transport
23
 *   Av. Blasco Ib��ez, 50
24
 *   46010 VALENCIA
25
 *   SPAIN
26
 *
27
 *      +34 963862235
28
 *   gvsig@gva.es
29
 *      www.gvsig.gva.es
30
 *
31
 *    or
32
 *
33
 *   IVER T.I. S.A
34
 *   Salamanca 50
35
 *   46005 Valencia
36
 *   Spain
37
 *
38
 *   +34 963163400
39
 *   dac@iver.es
40
 */
1 41
package org.gvsig.fmap.geom;
2 42

  
3 43
import java.util.ArrayList;
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/GeneralPathX.java
68 68
import java.util.ArrayList;
69 69

  
70 70
import org.cresques.cts.ICoordTrans;
71
import org.gvsig.fmap.geom.util.FConverter;
71
import org.gvsig.fmap.geom.util.Converter;
72 72

  
73 73
import sun.awt.geom.Crossings;
74 74
import sun.awt.geom.Curve;
......
340 340
     */
341 341
    public boolean isClosed()
342 342
    {
343
		PathIterator theIterator = getPathIterator(null, FConverter.FLATNESS); //polyLine.getPathIterator(null, flatness);
343
		PathIterator theIterator = getPathIterator(null, Converter.FLATNESS); //polyLine.getPathIterator(null, flatness);
344 344
		double[] theData = new double[6];
345 345
        double xFinal = 0;
346 346
        double yFinal = 0;
......
792 792
     */
793 793
    public void flip()
794 794
	{
795
		PathIterator theIterator = getPathIterator(null, FConverter.FLATNESS); //polyLine.getPathIterator(null, flatness);
795
		PathIterator theIterator = getPathIterator(null, Converter.FLATNESS); //polyLine.getPathIterator(null, flatness);
796 796
		double[] theData = new double[6];
797 797
        //Coordinate first = null;
798 798
        CoordinateList coordList = new CoordinateList();
......
990 990
    {
991 991
        //int i;
992 992

  
993
		PathIterator theIterator = getPathIterator(null, FConverter.FLATNESS); //polyLine.getPathIterator(null, flatness);
993
		PathIterator theIterator = getPathIterator(null, Converter.FLATNESS); //polyLine.getPathIterator(null, flatness);
994 994
		double[] theData = new double[6];
995 995
        Coordinate first = null;
996 996
        CoordinateList coordList = new CoordinateList();
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/Surface.java
51 51
/**
52 52
 * @author Jorge Piera Llodr� (jorge.piera@iver.es)
53 53
 */
54
public interface Surface extends Primitive {
54
public interface Surface extends OrientableSurface {
55 55

  
56 56
}
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/AbstractPrimitive.java
12 12
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
13 13
import org.gvsig.fmap.geom.operation.GeometryOperationException;
14 14
import org.gvsig.fmap.geom.type.GeometryType;
15
import org.gvsig.fmap.geom.util.FConverter;
15
import org.gvsig.fmap.geom.util.Converter;
16 16

  
17 17

  
18 18
/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
......
206 206
	}
207 207

  
208 208
	public com.vividsolutions.jts.geom.Geometry toJTSGeometry() {
209
		return FConverter.java2d_to_jts(this);
209
		return Converter.java2d_to_jts(this);
210 210
	}	
211 211
	
212 212
	public abstract GeometryType getGeometryType();
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/FShape3D.java
5 5
 * The interface <code>FShape3D</code> extends <code>FShape</code> adding support for 3D.
6 6
 * 
7 7
 * @see FShape
8
 * 
9
 * @deprecated
8 10
 *
9 11
 * @author Vicente Caballero Navarro
10 12
 */
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/OrientablePrimitive2D.java
13 13
import org.gvsig.fmap.geom.handler.AbstractHandler;
14 14
import org.gvsig.fmap.geom.handler.FinalHandler;
15 15
import org.gvsig.fmap.geom.handler.Handler;
16
import org.gvsig.fmap.geom.util.FConverter;
16
import org.gvsig.fmap.geom.util.Converter;
17 17

  
18 18

  
19 19
/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
......
173 173
		       Line2D l3 = new Line2D.Double(p3,p4);
174 174
		       Line2D l4 = new Line2D.Double(p4,p1);
175 175

  
176
		           theIterator = this.getPathIterator(null,FConverter.FLATNESS);
176
		           theIterator = this.getPathIterator(null,Converter.FLATNESS);
177 177
		           arrayCoords = new ArrayList();
178 178
		           while(!theIterator.isDone()) {
179 179
		                    theType = theIterator.currentSegment(theData);
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/FShape.java
13 13
/**
14 14
 * <p>The interface <code>FShape</code> extends <code>Shape</code> adding shape types, and allowing
15 15
 *  to work with it as a geometry.</p>
16
 *  
17
 *  @deprecated
16 18
 */
17 19
public interface FShape extends Shape, Serializable {
18 20
	/**
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/Curve2D.java
49 49
 * 
50 50
 * @author Fernando Gonz�lez Cort�s
51 51
 */
52
public class Curve2D extends OrientablePolyline2D implements Curve {
52
public class Curve2D extends OrientableCurve2D implements Curve {
53 53

  
54 54
	private static final long serialVersionUID = 1L;
55 55

  
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/Surface2D.java
51 51
 * 
52 52
 * @author Vicente Caballero Navarro
53 53
 */
54
public class Surface2D extends OrientablePolygon2D implements Surface {
54
public class Surface2D extends OrientableSurface2D implements Surface {
55 55

  
56 56
	private static final long serialVersionUID = 1L;
57 57

  
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/primitive/Surface3D.java
48 48
 *
49 49
 * @author Vicente Caballero Navarro
50 50
 */
51
public class Surface3D extends Surface2D implements FShape3D, Surface{
51
public class Surface3D extends Surface2D implements Surface {
52 52

  
53 53
	private static final long serialVersionUID = 1L;
54 54
	double[] pZ = null;
trunk/libraries/libFMap_geometries/src/org/gvsig/fmap/geom/Geometry.java
1
/* gvSIG. Sistema de Informaci�n Geogr�fica de la Generalitat Valenciana
2
 *
3
 * Copyright (C) 2004 IVER T.I. and Generalitat Valenciana.
4
 *
5
 * This program is free software; you can redistribute it and/or
6
 * modify it under the terms of the GNU General Public License
7
 * as published by the Free Software Foundation; either version 2
8
 * of the License, or (at your option) any later version.
9
 *
10
 * This program is distributed in the hope that it will be useful,
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13
 * GNU General Public License for more details.
14
 *
15
 * You should have received a copy of the GNU General Public License
16
 * along with this program; if not, write to the Free Software
17
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
18
 *
19
 * For more information, contact:
20
 *
21
 *  Generalitat Valenciana
22
 *   Conselleria d'Infraestructures i Transport
23
 *   Av. Blasco Ib��ez, 50
24
 *   46010 VALENCIA
25
 *   SPAIN
26
 *
27
 *      +34 963862235
28
 *   gvsig@gva.es
29
 *      www.gvsig.gva.es
30
 *
31
 *    or
32
 *
33
 *   IVER T.I. S.A
34
 *   Salamanca 50
35
 *   46005 Valencia
36
 *   Spain
37
 *
38
 *   +34 963163400
39
 *   dac@iver.es
40
 */
1 41
package org.gvsig.fmap.geom;
2 42

  
3 43

  
......
85 125
	 * Obtiene el tipo de la geometr�a
86 126
	 *
87 127
	 * @return una de las constantes de FShape: POINT, LINE, POLIGON
128
	 * @deprecated
88 129
	 */
89 130
	public int getShapeType();
90 131

  

Also available in: Unified diff