Revision 43511 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.impl/src/main/java/org/gvsig/fmap/mapcontext/layers/order/impl/RasterPolLinePointOrderManager.java

View differences:

RasterPolLinePointOrderManager.java
129 129
	 * 
130 130
	 */
131 131
	private int simplifyType(GeometryType gt) {
132
        if( gt.isTypeOf(TYPES.POINT) || gt.isTypeOf(TYPES.MULTIPOINT) ) {
133
            return TYPES.POINT;
132 134

  
133
		if (gt.getType() == TYPES.POINT || gt.getType() == TYPES.MULTIPOINT) {
134
			return TYPES.POINT;
135
		} else {
136
			if (gt.isTypeOf(TYPES.CURVE) || gt.getType() == TYPES.MULTICURVE) {
137
				return TYPES.CURVE;
138
			} else {
139
				if (gt.isTypeOf(TYPES.SURFACE) || gt.getType() == TYPES.MULTISURFACE) {
140
					return TYPES.SURFACE;
141
				} else {
142
					// default
143
					return TYPES.SURFACE;
144
				}
145
			}
146
		}
135
        } else if( gt.isTypeOf(TYPES.CURVE) || gt.isTypeOf(TYPES.MULTICURVE) ) {
136
            return TYPES.CURVE;
137

  
138
        } else if( gt.isTypeOf(TYPES.SURFACE) || gt.isTypeOf(TYPES.MULTISURFACE) ) {
139
            return TYPES.SURFACE;
140

  
141
        }
142
        return TYPES.SURFACE;
147 143
	}
148 144

  
149 145
	public void loadFromState(PersistentState state) throws PersistenceException {

Also available in: Unified diff