Revision 47762 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.jts/src/main/java/org/gvsig/fmap/geom/jts/DefaultGeometryLibrary.java

View differences:

DefaultGeometryLibrary.java
57 57 
import org.gvsig.fmap.geom.jts.operation.fromwkb.FromWKB;
58 58 
import org.gvsig.fmap.geom.jts.operation.fromwkt.FromWKT;
59 59 
import org.gvsig.fmap.geom.jts.operation.tojts.ToJTS;
60 
import org.gvsig.fmap.geom.jts.operation.towkb.ToOGCWKB;
60 61 
import org.gvsig.fmap.geom.jts.operation.towkb.ToPostGISEWKB;
61 
import org.gvsig.fmap.geom.jts.operation.towkb.ToOGCWKB;
62 62 
import org.gvsig.fmap.geom.jts.operation.towkt.ToWKT;
63 63 
import org.gvsig.fmap.geom.jts.persistence.GeometryPersistenceFactory;
64 64 
import org.gvsig.fmap.geom.jts.persistence.GeometryTypePersistenceFactory;
......
168 168 
        geometryManager.registerGeometryType(Geometry3DM.class, "Geometry3DM", TYPES.GEOMETRY, SUBTYPES.GEOM3DM);
169 169 

  		




  170
  170
  
    
        // Register points in 2D


  		




  171
  
  
    
        geometryManager.registerGeometryType(new Point2DGeometryType());


  		




  
  171
  
    
        geometryManager.registerGeometryType(new Point2DGeometryType())


  		




  
  172
  
    
            .addAlias("point")


  		




  
  173
  
    
        ;


  		




  172
  174
  
    
//        geometryManager.registerGeometryType(Point2D.class, "Point2D", TYPES.POINT, SUBTYPES.GEOM2D);


  		




  173
  
  
    
        geometryManager.registerGeometryType(Point2DM.class, "Point2DM", TYPES.POINT, SUBTYPES.GEOM2DM);


  		




  
  175
  
    
        geometryManager.registerGeometryType(Point2DM.class, "Point2DM", TYPES.POINT, SUBTYPES.GEOM2DM)


  		




  
  176
  
    
            .addAlias("point m")


  		




  
  177
  
    
            .addAlias("pointm")


  		




  
  178
  
    
        ;


  		




  174
  179
  
    

  		




  175
  180
  
    
        // Register curves in 2D


  		




  176
  
  
    
        geometryManager.registerGeometryType(Line2D.class, "Line2D", TYPES.LINE, SUBTYPES.GEOM2D, TYPES.CURVE);


  		




  
  181
  
    
        geometryManager.registerGeometryType(Line2D.class, "Line2D", TYPES.LINE, SUBTYPES.GEOM2D, TYPES.CURVE)


  		




  
  182
  
    
            .addAlias("line")


  		




  
  183
  
    
            .addAlias("linestring")


  		




  
  184
  
    
        ;


  		




  177
  185
  
    
        geometryManager.registerGeometryType(Line2D.class, "Curve2D", TYPES.CURVE, SUBTYPES.GEOM2D, TYPES.CURVE);


  		




  178
  186
  
    
        geometryManager.registerGeometryType(Arc2D.class, "Arc2D", TYPES.ARC, SUBTYPES.GEOM2D, TYPES.CURVE);


  		




  179
  187
  
    
        geometryManager.registerGeometryType(Spline2D.class, "Spline2D", TYPES.SPLINE, SUBTYPES.GEOM2D, TYPES.CURVE);


  		




  ......




  191
  199
  
    
        geometryManager.registerGeometryType(EllipticArc2D.class, "EllipticArc2D", TYPES.ELLIPTICARC, SUBTYPES.GEOM2D, TYPES.SURFACE);


  		




  192
  200
  
    

  		




  193
  201
  
    
        // Register curves in 2DM


  		




  194
  
  
    
        geometryManager.registerGeometryType(Line2DM.class, "Line2DM", TYPES.LINE, SUBTYPES.GEOM2DM, TYPES.CURVE);


  		




  
  202
  
    
        geometryManager.registerGeometryType(Line2DM.class, "Line2DM", TYPES.LINE, SUBTYPES.GEOM2DM, TYPES.CURVE)


  		




  
  203
  
    
            .addAlias("line m")


  		




  
  204
  
    
            .addAlias("linem")


  		




  
  205
  
    
            .addAlias("linestring m")


  		




  
  206
  
    
            .addAlias("linestringm")


  		




  
  207
  
    
        ;


  		




  195
  208
  
    
        geometryManager.registerGeometryType(Line2DM.class, "Curve2DM", TYPES.CURVE, SUBTYPES.GEOM2DM, TYPES.CURVE);


  		




  196
  209
  
    
        geometryManager.registerGeometryType(Spline2DM.class, "Spline2DM", TYPES.SPLINE, SUBTYPES.GEOM2DM, TYPES.CURVE);


  		




  197
  210
  
    

  		




  ......




  204
  217
  
    
        // Register multigeometries in 2D


  		




  205
  218
  
    
