Revision 44918 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.mdb/src/main/java/org/gvsig/fmap/dal/store/mdb/operations/MDBFetchFeatureTypeOperation.java

View differences:

MDBFetchFeatureTypeOperation.java
31 31 
@SuppressWarnings("UseSpecificCatch")
32 32 
public class MDBFetchFeatureTypeOperation extends FetchFeatureTypeOperation {
33 33 

  		




  34
  
  
    
    private static Map<String,GeometryType>h2spatialGeometryTypes = null;


  		




  
  34
  
    
    private static Map<String,GeometryType>mdbGeometryTypes = null;


  		




  35
  35
  
    
    private Map<String,GeometryColumnInfo> geometry_column;


  		




  36
  36
  
    
    


  		




  37
  37
  
    
    private static class GeometryColumnInfo {


  		




  ......




  179
  179
  
    
    }


  		




  180
  180
  
    

  		




  181
  181
  
    
    private GeometryType getGeometryTypeFromMDBSpatialType(String typeName) {


  		




  182
  
  
    
        if( h2spatialGeometryTypes==null ) {


  		




  
  182
  
    
        if( mdbGeometryTypes==null ) {


  		




  183
  183
  
    
            //


  		




  184
  184
  
    
            // https://github.com/orbisgis/h2gis/wiki/1.-Spatial-data#geometry-columns-view


  		




  185
  185
  
    
            //


  		




  186
  186
  
    
            GeometryManager manager = GeometryLocator.getGeometryManager();


  		




  187
  
  
    
            h2spatialGeometryTypes = new HashMap<>();


  		




  188
  
  
    
            h2spatialGeometryTypes.put("POINT", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM2D));


  		




  189
  
  
    
            h2spatialGeometryTypes.put("POINTZ", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM3D));


  		




  
  187
  
    
            mdbGeometryTypes = new HashMap<>();


  		




  
  188
  
    
            mdbGeometryTypes.put("POINT", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM2D));


  		




  
  189
  
    
            mdbGeometryTypes.put("POINTZ", getGT(manager, Geometry.TYPES.POINT,Geometry.SUBTYPES.GEOM3D));


  		




  190
  190
  
    
            


  		




  191
  
  
    
            h2spatialGeometryTypes.put("LINESTRING", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM2D));


  		




  192
  
  
    
            h2spatialGeometryTypes.put("LINESTRINGZ", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM3D));


  		




  
  191
  
    
            mdbGeometryTypes.put("LINESTRING", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM2D));


  		




  
  192
  
    
            mdbGeometryTypes.put("LINESTRINGZ", getGT(manager, Geometry.TYPES.LINE,Geometry.SUBTYPES.GEOM3D));


  		




  193
  193
  
    
            


  		




  194
  
  
    
            h2spatialGeometryTypes.put("POLYGON", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  195
  
  
    
            h2spatialGeometryTypes.put("POLYGONZ", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  
  194
  
    
            mdbGeometryTypes.put("POLYGON", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  
  195
  
    
            mdbGeometryTypes.put("POLYGONZ", getGT(manager, Geometry.TYPES.POLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  196
  196
  
    

  		




  197
  
  
    
            h2spatialGeometryTypes.put("MULTIPOINT", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM2D));


  		




  198
  
  
    
            h2spatialGeometryTypes.put("MULTIPOINTZ", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM3D));


  		




  
  197
  
    
            mdbGeometryTypes.put("MULTIPOINT", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM2D));


  		




  
  198
  
    
            mdbGeometryTypes.put("MULTIPOINTZ", getGT(manager, Geometry.TYPES.MULTIPOINT,Geometry.SUBTYPES.GEOM3D));


  		




  199
  199
  
    

  		




  200
  
  
    
            h2spatialGeometryTypes.put("MULTILINESTRING", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM2D));


  		




  201
  
  
    
            h2spatialGeometryTypes.put("MULTILINESTRINGZ", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM3D));


  		




  
  200
  
    
            mdbGeometryTypes.put("MULTILINESTRING", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM2D));


  		




  
  201
  
    
            mdbGeometryTypes.put("MULTILINESTRINGZ", getGT(manager, Geometry.TYPES.MULTILINE,Geometry.SUBTYPES.GEOM3D));


  		




  202
  202
  
    

  		




  203
  
  
    
            h2spatialGeometryTypes.put("MULTIPOLYGON", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  204
  
  
    
            h2spatialGeometryTypes.put("MULTIPOLYGONZ", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  
  203
  
    
            mdbGeometryTypes.put("MULTIPOLYGON", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM2D));


  		




  
  204
  
    
            mdbGeometryTypes.put("MULTIPOLYGONZ", getGT(manager, Geometry.TYPES.MULTIPOLYGON,Geometry.SUBTYPES.GEOM3D));


  		




  205
  205
  
    

  		




  206
  
  
    
            h2spatialGeometryTypes.put("GEOMETRY", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  207
  
  
    
            h2spatialGeometryTypes.put("GEOMETRYZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  
  206
  
    
            mdbGeometryTypes.put("GEOMETRY", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  
  207
  
    
            mdbGeometryTypes.put("GEOMETRYZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  208
  208
  
    

  		




  209
  
  
    
            h2spatialGeometryTypes.put("GEOMCOLLECTION", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  210
  
  
    
            h2spatialGeometryTypes.put("GEOMCOLLECTIONZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  
  209
  
    
            mdbGeometryTypes.put("GEOMCOLLECTION", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM2D));


  		




  
  210
  
    
            mdbGeometryTypes.put("GEOMCOLLECTIONZ", getGT(manager, Geometry.TYPES.GEOMETRY,Geometry.SUBTYPES.GEOM3D));


  		




  211
  211
  
    
        }


  		




  212
  
  
    
        return h2spatialGeometryTypes.get(typeName);


  		




  
  212
  
    
        return mdbGeometryTypes.get(typeName);


  		




  213
  213
  
    
    }


  		




  214
  214
  
    

  		




  215
  215
  
    
    @Override


  		












Also available in:  Unified diff