Changeset 33051 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2016-11-11T23:40:04+01:00 (8 years ago)

Author:

donvip

Message:

fix #josm11624 - better support for GML

Location:

applications/editors/josm/plugins/opendata

Files:

• src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReader.java (modified) (5 diffs)
• test/data/regress/11624 (added)
• test/data/regress/11624/temp3.gml (added)
• test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/GmlReaderTest.java (added)

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

@@ -6 +6 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
@@ -151 +149 @@
     private void parseFeatureMember(Component parent) throws XMLStreamException, GeoCrsException, FactoryException,
     UserCancelException, GeoMathTransformException, MismatchedDimensionException, TransformException {
-        List<OsmPrimitive> list = new ArrayList<>();
         Way way = null;
         Node node = null;
-        Map<String, String> tags = new HashMap<>();
+        Map<String, StringBuilder> tags = new HashMap<>();
+        OsmPrimitive prim = null;
+        String key = null;
         while (parser.hasNext()) {
             int event = parser.next();
             if (event == XMLStreamConstants.START_ELEMENT) {
                 if (isElement(GML_LINE_STRING)) {
-                    list.add(way = createWay());
+                    prim = way = createWay();
                     parseSrs(parent);
                 } else if (isElement(GML_LINEAR_RING)) {
-                    list.add(way = createWay());
+                    prim = way = createWay();
                 } else if (isElement(GML_POINT)) {
                     parseSrs(parent);
@@ -174 +173 @@
                         if (way != null) {
                             way.addNode(node);
+                        } else {
+                            prim = node;
                         }
                     }
@@ -179 +180 @@
                     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));
+                    node = createOrGetNode(p);
+                    if (way == null) {
+                        prim = node;
+                    }
+                } else {
+                    key = parser.getLocalName();
+                    if (key.startsWith("ogr:")) {
+                        key = key.substring("ogr:".length());
+                    }
                 }
             } else if (event == XMLStreamConstants.END_ELEMENT) {
@@ -185 +194 @@
                     break;
                 }
-            }
-        }
-        for (OsmPrimitive p : list) {
-            for (String key : tags.keySet()) {
-                p.put(key, tags.get(key));
+            } else if (event == XMLStreamConstants.CHARACTERS && key != null) {
+                StringBuilder sb = tags.get(key);
+                if (sb == null) {
+                    sb = new StringBuilder();
+                    tags.put(key, sb);
+                }
+                sb.append(parser.getTextCharacters(), parser.getTextStart(), parser.getTextLength());
+            }
+        }
+        if (prim != null) {
+            for (String k : tags.keySet()) {
+                prim.put(k, tags.get(k).toString());
             }
         }