Index: /applications/editors/josm/plugins/opendata/.classpath =================================================================== --- /applications/editors/josm/plugins/opendata/.classpath (revision 35268) +++ /applications/editors/josm/plugins/opendata/.classpath (revision 35269) @@ -2,4 +2,5 @@ + Index: /applications/editors/josm/plugins/opendata/build.xml =================================================================== --- /applications/editors/josm/plugins/opendata/build.xml (revision 35268) +++ /applications/editors/josm/plugins/opendata/build.xml (revision 35269) @@ -1,5 +1,5 @@ - + Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (revision 35269) @@ -3,5 +3,4 @@ import java.util.Collection; -import java.util.Comparator; import java.util.TreeSet; @@ -59,5 +58,9 @@ 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,20 +115,17 @@ public static final DataSet data = new DataSet(); - private static final Collection getBoundaries(int admin_level) { - Collection result = new TreeSet<>(new Comparator() { - @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 getBoundaries(int adminLevel) { + Collection 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,17 +141,14 @@ 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); } }); Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java (revision 35269) @@ -35,4 +35,5 @@ 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,16 +42,16 @@ * 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,26 +64,17 @@ } - 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,5 +84,4 @@ String url = PORTAL + "/les-donnees/-/opendata/card/" + portalId + "--"; setLocalPortalURL(url); - //setLicenseURL(url+"/license"); setDataURL(url+"/resource/document"); } @@ -99,5 +90,5 @@ addTool(new SplitByNeighbourhood()); } catch (MalformedURLException e) { - e.printStackTrace(); + Logging.error(e); } } @@ -124,5 +115,5 @@ setWikiURL(WIKI + "/" + wikiPage.replace(" ", "_")); } catch (MalformedURLException e) { - e.printStackTrace(); + Logging.error(e); } } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/QuartiersHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/QuartiersHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/QuartiersHandler.java (revision 35269) @@ -12,5 +12,5 @@ setWikiPage("Quartiers de proximité"); setCategory(CAT_CITOYENNETE); - setMenuIcon("presets/boundaries.png"); + setMenuIcon("presets/misc/boundaries.svg"); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/SecteursHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/SecteursHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/SecteursHandler.java (revision 35269) @@ -12,5 +12,5 @@ setWikiPage("Secteurs de proximité"); setCategory(CAT_CITOYENNETE); - setMenuIcon("presets/boundaries.png"); + setMenuIcon("presets/misc/boundaries.svg"); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/HorodateurHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/HorodateurHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/HorodateurHandler.java (revision 35269) @@ -16,5 +16,5 @@ setWikiPage("Horodateurs"); setCategory(CAT_TRANSPORT); - setMenuIcon("styles/standard/transport/ticket-machine.png"); + setMenuIcon("presets/transport/ticket-machine.svg"); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/MetroStationHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/MetroStationHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/MetroStationHandler.java (revision 35269) @@ -12,5 +12,5 @@ setName("Stations de métro"); setCategory(CAT_TRANSPORT); - setMenuIcon("styles/standard/transport/railway_station.png"); + setMenuIcon("presets/transport/railway_station.svg"); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PMRHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PMRHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PMRHandler.java (revision 35269) @@ -12,5 +12,5 @@ setWikiPage("PMR"); setCategory(CAT_TRANSPORT); - setMenuIcon("styles/standard/vehicle/parking/handicapped.png"); + setMenuIcon("presets/vehicle/parking/handicapped.svg"); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/TramwayStationHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/TramwayStationHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/TramwayStationHandler.java (revision 35269) @@ -12,5 +12,5 @@ setName("Stations de tramway"); setCategory(CAT_TRANSPORT); - setMenuIcon("styles/standard/transport/railway_station.png"); + setMenuIcon("presets/transport/railway_station.svg"); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/CommuneHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/CommuneHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/CommuneHandler.java (revision 35269) @@ -12,5 +12,5 @@ setName("Communes"); setCategory(CAT_URBANISME); - setMenuIcon("presets/boundaries.png"); + setMenuIcon("presets/misc/boundaries.svg"); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java (revision 35269) @@ -18,14 +18,14 @@ protected final Map> 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,5 +39,5 @@ map.put("road", Arrays.asList(new String[] {"VA "})); } - + @Override public boolean acceptsFilename(String filename) { @@ -58,13 +58,13 @@ return null; } - + protected String getStreetId(Way w) { return w.get("sti"); } - + @Override public void updateDataSet(DataSet ds) { Map associatedStreets = new HashMap<>(); - + for (Way w : ds.getWays()) { String name = w.get(streetField); @@ -75,9 +75,9 @@ 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,7 +86,7 @@ w.put("ref", name.split(" ")[1]); } - + w.put("name", name); - + if (name.matches("D[0-9]+.*")) { w.put("highway", "secondary"); @@ -95,5 +95,5 @@ name = NamesFrUtils.checkStreetName(w, "name"); } - + if (!name.startsWith("VA ")) { // Unknown labels Relation street = associatedStreets.get(getStreetId(w)); Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (revision 35269) @@ -51,7 +51,10 @@ import org.openstreetmap.josm.plugins.opendata.core.modules.ModuleInformation; import org.openstreetmap.josm.plugins.opendata.core.util.OdUtils; -import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Pair; - +import org.openstreetmap.josm.tools.ResourceProvider; + +/** + * Open data plugin. + */ public final class OdPlugin extends Plugin { @@ -64,5 +67,5 @@ private OdDialog dialog; - public final List importers = Arrays.asList(new AbstractImporter[]{ + public final List importers = Arrays.asList(new AbstractImporter[] { new CsvImporter(), new OdsImporter(), new XlsImporter(), // Tabular file formats new KmlKmzImporter(), new ShpImporter(), new MifTabImporter(), new GmlImporter(), // Geographic file formats @@ -74,5 +77,5 @@ public OdPlugin(PluginInformation info) { super(info); - ImageProvider.addAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders()); + ResourceProvider.addAdditionalClassLoaders(ModuleHandler.getResourceClassLoaders()); if (instance == null) { instance = this; Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java (revision 35269) @@ -23,4 +23,7 @@ import org.openstreetmap.josm.spi.preferences.Config; +/** + * Data set updater. + */ public abstract class DataSetUpdater { @@ -43,5 +46,5 @@ // Simplify ways geometries for (Way w : dataSet.getWays()) { - SequenceCommand command = SimplifyWayAction.simplifyWay(w, 0.25); + SequenceCommand command = SimplifyWayAction.createSimplifyCommand(w, 0.25); if (command != null) { command.executeCommand(); Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java (revision 35268) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/modules/ModuleHandler.java (revision 35269) @@ -52,4 +52,5 @@ import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.Logging; +import org.openstreetmap.josm.tools.ResourceProvider; /** @@ -289,5 +290,5 @@ ClassLoader moduleClassLoader = createClassLoader(toLoad); sources.add(0, moduleClassLoader); - ImageProvider.addAdditionalClassLoader(moduleClassLoader); + ResourceProvider.addAdditionalClassLoader(moduleClassLoader); monitor.setTicksCount(toLoad.size()); for (ModuleInformation info : toLoad) { Index: /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTest.java =================================================================== --- /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTest.java (revision 35269) +++ /applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModuleTest.java (revision 35269) @@ -0,0 +1,28 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import org.junit.Rule; +import org.junit.Test; +import org.openstreetmap.josm.testutils.JOSMTestRules; + +/** + * Unit tests of {@link ToulouseModule} class. + */ +public class ToulouseModuleTest { + + /** + * Setup test. + */ + @Rule + public JOSMTestRules rules = new JOSMTestRules().preferences(); + + @Test + public void testHandlersConstruction() { + ToulouseModule module = new ToulouseModule(null); + assertFalse(module.getHandlers().isEmpty()); + assertEquals(module.getHandlers().size(), module.getNewlyInstanciatedHandlers().size()); + } +}