//        geometryManager.registerGeometryType(BaseMultiPrimitive2D.class, "MultiPrimitive2D", TYPES.AGGREGATE,


  		




  206
  219
  
    
//            SUBTYPES.GEOM2D);


  		




  207
  
  
    
        geometryManager.registerGeometryType(MultiPoint2D.class, "MultiPoint2D", TYPES.MULTIPOINT, SUBTYPES.GEOM2D, TYPES.AGGREGATE);


  		




  
  220
  
    
        geometryManager.registerGeometryType(MultiPoint2D.class, "MultiPoint2D", TYPES.MULTIPOINT, SUBTYPES.GEOM2D, TYPES.AGGREGATE)


  		




  
  221
  
    
            .addAlias("multipoint");


  		




  208
  222
  
    
        geometryManager.registerGeometryType(DefaultMultiCurve.class, "MultiCurve", TYPES.MULTICURVE, SUBTYPES.GEOM2D, TYPES.AGGREGATE);


  		




  209
  
  
    
        geometryManager.registerGeometryType(MultiLine2D.class, "MultiLine2D", TYPES.MULTILINE, SUBTYPES.GEOM2D, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE});


  		




  
  223
  
    
        geometryManager.registerGeometryType(MultiLine2D.class, "MultiLine2D", TYPES.MULTILINE, SUBTYPES.GEOM2D, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE})


  		




  
  224
  
    
            .addAlias("multiline")


  		




  
  225
  
    
            .addAlias("multilinestring")


  		




  
  226
  
    
        ;


  		




  210
  227
  
    
        geometryManager.registerGeometryType(DefaultMultiSurface.class, "MultiSurface", TYPES.MULTISURFACE, SUBTYPES.GEOM2D, TYPES.AGGREGATE);


  		




  211
  
  
    
        geometryManager.registerGeometryType(MultiPolygon2D.class, "MultiPolygon2D", TYPES.MULTIPOLYGON, SUBTYPES.GEOM2D, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE});


  		




  
  228
  
    
        geometryManager.registerGeometryType(MultiPolygon2D.class, "MultiPolygon2D", TYPES.MULTIPOLYGON, SUBTYPES.GEOM2D, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE})


  		




  
  229
  
    
            .addAlias("multipolygon")


  		




  
  230
  
    
        ;


  		




  212
  231
  
    

  		




  213
  232
  
    
        // Register multigeometries in 2DM


  		




  214
  
  
    
        geometryManager.registerGeometryType(MultiPoint2DM.class, "MultiPoint2DM", TYPES.MULTIPOINT, SUBTYPES.GEOM2DM, TYPES.AGGREGATE);


  		




  
  233
  
    
        geometryManager.registerGeometryType(MultiPoint2DM.class, "MultiPoint2DM", TYPES.MULTIPOINT, SUBTYPES.GEOM2DM, TYPES.AGGREGATE)


  		




  
  234
  
    
            .addAlias("multipoint m")


  		




  
  235
  
    
            .addAlias("multipointm")


  		




  
  236
  
    
        ;


  		




  215
  237
  
    
        geometryManager.registerGeometryType(DefaultMultiCurve.class, "MultiCurve", TYPES.MULTICURVE, SUBTYPES.GEOM2DM, TYPES.AGGREGATE);


  		




  216
  
  
    
        geometryManager.registerGeometryType(MultiLine2DM.class, "MultiLine2DM", TYPES.MULTILINE, SUBTYPES.GEOM2DM, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE});


  		




  
  238
  
    
        geometryManager.registerGeometryType(MultiLine2DM.class, "MultiLine2DM", TYPES.MULTILINE, SUBTYPES.GEOM2DM, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE})


  		




  
  239
  
    
            .addAlias("multiline m")


  		




  
  240
  
    
            .addAlias("multilinem")


  		




  
  241
  
    
            .addAlias("multilinestring m")


  		




  
  242
  
    
            .addAlias("multilinestringm")


  		




  
  243
  
    
        ;;


  		




  217
  244
  
    
        geometryManager.registerGeometryType(DefaultMultiSurface.class, "MultiSurface", TYPES.MULTISURFACE, SUBTYPES.GEOM2DM, TYPES.AGGREGATE);


  		




  218
  
  
    
        geometryManager.registerGeometryType(MultiPolygon2DM.class, "MultiPolygon2DM", TYPES.MULTIPOLYGON, SUBTYPES.GEOM2DM, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE});


  		




  
  245
  
    
        geometryManager.registerGeometryType(MultiPolygon2DM.class, "MultiPolygon2DM", TYPES.MULTIPOLYGON, SUBTYPES.GEOM2DM, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE})


  		




  
  246
  
    
            .addAlias("multipolygon m")


  		




  
  247
  
    
            .addAlias("multipolygonm")


  		




  
  248
  
    
        ;


  		




  219
  249
  
    

  		




  220
  250
  
    
        // Register the geometries in 3D


  		




  221
  251
  
    
        geometryManager.registerGeometryType(DefaultNullGeometry.class, TYPES.NULL, SUBTYPES.GEOM3D);


  		




  222
  252
  
    

  		




  223
  253
  
    
        // Register points in 3D


  		




  224
  
  
    
        geometryManager.registerGeometryType(new Point3DGeometryType());


  		




  
  254
  
    
        geometryManager.registerGeometryType(new Point3DGeometryType())


  		




  
  255
  
    
            .addAlias("point z")


  		




  
  256
  
    
        ;


  		




  225
  257
  
    
