Changeset 28044 in osm for applications/editors/josm/plugins/opendata/modules

Timestamp:

2012-03-11T17:50:51+01:00 (13 years ago)

Author:

donvip

Message:

opendata: allow to download Paris and Toulouse data

Location:

applications/editors/josm/plugins/opendata/modules

Files:

• fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/ParisConstants.java (modified) (1 diff)
• fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/ParisDataSetHandler.java (modified) (2 diffs)
• fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java (modified) (2 diffs)
• fr.sncf/src/org/openstreetmap/josm/plugins/opendata/modules/fr/sncf/datasets/EquipementsHandler.java (modified) (2 diffs)
• fr.sncf/src/org/openstreetmap/josm/plugins/opendata/modules/fr/sncf/datasets/SncfDataSetHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseConstants.java (modified) (2 diffs)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java (modified) (2 diffs)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/associations/Club3eAgeHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/BureauxVoteHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieAnnexeHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/PolesTerritoriauxHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/QuartiersHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/SecteursHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/BibliothequesHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/EquipementCulturelBalmaHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/LudothequeHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/MuseeHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/TheatreHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/CrechesHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleBalmaHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleElementaireHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleMaternelleHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/PetiteEnfanceEtJeunesseBalmaHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupEmballageHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupVerreHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/StationEpurationHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1680Handler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1830Handler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveBalmaHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/topographie/AltimetrieVoieHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/HorodateurHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/MetroStationHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PMRHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java (modified) (3 diffs)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/TramwayStationHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/VeloToulouseHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/Zone30Handler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/CommuneHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/SanisetteHandler.java (modified) (1 diff)
• fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/ParisConstants.java ¶

@@ -28 +28 @@
          * Portal
          */
