svn - r34228 - branches/geometry/spike/geomet
|
|
svn_geotools
|
Author: jive
Date: 2009-10-25 00:14:32 -0400 (Sun, 25 Oct 2009) New Revision: 34228 Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java Log: now with header action Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java =================================================================== --- branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java 2009-10-25 04:11:23 UTC (rev 34227) +++ branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryBuilder.java 2009-10-25 04:14:32 UTC (rev 34228) @@ -1,3 +1,20 @@ +/* + * OSGeom -- Geometry Collab + * + * (C) 2009, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2009 Department of Geography, University of Bonn + * (C) 2001-2009 lat/lon GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.osgeo.geometry; import java.util.List; @@ -5,13 +22,20 @@ import org.osgeo.commons.crs.CRS; import org.osgeo.commons.uom.Angle; import org.osgeo.commons.uom.Length; +import org.osgeo.geometry.composite.CompositeCurve; +import org.osgeo.geometry.composite.CompositeGeometry; +import org.osgeo.geometry.composite.CompositeSolid; +import org.osgeo.geometry.composite.CompositeSurface; import org.osgeo.geometry.multi.MultiCurve; import org.osgeo.geometry.multi.MultiGeometry; import org.osgeo.geometry.multi.MultiLineString; import org.osgeo.geometry.multi.MultiPoint; import org.osgeo.geometry.multi.MultiPolygon; +import org.osgeo.geometry.multi.MultiSolid; +import org.osgeo.geometry.multi.MultiSurface; import org.osgeo.geometry.points.Points; import org.osgeo.geometry.primitive.Curve; +import org.osgeo.geometry.primitive.GeometricPrimitive; import org.osgeo.geometry.primitive.LineString; import org.osgeo.geometry.primitive.LinearRing; import org.osgeo.geometry.primitive.OrientableCurve; @@ -57,6 +81,8 @@ * contain many helpful methods for the same construction. * </p> * @author Jody Garnett + * @author <a href="mailto:[hidden email]">Markus Schneider</a> + * @author <a href="mailto:[hidden email]">Andreas Poth</a> */ public class GeometryBuilder { @@ -754,7 +780,7 @@ * @return created {@link MultiSurface} */ public MultiSurface createMultiSurface( String id, CRS crs, List<Surface> members ) { - return new DefaultMultiSurface( id, crs, pm, members ); + return factory.multiSurface(id, crs, members); } /** @@ -769,7 +795,7 @@ * @return created {@link MultiSolid} */ public MultiSolid createMultiSolid( String id, CRS crs, List<Solid> members ) { - return new DefaultMultiSolid( id, crs, pm, members ); + return factory.multiSolid(id, crs, members); } /** @@ -785,7 +811,7 @@ * @return created {@link CompositeCurve} */ public CompositeCurve createCompositeCurve( String id, CRS crs, List<Curve> members ) { - return new DefaultCompositeCurve( id, crs, pm, members ); + return factory.compositeCurve(id, crs, members); } /** @@ -801,7 +827,7 @@ * @return created {@link CompositeSurface} */ public CompositeSurface createCompositeSurface( String id, CRS crs, List<Surface> memberSurfaces ) { - return new DefaultCompositeSurface( id, crs, pm, memberSurfaces ); + return factory.compositeSurface(id, crs, memberSurfaces); } /** @@ -817,7 +843,7 @@ * @return created {@link CompositeSolid} */ public CompositeSolid createCompositeSolid( String id, CRS crs, List<Solid> memberSolids ) { - return new DefaultCompositeSolid( id, crs, pm, memberSolids ); + return factory.compositeSolid(id, crs, memberSolids); } /** @@ -832,6 +858,6 @@ */ public CompositeGeometry<GeometricPrimitive> createCompositeGeometry( String id, CRS crs, List<GeometricPrimitive> memberPrimitives ) { - return new DefaultCompositeGeometry( id, crs, pm, memberPrimitives ); + return factory.compositeGeometry(id, crs, memberPrimitives); } } Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java =================================================================== --- branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java 2009-10-25 04:11:23 UTC (rev 34227) +++ branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/GeometryFactory.java 2009-10-25 04:14:32 UTC (rev 34228) @@ -2,6 +2,8 @@ * OSGeom -- Geometry Collab * * (C) 2009, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2009 Department of Geography, University of Bonn + * (C) 2001-2009 lat/lon GmbH * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -78,9 +80,16 @@ * This api is not intended to be used directly; client code should use one of the Builders; or * WKTReader. * <p> - * The first cut is method compatible with + * The methods here fall into three categories: + * <ul> + * <li>Construction of small data structures such as Points, CurveSegment or Patch</li> + * <li>Construction of actuall Geometry (methods always accept an optional id and a CRS)</li> + * <li>Construction of multi geometry</li> + * </ul> * * @author Jody Garnett + * @author <a href="mailto:[hidden email]">Markus Schneider</a> + * @author <a href="mailto:[hidden email]">Andreas Poth</a> */ public interface GeometryFactory { /** Modified: branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java =================================================================== --- branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java 2009-10-25 04:11:23 UTC (rev 34227) +++ branches/geometry/spike/geometry/src/main/java/org/osgeo/geometry/SimpleGeometryBuilder.java 2009-10-25 04:14:32 UTC (rev 34228) @@ -1,3 +1,20 @@ +/* + * OSGeom -- Geometry Collab + * + * (C) 2009, Open Source Geospatial Foundation (OSGeo) + * (C) 2001-2009 Department of Geography, University of Bonn + * (C) 2001-2009 lat/lon GmbH + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + */ package org.osgeo.geometry; import java.util.List; @@ -17,6 +34,7 @@ /** * GeometryBuilder that is method compatible with the deegree requirements. * + * @author <a href="mailto:[hidden email]">Markus Schneider</a> * @author Jody Garnett */ public class SimpleGeometryBuilder { ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ GeoTools-commits mailing list [hidden email] https://lists.sourceforge.net/lists/listinfo/geotools-commits |
||||||||||||||||
| Free Embeddable Forum Powered by Nabble | Help |
