Changeset 20824 in osm

Timestamp:

2010-04-07T19:53:12+02:00 (15 years ago)

Author:

pieren

Message:

Add the modified projection for the french DOM "La Réunion".

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• CacheControl.java (modified) (2 diffs)
• CacheFileUTM20NFilter.java (modified) (1 diff)
• CadastrePlugin.java (modified) (1 diff)
• MenuActionLoadFromCache.java (modified) (4 diffs)
• MenuActionNewLocation.java (modified) (2 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheControl.java

@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
-import org.openstreetmap.josm.data.projection.UTM_20N_France_DOM;
+import org.openstreetmap.josm.data.projection.UTM_France_DOM;
 
 public class CacheControl implements Runnable {
@@ -211 +211 @@
         if (Main.proj instanceof LambertCC9Zones)
             ext = cLambertCC9Z + ext;
-        else if (Main.proj instanceof UTM_20N_France_DOM)
+        else if (Main.proj instanceof UTM_France_DOM)
             ext = cUTM20N + ext;
         return ext;

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java

@@ -19 +19 @@
         new CacheFileUTM20NFilter("utm1", tr("Guadeloupe Fort-Marigot cache file (.UTM1)")),
         new CacheFileUTM20NFilter("utm2", tr("Guadeloupe Ste-Anne cache file (.UTM2)")),
-        new CacheFileUTM20NFilter("utm3", tr("Martinique Fort Desaix cache file (.UTM3)"))
+        new CacheFileUTM20NFilter("utm3", tr("Martinique Fort Desaix cache file (.UTM3)")),
+        new CacheFileUTM20NFilter("utm4", tr("Reunion RGR92 cache file (.UTM4)"))
         };
 

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

@@ -342 +342 @@
     public static boolean isCadastreProjection() {
         return Main.proj.toString().equals(new Lambert().toString())
-            || Main.proj.toString().equals(new UTM_20N_France_DOM().toString())
-            || Main.proj.toString().equals(new GaussLaborde_Reunion().toString())
+            || Main.proj.toString().equals(new UTM_France_DOM().toString())
             || Main.proj.toString().equals(new LambertCC9Zones().toString());
     }

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.projection.Lambert;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
-import org.openstreetmap.josm.data.projection.UTM_20N_France_DOM;
+import org.openstreetmap.josm.data.projection.UTM_France_DOM;
 import org.openstreetmap.josm.gui.layer.Layer;
 
@@ -40 +40 @@
                     !(Main.proj instanceof LambertCC9Zones))
                     || (ext.length() == 4 && ext.substring(0, CacheControl.cUTM20N.length()).equals(CacheControl.cUTM20N) &&
-                            !(Main.proj instanceof UTM_20N_France_DOM))
+                            !(Main.proj instanceof UTM_France_DOM))
                     || (ext.length() == 1) && !(Main.proj instanceof Lambert)) {
                         JOptionPane.showMessageDialog(Main.parent, tr("{0} not allowed with the current projection", filename), tr("Error"), JOptionPane.ERROR_MESSAGE);
@@ -93 +93 @@
             else if (Main.proj instanceof LambertCC9Zones)
                 fc.addChoosableFileFilter(CacheFileLambert9ZoneFilter.filters[layoutZone]);
-            else if (Main.proj instanceof UTM_20N_France_DOM)
+            else if (Main.proj instanceof UTM_France_DOM)
                 fc.addChoosableFileFilter(CacheFileUTM20NFilter.filters[layoutZone]);
         }
@@ -111 +111 @@
         else if (Main.proj instanceof Lambert)
             zone = ((Lambert)Main.proj).getLayoutZone();
-        else if (Main.proj instanceof UTM_20N_France_DOM)
-            zone = ((UTM_20N_France_DOM)Main.proj).getCurrentGeodesic();
+        else if (Main.proj instanceof UTM_France_DOM)
+            zone = ((UTM_France_DOM)Main.proj).getCurrentGeodesic();
         return zone;
     }

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.projection.Lambert;
 import org.openstreetmap.josm.data.projection.LambertCC9Zones;
-import org.openstreetmap.josm.data.projection.UTM_20N_France_DOM;
+import org.openstreetmap.josm.data.projection.UTM_France_DOM;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.GBC;
@@ -82 +82 @@
             else if (Main.proj instanceof Lambert)
                 zone = ((Lambert)Main.proj).getLayoutZone();
-            else if (Main.proj instanceof UTM_20N_France_DOM)
-                zone = ((UTM_20N_France_DOM)Main.proj).getCurrentGeodesic();
+            else if (Main.proj instanceof UTM_France_DOM)
+                zone = ((UTM_France_DOM)Main.proj).getCurrentGeodesic();
             wmsLayer = new WMSLayer(location, codeCommune, zone);
             CadastrePlugin.addWMSLayer(wmsLayer);