Changeset 36020 in osm for applications/editors

Timestamp:

2022-09-17T20:18:47+02:00 (2 years ago)

Author:

Don-vip

Message:

fix #21882 - full support of cadastre in Guadeloupe, Martinique, Guyane, Réunion, Mayotte

Location:

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

Files:

• download/CadastreDownloadTask.java (modified) (1 diff)
• edigeo/EdigeoFileGEO.java (modified) (1 diff)

applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java

@@ -63 +63 @@
         try {
             for (String id : CadastreAPI.getSheets(downloadArea)) {
-                String url = String.join("/", CADASTRE_URL, id.substring(0, 2), id.substring(0, 5), "edigeo-"+id+".tar.bz2");
+                                String url = String.join("/", CADASTRE_URL, id.substring(0, id.startsWith("97") ? 3 : 2), id.substring(0, 5), "edigeo-"+id+".tar.bz2");
                 tasks.add(MainApplication.worker.submit(new InternalDownloadTask(settings, url, progressMonitor, zoomAfterDownload)));
             }

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

@@ -166 +166 @@
             CSG67UTM21("EPSG:3312"),
             CSG67UTM22("EPSG:2971"),
+            RGFG95UTM22("EPSG:2972"),
+            RGR92UTM("EPSG:2975"),
             MAYO50UTM38S("EPSG:2980"),
-            STPM50UTM21("EPSG:2987");
+            STPM50UTM21("EPSG:2987"),
+            RGM04("EPSG:4471");
 
             final String epsg;