//        geometryManager.registerGeometryType(Point3D.class, "Point3D", TYPES.POINT, SUBTYPES.GEOM3D);


  		




  226
  
  
    
        geometryManager.registerGeometryType(Point3DM.class, "Point3DM", TYPES.POINT, SUBTYPES.GEOM3DM);


  		




  
  258
  
    
        geometryManager.registerGeometryType(Point3DM.class, "Point3DM", TYPES.POINT, SUBTYPES.GEOM3DM)


  		




  
  259
  
    
            .addAlias("point zm")


  		




  
  260
  
    
            .addAlias("pointzm")


  		




  
  261
  
    
        ;


  		




  227
  262
  
    

  		




  228
  263
  
    
        // Register curves in 3D


  		




  229
  
  
    
        geometryManager.registerGeometryType(Line3D.class, "Line3D", TYPES.LINE, SUBTYPES.GEOM3D, TYPES.CURVE);


  		




  
  264
  
    
        geometryManager.registerGeometryType(Line3D.class, "Line3D", TYPES.LINE, SUBTYPES.GEOM3D, TYPES.CURVE)


  		




  
  265
  
    
            .addAlias("line z")


  		




  
  266
  
    
            .addAlias("linez")


  		




  
  267
  
    
            .addAlias("linestring z")


  		




  
  268
  
    
            .addAlias("linestringz")


  		




  
  269
  
    
        ;


  		




  230
  270
  
    
        geometryManager.registerGeometryType(Line3D.class, "Curve3D", TYPES.CURVE, SUBTYPES.GEOM3D, TYPES.CURVE);


  		




  231
  271
  
    
        geometryManager.registerGeometryType(Arc2DZ.class, "Arc3D", TYPES.ARC, SUBTYPES.GEOM3D, TYPES.CURVE);


  		




  232
  272
  
    
        geometryManager.registerGeometryType(Spline3D.class, "Spline3D", TYPES.SPLINE, SUBTYPES.GEOM3D, TYPES.CURVE);


  		




  ......




  245
  285
  
    
        geometryManager.registerGeometryType(EllipticArc2DZ.class, "EllipticArc3D", TYPES.ELLIPTICARC, SUBTYPES.GEOM3D, TYPES.SURFACE);


  		




  246
  286
  
    

  		




  247
  287
  
    
        // Register curves in 3DM


  		




  248
  
  
    
        geometryManager.registerGeometryType(Line3DM.class, "Line3DM", TYPES.LINE, SUBTYPES.GEOM3DM, TYPES.CURVE);


  		




  
  288
  
    
        geometryManager.registerGeometryType(Line3DM.class, "Line3DM", TYPES.LINE, SUBTYPES.GEOM3DM, TYPES.CURVE)


  		




  
  289
  
    
            .addAlias("line zm")


  		




  
  290
  
    
            .addAlias("linezm")


  		




  
  291
  
    
            .addAlias("linestring zm")


  		




  
  292
  
    
            .addAlias("linestringzm")


  		




  
  293
  
    
        ;


  		




  249
  294
  
    
        geometryManager.registerGeometryType(Line3DM.class, "Curve3DM", TYPES.CURVE, SUBTYPES.GEOM3DM, TYPES.CURVE);


  		




  250
  295
  
    
        geometryManager.registerGeometryType(Spline3DM.class, "Spline3DM", TYPES.SPLINE, SUBTYPES.GEOM3DM, TYPES.CURVE);


  		




  251
  296
  
    

  		




  ......




  257
  302
  
    

  		




  258
  303
  
    

  		




  259
  304
  
    
        // Register multigeometries in 3D


  		




  260
  
  
    
        geometryManager.registerGeometryType(MultiPoint3D.class, "MultiPoint3D", TYPES.MULTIPOINT, SUBTYPES.GEOM3D, TYPES.AGGREGATE);


  		




  
  305
  
    
        geometryManager.registerGeometryType(MultiPoint3D.class, "MultiPoint3D", TYPES.MULTIPOINT, SUBTYPES.GEOM3D, TYPES.AGGREGATE)


  		




  
  306
  
    
            .addAlias("multipoint z")


  		




  
  307
  
    
            .addAlias("multipointz")


  		




  
  308
  
    
        ;


  		




  261
  309
  
    
        geometryManager.registerGeometryType(DefaultMultiCurve.class, "MultiCurve", TYPES.MULTICURVE, SUBTYPES.GEOM3D, TYPES.AGGREGATE);


  		




  262
  
  
    
        geometryManager.registerGeometryType(MultiLine3D.class, "MultiLine3D", TYPES.MULTILINE, SUBTYPES.GEOM3D, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE});


  		




  
  310
  
    
        geometryManager.registerGeometryType(MultiLine3D.class, "MultiLine3D", TYPES.MULTILINE, SUBTYPES.GEOM3D, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE})


  		




  
  311
  
    
            .addAlias("multiline z")


  		




  
  312
  
    
            .addAlias("multilinez")


  		




  
  313
  
    
            .addAlias("multilinestring z")


  		




  
  314
  
    
            .addAlias("multilinestringz")


  		




  
  315
  
    
        ;


  		




  263
  316
  
    
        geometryManager.registerGeometryType(DefaultMultiSurface.class, "MultiSurface", TYPES.MULTISURFACE, SUBTYPES.GEOM3D, TYPES.AGGREGATE);


  		




  264
  
  
    
        geometryManager.registerGeometryType(MultiPolygon3D.class, "MultiPolygon3D", TYPES.MULTIPOLYGON, SUBTYPES.GEOM3D, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE});


  		




  
  317
  
    
        geometryManager.registerGeometryType(MultiPolygon3D.class, "MultiPolygon3D", TYPES.MULTIPOLYGON, SUBTYPES.GEOM3D, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE})


  		




  
  318
  
    
            .addAlias("multipolygon z")


  		




  
  319
  
    
            .addAlias("multipolygonz")


  		




  
  320
  
    
        ;


  		




  265
  321
  
    

  		




  266
  322
  
    
        // Register multigeometries in 3DM


  		




  267
  
  
    
        geometryManager.registerGeometryType(MultiPoint3DM.class, "MultiPoint3DM", TYPES.MULTIPOINT, SUBTYPES.GEOM3DM, TYPES.AGGREGATE);


  		




  
  323
  
    
        geometryManager.registerGeometryType(MultiPoint3DM.class, "MultiPoint3DM", TYPES.MULTIPOINT, SUBTYPES.GEOM3DM, TYPES.AGGREGATE)


  		




  
  324
  
    
            .addAlias("multipoint zm")


  		




  
  325
  
    
            .addAlias("multipointzm")


  		




  
  326
  
    
        ;


  		




  268
  327
  
    
        geometryManager.registerGeometryType(DefaultMultiCurve.class, "MultiCurve", TYPES.MULTICURVE, SUBTYPES.GEOM3DM, TYPES.AGGREGATE);


  		




  269
  
  
    
        geometryManager.registerGeometryType(MultiLine3DM.class, "MultiLine3DM", TYPES.MULTILINE, SUBTYPES.GEOM3DM, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE});


  		




  
  328
  
    
        geometryManager.registerGeometryType(MultiLine3DM.class, "MultiLine3DM", TYPES.MULTILINE, SUBTYPES.GEOM3DM, new int[]{TYPES.AGGREGATE, TYPES.MULTICURVE})


  		




  
  329
  
    
            .addAlias("multiline zm")


  		




  
  330
  
    
            .addAlias("multilinezm")


  		




  
  331
  
    
            .addAlias("multilinestring zm")


  		




  
  332
  
    
            .addAlias("multilinestringzm")


  		




  
  333
  
    
        ;


  		




  270
  334
  
    
        geometryManager.registerGeometryType(DefaultMultiSurface.class, "MultiSurface", TYPES.MULTISURFACE, SUBTYPES.GEOM3DM, TYPES.AGGREGATE);


  		




  271
  
  
    
        geometryManager.registerGeometryType(MultiPolygon3DM.class, "MultiPolygon3DM", TYPES.MULTIPOLYGON, SUBTYPES.GEOM3DM, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE});


  		




  
  335
  
    
        geometryManager.registerGeometryType(MultiPolygon3DM.class, "MultiPolygon3DM", TYPES.MULTIPOLYGON, SUBTYPES.GEOM3DM, new int[]{TYPES.AGGREGATE, TYPES.MULTISURFACE})


  		




  
  336
  
    
            .addAlias("multipolygon zm")


  		




  
  337
  
    
            .addAlias("multipolygonzm")


  		




  
  338
  
    
        ;


  		




  272
  339
  
    
        


  		




  273
  340
  
    
        


  		




  274
  341
  
    
        // Register complex


  		












Also available in:  Unified diff