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 30302) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (revision 30303) @@ -53,4 +53,5 @@ import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.patrimoine.Parcelles1830Handler; import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.services.MarchesPleinVentHandler; +import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.services.PointsLumineuxHandler; import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.sport.InstallationSportiveBalmaHandler; import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.sport.InstallationSportiveToulouseHandler; @@ -120,4 +121,5 @@ handlers.add(MarchesPleinVentHandler.class); handlers.add(AiresPietonnesHandler.class); + handlers.add(PointsLumineuxHandler.class); } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/CrechesHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/CrechesHandler.java (revision 30302) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/CrechesHandler.java (revision 30303) @@ -16,4 +16,5 @@ package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.enfance; +import org.apache.commons.lang3.text.WordUtils; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; @@ -38,4 +39,48 @@ n.put("amenity", "kindergarten"); replace(n, "NOM", "name"); + n.put("name", WordUtils.capitalizeFully(n.get("name"))); + n.remove("QUARTIER"); + n.remove("RUE"); + replace(n, "NUM", "addr:housenumber"); + n.remove("CP"); + n.remove("STIADR"); + if (n.hasKey("NATURE")) { + String nature = n.get("NATURE"); + if (nature.equals("CC")) { + nature = "Crèche collective"; + } else if (nature.equals("CF")) { + nature = "Crèche familiale"; + } else if (nature.equals("HG")) { + nature = "Halte-Garderie"; + } else if (nature.equals("JE")) { + nature = "Jardin d'Enfants"; + } else if (nature.equals("MA")) { + nature = "Multi-Accueil"; + } + n.remove("NATURE"); + n.put("description", nature); + } + if (n.hasKey("NATGEST")) { + String gest = n.get("NATGEST").split(" ")[1]; + if (gest.equals("ASS")) { + gest = "Association"; + } else if (gest.equals("CCAS")) { + gest = "Centre Communal d'Action Sociale"; + } else if (gest.equals("CHU")) { + gest = "CHU de Toulouse"; + } else if (gest.equals("PRIV")) { + gest = "private"; + } else if (gest.equals("VT")) { + gest = "Mairie de Toulouse"; + } else if (gest.equals("CAF")) { + gest = "Caisse d'Allocations familiales"; + } else if (gest.equals("MUT")) { + gest = "Mutuelle"; + } else if (gest.equals("UPS")) { + gest = "Université Paul Sabatier"; + } + n.remove("NATGEST"); + n.put("operator", gest); + } } } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleElementaireHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleElementaireHandler.java (revision 30302) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleElementaireHandler.java (revision 30303) @@ -16,4 +16,5 @@ package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.enfance; +import org.apache.commons.lang3.text.WordUtils; import org.openstreetmap.josm.data.osm.DataSet; import org.openstreetmap.josm.data.osm.Node; @@ -40,7 +41,16 @@ for (Node n : ds.getNodes()) { n.put("amenity", "school"); - n.put("school:FR", "elementaire"); - n.put("operator", "public"); + n.put("school:FR", "élémentaire"); + n.put("operator:type", "public"); replace(n, "Ecole", "name"); + n.put("name", WordUtils.capitalizeFully(n.get("name"))); + n.remove("Codpos"); + n.remove("Codsti"); + n.remove("color"); + n.remove("Index"); + n.remove("Libelle"); + n.remove("Num"); + replace(n, "RNE", "ref:UAI"); + replace(n, "Tel", "phone"); } } Index: /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/services/PointsLumineuxHandler.java =================================================================== --- /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/services/PointsLumineuxHandler.java (revision 30303) +++ /applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/services/PointsLumineuxHandler.java (revision 30303) @@ -0,0 +1,43 @@ +// JOSM opendata plugin. +// Copyright (C) 2011-2014 Don-vip +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.services; + +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.data.osm.Node; +import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler; + +public class PointsLumineuxHandler extends ToulouseDataSetHandler { + + public PointsLumineuxHandler() { + super(25051, "highway=street_lamp"); + setName("Points lumineux"); + setCategory(CAT_SERVICES); + } + + @Override + public boolean acceptsFilename(String filename) { + return acceptsCsvKmzTabFilename(filename, "Points_lumineux"); + } + + @Override + public void updateDataSet(DataSet ds) { + for (Node n : ds.getNodes()) { + n.put("highway", "street_lamp"); + replace(n, "Point_geo", "ref"); + n.remove("color"); + } + } +} 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 30302) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (revision 30303) @@ -145,5 +145,5 @@ JMenuItem handlerItem = null; if (dataURL != null) { - handlerItem = endMenu.add(new DownloadDataAction(module.getDisplayedName()+"_"+handlerName, dataURL)); + handlerItem = endMenu.add(new DownloadDataAction(module, handlerName, dataURL)); } else if (dataURLs != null) { JMenu handlerMenu = new JMenu(handlerName); @@ -151,5 +151,5 @@ for (Pair pair : dataURLs) { if (pair != null && pair.a != null && pair.b != null) { - item = handlerMenu.add(new DownloadDataAction(pair.a, pair.b)); + item = handlerMenu.add(new DownloadDataAction(module, pair.a, pair.b)); } } Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java (revision 30302) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/DownloadDataAction.java (revision 30303) @@ -23,4 +23,5 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.plugins.opendata.core.modules.Module; import org.openstreetmap.josm.tools.CheckParameterUtil; @@ -29,10 +30,10 @@ private final URL url; - public DownloadDataAction(String name, URL url) { + public DownloadDataAction(Module module, String name, URL url) { super(false); CheckParameterUtil.ensureParameterNotNull(name, "name"); CheckParameterUtil.ensureParameterNotNull(url, "url"); putValue(Action.NAME, name); - putValue("toolbar", "opendata_download_"+name.toLowerCase().replace(" ", "_")); + putValue("toolbar", ("opendata_download_"+module.getDisplayedName()+"_"+name).toLowerCase().replace(" ", "_")); this.url = url; } Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java =================================================================== --- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java (revision 30302) +++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/archive/ZipImporter.java (revision 30303) @@ -16,4 +16,5 @@ package org.openstreetmap.josm.plugins.opendata.core.io.archive; +import java.io.File; import java.io.InputStream; @@ -38,3 +39,8 @@ } } + + @Override + public boolean acceptFile(File pathname) { + return super.acceptFile(pathname) && !pathname.getName().endsWith(".osm.zip"); + } }