-        public static final String PORTAL = "http://opendata.paris.fr/opendata/jsp/site/Portal.jsp?";
+        public static final String PORTAL = "http://opendata.paris.fr/opendata/";
 
         /**

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/ParisDataSetHandler.java ¶

@@ -26 +26 @@
         
         private int documentId;
-        private int portletId;
+        private static final int portletId = 106; // FIXME
         
-        public ParisDataSetHandler(int documentId, int portletId) {
-                init(documentId, portletId);
+        public ParisDataSetHandler(int documentId) {
+                init(documentId);
         }
         
-        public ParisDataSetHandler(int documentId, int portletId, String relevantTag) {
+        public ParisDataSetHandler(int documentId, String relevantTag) {
                 super(relevantTag);
-                init(documentId, portletId);
+                init(documentId);
         }
         
-        public ParisDataSetHandler(int documentId, int portletId, boolean relevantUnion, String ... relevantTags) {
+        public ParisDataSetHandler(int documentId, boolean relevantUnion, String ... relevantTags) {
                 super(relevantUnion, relevantTags);
-                init(documentId, portletId);
+                init(documentId);
         }
 
-        public ParisDataSetHandler(int documentId, int portletId, String ... relevantTags) {
-                this(documentId, portletId, false, relevantTags);
+        public ParisDataSetHandler(int documentId, String ... relevantTags) {
+                this(documentId, false, relevantTags);
         }
 
-        public ParisDataSetHandler(int documentId, int portletId, boolean relevantUnion, Tag ... relevantTags) {
+        public ParisDataSetHandler(int documentId, boolean relevantUnion, Tag ... relevantTags) {
                 super(relevantUnion, relevantTags);
-                init(documentId, portletId);
+                init(documentId);
         }
 
-        private final void init(int documentId, int portletId) {
+        private final void init(int documentId) {
                 this.documentId = documentId;
-                this.portletId = portletId;
         }
 
@@ -75 +74 @@
                 try {
                         if (documentId > 0) {
-                                return new URL(PORTAL + "document_id="+documentId + "&portlet_id="+portletId);
+                                return new URL(PORTAL + "jsp/site/Portal.jsp?document_id="+documentId + "&portlet_id="+portletId);
+                        }
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+        
+        protected abstract String getDirectLink();
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataURL()
+         */
+        @Override
+        public URL getDataURL() {
+                try {
+                        if (documentId > 0) {
+                                return new URL(PORTAL + "rating/download/?id_resource="+documentId + "&type_resource=document&url="+getDirectLink());
                         }
                 } catch (MalformedURLException e) {

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java ¶

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.paris.datasets.urbanisme;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.opendata.core.datasets.WayCombiner;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.paris.datasets.ParisDataSetHandler;
 
@@ -22 +30 @@
 
         public SanisettesHandler() {
-                super(93, 106);
+                super(93);
+                setName("Sanisettes");
         }
 
         @Override
         public boolean acceptsFilename(String filename) {
-                return acceptsShpFilename(filename, "sanisettes");
+                return acceptsShpFilename(filename, "sanisettes") || acceptsZipFilename(filename, "sanisettes");
+        }
+
+        private boolean wayBelongsTo(Way a, List<Way> ways) {
+                for (Way b : ways) {
+                        if (a.getNode(0).equals(b.getNode(0)) || a.getNode(0).equals(b.getNode(b.getNodesCount()-1))
+                         || a.getNode(a.getNodesCount()-1).equals(b.getNode(0)) || a.getNode(a.getNodesCount()-1).equals(b.getNode(b.getNodesCount()-1))) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+        
+        private boolean wayProcessed(Way a, List<List<Way>> waysToCombine) {
+                for (List<Way> ways : waysToCombine) {
+                        for (Way b : ways) {
+                                if (a.equals(b)) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+        
+        @Override
+        public void updateDataSet(DataSet ds) {
+                
+                List<Way> sourceWays = new ArrayList<Way>(ds.getWays());
+                List<List<Way>> waysToCombine = new ArrayList<List<Way>>();
+                
+                for (Iterator<Way> it = sourceWays.iterator(); it.hasNext();) {
+                        Way w = it.next();
+                        it.remove();
+                        if (!wayProcessed(w, waysToCombine)) {
+                                List<Way> list = new ArrayList<Way>();
+                                list.add(w);
+                                boolean finished = false;
+                                List<Way> sourceWays2 = new ArrayList<Way>(sourceWays);
+                                while (!finished) {
+                                        int before = list.size();
+                                        for (Iterator<Way> it2 = sourceWays2.iterator(); it2.hasNext();) {
+                                                Way w2 = it2.next();
+                                                if (wayBelongsTo(w2, list)) {
+                                                        list.add(w2);
+                                                        it2.remove();
+                                                }
+                                        }
+                                        int after = list.size();
+                                        finished = (after == before);
+                                }
+                                if (list.size() > 1) {
+                                        waysToCombine.add(list);
+                                }
+                        }
+                }
+                                
+                for (List<Way> ways : waysToCombine) {
+                        try {
+                                WayCombiner.combineWays(ways);
+                        } catch (UserCancelException e) {
+                                return;
+                        }
+                }
+                
+                for (Way w : ds.getWays()) {
+                        if (w.getNodesCount() <= 3) {
+                                ds.removePrimitive(w);
+                                for (Node n : w.getNodes()) {
+                                        ds.removePrimitive(n);
+                                }
+                        } else {
+                                w.put("amenity", "toilets");
+                        }
+                }
         }
 
         @Override
-        public void updateDataSet(DataSet ds) {
+        protected String getDirectLink() {
+                return PORTAL+"hn/sanisettes.zip";
+        }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#checkShpNodeProximity()
+         */
+        @Override
+        public boolean checkShpNodeProximity() {
+                return true;
         }
 }

applications/editors/josm/plugins/opendata/modules/fr.sncf/src/org/openstreetmap/josm/plugins/opendata/modules/fr/sncf/datasets/EquipementsHandler.java ¶

@@ -15 +15 @@
         @Override
         public boolean acceptsFilename(String filename) {
-                return acceptsXlsFilename(filename, "gare_20......");
+                return acceptsCsvXlsFilename(filename, "gare_20......");
         }
 
@@ -31 +31 @@
         @Override
         public LatLon getSpreadSheetCoor(EastNorth en, String[] fields) {
-                // Lambert II coordinates offset by 2000000 (see http://fr.wikipedia.org/wiki/Projection_conique_conforme_de_Lambert#Projections_officielles_en_France_m.C3.A9tropolitaine)
+                // Lambert II coordinates offset by 2000000 (see http://fr.wikipedia.org/wiki/Projection_conique_conforme_de_Lambert#Projections_officielles_en_France_métropolitaine)
                 return super.getSpreadSheetCoor(new EastNorth(en.getX(), en.getY()-2000000), fields);
         }

applications/editors/josm/plugins/opendata/modules/fr.sncf/src/org/openstreetmap/josm/plugins/opendata/modules/fr/sncf/datasets/SncfDataSetHandler.java ¶

@@ -82 +82 @@
                 return null;
         }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getLicenseURL()
+         */
+        @Override
+        public URL getLicenseURL() {
+                try {
+                        return new URL("http://test.data-sncf.com/licence");
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
 }

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

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse;
 
+import org.openstreetmap.josm.plugins.opendata.core.datasets.DataSetCategory;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchConstants;
 
@@ -46 +47 @@
          */
         public static final String TOULOUSE_NEPTUNE_XSD = "/neptune_toulouse/neptune.xsd";
+        
+        /**
+         * Categories: TODO: icons
+         */
+        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_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", "");
 }

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

@@ -98 +98 @@
 
         /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataURL()
+         */
+        @Override
+        public URL getDataURL() {
+                try {
+                        return new URL(getLocalPortalURL().toString()+"/resource/document");
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+
+        /* (non-Javadoc)
          * @see org.openstreetmap.josm.plugins.fr.opendata.datasets.AbstractDataSetHandler#getWikiURL()
          */
@@ -113 +126 @@
         
         protected final void setWikiPage(String wikiPage) {
-                this.wikiPage = wikiPage;
+                this.wikiPage = wikiPage.replace(" ", "_");
+                setName(wikiPage.replace("_", " "));
         }
 }

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

@@ -25 +25 @@
                 super(12587, "leisure=club", "club=elderly");
                 setWikiPage("Clubs du 3ème âge");
+                setCategory(CAT_ASSOCIATIONS);
         }
         

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

@@ -25 +25 @@
                 super(12550, "polling_station");
                 setWikiPage("Bureaux de vote 2012");
+                setCategory(CAT_CITOYENNETE);
         }
 

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

@@ -24 +24 @@
         public MairieAnnexeHandler() {
                 super(12560, "Mairies annexes");
+                setCategory(CAT_CITOYENNETE);
         }
 

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

@@ -24 +24 @@
         public MairieHandler() {
                 this(12554, "Mairies");
+                setCategory(CAT_CITOYENNETE);
         }
         

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

@@ -24 +24 @@
         public PolesTerritoriauxHandler() {
                 super(12568);
+                setName("Pôles territoriaux ");
+                setCategory(CAT_CITOYENNETE);
         }
 

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

@@ -25 +25 @@
                 super(12574, "admin_level=11");
                 setWikiPage("Quartiers de proximité");
+                setCategory(CAT_CITOYENNETE);
         }
 

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

@@ -25 +25 @@
                 super(12580, "admin_level=10");
                 setWikiPage("Secteurs de proximité");
+                setCategory(CAT_CITOYENNETE);
         }
 

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

@@ -25 +25 @@
                 super(12402, "amenity=library");
                 setWikiPage("Médiathèques, bibliothèques et bibliobus");
+                setCategory(CAT_CULTURE);
         }
 

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

@@ -25 +25 @@
                 super(13997);
                 setWikiPage("Équipements Culturels");
+                setCategory(CAT_CULTURE);
         }
 

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

@@ -25 +25 @@
                 super(12420, "amenity=toy_library");
                 setWikiPage("Ludothèques");
+                setCategory(CAT_CULTURE);
         }
         

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

