Changeset 33651 in osm for applications/editors/josm/plugins/cadastre-fr/src

Timestamp:

2017-09-22T02:58:54+02:00 (7 years ago)

Author:

donvip

Message:

Edigeo: unfortunate attempt to get bounds

Location:

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo

Files:

• EdigeoFileGEN.java (modified) (6 diffs)
• EdigeoFileTHF.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileGEN.java

@@ -7 +7 @@
 import java.nio.file.Path;
 
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.plugins.fr.cadastre.edigeo.EdigeoFileGEN.GenBlock;
 import org.openstreetmap.josm.plugins.fr.cadastre.edigeo.EdigeoFileTHF.ChildBlock;
@@ -27 +30 @@
      */
     public static class GeoBounds extends GenBlock {
-        /** CM1 */ String min = "";
-        /** CM2 */ String max = "";
+        /** CM1 */ EastNorth min;
+        /** CM2 */ EastNorth max;
 
         GeoBounds(Lot lot, String type) {
@@ -37 +40 @@
         void processRecord(EdigeoRecord r) {
             switch (r.name) {
-            case "CM1": safeGet(r, s -> min += s); break;
-            case "CM2": safeGet(r, s -> max += s); break;
+            case "CM1": min = safeGetEastNorth(r); break;
+            case "CM2": max = safeGetEastNorth(r); break;
             default:
                 super.processRecord(r);
@@ -48 +51 @@
          * @return the minimal coordinates
          */
-        public final String getMinCm1() {
+        public final EastNorth getMinCm1() {
             return min;
         }
@@ -56 +59 @@
          * @return the maximal coordinates
          */
-        public final String getMaxCm2() {
+        public final EastNorth getMaxCm2() {
             return max;
+        }
+
+        /**
+         * Returns the bounds.
+         * @return the bounds
+         */
+        public Bounds getBounds() {
+/*
+            for (String s : Projections.getAllProjectionCodes()) {
+                Projection p = Projections.getProjectionByCode(s);
+                LatLon en = p.eastNorth2latlon(min);
+                double lat = en.lat();
+                double lon = en.lon();
+                if (43 <= lat && lat <= 44 && 1.38 <= lon && lon <= 1.45) {
+                    System.out.println(s + ": " + p);
+                }
+            }
+*/
+            Projection proj = lot.geo.getCoorReference().getProjection();
+            return new Bounds(proj.eastNorth2latlon(min), proj.eastNorth2latlon(max));
         }
     }
@@ -154 +177 @@
         return this;
     }
+
+    /**
+     * Returns the geographic bounds.
+     * @return the geographic bounds
+     */
+    public final GeoBounds getGeoBounds() {
+        return blocks.getInstances(GeoBounds.class).get(0);
+    }
 }

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/edigeo/EdigeoFileTHF.java

@@ -444 +444 @@
         for (Lot lot : getLots()) {
             lot.readFiles(path, ds);
+            //ds.addDataSource(new DataSource(lot.gen.getGeoBounds().getBounds(), support.author));
         }
         return this;