Changeset 3872 in josm for trunk

Timestamp:

2011-02-08T19:52:58+01:00 (13 years ago)

Author:

stoecker

Message:

see #5532 - add missing addProjectsions() function nobody seems able to add when asked to do so

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/OffsetBookmark.java (modified) (2 diffs)
• data/projection/Projection.java (modified) (1 diff)
• data/projection/ProjectionInfo.java (modified) (1 diff)
• data/projection/Projections.java (added)
• gui/preferences/AddWMSLayerPanel.java (modified) (2 diffs)
• gui/preferences/ProjectionPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/OffsetBookmark.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.data.projection.ProjectionInfo;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
@@ -51 +52 @@
         proj = ProjectionInfo.getProjectionByCode(projectionStr);
         if (proj == null) {
-            for (Projection proj : Projection.allProjections) {
+            for (Projection proj : Projections.getProjections()) {
                 if (proj.getCacheDirectoryName().equals(projectionStr)) {
                     this.proj = proj;

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

@@ -13 +13 @@
  */
 public interface Projection {
-    /**
-     * List of all available projections.
-     */
-    public static Projection[] allProjections = 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(),
-    };
-
     /**
      * Returns the default zoom scale in pixel per degree ({@see #NavigatableComponent#scale}))

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

@@ -21 +21 @@
     static {
         allCodes = new HashMap<String, Projection>();
-        for (Projection proj : Projection.allProjections) {
+        for (Projection proj : Projections.getProjections()) {
             if (proj instanceof ProjectionSubPrefs) {
                 ProjectionSubPrefs projSub = recreateProj((ProjectionSubPrefs)proj);

trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java

@@ -47 +47 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
@@ -400 +401 @@
 
     private boolean isProjSupported(String crs) {
-        for (Projection proj : Projection.allProjections) {
+        for (Projection proj : Projections.getProjections()) {
             if (proj instanceof ProjectionSubPrefs) {
                 if (((ProjectionSubPrefs) proj).getPreferencesFromCode(crs) == null) {

trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -84 +85 @@
      * Combobox with all projections available
      */
-    private JComboBox projectionCombo = new JComboBox(Projection.allProjections);
+    private JComboBox projectionCombo = new JComboBox(Projections.getProjections().toArray());
 
     /**