Changeset 19640 in josm

Timestamp:

2026-10-06T09:35:45+02:00 (10 hours ago)

Author:

stoecker

Message:

add grid overlay and tile border display, fix #8464, patch by wangi

Location:

trunk

Files:

• resources/images/grid.svg (added)
• resources/images/gridorigin.svg (added)
• resources/images/gridrotate.svg (added)
• resources/images/preferences/grid.svg (added)
• src/org/openstreetmap/josm/actions/AlignGridRotationAction.java (added)
• src/org/openstreetmap/josm/actions/SetGridOriginAction.java (added)
• src/org/openstreetmap/josm/actions/ShowGridAction.java (added)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/MapFrame.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/draw/BlendComposite.java (added)
• src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java (modified) (7 diffs)
• src/org/openstreetmap/josm/gui/layer/MapGridPaintable.java (added)
• src/org/openstreetmap/josm/gui/layer/imagery/ShowTileBordersAction.java (added)
• src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java (modified) (10 diffs)
• src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/display/GridPreference.java (added)
• test/unit/org/openstreetmap/josm/actions/GridActionsTest.java (added)
• test/unit/org/openstreetmap/josm/gui/draw (added)
• test/unit/org/openstreetmap/josm/gui/draw/BlendCompositeTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/MapGridPaintableTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/imagery/ShowTileBordersActionTest.java (added)
• test/unit/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettingsTest.java (added)
• test/unit/org/openstreetmap/josm/gui/preferences/display/GridPreferenceTest.java (added)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -31 +31 @@
 import org.openstreetmap.josm.actions.AboutAction;
 import org.openstreetmap.josm.actions.AddNodeAction;
+import org.openstreetmap.josm.actions.AlignGridRotationAction;
 import org.openstreetmap.josm.actions.AlignInCircleAction;
 import org.openstreetmap.josm.actions.AlignInLineAction;
@@ -101 +102 @@
 import org.openstreetmap.josm.actions.SessionSaveAction;
 import org.openstreetmap.josm.actions.SessionSaveAsAction;
+import org.openstreetmap.josm.actions.SetGridOriginAction;
+import org.openstreetmap.josm.actions.ShowGridAction;
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
 import org.openstreetmap.josm.actions.SimplifyWayAction;
@@ -136 +139 @@
 import org.openstreetmap.josm.gui.layer.geoimage.WikimediaCommonsLoader.WikimediaCommonsLoadImagesAction;
 import org.openstreetmap.josm.gui.mappaint.MapPaintMenu;
+import org.openstreetmap.josm.gui.preferences.display.GridPreference;
 import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSearchPrimitiveDialog;
@@ -257 +261 @@
     /** View / Hatch area outside download */
     public final DrawBoundariesOfDownloadedDataAction drawBoundariesOfDownloadedDataAction = new DrawBoundariesOfDownloadedDataAction();
+    /** View / Grid submenu: the grid drawn over the map and its placement */
+    public final JMenu gridMenu = new JMenu(tr("Grid"));
+    /** View / Grid / Show */
+    public final ShowGridAction showGridAction = new ShowGridAction();
+    /** View / Grid / Set origin to selection */
+    public final SetGridOriginAction setGridOriginAction = new SetGridOriginAction();
+    /** View / Grid / Align rotation to selection */
+    public final AlignGridRotationAction alignGridRotationAction = new AlignGridRotationAction();
     /** View / Advanced info */
     public final InfoAction info = new InfoAction();
@@ -816 +828 @@
         viewMenu.add(hatchAreaOutsideDownloadMenuItem);
         ExpertToggleAction.addVisibilitySwitcher(hatchAreaOutsideDownloadMenuItem);
+        // -- Grid submenu
+        gridMenu.setIcon(ImageProvider.get("grid", ImageProvider.ImageSizes.MENU));
+        gridMenu.add(showGridAction.getCheckbox());
+        add(gridMenu, setGridOriginAction);
+        add(gridMenu, alignGridRotationAction);
+        gridMenu.addSeparator();
+        add(gridMenu, PreferencesAction.forPreferenceTab(tr("Grid preferences..."),
+                tr("Click to open the grid tab in the preferences"), GridPreference.class));
+        viewMenu.add(gridMenu);
 
         viewMenu.add(new MapPaintMenu());

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -74 +74 @@
 import org.openstreetmap.josm.gui.dialogs.properties.PropertiesDialog;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.MapGridPaintable;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -123 +124 @@
      */
     public final MapView mapView;
