Changeset 18289 in osm

Timestamp:

2009-10-27T10:41:49+01:00 (15 years ago)

Author:

guggis

Message:

Updated to JOSM r2327

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/cadastre_fr/WMSLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -27 +27 @@
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
                 <attribute name="Plugin-Mainversion" value="2012"/>
-                <attribute name="Plugin-Stage" value="2168"/>
+                <attribute name="Plugin-Stage" value="2327"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

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

@@ -149 +149 @@
      */
     private void divideBbox(Bounds b, int factor) {
-        EastNorth lambertMin = Main.proj.latlon2eastNorth(b.min);
-        EastNorth lambertMax = Main.proj.latlon2eastNorth(b.max);
+        EastNorth lambertMin = Main.proj.latlon2eastNorth(b.getMin());
+        EastNorth lambertMax = Main.proj.latlon2eastNorth(b.getMax());
         double minEast = lambertMin.east();
         double minNorth = lambertMin.north();
@@ -254 +254 @@
         GeorefImage georefImage =
             new GeorefImage(new BufferedImage(1,1,BufferedImage.TYPE_INT_RGB ), // not really important
-            Main.proj.latlon2eastNorth(bounds.min),
-            Main.proj.latlon2eastNorth(bounds.max));
+            Main.proj.latlon2eastNorth(bounds.getMin()),
+            Main.proj.latlon2eastNorth(bounds.getMax()));
         for (GeorefImage img : images) {
             if (img.overlap(georefImage))
@@ -344 +344 @@
     public void setRasterBounds(Bounds bounds) {
         EastNorth rasterCenter = Main.proj.latlon2eastNorth(bounds.getCenter());
-        EastNorth eaMin = Main.proj.latlon2eastNorth(bounds.min);
-        EastNorth eaMax = Main.proj.latlon2eastNorth(bounds.max);
+        EastNorth eaMin = Main.proj.latlon2eastNorth(bounds.getMin());
+        EastNorth eaMax = Main.proj.latlon2eastNorth(bounds.getMax());
         double rasterSizeX = communeBBox.max.getX() - communeBBox.min.getX(); 
         double rasterSizeY = communeBBox.max.getY() - communeBBox.min.getY();