Changeset 26228 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java

Timestamp:

2011-07-01T00:44:06+02:00 (15 years ago)

Author:

pieren

Message:

For v2.2

• replace deprecated Main.proj by newest Main.getProjection()
• fix list of raster images (Feuilles) parsing failing after a Cadastre server change/maintenance

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (modified) (4 diffs)

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

@@ -138 +138 @@
         } else {
             if (isRaster) {
-                b = new Bounds(Main.proj.eastNorth2latlon(rasterMin), Main.proj.eastNorth2latlon(rasterMax));
+                b = new Bounds(Main.getProjection().eastNorth2latlon(rasterMin), Main.getProjection().eastNorth2latlon(rasterMax));
                 divideBbox(b, Integer.parseInt(Main.pref.get("cadastrewms.rasterDivider",
                         CadastrePreferenceSetting.DEFAULT_RASTER_DIVIDER)));
@@ -158 +158 @@
      */
     private void divideBbox(Bounds b, int factor) {
-        EastNorth lambertMin = Main.proj.latlon2eastNorth(b.getMin());
-        EastNorth lambertMax = Main.proj.latlon2eastNorth(b.getMax());
+        EastNorth lambertMin = Main.getProjection().latlon2eastNorth(b.getMin());
+        EastNorth lambertMax = Main.getProjection().latlon2eastNorth(b.getMax());
         double minEast = lambertMin.east();
         double minNorth = lambertMin.north();
@@ -322 +322 @@
         GeorefImage georefImage =
             new GeorefImage(null,
-            Main.proj.latlon2eastNorth(bounds.getMin()),
-            Main.proj.latlon2eastNorth(bounds.getMax()));
+            Main.getProjection().latlon2eastNorth(bounds.getMin()),
+            Main.getProjection().latlon2eastNorth(bounds.getMax()));
         for (GeorefImage img : images) {
             if (img.overlap(georefImage))
@@ -399 +399 @@
      */
     public void setRasterBounds(Bounds bounds) {
-        EastNorth rasterCenter = Main.proj.latlon2eastNorth(bounds.getCenter());
-        EastNorth eaMin = Main.proj.latlon2eastNorth(bounds.getMin());
-        EastNorth eaMax = Main.proj.latlon2eastNorth(bounds.getMax());
+        EastNorth rasterCenter = Main.getProjection().latlon2eastNorth(bounds.getCenter());
+        EastNorth eaMin = Main.getProjection().latlon2eastNorth(bounds.getMin());
+        EastNorth eaMax = Main.getProjection().latlon2eastNorth(bounds.getMax());
         double rasterSizeX = communeBBox.max.getX() - communeBBox.min.getX();
         double rasterSizeY = communeBBox.max.getY() - communeBBox.min.getY();