+    /** The grid drawn over the map view, see {@link MapGridPaintable} */
+    private final MapGridPaintable gridOverlay = new MapGridPaintable();
 
     /**
@@ -205 +208 @@
 
         mapView = new MapView(MainApplication.getLayerManager(), viewportData);
+        mapView.addTemporaryLayer(gridOverlay);
 
         splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
@@ -367 +371 @@
 
         statusLine.destroy();
+        mapView.removeTemporaryLayer(gridOverlay);
+        gridOverlay.destroy();
         mapView.destroy();
         keyDetector.unregister();

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Component;
@@ -16 +17 @@
 import java.awt.Shape;
 import java.awt.Toolkit;
+import java.awt.Stroke;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
@@ -94 +96 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
@@ -117 +120 @@
 import org.openstreetmap.josm.gui.layer.imagery.ReprojectionTile;
 import org.openstreetmap.josm.gui.layer.imagery.ShowErrorsAction;
+import org.openstreetmap.josm.gui.layer.imagery.ShowTileBordersAction;
 import org.openstreetmap.josm.gui.layer.imagery.TileAnchor;
 import org.openstreetmap.josm.gui.layer.imagery.TileCoordinateConverter;
@@ -182 +186 @@
 
     private static final BooleanProperty POPUP_MENU_ENABLED = new BooleanProperty(PREFERENCE_PREFIX + ".popupmenu", true);
+    /** Color of the border drawn around each tile if enabled, see {@link TileSourceDisplaySettings#isShowTileBorders()} */
+    private static final NamedColorProperty TILE_BORDER_COLOR = new NamedColorProperty(marktr("imagery tile border"), new Color(0, 0, 0, 96));
+    private static final Stroke TILE_BORDER_STROKE = new BasicStroke(1f);
     private static final String ERROR_STRING = marktr("Error");
 
@@ -1227 +1234 @@
         }
 
