Changeset 35167 in osm for applications/editors/josm

Timestamp:

2019-10-02T22:36:02+02:00 (5 years ago)

Author:

donvip

Message:

fix #josm18192 - Support new building layer name of cadastre WMS

File:

• applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/CadastrePlugin.java (modified) (2 diffs)

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

@@ -169 +169 @@
  * <br>2.9 23-Aug-2017 - use new HTTPS links from French cadastre - requires JOSM 12623+ to load Certigna certificate
  * <br>3.0 30-Sep-2017 - add support for direct access to Cadastre vectorial data (Edigeo files)
+ * <br>3.1 01-Oct-2019 - Support new building layer name of cadastre WMS (trac #18192)
  */
 public class CadastrePlugin extends Plugin {
-    static String VERSION = "3.0";
+    static final String VERSION = "3.1";
 
     static JMenu cadastreJMenu;
@@ -199 +200 @@
     private static boolean menuEnabled = false;
 
-    private static String LAYER_BULDINGS = "CDIF:LS2";
-    private static String STYLE_BUILDING = "LS2_90";
-    private static String LAYER_WATER = "CDIF:LS3";
-    private static String STYLE_WATER = "LS3_90";
-    private static String LAYER_SYMBOL = "CDIF:LS1";
-    private static String STYLE_SYMBOL = "LS1_90";
-    private static String LAYER_PARCELS = "CDIF:PARCELLE";
-    private static String STYLE_PARCELS = "PARCELLE_90";
-    private static String LAYER_NUMERO = "CDIF:NUMERO";
-    private static String STYLE_NUMERO = "NUMERO_90";
-    private static String LAYER_LABEL = "CDIF:PT3,CDIF:PT2,CDIF:PT1";
-    private static String STYLE_LABEL = "PT3_90,PT2_90,PT1_90";
-    private static String LAYER_LIEUDIT = "CDIF:LIEUDIT";
-    private static String STYLE_LIEUDIT = "LIEUDIT_90";
-    private static String LAYER_SECTION = "CDIF:SUBSECTION,CDIF:SECTION";
-    private static String STYLE_SECTION = "SUBSECTION_90,SECTION_90";
-    private static String LAYER_COMMUNE = "CDIF:COMMUNE";
-    private static String STYLE_COMMUNE = "COMMUNE_90";
+    private static final String LAYER_BULDINGS = "CDIF:BATIMENT,CDIF:LS2";
+    private static final String STYLE_BUILDING = "BATIMENT_90,LS2_90";
+    private static final String LAYER_WATER = "CDIF:LS3";
+    private static final String STYLE_WATER = "LS3_90";
+    private static final String LAYER_SYMBOL = "CDIF:LS1";
+    private static final String STYLE_SYMBOL = "LS1_90";
+    private static final String LAYER_PARCELS = "CDIF:PARCELLE";
+    private static final String STYLE_PARCELS = "PARCELLE_90";
+    private static final String LAYER_NUMERO = "CDIF:NUMERO";
+    private static final String STYLE_NUMERO = "NUMERO_90";
+    private static final String LAYER_LABEL = "CDIF:PT3,CDIF:PT2,CDIF:PT1";
+    private static final String STYLE_LABEL = "PT3_90,PT2_90,PT1_90";
+    private static final String LAYER_LIEUDIT = "CDIF:LIEUDIT";
+    private static final String STYLE_LIEUDIT = "LIEUDIT_90";
+    private static final String LAYER_SECTION = "CDIF:SUBSECTION,CDIF:SECTION";
+    private static final String STYLE_SECTION = "SUBSECTION_90,SECTION_90";
+    private static final String LAYER_COMMUNE = "CDIF:COMMUNE";
+    private static final String STYLE_COMMUNE = "COMMUNE_90";
 
     /**