@@ -26 +26 @@
                 super(12426, "tourism=museum");
                 setWikiPage("Musées");
+                setCategory(CAT_CULTURE);
         }
 

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

@@ -25 +25 @@
                 super(12448, "amenity=theatre");
                 setWikiPage("Théâtres");
+                setCategory(CAT_CULTURE);
         }
 

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

@@ -25 +25 @@
                 super(12462, "amenity=kindergarten");
                 setWikiPage("Crèches");
+                setCategory(CAT_ENFANCE);
         }
 

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

@@ -25 +25 @@
                 super(13993, "amenity=school");
                 setWikiPage("Écoles");
+                setCategory(CAT_ENFANCE);
         }
 

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

@@ -25 +25 @@
                 super(12474, "amenity=school");
                 setWikiPage("Écoles élémentaires publiques");
+                setCategory(CAT_ENFANCE);
                 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/enfance/EcoleMaternelleHandler.java ¶

@@ -25 +25 @@
                 super(12490, "amenity=school");
                 setWikiPage("Écoles maternelles publiques");
+                setCategory(CAT_ENFANCE);
                 for (String forbidden : new String[]{"élémentaire","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/enfance/PetiteEnfanceEtJeunesseBalmaHandler.java ¶

@@ -25 +25 @@
                 super(14001);
                 setWikiPage("Petite enfance et jeunesse");
+                setCategory(CAT_ENFANCE);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupEmballageHandler.java ¶

@@ -25 +25 @@
                 super(12494, "amenity=recycling");
                 setWikiPage("Récup' Emballage");
+                setCategory(CAT_ENVIRONNEMENT);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupVerreHandler.java ¶

@@ -25 +25 @@
                 super(12496, "amenity=recycling");
                 setWikiPage("Récup' Verre");
+                setCategory(CAT_ENVIRONNEMENT);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/StationEpurationHandler.java ¶

@@ -25 +25 @@
                 super(12500, "man_made=wastewater_plant");
                 setWikiPage("Stations d'épuration");
+                setCategory(CAT_ENVIRONNEMENT);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1680Handler.java ¶

@@ -24 +24 @@
         public Parcelles1680Handler() {
                 super(12514);
+                setName("Parcellaire de 1680");
+                setCategory(CAT_PATRIMOINE);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1830Handler.java ¶

@@ -24 +24 @@
         public Parcelles1830Handler() {
                 super(12534);
+                setName("Parcellaire de 1830");
+                setCategory(CAT_PATRIMOINE);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveBalmaHandler.java ¶

@@ -25 +25 @@
                 super(14010);
                 setWikiPage("Installations sportives");
+                setCategory(CAT_SPORT);
         }
 

applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/topographie/AltimetrieVoieHandler.java ¶

@@ -24 +24 @@
         public AltimetrieVoieHandler() {
                 super(12660, "ele");
+                setName("Altimétrie des voies");
+                setCategory(CAT_TOPOGRAPHIE);
         }
 

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

@@ -29 +29 @@
                 super(12540, "vending=parking_tickets");
                 setWikiPage("Horodateurs");
+                setCategory(CAT_TRANSPORT);
         }
 

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

@@ -24 +24 @@
         public MetroStationHandler() {
                 super(12542, "subway=yes");
+                setName("Stations de métro");
+                setCategory(CAT_TRANSPORT);
         }
 

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

@@ -25 +25 @@
                 super(12538, "amenity=parking_space");
                 setWikiPage("PMR");
+                setCategory(CAT_TRANSPORT);
         }
 

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

@@ -41 +41 @@
         public PistesCyclablesHandler() {
                 this("Nom_voie");
+                setCategory(CAT_TRANSPORT);
         }
         

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

@@ -17 +17 @@
 
 import java.io.File;
+import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -31 +32 @@
                 super(14022, "network=fr_tisseo");
                 NeptuneReader.registerSchema(neptuneSchemaUrl);
+                setName("Réseau Tisséo (Métro, Bus, Tram)");
+                setCategory(CAT_TRANSPORT);
         }
 
