Changeset 14388 in josm for trunk

Timestamp:

2018-10-30T23:05:04+01:00 (6 years ago)

Author:

simon04

Message:

Add checkbox to main menu to toggle hatched background rendering of areas outside of the downloaded areas

This is useful, e.g, for mapping public transport relations when one
downloads a relation modify by id and missing stops by bbox.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HatchAreaOutsideDownloadAction.java (added)
• gui/MainMenu.java (modified) (5 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)

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

@@ -53 +53 @@
 import org.openstreetmap.josm.actions.FullscreenToggleAction;
 import org.openstreetmap.josm.actions.GpxExportAction;
+import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
 import org.openstreetmap.josm.actions.HelpAction;
 import org.openstreetmap.josm.actions.HistoryInfoAction;
@@ -221 +222 @@
     /** View / Wireframe View */
     public final WireframeToggleAction wireFrameToggleAction = new WireframeToggleAction();
+    /** View / Hatch area outside download */
+    public final HatchAreaOutsideDownloadAction hatchAreaOutsideDownloadAction = new HatchAreaOutsideDownloadAction();
     /** View / Advanced info */
     public final InfoAction info = new InfoAction();
@@ -651 +654 @@
      * @since 10340
      */
+    // CHECKSTYLE.OFF: ExecutableStatementCountCheck
     public void initialize() {
         moreToolsMenu.setVisible(false);
@@ -715 +719 @@
         wireframe.setAccelerator(wireFrameToggleAction.getShortcut().getKeyStroke());
         wireFrameToggleAction.addButtonModel(wireframe.getModel());
+        final JCheckBoxMenuItem hatchAreaOutsideDownloadMenuItem = hatchAreaOutsideDownloadAction.getCheckbox();
+        viewMenu.add(hatchAreaOutsideDownloadMenuItem);
+        ExpertToggleAction.addVisibilitySwitcher(hatchAreaOutsideDownloadMenuItem);
 
         viewMenu.add(new MapPaintMenu());
@@ -838 +845 @@
         new PresetsMenuEnabler(presetsMenu);
     }
+    // CHECKSTYLE.ON: ExecutableStatementCountCheck
 
     /**

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

@@ -44 +44 @@
 
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.actions.HatchAreaOutsideDownloadAction;
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.actions.ToggleUploadDiscouragedLayerAction;
@@ -499 +500 @@
             }
             try {
-                g.fill(a);
+                if (HatchAreaOutsideDownloadAction.isHatchEnabled()) {
+                    g.fill(a);
+                }
             } catch (ArrayIndexOutOfBoundsException e) {
                 // #16686 - AIOOBE in java.awt.TexturePaintContext$Int.setRaster