Changeset 16321 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2020-04-17T17:54:04+02:00 (6 years ago)

Author:

simon04

Message:

fix #18907 - Initialize Territories+RightAndLefthandTraffic together, remove "Edit boundaries" to save memory (unless started with --debug)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainInitialization.java (modified) (3 diffs)
• mappaint/RenderingCLI.java (modified) (2 diffs)
• preferences/advanced/AdvancedPreference.java (modified) (2 diffs)

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

@@ -39 +39 @@
 import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
 import org.openstreetmap.josm.tools.PlatformManager;
-import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.Tag2Link;
@@ -82 +81 @@
                 MainApplication.registerActionShortcut(MainApplication.menu.help,
                         Shortcut.registerShortcut("system:help", tr("Help"), KeyEvent.VK_F1, Shortcut.DIRECT));
-            }),
-            // This needs to be done before RightAndLefthandTraffic::initialize is called
-            new InitializationTask(tr("Initializing internal boundaries data"), Territories::initialize)
+            })
         );
     }
@@ -114 +111 @@
                     }
                 }),
-            new InitializationTask(tr("Initializing internal traffic data"), RightAndLefthandTraffic::initialize),
-            new InitializationTask(tr("Initializing numbering format"), () -> {
+            new InitializationTask(tr("Initializing internal boundaries data"), () -> {
+                Territories.initialize();
                 if (Config.getPref().getBoolean("override.numbering.format", true)) {
                     I18n.initializeNumberingFormat();

trunk/src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java

@@ -44 +44 @@
 import org.openstreetmap.josm.tools.OptionParser.OptionCount;
 import org.openstreetmap.josm.tools.OptionParser.OptionParseException;
-import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
+import org.openstreetmap.josm.tools.Territories;
 
 /**
@@ -439 +439 @@
         ProjectionRegistry.setProjection(Projections.getProjectionByCode(projCode.toUpperCase(Locale.US)));
 
-        RightAndLefthandTraffic.initialize();
+        Territories.initialize();
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -90 +90 @@
     }
 
+    /**
+     * Requires {@link Logging#isDebugEnabled()}, otherwise dataset is unloaded
+     * @see Territories#initializeInternalData()
+     */
     private static final class EditBoundariesAction extends AbstractAction {
         EditBoundariesAction() {
@@ -391 +395 @@
         menu.addSeparator();
         menu.add(getProfileMenu());
-        menu.addSeparator();
-        menu.add(new EditBoundariesAction());
+        if (Logging.isDebugEnabled()) {
+            menu.addSeparator();
+            menu.add(new EditBoundariesAction());
+        }
         menu.addSeparator();
         menu.add(new ResetPreferencesAction());