Changeset 4430 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2011-09-16T22:47:09+02:00 (13 years ago)

Author:

stoecker

Message:

fix WMS projection checking, use Marcator when WMS supports it, drop old style imagery source reader

Location:

trunk/src/org/openstreetmap/josm/io/imagery

Files:

• ImageryReader.java (modified) (4 diffs)
• WMSGrabber.java (modified) (7 diffs)

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

@@ -41 +41 @@
         ENTRY_ATTRIBUTE,    // note we are inside an entry attribute to collect the character data
         SUPPORTED_PROJECTIONS,
-        PR,
+        SRS,
         BOUNDS,
         SHAPE,
@@ -52 +52 @@
 
     public List<ImageryInfo> parse() throws SAXException, IOException {
-        if (isXml(source)) {
-            Parser parser = new Parser();
-            try {
-                SAXParserFactory factory = SAXParserFactory.newInstance();
-                factory.setNamespaceAware(true);
-                InputStream in = new MirroredInputStream(source);
-                InputSource is = new InputSource(UTFInputStreamReader.create(in, "UTF-8"));
-                factory.newSAXParser().parse(is, parser);
-                return parser.entries;
-            } catch (SAXException e) {
-                throw e;
-            } catch (ParserConfigurationException e) {
-                e.printStackTrace(); // broken SAXException chaining
-                throw new SAXException(e);
-            }
-        } else {
-            return readCSV(source);
-        }
-    }
-
-    /**
-     * Probe the file to see if it is xml or the traditional csv format.
-     * 
-     * If the first non-whitespace character is a '<', decide for
-     * xml, otherwise csv.
-     */
-    private boolean isXml(String source) {
-        MirroredInputStream in = null;
+        Parser parser = new Parser();
         try {
-            in = new MirroredInputStream(source);
-            InputStreamReader reader = UTFInputStreamReader.create(in, null);
-            WHILE: while (true) {
-                int c = reader.read();
-                switch (c) {
-                    case -1:
-                        break WHILE;
-                    case ' ':
-                    case '\t':
-                    case '\n':
-                    case '\r':
-                        continue;
-                    case '<':
-                        return true;
-                    default:
-                        return false;
-                }
-            }
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        } finally {
-            Utils.close(in);
-        }
-        Main.warn(tr("Warning: Could not detect type of imagery source ''{0}''. Using default (xml).", source));
-        return true;
-    }
-
-    private List<ImageryInfo> readCSV(String source) {
-        List<ImageryInfo> entries = new ArrayList<ImageryInfo>();
-        MirroredInputStream s = null;
-        try {
-            s = new MirroredInputStream(source);
-            try {
-                InputStreamReader r;
-                try
-                {
-                    r = new InputStreamReader(s, "UTF-8");
-                }
-                catch (UnsupportedEncodingException e)
-                {
-                    r = new InputStreamReader(s);
-                }
-                BufferedReader reader = new BufferedReader(r);
-                String line;
-                while((line = reader.readLine()) != null)
-                {
-                    String val[] = line.split(";");
-                    if(!line.startsWith("#") && val.length >= 3) {
-                        boolean defaultEntry = "true".equals(val[0]);
-                        String name = tr(val[1]);
-                        String url = val[2];
-                        String eulaAcceptanceRequired = null;
-
-                        if (val.length >= 4 && !val[3].isEmpty()) {
-                            // 4th parameter optional for license agreement (EULA)
-                            eulaAcceptanceRequired = val[3];
-                        }
-
-                        ImageryInfo info = new ImageryInfo(name, url, eulaAcceptanceRequired);
-                        
-                        info.setDefaultEntry(defaultEntry);
-
-                        if (val.length >= 5 && !val[4].isEmpty()) {
-                            // 5th parameter optional for bounds
-                            try {
-                                info.setBounds(new ImageryBounds(val[4], ","));
-                            } catch (IllegalArgumentException e) {
-                                Main.warn(e.toString());
-                            }
-                        }
-                        if (val.length >= 6 && !val[5].isEmpty()) {
-                            info.setAttributionText(val[5]);
-                        }
-                        if (val.length >= 7 && !val[6].isEmpty()) {
-                            info.setAttributionLinkURL(val[6]);
-                        }
-                        if (val.length >= 8 && !val[7].isEmpty()) {
-                            info.setTermsOfUseURL(val[7]);
-                        }
-                        if (val.length >= 9 && !val[8].isEmpty()) {
-                            info.setAttributionImage(val[8]);
-                        }
-
-                        entries.add(info);
-                    }
-                }
-            } finally {
-                Utils.close(s);
-            }
-            return entries;
-        } catch (IOException ex) {
-            ex.printStackTrace();
-        } finally {
-            Utils.close(s);
-        }
-        return entries;
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            InputStream in = new MirroredInputStream(source);
+            InputSource is = new InputSource(UTFInputStreamReader.create(in, "UTF-8"));
+            factory.newSAXParser().parse(is, parser);
+            return parser.entries;
+        } catch (SAXException e) {
+            throw e;
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace(); // broken SAXException chaining
+            throw new SAXException(e);
+        }
     }
 
@@ -275 +164 @@
                     break;
                 case SUPPORTED_PROJECTIONS:
-                    if (qName.equals("pr")) {
-                        newState = State.PR;
+                    if (qName.equals("srs")) {
+                        newState = State.SRS;
                     }
                     break;
@@ -383 +272 @@
                     shape = null;
                     break;
-                case PR:
+                case SRS:
                     supported_srs.add(accumulator.toString());
                     break;

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

@@ -96 +96 @@
         String srs = "";
         boolean useepsg = false;
+        // FIXME: Non-Pattern format should be dropped in future
         try
         {
@@ -103 +104 @@
                 if(m.group(1).equals("EPSG:4326") && Main.getProjection() instanceof Mercator)
                     useepsg = true;
-            } else if(Main.getProjection() instanceof Mercator) {
+            } else if((Main.getProjection() instanceof Mercator) && !serverProjections.contains(myProj)) {
                 useepsg = true;
                 srs ="&srs=EPSG:4326";
@@ -156 +157 @@
     {
         ArrayList<String> serverProjections = new ArrayList<String>();
+        boolean hasepsg = false;
+        
+        // FIXME: Non-Pattern format should be dropped in future
         try
         {
@@ -161 +165 @@
             if(m.matches())
             {
-                boolean hasepsg = false;
                 for(String p : m.group(1).split(","))
                 {
@@ -168 +171 @@
                         hasepsg = true;
                 }
-                if(hasepsg && !serverProjections.contains(new Mercator().toCode()))
-                    serverProjections.add(new Mercator().toCode());
             }
             else
@@ -178 +179 @@
                     serverProjections.add(m.group(1));
                     if(m.group(1).equals("EPSG:4326"))
-                        serverProjections.add(new Mercator().toCode());
+                        hasepsg = true;
                 }
                 /* TODO: here should be an "else" code checking server capabilities */
@@ -191 +192 @@
         {
             String myProj = Main.getProjection().toCode().toUpperCase();
-            if(!serverProjections.contains(myProj))
+            if(!serverProjections.contains(myProj) &&
+            !(Main.getProjection() instanceof Mercator && serverProjections.contains("EPSG:4326")))
             {
                 JOptionPane.showMessageDialog(Main.parent,