Changeset 14519 in josm for trunk

Timestamp:

2018-12-08T01:04:03+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - handle entries with several shapes (like French 'BDOrtho IGN')

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -13 +13 @@
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 import org.junit.Rule;
@@ -27 +28 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
+import org.openstreetmap.josm.data.imagery.Shape;
 import org.openstreetmap.josm.data.imagery.TemplatedWMSTileSource;
 import org.openstreetmap.josm.data.imagery.WMSEndpointTileSource;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.HttpClient.Response;
@@ -102 +106 @@
     }
 
+    private static LatLon getCenter(ImageryBounds bounds) {
+        List<Shape> shapes = bounds.getShapes();
+        Projection proj = ProjectionRegistry.getProjection();
+        return shapes != null && shapes.size() > 1
+                ? proj.eastNorth2latlon(
+                        Geometry.getCentroidEN(shapes.get(0).getPoints().stream()
+                                .map(CoordinateConversion::coorToLL)
+                                .map(proj::latlon2eastNorth)
+                                .collect(Collectors.toList())))
+                : bounds.getCenter();
+    }
+
     private void checkEntry(ImageryInfo info) {
         Logging.info("Checking "+ info);
@@ -121 +137 @@
             ImageryBounds bounds = info.getBounds();
             // Some imagery sources do not define tiles at (0,0). So pickup Greenwich Royal Observatory for global sources
-            ICoordinate center = CoordinateConversion.llToCoor(bounds != null ? bounds.getCenter() : new LatLon(51.47810, -0.00170));
+            ICoordinate center = CoordinateConversion.llToCoor(bounds != null ? getCenter(bounds) : new LatLon(51.47810, -0.00170));
             AbstractTileSource tileSource = getTileSource(info);
             checkTileUrl(info, tileSource, center, info.getMinZoom());