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

Timestamp:

2020-01-11T16:18:11+01:00 (5 years ago)

Author:

donvip

Message:

update to JOSM 15419 + add unit test for Toulouse module

Location:

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

Files:

• ToulouseModule.java (modified) (4 diffs)
• datasets/ToulouseDataSetHandler.java (modified) (6 diffs)
• datasets/citoyennete/QuartiersHandler.java (modified) (1 diff)
• datasets/citoyennete/SecteursHandler.java (modified) (1 diff)
• datasets/transport/HorodateurHandler.java (modified) (1 diff)
• datasets/transport/MetroStationHandler.java (modified) (1 diff)
• datasets/transport/PMRHandler.java (modified) (1 diff)
• datasets/transport/TramwayStationHandler.java (modified) (1 diff)
• datasets/urbanisme/CommuneHandler.java (modified) (1 diff)
• datasets/urbanisme/VoirieHandler.java (modified) (6 diffs)

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

@@ -3 +3 @@
 
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.TreeSet;
 
@@ -59 +58 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.urbanisme.SanisetteHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.urbanisme.VoirieHandler;
+import org.openstreetmap.josm.tools.Logging;
 
+/**
+ * Open data module for Toulouse portal.
+ */
 public class ToulouseModule extends AbstractModule {
 
@@ -112 +115 @@
     public static final DataSet data = new DataSet();
 
-    private static final Collection<Relation> getBoundaries(int admin_level) {
-        Collection<Relation> result = new TreeSet<>(new Comparator<Relation>() {
-            @Override
-            public int compare(Relation o1, Relation o2) {
-                if (o1.hasKey("name") && o2.hasKey("name")) {
-                    return o1.get("name").compareTo(o2.get("name"));
-                } else if (o1.hasKey("ref") && o2.hasKey("ref")) {
-                    return o1.get("ref").compareTo(o2.get("ref"));
-                } else {
-                    return o1.get("description").compareTo(o2.get("description"));
-                }
+    private static Collection<Relation> getBoundaries(int adminLevel) {
+        Collection<Relation> result = new TreeSet<>((o1, o2) -> {
+            if (o1.hasKey("name") && o2.hasKey("name")) {
+                return o1.get("name").compareTo(o2.get("name"));
+            } else if (o1.hasKey("ref") && o2.hasKey("ref")) {
+                return o1.get("ref").compareTo(o2.get("ref"));
+            } else {
+                return o1.get("description").compareTo(o2.get("description"));
             }
         });
         synchronized (data) {
             for (Relation r : data.getRelations()) {
-                if (r.hasTag("admin_level", Integer.toString(admin_level)) &&
+                if (r.hasTag("admin_level", Integer.toString(adminLevel)) &&
                         (r.hasKey("name") || r.hasKey("ref") || r.hasKey("description"))) {
                     result.add(r);
@@ -141 +141 @@
                 for (final ToulouseDataSetHandler handler : new ToulouseDataSetHandler[]{
                         new CommuneHandler(), new SecteursHandler(), new QuartiersHandler()}) {
-                    MainApplication.worker.submit(new Runnable() {
-                        @Override
-                        public void run() {
-                            try {
-                                DataSet ds = new NetworkReader(handler.getDataURL().toString(), handler, false).
-                                        parseOsm(NullProgressMonitor.INSTANCE);
-                                handler.updateDataSet(ds);
-                                synchronized (data) {
-                                    data.mergeFrom(ds);
-                                }
-                            } catch (OsmTransferException e) {
-                                e.printStackTrace();
+                    MainApplication.worker.submit(() -> {
+                        try {
+                            DataSet ds = new NetworkReader(handler.getDataURL().toString(), handler, false).
+                                    parseOsm(NullProgressMonitor.INSTANCE);
+                            handler.updateDataSet(ds);
+                            synchronized (data) {
+                                data.mergeFrom(ds);
                             }
+                        } catch (OsmTransferException e) {
+                            Logging.error(e);
                         }
                     });

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

@@ -35 +35 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.ToulouseModule;
 import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
+import org.openstreetmap.josm.tools.Logging;
 
 public abstract class ToulouseDataSetHandler extends FrenchDataSetHandler implements ToulouseConstants {
@@ -41 +42 @@
      * Categories
      */
-    public static final DataSetCategory CAT_ASSOCIATIONS = new DataSetCategory("Associations", "styles/standard/people.png");
-    public static final DataSetCategory CAT_CITOYENNETE = new DataSetCategory("Citoyenneté", "presets/townhall.png");
-    public static final DataSetCategory CAT_CULTURE = new DataSetCategory("Culture", "presets/arts_centre.png");
-    public static final DataSetCategory CAT_ENFANCE = new DataSetCategory("Enfance", "presets/kindergarten.png");
+    public static final DataSetCategory CAT_ASSOCIATIONS = new DataSetCategory("Associations", "people.png");
+    public static final DataSetCategory CAT_CITOYENNETE = new DataSetCategory("Citoyenneté", "presets/service/townhall.svg");
+    public static final DataSetCategory CAT_CULTURE = new DataSetCategory("Culture", "presets/sightseeing/arts_centre.svg");
+    public static final DataSetCategory CAT_ENFANCE = new DataSetCategory("Enfance", "presets/education/kindergarten.svg");
     public static final DataSetCategory CAT_ENVIRONNEMENT = new DataSetCategory("Environnement",
-            "styles/standard/service/recycling/recycling_container.svg");
-    public static final DataSetCategory CAT_PATRIMOINE = new DataSetCategory("Patrimoine", "presets/ruins.png");
-    public static final DataSetCategory CAT_SERVICES = new DataSetCategory("Services", "styles/standard/vehicle/services.png");
-    public static final DataSetCategory CAT_SPORT = new DataSetCategory("Sport", "styles/standard/sport/soccer.png");
-    public static final DataSetCategory CAT_TOPOGRAPHIE = new DataSetCategory("Topographie", "presets/peak.svg");
-    public static final DataSetCategory CAT_TRANSPORT = new DataSetCategory("Transport", "presets/bus.png");
-    public static final DataSetCategory CAT_URBANISME = new DataSetCategory("Urbanisme", "styles/standard/place/settlement/city.png");
+            "presets/service/recycling/recycling_container.svg");
+    public static final DataSetCategory CAT_PATRIMOINE = new DataSetCategory("Patrimoine", "presets/sightseeing/ruins.svg");
+    public static final DataSetCategory CAT_SERVICES = new DataSetCategory("Services", "presets/vehicle/services.svg");
+    public static final DataSetCategory CAT_SPORT = new DataSetCategory("Sport", "presets/sport/soccer.svg");
+    public static final DataSetCategory CAT_TOPOGRAPHIE = new DataSetCategory("Topographie", "presets/landmark/peak.svg");
+    public static final DataSetCategory CAT_TRANSPORT = new DataSetCategory("Transport", "presets/transport/bus.svg");
+    public static final DataSetCategory CAT_URBANISME = new DataSetCategory("Urbanisme", "presets/place/city.svg");
 
     public ToulouseDataSetHandler(int portalId) {
@@ -63 +64 @@
     }
 
-    public ToulouseDataSetHandler(int portalId, boolean relevantUnion, String ... relevantTags) {
+    public ToulouseDataSetHandler(int portalId, boolean relevantUnion, String... relevantTags) {
         super(relevantUnion, relevantTags);
         init(portalId);
     }
 
-    public ToulouseDataSetHandler(int portalId, String ... relevantTags) {
+    public ToulouseDataSetHandler(int portalId, String... relevantTags) {
         this(portalId, false, relevantTags);
     }
 
-    /*public ToulouseDataSetHandler(int portalId, Tag relevantTag) {
-        super(relevantTag);
-        init(portalId);
-    }*/
-
-    public ToulouseDataSetHandler(int portalId, boolean relevantUnion, Tag ... relevantTags) {
+    public ToulouseDataSetHandler(int portalId, boolean relevantUnion, Tag... relevantTags) {
         super(relevantUnion, relevantTags);
         init(portalId);
     }
-
-    /*public ToulouseDataSetHandler(int portalId, Tag ... relevantTags) {
-        this(portalId, false, relevantTags);
-    }*/
 
     private void init(int portalId) {
@@ -92 +84 @@
                 String url = PORTAL + "/les-donnees/-/opendata/card/" + portalId + "--";
                 setLocalPortalURL(url);
-                //setLicenseURL(url+"/license");
                 setDataURL(url+"/resource/document");
             }
@@ -99 +90 @@
             addTool(new SplitByNeighbourhood());
         } catch (MalformedURLException e) {
-            e.printStackTrace();
+            Logging.error(e);
         }
     }
@@ -124 +115 @@
                 setWikiURL(WIKI + "/" + wikiPage.replace(" ", "_"));
             } catch (MalformedURLException e) {
-                e.printStackTrace();
+                Logging.error(e);
             }
         }

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

@@ -12 +12 @@
         setWikiPage("Quartiers de proximité");
         setCategory(CAT_CITOYENNETE);
-        setMenuIcon("presets/boundaries.png");
+        setMenuIcon("presets/misc/boundaries.svg");
     }
 

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

@@ -12 +12 @@
         setWikiPage("Secteurs de proximité");
         setCategory(CAT_CITOYENNETE);
-        setMenuIcon("presets/boundaries.png");
+        setMenuIcon("presets/misc/boundaries.svg");
     }
 

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

@@ -16 +16 @@
         setWikiPage("Horodateurs");
         setCategory(CAT_TRANSPORT);
-        setMenuIcon("styles/standard/transport/ticket-machine.png");
+        setMenuIcon("presets/transport/ticket-machine.svg");
     }
 

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

@@ -12 +12 @@
         setName("Stations de métro");
         setCategory(CAT_TRANSPORT);
-        setMenuIcon("styles/standard/transport/railway_station.png");
+        setMenuIcon("presets/transport/railway_station.svg");
     }
 

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

@@ -12 +12 @@
         setWikiPage("PMR");
         setCategory(CAT_TRANSPORT);
-        setMenuIcon("styles/standard/vehicle/parking/handicapped.png");
+        setMenuIcon("presets/vehicle/parking/handicapped.svg");
     }
 

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

@@ -12 +12 @@
         setName("Stations de tramway");
         setCategory(CAT_TRANSPORT);
-        setMenuIcon("styles/standard/transport/railway_station.png");
+        setMenuIcon("presets/transport/railway_station.svg");
     }
 

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

@@ -12 +12 @@
         setName("Communes");
         setCategory(CAT_URBANISME);
-        setMenuIcon("presets/boundaries.png");
+        setMenuIcon("presets/misc/boundaries.svg");
     }
 

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

@@ -18 +18 @@
 
     protected final Map<String, Collection<String>> map = new HashMap<>();
-    
+
     private String streetField;
-    
+
     public VoirieHandler() {
         this(12693, "lib_off", "highway");
         setName("Filaire de voirie");
         setCategory(CAT_URBANISME);
-        setMenuIcon("styles/standard/transport/way/way_secondary.svg");
+        setMenuIcon("presets/transport/way/way_secondary.svg");
     }
-    
+
     protected VoirieHandler(int portalId, String streetField, String relevantTag) {
         super(portalId, relevantTag);
@@ -39 +39 @@
         map.put("road", Arrays.asList(new String[] {"VA "}));
     }
-    
+
     @Override
     public boolean acceptsFilename(String filename) {
@@ -58 +58 @@
         return null;
     }
-    
+
     protected String getStreetId(Way w) {
         return w.get("sti");
     }
-    
+
     @Override
     public void updateDataSet(DataSet ds) {
         Map<String, Relation> associatedStreets = new HashMap<>();
-        
+
         for (Way w : ds.getWays()) {
             String name = w.get(streetField);
@@ -75 +75 @@
                 w.remove("rivoli");
                 w.remove("nrivoli");
-                
+
                 if (applyHighwayTag(name, w) == null) {
                     w.put("highway", "road");
                 }
-                
+
                 if (name.startsWith("RPT ") || name.startsWith("GIRATOIRE ")) {
                     // TODO: find correct highway
@@ -86 +86 @@
                     w.put("ref", name.split(" ")[1]);
                 }
-                
+
                 w.put("name", name);
-                
+
                 if (name.matches("D[0-9]+.*")) {
                     w.put("highway", "secondary");
@@ -95 +95 @@
                     name = NamesFrUtils.checkStreetName(w, "name");
                 }
-                
+
                 if (!name.startsWith("VA ")) { // Unknown labels
                     Relation street = associatedStreets.get(getStreetId(w));