@@ -54 +57 @@
         }
 
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler#getWikiURL()
+         */
+        @Override
+        public URL getWikiURL() {
+                try {
+                        return new URL("http://wiki.openstreetmap.org/wiki/Toulouse/Transports_en_commun#Réseau_Tisséo");
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+
         @Override
         public void updateDataSet(DataSet ds) {

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

@@ -24 +24 @@
         public TramwayStationHandler() {
                 super(12611, "tram=yes");
+                setName("Stations de tramway");
+                setCategory(CAT_TRANSPORT);
         }
 

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

@@ -26 +26 @@
                 super(12546, "amenity=bicycle_rental");
                 setWikiPage("Vélô Toulouse");
+                setCategory(CAT_TRANSPORT);
         }
 

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

@@ -25 +25 @@
                 super(12548, "Street", "maxspeed=30");
                 setWikiPage("Zones 30");
+                setCategory(CAT_TRANSPORT);
         }
 

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

@@ -24 +24 @@
         public CommuneHandler() {
                 super(12582, "admin_level=8");
+                setName("Communes");
+                setCategory(CAT_URBANISME);
         }
 

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

@@ -31 +31 @@
                 super(12673, "addr:housenumber");
                 setWikiPage("Numéros de rue");
+                setCategory(CAT_URBANISME);
         }
 

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

@@ -25 +25 @@
                 super(12584, "amenity=toilets");
                 setWikiPage("Sanisettes");
+                setCategory(CAT_URBANISME);
         }
 

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

@@ -37 +37 @@
         public VoirieHandler() {
                 this(12693, "lib_off", "highway");
+                setName("Filaire de voirie");
+                setCategory(CAT_URBANISME);
         }