Changeset 31364 in osm for applications/editors/josm

Timestamp:

2015-07-10T00:36:28+02:00 (9 years ago)

Author:

donvip

Message:

[josm_opendata] see #josm11624 - better GML support

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic

Files:

• DefaultGeographicHandler.java (modified) (1 diff)
• GmlReader.java (modified) (8 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/DefaultGeographicHandler.java

@@ -47 +47 @@
         if (crsName.equalsIgnoreCase("GCS_ETRS_1989")) {
             return CRS.decode("EPSG:4258");
+        } else if (crsName.startsWith("EPSG:")) {
+            return CRS.decode(crsName);
         }
         return null;

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReader.java

@@ -43 +43 @@
     public static final String GML_LINE_STRING = "LineString";
     public static final String GML_LINEAR_RING = "LinearRing";
+    public static final String GML_POINT = "Point";
     public static final String GML_SURFACE = "Surface";
     public static final String GML_SRS_NAME = "srsName";
     public static final String GML_SRS_DIMENSION = "srsDimension";
     public static final String GML_POS_LIST = "posList";
+    public static final String GML_COORDINATES = "coordinates";
 
     private final GeometryFactory geometryFactory = new GeometryFactory();
-    
+
     private final GmlHandler gmlHandler;
-    
+
     private XMLStreamReader parser;
-    
+
     private int dim;
-    
+
     private final class CrsData {
         public CoordinateReferenceSystem crs;
@@ -68 +70 @@
 
     private final Map<String, CrsData> crsDataMap = new HashMap<>();
-    
+
     public GmlReader(XMLStreamReader parser, GmlHandler handler) {
         super(handler, NationalHandlers.DEFAULT_GML_HANDLERS);
@@ -84 +86 @@
         }
     }
-    
+
     private final boolean isElement(String element) {
         return parser.getLocalName().matches("(gml:)?"+element);
@@ -105 +107 @@
         return ds;
     }
-    
+
     private void findCRS(String srs) throws NoSuchAuthorityCodeException, FactoryException {
         Main.info("Finding CRS for "+srs);
@@ -118 +120 @@
         }
     }
-    
+
     private void parseSrs(Component parent) throws GeoCrsException, FactoryException, UserCancelException, GeoMathTransformException {
         String srs = parser.getAttributeValue(null, GML_SRS_NAME);
-        dim = Integer.parseInt(parser.getAttributeValue(null, GML_SRS_DIMENSION));
+        String sdim = parser.getAttributeValue(null, GML_SRS_DIMENSION);
+        dim = sdim != null ? Integer.parseInt(sdim) : 2;
         CrsData crsData = crsDataMap.get(srs);
         if (crsData == null) {
@@ -143 +146 @@
         }
     }
-    
+
     private void parseFeatureMember(Component parent) throws XMLStreamException, GeoCrsException, FactoryException, UserCancelException, GeoMathTransformException, MismatchedDimensionException, TransformException {
         List<OsmPrimitive> list = new ArrayList<>();
@@ -157 +160 @@
                 } else if (isElement(GML_LINEAR_RING)) {
                     list.add(way = createWay());
+                } else if (isElement(GML_POINT)) {
+                    parseSrs(parent);
                 } else if (isElement(GML_SURFACE)) {
                     parseSrs(parent);
@@ -168 +173 @@
                         }
                     }
+                } else if (isElement(GML_COORDINATES)) {
+                    String[] tab = parser.getElementText().trim().split(",");
+                    Point p = geometryFactory.createPoint(new Coordinate(Double.valueOf(tab[0]), Double.valueOf(tab[1])));
+                    list.add(node = createOrGetNode(p));
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {