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

Timestamp:

2009-01-20T13:55:33+01:00 (15 years ago)

Author:

stoecker

Message:

fixed texts, added EPSG codes to projection (to fix WMS access)

Location:

trunk/src/org/openstreetmap/josm/data/projection

Files:

• Epsg4326.java (modified) (1 diff)
• Lambert.java (modified) (2 diffs)
• LambertEST.java (modified) (1 diff)
• Mercator.java (modified) (1 diff)
• Projection.java (modified) (1 diff)

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

@@ -24 +24 @@
     }
 
+    public String toCode() {
+        return "EPSG:4326";
+    }
+
     public String getCacheDirectoryName() {
         return "epsg4326";

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

@@ -122 +122 @@
             } else if (layoutZone != currentZone) {
                 if ((currentZone < layoutZone && Math.abs(zoneLimits[currentZone] - lt) > cMaxOverlappingZones)
-                        || (currentZone > layoutZone && Math.abs(zoneLimits[layoutZone] - lt) > cMaxOverlappingZones)) {
+                || (currentZone > layoutZone && Math.abs(zoneLimits[layoutZone] - lt) > cMaxOverlappingZones)) {
                     JOptionPane.showMessageDialog(Main.parent,
-                                    tr("IMPORTANT : data positioned far away from\n"
-                                            + "the current Lambert zone limits.\n"
-                                            + "Do not upload any data after this message.\n"
-                                            + "Undo your last action, Save your work \n"
-                                            + "and Start a new layer on the new zone."));
+                    tr("IMPORTANT : data positioned far away from\n"
+                    + "the current Lambert zone limits.\n"
+                    + "Do not upload any data after this message.\n"
+                    + "Undo your last action, save your work\n"
+                    + "and start a new layer on the new zone."));
                     layoutZone = -1;
                     dontDisplayErrors = true;
@@ -157 +157 @@
     @Override public String toString() {
         return tr("Lambert Zone (France)");
+    }
+
+    public String toCode() {
+        return "EPSG::"+(27571+currentZone);
     }
 

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

@@ -97 +97 @@
     }
 
+    public String toCode() {
+        return "EPSG:3301";
+    }
+
     public String getCacheDirectoryName() {
         return "lambertest";

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

@@ -37 +37 @@
     }
 
+    public String toCode() {
+        return "EPSG:3785"; /* TODO: Check if that is correct */
+    }
+
     public String getCacheDirectoryName() {
         return "mercator";

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

@@ -58 +58 @@
 
     /**
+     * Return projection code.
+     */
+    String toCode();
+
+    /**
      * Get a filename compatible string (for the cache directory)
      */