Changeset 13214 in josm for trunk/src

Timestamp:

2017-12-17T21:50:59+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15673 - display tile URL as clickable link in "show tile info" + add expert menu entries "Get tile status" (/status) and "Force tile rendering" (/dirty) for tiles from *.tile.openstreetmap.org

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (5 diffs)
• ImageryLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -73 +73 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.actions.ImageryAdjustAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
@@ -93 +94 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -117 +119 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManager;
@@ -499 +502 @@
     }
 
+    private void sendOsmTileRequest(String request) {
+        Tile clickedTile = clickedTileHolder.getTile();
+        if (clickedTile != null) {
+            try {
+                new Notification(HttpClient.create(new URL(clickedTile.getUrl() + '/' + request))
+                        .connect().fetchContent()).show();
+            } catch (IOException ex) {
+                Logging.error(ex);
+            }
+        }
+    }
+
+    private final class GetOsmTileStatusAction extends AbstractAction {
+        private GetOsmTileStatusAction() {
+            super(tr("Get tile status"));
+            setEnabled(clickedTileHolder.getTile() != null);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            sendOsmTileRequest("status");
+        }
+    }
+
+    private final class MarkOsmTileDirtyAction extends AbstractAction {
+        private MarkOsmTileDirtyAction() {
+            super(tr("Force tile rendering"));
+            setEnabled(clickedTileHolder.getTile() != null);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            sendOsmTileRequest("dirty");
+        }
+    }
+
     /**
      * Simple class to keep clickedTile within hookUpMapView
@@ -577 +616 @@
             add(new JMenuItem(new LoadTileAction()));
             add(new JMenuItem(new ShowTileInfoAction()));
+            if (ExpertToggleAction.isExpert() && tileSource.getBaseUrl().contains(".tile.openstreetmap.org/")) {
+                add(new JMenuItem(new GetOsmTileStatusAction()));
+                add(new JMenuItem(new MarkOsmTileDirtyAction()));
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
 import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
+import org.openstreetmap.josm.gui.widgets.UrlLabel;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProcessor;
@@ -176 +177 @@
     }
 
-    protected JTextField createTextField(String text) {
+    protected JComponent createTextField(String text) {
+        if (text != null && text.matches("https?://.*")) {
+            return new UrlLabel(text);
+        }
         JTextField ret = new JTextField(text);
         ret.setEditable(false);