Changeset 16734 in josm for trunk/src/org

Timestamp:

2020-07-06T17:44:17+02:00 (4 years ago)

Author:

simon04

Message:

fix #19483 - Remote control /imagery: parse extended URL (parse imagery type from URL)

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java

@@ -53 +53 @@
 
     protected ImageryInfo buildImageryInfo() {
-        args.computeIfAbsent("type", ignore -> ImageryType.WMS.getDefault().getTypeString());
+        ImageryInfo fromExtendedUrl = new ImageryInfo("", args.get("url"));
+        args.put("url", fromExtendedUrl.getUrl());
+        args.computeIfAbsent("min_zoom", ignore -> String.valueOf(fromExtendedUrl.getMinZoom()));
+        args.computeIfAbsent("max_zoom", ignore -> String.valueOf(fromExtendedUrl.getMaxZoom()));
+        args.computeIfAbsent("type", ignore -> fromExtendedUrl.getSourceType().getTypeString());
         args.computeIfAbsent("name", ignore -> args.getOrDefault("title", tr("Remote imagery")));
         ImageryPreferenceEntry imageryPreferenceEntry = StructUtils.deserializeStruct(args, ImageryPreferenceEntry.class);
@@ -101 +105 @@
         return new String[] {
             "/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
+            "/imagery?url=[0-19]https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
             "/imagery?title=landsat&type=wms&url=http://irs.gis-lab.info/?" +
                     "layers=landsat&SRS=%7Bproj%7D&WIDTH=%7Bwidth%7D&HEIGHT=%7Bheight%7D&BBOX=%7Bbbox%7D",