Revision 42379 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/operation/fromwkb/WKBParser3.java

View differences:

WKBParser3.java
193 193
        // Other dimensions
194 194
        if (haveZ) {
195 195
            point.setCoordinateAt(Geometry.DIMENSIONS.Z, data.getDouble());
196
            if (haveM) {
197
                /*point.setCoordinateAt(Geometry.DIMENSIONS.Z + 1,
198
                 data.getDouble());*/
199
                data.getDouble();
200 196
        }
201
        } else {
202 197
        if (haveM) {
203
                /*point.setCoordinateAt(Geometry.DIMENSIONS.Y + 1,
204
                 data.getDouble());*/
205
                data.getDouble();
198
           point.setCoordinateAt(point.getDimension()-1, data.getDouble());
206 199
        }
207
        }
208

  
209 200
        return point;
210 201
    }
211 202

  
......
215 206
     * @return
216 207
     */
217 208
    private int getSubType(boolean haveZ, boolean haveM) {
218
        /*int subtype =
219
         haveZ ? (haveM ? Geometry.SUBTYPES.GEOM3DM
220
         : Geometry.SUBTYPES.GEOM3D) : (haveM
221
         ? Geometry.SUBTYPES.GEOM2DM : Geometry.SUBTYPES.GEOM2D);*/
222
        //TODO: No hay soporte para M
223
        int subtype = haveZ ? Geometry.SUBTYPES.GEOM3D : Geometry.SUBTYPES.GEOM2D;
209
        int subtype;
210
        
211
        if( haveZ ) {
212
            if( haveM ) {
213
                subtype = Geometry.SUBTYPES.GEOM3DM;
214
            } else {
215
                subtype = Geometry.SUBTYPES.GEOM3D;
216
            }
217
        } else {
218
            if( haveM ) {
219
                subtype = Geometry.SUBTYPES.GEOM2DM;
220
            } else {
221
                subtype = Geometry.SUBTYPES.GEOM2D;
222
            }
223
        }
224 224
       return subtype;
225 225
    }
226 226

  

Also available in: Unified diff