Changeset 16321 in josm

Timestamp:

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

Author:

simon04

Message:

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

Location:

trunk

Files:

• scripts/TagInfoExtract.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MainInitialization.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/mappaint/RenderingCLI.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java (modified) (4 diffs)
• src/org/openstreetmap/josm/tools/Territories.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java (modified) (1 diff)

trunk/scripts/TagInfoExtract.java

@@ -622 +622 @@
         DeleteCommand.setDeletionCallback(DeleteAction.defaultDeletionCallback);
         Territories.initializeInternalData();
-        RightAndLefthandTraffic.initialize();
         Files.createDirectories(options.imageDir);
     }

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());

trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -8 +7 @@
 
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -43 +41 @@
     /**
      * Initializes Right and lefthand traffic data.
+     * @param geoProperty the property containing the traffic data
      * TODO: Synchronization can be refined inside the {@link GeoPropertyIndex} as most look-ups are read-only.
      */
-    public static synchronized void initialize() {
-        rlCache = new GeoPropertyIndex<>(computeLeftDrivingBoundaries(), 24);
+    static synchronized void initialize(DefaultGeoProperty geoProperty) {
+        rlCache = new GeoPropertyIndex<>(geoProperty, 24);
     }
 
-    private static DefaultGeoProperty computeLeftDrivingBoundaries() {
-        Collection<Way> ways = new ArrayList<>();
+    static void appendLeftDrivingBoundaries(OsmPrimitive osm, Collection<Way> ways) {
         // Find all outer ways of left-driving countries. Many of them are adjacent (African and Asian states)
-        DataSet data = Territories.getDataSet();
-        for (Way w : data.getWays()) {
-            if (LEFT.equals(w.get(DRIVING_SIDE))) {
+        if (LEFT.equals(osm.get(DRIVING_SIDE))) {
+            if (osm instanceof Way) {
+                Way w = (Way) osm;
                 addWayIfNotInner(ways, w);
-            }
-        }
-        for (Relation r : data.getRelations()) {
-            if (r.isMultipolygon() && LEFT.equals(r.get(DRIVING_SIDE))) {
+            } else if (osm instanceof Relation && osm.isMultipolygon()) {
+                Relation r = (Relation) osm;
                 for (RelationMember rm : r.getMembers()) {
                     if (rm.isWay() && "outer".equals(rm.getRole()) && !RIGHT.equals(rm.getMember().get(DRIVING_SIDE))) {
@@ -67 +63 @@
             }
         }
-        // Combine adjacent countries into a single polygon
-        return new DefaultGeoProperty(ways);
     }
 

trunk/src/org/openstreetmap/josm/tools/Territories.java

@@ -32 +32 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.TagMap;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.io.IllegalDataException;
@@ -114 +116 @@
 
     /**
-     * Returns a copy of the territories dataset.
-     * @return a copy of the territories dataset
-     */
-    public static synchronized DataSet getDataSet() {
-        return new DataSet(dataSet);
-    }
-
-    /**
      * Initializes territories.
      * TODO: Synchronization can be refined inside the {@link GeoPropertyIndex} as most look-ups are read-only.
@@ -138 +132 @@
         taginfoCache = new TreeMap<>();
         customTagsCache = new TreeMap<>();
+        Collection<Way> traffic = new ArrayList<>();
         try (CachedFile cf = new CachedFile("resource://data/" + FILENAME);
                 InputStream is = cf.getInputStream()) {
             dataSet = OsmReader.parseDataSet(is, null);
-            Collection<OsmPrimitive> candidates = new ArrayList<>(dataSet.getWays());
-            candidates.addAll(dataSet.getRelations());
-            for (OsmPrimitive osm : candidates) {
+            for (OsmPrimitive osm : dataSet.allPrimitives()) {
+                if (osm instanceof Node) {
+                    continue;
+                }
                 String iso1 = osm.get(ISO3166_1);
                 String iso2 = osm.get(ISO3166_2);
@@ -165 +161 @@
                     }
                 }
-            }
+                RightAndLefthandTraffic.appendLeftDrivingBoundaries(osm, traffic);
+            }
+            RightAndLefthandTraffic.initialize(new DefaultGeoProperty(traffic));
         } catch (IOException | IllegalDataException ex) {
             throw new JosmRuntimeException(ex);
+        } finally {
+            MultipolygonCache.getInstance().clear(dataSet);
+            if (!Logging.isDebugEnabled()) {
+                // unset dataSet to save memory, see #18907
+                dataSet = null;
+            } else {
+                Logging.debug("Retaining {0} to allow editing via advanced preferences", FILENAME);
+            }
         }
     }

trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java

@@ -51 +51 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().territories().rlTraffic().projection();
+    public JOSMTestRules test = new JOSMTestRules().territories().projection();
 
     private static TagEditHelper newTagEditHelper() {

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -65 +65 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
-import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
@@ -100 +99 @@
     private boolean useHttps;
     private boolean territories;
-    private boolean rlTraffic;
     private boolean metric;
     private boolean main;
@@ -270 +268 @@
      * @return this instance, for easy chaining
      * @since 12556
-     */
+     * @deprecated Use {@link #territories}
+     */
+    @Deprecated
     public JOSMTestRules rlTraffic() {
         territories();
-        rlTraffic = true;
         return this;
     }
@@ -551 +550 @@
         if (territories) {
             Territories.initializeInternalData();
-        }
-
-        if (rlTraffic) {
-            RightAndLefthandTraffic.initialize();
         }
 

trunk/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java

@@ -21 +21 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules rules = new JOSMTestRules().projection().rlTraffic();
+    public JOSMTestRules rules = new JOSMTestRules().projection().territories();
 
     /**