Revision 47632 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/DefaultGeometryManager.java

View differences:

DefaultGeometryManager.java
56 56 
import org.gvsig.fmap.geom.exception.CreateEnvelopeException;
57 57 
import org.gvsig.fmap.geom.exception.CreateGeometryException;
58 58 
import org.gvsig.fmap.geom.jts.coerce.DefaultGeometryCoercionContext;
59 
import org.gvsig.fmap.geom.jts.gml.GMLReader;
59 60 
import org.gvsig.fmap.geom.jts.gputils.DefaultGeneralPathX;
60 61 
import org.gvsig.fmap.geom.jts.primitive.DefaultNullGeometry;
61 62 
import org.gvsig.fmap.geom.jts.primitive.Envelope2D;
......
762 763 
        char ch;
763 764 
        int i=0;
764 765 
        while(i < s.length()) {
765 
            if( !Character.isSpaceChar(ch = s.charAt(i++)) ) {
766 
            if( !Character.isWhitespace(ch = s.charAt(i++)) ) {
766 767 
                return ch;
767 768 
            }
768 769 
        }
......
774 775 
            int ch;
775 776 
            int i=0;
776 777 
            while( (ch=r.read())!= -1) {
777 
                if( !Character.isSpaceChar(ch) ) {
778 
                if( !Character.isWhitespace(ch) ) {
778 779 
                    return ch;
779 780 
                }
780 781 
            }
......
842 843 
                switch(ch) {
843 844 
                    case '0':
844 845 
                    case '1':
846 
                        geom.reset();
847 
                        //FIXME: Habr?a que eliminar los blancos
845 848 
                        return createFrom(Hex.decodeHex(IOUtils.toCharArray(geom)), srs);
846 849 
                    case '{':
847 850 
                        try {
851 
                            geom.reset();
848 852 
                            com.vividsolutions.jts.io.geojson.GeoJsonReader reader = new com.vividsolutions.jts.io.geojson.GeoJsonReader();
849 853 
                            com.vividsolutions.jts.geom.Geometry geom_jts = reader.read(geom);
850 854 
                            return JTSUtils.createGeometry(srs, geom_jts);
......
857 861 
                            char[] buffer = new char[100];
858 862 
                            IOUtils.read(geom, buffer);
859 863 
                            String s = new String(buffer);
860 
                            if( StringUtils.startsWithIgnoreCase(s,"<gml:") ) {
861 
                                com.vividsolutions.jts.io.gml2.GMLReader reader = new com.vividsolutions.jts.io.gml2.GMLReader();
864 
                            if( StringUtils.startsWithIgnoreCase(s,"gml:") ) {
865 
                                geom.reset();
866 
                                GMLReader reader = new GMLReader();
862 867 
                                com.vividsolutions.jts.geom.Geometry geom_jts = reader.read(
863 868 
                                        geom,
864 869 
                                        new com.vividsolutions.jts.geom.GeometryFactory()
......
866 871 
                                return JTSUtils.createGeometry(srs, geom_jts);
867 872 
                            }
868 873 
                        } catch(Exception ex) {
869 
                            LOGGER.debug("Can't parse as GML");
874 
                            LOGGER.debug("Can't parse as GML", ex);
870 875 
                        }
871 876 
                        break;
872 877 
                }

Also available in: Unified diff