Changeset 32181 in osm for applications/viewer/jmapviewer/src/org/openstreetmap

Timestamp:

2016-05-15T17:45:55+02:00 (9 years ago)

Author:

donvip

Message:

fix some sonar issues

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java (modified) (8 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -37 +37 @@
 import org.xml.sax.SAXException;
 
+/**
+ * Tile source for the Bing Maps REST Imagery API.
+ * @see <a href="https://msdn.microsoft.com/en-us/library/ff701724.aspx">MSDN</a>
+ */
 public class BingAerialTileSource extends TMSTileSource {
 
@@ -66 +70 @@
 
     protected static class Attribution {
-        private String attribution;
+        private String attributionText;
         private int minZoom;
         private int maxZoom;
@@ -102 +106 @@
             XPathFactory xPathFactory = XPathFactory.newInstance();
             XPath xpath = xPathFactory.newXPath();
-            imageUrlTemplate = xpath.compile("//ImageryMetadata/ImageUrl/text()").evaluate(document);
-            imageUrlTemplate = imageUrlTemplate.replace(
+            imageUrlTemplate = xpath.compile("//ImageryMetadata/ImageUrl/text()").evaluate(document).replace(
                     "http://ecn.{subdomain}.tiles.virtualearth.net/",
                     "https://ecn.{subdomain}.tiles.virtualearth.net/");
@@ -129 +132 @@
             NodeList imageryProviderNodes = (NodeList) xpath.compile("//ImageryMetadata/ImageryProvider")
                     .evaluate(document, XPathConstants.NODESET);
-            List<Attribution> attributions = new ArrayList<>(imageryProviderNodes.getLength());
+            List<Attribution> attributionsList = new ArrayList<>(imageryProviderNodes.getLength());
             for (int i = 0; i < imageryProviderNodes.getLength(); i++) {
                 Node providerNode = imageryProviderNodes.item(i);
@@ -139 +142 @@
                     Node areaNode = coverageAreaNodes.item(j);
                     Attribution attr = new Attribution();
-                    attr.attribution = attribution;
+                    attr.attributionText = attribution;
 
                     attr.maxZoom = Integer.parseInt(zoomMaxXpath.evaluate(areaNode));
@@ -151 +154 @@
                     attr.max = new Coordinate(northLat, eastLon);
 
-                    attributions.add(attr);
-                }
-            }
-
-            return attributions;
+                    attributionsList.add(attr);
+                }
+            }
+
+            return attributionsList;
         } catch (SAXException e) {
             System.err.println("Could not parse Bing aerials attribution metadata.");
@@ -182 +185 @@
     @Override
     public String getAttributionLinkURL() {
-        //return "http://bing.com/maps"
-        // FIXME: I've set attributionLinkURL temporarily to ToU URL to comply with bing ToU
+        // Terms of Use URL to comply with Bing Terms of Use
         // (the requirement is that we have such a link at the bottom of the window)
-        return "http://go.microsoft.com/?linkid=9710837";
+        return "https://www.microsoft.com/maps/assets/docs/terms.aspx";
     }
 
@@ -284 +286 @@
                     if (topLeft.getLon() < attr.max.getLon() && botRight.getLon() > attr.min.getLon()
                             && topLeft.getLat() > attr.min.getLat() && botRight.getLat() < attr.max.getLat()) {
-                        a.append(attr.attribution);
+                        a.append(attr.attributionText);
                         a.append(' ');
                     }