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

Timestamp:

2013-06-13T02:20:32+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] update Toulouse module + menu icons

Location:

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

Files:

• ToulouseConstants.java (modified) (1 diff)
• ToulouseModule.java (modified) (2 diffs)
• datasets/citoyennete/QuartiersHandler.java (modified) (1 diff)
• datasets/citoyennete/SecteursHandler.java (modified) (1 diff)
• datasets/transport/AiresPietonnesHandler.java (added)
• 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) (1 diff)

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

@@ -51 +51 @@
     
     /**
-     * Categories: TODO: icons
+     * Categories
      */
-    public static final DataSetCategory CAT_ASSOCIATIONS = new DataSetCategory("Associations", "");
-    public static final DataSetCategory CAT_CITOYENNETE = new DataSetCategory("Citoyenneté", "");
-    public static final DataSetCategory CAT_CULTURE = new DataSetCategory("Culture", "");
-    public static final DataSetCategory CAT_ENFANCE = new DataSetCategory("Enfance", "");
-    public static final DataSetCategory CAT_ENVIRONNEMENT = new DataSetCategory("Environnement", "");
-    public static final DataSetCategory CAT_PATRIMOINE = new DataSetCategory("Patrimoine", "");
-    public static final DataSetCategory CAT_SERVICES = new DataSetCategory("Services", "");
-    public static final DataSetCategory CAT_SPORT = new DataSetCategory("Sport", "");
-    public static final DataSetCategory CAT_TOPOGRAPHIE = new DataSetCategory("Topographie", "");
-    public static final DataSetCategory CAT_TRANSPORT = new DataSetCategory("Transport", "");
-    public static final DataSetCategory CAT_URBANISME = new DataSetCategory("Urbanisme", "");
+    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_ENVIRONNEMENT = new DataSetCategory("Environnement", "presets/recycling.png");
+    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", "presets/soccer.png");
+    public static final DataSetCategory CAT_TOPOGRAPHIE = new DataSetCategory("Topographie", "presets/peak.png");
+    public static final DataSetCategory CAT_TRANSPORT = new DataSetCategory("Transport", "presets/bus.png");
+    public static final DataSetCategory CAT_URBANISME = new DataSetCategory("Urbanisme", "presets/places.png");
 }

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

@@ -55 +55 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.sport.InstallationSportiveToulouseHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.topographie.AltimetrieVoieHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.AiresPietonnesHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.ChantiersLineairesHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.ChantiersPonctuelsHandler;
@@ -116 +117 @@
         handlers.add(StationsAutoPartageHandler.class);
         handlers.add(MarchesPleinVentHandler.class);
+        handlers.add(AiresPietonnesHandler.class);
     }
     

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

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

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

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

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

@@ -30 +30 @@
         setWikiPage("Horodateurs");
         setCategory(CAT_TRANSPORT);
+        setMenuIcon("presets/vending_machine.png");
     }
 

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

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

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

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

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

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

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

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

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

@@ -39 +39 @@
         setName("Filaire de voirie");
         setCategory(CAT_URBANISME);
+        setMenuIcon("presets/way_secondary.png");
     }
     
-    protected VoirieHandler(int portalId, String streetField, String relevantKey) {
-        super(portalId, relevantKey);
+    protected VoirieHandler(int portalId, String streetField, String relevantTag) {
+        super(portalId, relevantTag);
         this.streetField = streetField;
         map.put("motorway", Arrays.asList(new String[] {"A6", "AUTOROUTE "}));