Changeset 4126 in josm for trunk/src/org/openstreetmap/josm/data/projection

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/src/org/openstreetmap/josm/data/projection

Files:

• ProjectionChangeListener.java (added)
• Projections.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.projection;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.ArrayList;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -14 +18 @@
      */
     private static ArrayList<Projection> allProjections =
-    new ArrayList<Projection>(Arrays.asList(new Projection[] {
-        // global projections
-        new Epsg4326(),
-        new Mercator(),
-        new UTM(),
-        // regional - alphabetical order by country name
-        new LambertEST(), // Still needs proper default zoom
-        new Lambert(),    // Still needs proper default zoom
-        new LambertCC9Zones(),    // Still needs proper default zoom
-        new UTM_France_DOM(),
-        new TransverseMercatorLV(),
-        new Puwg(),
-        new Epsg3008(), // SWEREF99 13 30
-        new SwissGrid(),
-    }));
+        new ArrayList<Projection>(Arrays.asList(new Projection[] {
+                // global projections
+                new Epsg4326(),
+                new Mercator(),
+                new UTM(),
+                // regional - alphabetical order by country name
+                new LambertEST(), // Still needs proper default zoom
+                new Lambert(),    // Still needs proper default zoom
+                new LambertCC9Zones(),    // Still needs proper default zoom
+                new UTM_France_DOM(),
+                new TransverseMercatorLV(),
+                new Puwg(),
+                new Epsg3008(), // SWEREF99 13 30
+                new SwissGrid(),
+        }));
 
     public static ArrayList<Projection> getProjections() {
@@ -43 +47 @@
         allProjections.add(proj);
     }
+
+    static public EastNorth project(LatLon ll) {
+        if (ll == null) return null;
+        return Main.getProjection().latlon2eastNorth(ll);
+    }
+
+    static public LatLon inverseProject(EastNorth en) {
+        if (en == null) return null;
+        return Main.getProjection().eastNorth2latlon(en);
+    }
 }