Changeset 11009 in josm for trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

Timestamp:

2016-09-17T15:19:44+02:00 (8 years ago)

Author:

Don-vip

Message:

fix recent sonar/checkstyle issues

File:

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

trunk/src/org/openstreetmap/josm/io/OverpassDownloadReader.java

@@ -8 +8 @@
 import java.util.EnumMap;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -58 +59 @@
             return super.getRequestForBbox(lon1, lat1, lon2, lat2);
         else {
-            final String overpassQuery = this.overpassQuery.replace("{{bbox}}", lat1 + "," + lon1 + "," + lat2 + "," + lon2);
-            final String expandedOverpassQuery = expandExtendedQueries(overpassQuery);
+            final String query = this.overpassQuery.replace("{{bbox}}", lat1 + "," + lon1 + "," + lat2 + "," + lon2);
+            final String expandedOverpassQuery = expandExtendedQueries(query);
             return "interpreter?data=" + Utils.encodeUrl(expandedOverpassQuery);
         }
@@ -67 +68 @@
      * Evaluates some features of overpass turbo extended query syntax.
      * See https://wiki.openstreetmap.org/wiki/Overpass_turbo/Extended_Overpass_Turbo_Queries
+     * @param query unexpanded query
+     * @return expanded query
      */
     static String expandExtendedQueries(String query) {
@@ -77 +80 @@
                         matcher.appendReplacement(sb, geocodeArea(matcher.group(2)));
                 }
-            } catch (Exception ex) {
+            } catch (UncheckedParseException ex) {
                 final String msg = tr("Failed to evaluate {0}", matcher.group());
                 Main.warn(ex, msg);
@@ -91 +94 @@
         final EnumMap<OsmPrimitiveType, Long> idOffset = new EnumMap<>(OsmPrimitiveType.class);
         idOffset.put(OsmPrimitiveType.NODE, 0L);
-        idOffset.put(OsmPrimitiveType.WAY, 2400000000L);
-        idOffset.put(OsmPrimitiveType.RELATION, 3600000000L);
+        idOffset.put(OsmPrimitiveType.WAY, 2_400_000_000L);
+        idOffset.put(OsmPrimitiveType.RELATION, 3_600_000_000L);
         try {
             final List<NameFinder.SearchResult> results = NameFinder.queryNominatim(area);
-            final PrimitiveId osmId = results.iterator().next().osmId;
+            final PrimitiveId osmId = results.iterator().next().getOsmId();
             return String.format("area(%d)", osmId.getUniqueId() + idOffset.get(osmId.getType()));
-        } catch (IOException ex) {
+        } catch (IOException | NoSuchElementException ex) {
             throw new UncheckedParseException(ex);
         }
@@ -144 +147 @@
             @Override
             protected void parseUnknown(boolean printWarning) throws XMLStreamException {
-                if ("remark".equals(parser.getLocalName())) {
-                    if (parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
-                        final String text = parser.getElementText();
-                        if (text.contains("runtime error")) {
-                            throw new XMLStreamException(text);
-                        }
+                if ("remark".equals(parser.getLocalName()) && parser.getEventType() == XMLStreamConstants.START_ELEMENT) {
+                    final String text = parser.getElementText();
+                    if (text.contains("runtime error")) {
+                        throw new XMLStreamException(text);
                     }
                 }