Changeset 4126 in josm for trunk/test/functional/org/openstreetmap

Timestamp:

2011-06-07T19:05:14+02:00 (13 years ago)

Author:

bastiK

Message:

memory optimizations for Node & WayPoint (Patch by Gubaer, modified)

The field 'proj' in CachedLatLon is a waste of memory. For the 2 classes where this has the greatest impact, the cache for the projected coordinates is replaced by 2 simple double fields (east & north). On projection change, they have to be invalidated explicitly. This is handled by the DataSet & the GpxLayer.

Location:

trunk/test/functional/org/openstreetmap/josm

Files:

• fixtures/JOSMFixture.java (modified) (1 diff)
• gui/conflict/pair/properties/PropertiesMergerTest.java (modified) (1 diff)
• gui/history/HistoryBrowserTest.java (modified) (1 diff)
• io/MultiFetchServerObjectReaderTest.java (modified) (1 diff)
• io/OsmServerBackreferenceReaderTest.java (modified) (1 diff)

trunk/test/functional/org/openstreetmap/josm/fixtures/JOSMFixture.java

@@ -68 +68 @@
 
         // init projection
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
 
         // make sure we don't upload to or test against production

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -18 +18 @@
 
     protected void build() {
-        Main.proj = new Epsg4326();
+        Main.setProjection(new Epsg4326());
 
         setLayout(new BorderLayout());

trunk/test/functional/org/openstreetmap/josm/gui/history/HistoryBrowserTest.java

@@ -58 +58 @@
 
         // init projection
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
     }
 

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -176 +176 @@
         //
         Main.pref.put("osm-server.atomic-upload", false);
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
 
         File dataSetCacheOutputFile = new File(tempOutputDir, MultiFetchServerObjectReaderTest.class.getName() + ".dataset");

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -183 +183 @@
         //
         Main.pref.put("osm-server.atomic-upload", false);
-        Main.proj = new Mercator();
+        Main.setProjection(new Mercator());
 
         File dataSetCacheOutputFile = new File(tempOutputDir, MultiFetchServerObjectReaderTest.class.getName() + ".dataset");