-        if (Logging.isDebugEnabled()) {
+        if (getDisplaySettings().isShowTileBorders()) {
+            // draw a thin border around the tile
+            Color oldColor = g.getColor();
+            Stroke oldStroke = g.getStroke();
+            g.setColor(TILE_BORDER_COLOR.get());
+            g.setStroke(TILE_BORDER_STROKE);
+            g.draw(coordinateConverter.getTileShapeScreen(tile));
+            g.setStroke(oldStroke);
+            g.setColor(oldColor);
+        } else if (Logging.isDebugEnabled()) {
             // draw tile outline in semi-transparent red
             g.setColor(new Color(255, 0, 0, 50));
@@ -1854 +1870 @@
             new AutoZoomAction(this),
             new ShowErrorsAction(this),
+            new ShowTileBordersAction(this),
             new IncreaseZoomAction(this),
             new DecreaseZoomAction(this),

trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java

@@ -46 +46 @@
     private static final String SHOW_ERRORS = "show-errors";
 
+    private static final String SHOW_TILE_BORDERS = "show-tile-borders";
+
     private static final String DISPLACEMENT = "displacement";
 
@@ -59 +61 @@
      */
     public static final BooleanProperty PROP_AUTO_ZOOM = new BooleanProperty(PREFERENCE_PREFIX + ".default_autozoom", true);
+
+    /**
+     * The default tile borders property, remembered whenever the user toggles them, so that the choice also
+     * applies to layers created later and after a restart
+     * @since 19640
+     */
+    public static final BooleanProperty PROP_SHOW_TILE_BORDERS
+            = new BooleanProperty(PREFERENCE_PREFIX + ".default_showtileborders", false);
 
 
@@ -67 +77 @@
     /** if layer should show errors on tiles */
     private boolean showErrors;
+    /** if layer should draw a border around each tile */
+    private boolean showTileBorders;
 
     private OffsetBookmark previousOffsetBookmark;
@@ -97 +109 @@
         autoLoad = getProperty(prefixes, "default_autoload", PROP_AUTO_LOAD.getDefaultValue());
         showErrors = getProperty(prefixes, "default_showerrors", Boolean.TRUE);
+        showTileBorders = getProperty(prefixes, "default_showtileborders", PROP_SHOW_TILE_BORDERS.getDefaultValue());
     }
 
     private static boolean getProperty(String[] prefixes, String name, Boolean def) {
-        // iterate through all values to force the preferences to receive the default value.
-        // we only support a default value of true.
-        boolean value = true;
+        // iterate through all values to force the preferences to receive the default value
+        boolean value = def;
         for (String p : prefixes) {
             String key = p + "." + name;
-            boolean currentValue = Config.getPref().getBoolean(key, true);
+            boolean currentValue = Config.getPref().getBoolean(key, def);
             if (!Config.getPref().get(key, def.toString()).isEmpty()) {
                 value = currentValue;
@@ -168 +180 @@
         this.showErrors = showErrors;
         fireSettingsChange(SHOW_ERRORS);
+    }
+
+    /**
+     * If the layer should draw a thin border around each tile.
+     * @return <code>true</code> to draw tile borders.
+     * @since 19640
+     */
+    public boolean isShowTileBorders() {
+        return showTileBorders;
+    }
+
+    /**
+     * Sets the show tile borders property. Fires a change event.
+     * @param showTileBorders {@code true} if the layer should draw a thin border around each tile
+     * @see #isShowTileBorders()
+     * @since 19640
+     */
+    public void setShowTileBorders(boolean showTileBorders) {
+        this.showTileBorders = showTileBorders;
+        fireSettingsChange(SHOW_TILE_BORDERS);
     }
 
@@ -290 +322 @@
         data.put(AUTO_ZOOM, Boolean.toString(autoZoom));
         data.put(SHOW_ERRORS, Boolean.toString(showErrors));
+        data.put(SHOW_TILE_BORDERS, Boolean.toString(showTileBorders));
         return data;
     }
@@ -317 +350 @@
                 setShowErrors(Boolean.parseBoolean(doShowErrors));
             }
+
+            String doShowTileBorders = data.get(SHOW_TILE_BORDERS);
+            if (doShowTileBorders != null) {
+                setShowTileBorders(Boolean.parseBoolean(doShowTileBorders));
+            }
         } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
             throw BugReport.intercept(e).put("data", data);
@@ -324 +362 @@
     @Override
     public int hashCode() {
-        return Objects.hash(autoLoad, autoZoom, showErrors);
+        return Objects.hash(autoLoad, autoZoom, showErrors, showTileBorders);
     }
 
@@ -336 +374 @@
         return autoLoad == other.autoLoad
             && autoZoom == other.autoZoom
-            && showErrors == other.showErrors;
+            && showErrors == other.showErrors
+            && showTileBorders == other.showTileBorders;
     }
 
@@ -342 +381 @@
     public String toString() {
         return "TileSourceDisplaySettings [autoZoom=" + autoZoom + ", autoLoad=" + autoLoad + ", showErrors="
-                + showErrors + ']';
+                + showErrors + ", showTileBorders=" + showTileBorders + ']';
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.preferences.display.DrawingPreference;
 import org.openstreetmap.josm.gui.preferences.display.GPXPreference;
+import org.openstreetmap.josm.gui.preferences.display.GridPreference;
 import org.openstreetmap.josm.gui.preferences.display.LafPreference;
 import org.openstreetmap.josm.gui.preferences.display.LanguagePreference;
@@ -611 +612 @@
         SETTINGS_FACTORIES.add(new ProxyPreference.Factory());
         SETTINGS_FACTORIES.add(new ProjectionPreference.Factory());
+        SETTINGS_FACTORIES.add(new GridPreference.Factory());
         SETTINGS_FACTORIES.add(new MapPaintPreference.Factory());
         SETTINGS_FACTORIES.add(new TaggingPresetPreference.Factory());