Changeset 4439 in josm for trunk/src/org

Timestamp:

2011-09-17T23:29:49+02:00 (13 years ago)

Author:

bastiK

Message:

change imagery projection tag to something neutral (wms 1.1.1 has <srs> and wms 1.3.0 has <crs>, but both is supported in principle)

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -40 +40 @@
         ENTRY,              // inside an entry
         ENTRY_ATTRIBUTE,    // note we are inside an entry attribute to collect the character data
-        SUPPORTED_PROJECTIONS,
-        SRS,
+        PROJECTIONS,
+        CODE,
         BOUNDS,
         SHAPE,
@@ -84 +84 @@
         ImageryBounds bounds;
         Shape shape;
-        List<String> supported_srs;
+        List<String> projections;
 
         @Override public void startDocument() {
@@ -94 +94 @@
             entry = null;
             bounds = null;
-            supported_srs = null;
+            projections = null;
         }
 
@@ -143 +143 @@
                         }
                         newState = State.BOUNDS;
-                    } else if (qName.equals("supported-projections")) {
-                        supported_srs = new ArrayList<String>();
-                        newState = State.SUPPORTED_PROJECTIONS;
+                    } else if (qName.equals("projections")) {
+                        projections = new ArrayList<String>();
+                        newState = State.PROJECTIONS;
                     }
                     break;
@@ -163 +163 @@
                     }
                     break;
-                case SUPPORTED_PROJECTIONS:
-                    if (qName.equals("srs")) {
-                        newState = State.SRS;
+                case PROJECTIONS:
+                    if (qName.equals("code")) {
+                        newState = State.CODE;
                     }
                     break;
@@ -271 +271 @@
                     shape = null;
                     break;
-                case SRS:
-                    supported_srs.add(accumulator.toString());
-                    break;
-                case SUPPORTED_PROJECTIONS:
-                    entry.setServerProjections(supported_srs);
-                    supported_srs = null;
+                case CODE:
+                    projections.add(accumulator.toString());
+                    break;
+                case PROJECTIONS:
+                    entry.setServerProjections(projections);
+                    projections = null;
                     break;
             }