Changeset 33518 in osm for applications/editors/josm/plugins/opendata/modules/fr.toulouse

Timestamp:

2017-08-25T22:50:43+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12649

Location:

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse

Files:

• ToulouseModule.java (modified) (6 diffs)
• datasets/ToulouseDataSetHandler.java (modified) (4 diffs)
• datasets/associations/Club3eAgeHandler.java (modified) (2 diffs)
• datasets/culture/MuseeHandler.java (modified) (1 diff)
• datasets/enfance/CrechesHandler.java (modified) (1 diff)
• datasets/enfance/EcoleElementaireHandler.java (modified) (2 diffs)
• datasets/services/MarchesPleinVentHandler.java (modified) (2 diffs)
• datasets/transport/HorodateurHandler.java (modified) (3 diffs)
• datasets/transport/VeloToulouseHandler.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java

@@ -6 +6 @@
 import java.util.TreeSet;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -109 +109 @@
         handlers.add(PointsLumineuxHandler.class);
     }
-    
+
     public static final DataSet data = new DataSet();
-    
+
     private static final Collection<Relation> getBoundaries(int admin_level) {
         Collection<Relation> result = new TreeSet<>(new Comparator<Relation>() {
@@ -127 +127 @@
         synchronized (data) {
             for (Relation r : data.getRelations()) {
-                if (r.hasTag("admin_level", Integer.toString(admin_level)) && 
+                if (r.hasTag("admin_level", Integer.toString(admin_level)) &&
                         (r.hasKey("name") || r.hasKey("ref") || r.hasKey("description"))) {
                     result.add(r);
@@ -135 +135 @@
         return result;
     }
-    
+
     public static final void downloadData() {
         synchronized (data) {
@@ -141 +141 @@
                 for (final ToulouseDataSetHandler handler : new ToulouseDataSetHandler[]{
                         new CommuneHandler(), new SecteursHandler(), new QuartiersHandler()}) {
-                    Main.worker.submit(new Runnable() {
+                    MainApplication.worker.submit(new Runnable() {
                         @Override
                         public void run() {
@@ -160 +160 @@
         }
     }
-    
+
     public static final Collection<Relation> getMunicipalities() {
         return getBoundaries(8);
     }
-    
+
     public static final Collection<Relation> getSectors() {
         return getBoundaries(10);

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java

@@ -10 +10 @@
 import java.util.Collections;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -27 +26 @@
 import org.openstreetmap.josm.data.osm.event.TagsChangedEvent;
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.plugins.opendata.OdPlugin;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.DataSetCategory;
@@ -142 +142 @@
         public void actionPerformed(ActionEvent e) {
             final String baseName = OdPlugin.getInstance().getDialog().getDataLayer().getName();
-            final DataSet baseDs = Main.getLayerManager().getEditDataSet();
+            final DataSet baseDs = MainApplication.getLayerManager().getEditDataSet();
             for (OsmPrimitive boundary : getBoundaries()) {
                 DataSet data = new DataSet();
@@ -162 +162 @@
                         name = boundary.get("description");
                     }
-                    Main.getLayerManager().addLayer(new OdDataLayer(data, baseName+"/"+name, null, ToulouseDataSetHandler.this));
+                    MainApplication.getLayerManager().addLayer(new OdDataLayer(data, baseName+"/"+name, null, ToulouseDataSetHandler.this));
                 }
             }

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/associations/Club3eAgeHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.associations;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -14 +14 @@
         setCategory(CAT_ASSOCIATIONS);
     }
-    
+
     @Override
     public boolean acceptsFilename(String filename) {

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/MuseeHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.culture;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/CrechesHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.enfance;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleElementaireHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.enfance;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -13 +13 @@
         setWikiPage("Écoles élémentaires publiques");
         setCategory(CAT_ENFANCE);
-        for (String forbidden : new String[]{"maternelle","primaire","collège","lycée","secondaire"}) {
+        for (String forbidden : new String[]{"maternelle", "primaire", "collège", "lycée", "secondaire"}) {
             addForbiddenTag("school:FR="+forbidden);
         }

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/services/MarchesPleinVentHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.services;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -29 +29 @@
                 @Override public String replace(String value) {
                     return WordUtils.capitalizeFully(value).replace(", ", "").replace("MarchÉ", "Marché");
-                }});
+                } });
             n.put("amenity", "marketplace");
             replace(n, "Type", "note");
             String hours = "";
             for (String[] day : new String[][]{
-                    new String[]{"Lundi","Mo"},
-                    new String[]{"mardi","Tu"},
-                    new String[]{"mercredi","We"},
-                    new String[]{"jeudi","Th"},
-                    new String[]{"vendredi","Fr"},
-                    new String[]{"samedi","Sa"},
-                    new String[]{"dimanche","Su"}
+                    new String[]{"Lundi", "Mo"},
+                    new String[]{"mardi", "Tu"},
+                    new String[]{"mercredi", "We"},
+                    new String[]{"jeudi", "Th"},
+                    new String[]{"vendredi", "Fr"},
+                    new String[]{"samedi", "Sa"},
+                    new String[]{"dimanche", "Su"}
             }) {
                 String value = n.get(day[0]);

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/HorodateurHandler.java

@@ -5 +5 @@
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -23 +23 @@
         return acceptsCsvKmzTabFilename(filename, "Horodateur");
     }
-    
+
     private String parseHour(String hour) {
         String s = hour.replaceFirst("[hH]", ":");
@@ -31 +31 @@
         return s;
     }
-    
+
     protected String parseOpeningHours(String horaire) {
         final String hour = "\\p{Digit}{1,2}[hH]\\p{Digit}{0,2}";

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/VeloToulouseHandler.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport;
 
-import org.apache.commons.lang3.text.WordUtils;
+import org.apache.commons.text.WordUtils;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;