Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseConstants.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseConstants.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseConstants.java (revision 28554)
@@ -20,44 +20,44 @@
public interface ToulouseConstants extends FrenchConstants {
-
- /**
- * Sources
- */
- public static final String SOURCE_GRAND_TOULOUSE = "GrandToulouse";
- public static final String SOURCE_TISSEO = "Tisséo SMTC";
-
- /**
- * Wiki
- */
- public static final String WIKI = "http://wiki.openstreetmap.org/wiki/Toulouse/GrandToulouseData";
+
+ /**
+ * Sources
+ */
+ public static final String SOURCE_GRAND_TOULOUSE = "GrandToulouse";
+ public static final String SOURCE_TISSEO = "Tisséo SMTC";
+
+ /**
+ * Wiki
+ */
+ public static final String WIKI = "http://wiki.openstreetmap.org/wiki/Toulouse/GrandToulouseData";
- /**
- * Portal
- */
- public static final String PORTAL = "http://data.grandtoulouse.fr";
+ /**
+ * Portal
+ */
+ public static final String PORTAL = "http://data.grandtoulouse.fr";
- /**
- * Icons
- */
- public static final String ICON_CROIX_16 = "data.fr.toulouse_16.png";
- public static final String ICON_CROIX_24 = "data.fr.toulouse_24.png";
+ /**
+ * Icons
+ */
+ public static final String ICON_CROIX_16 = "data.fr.toulouse_16.png";
+ public static final String ICON_CROIX_24 = "data.fr.toulouse_24.png";
- /**
- * NEPTUNE XML Schema modified to accept Tisséo files
- */
- 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", "");
+ /**
+ * NEPTUNE XML Schema modified to accept Tisséo files
+ */
+ 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", "");
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseLicense.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseLicense.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseLicense.java (revision 28554)
@@ -20,11 +20,11 @@
public class ToulouseLicense extends ODbL implements ToulouseConstants {
- public ToulouseLicense() {
- // TODO: Toulouse license
- /*try {
- setURL(PORTAL + "/la-licence", "fr");
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }*/
- }
+ public ToulouseLicense() {
+ // TODO: Toulouse license
+ /*try {
+ setURL(PORTAL + "/la-licence", "fr");
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }*/
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (revision 28554)
@@ -41,4 +41,5 @@
import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.patrimoine.Parcelles1830Handler;
import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.sport.InstallationSportiveBalmaHandler;
+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.ChantiersLineairesHandler;
@@ -59,6 +60,6 @@
public class ToulouseModule extends AbstractModule {
- public ToulouseModule(ModuleInformation info) {
- super(info);
+ public ToulouseModule(ModuleInformation info) {
+ super(info);
handlers.add(SanisetteHandler.class);
handlers.add(NumerosRueHandler.class);
@@ -99,4 +100,5 @@
handlers.add(ChantiersPonctuelsHandler.class);
handlers.add(ChantiersLineairesHandler.class);
+ handlers.add(InstallationSportiveToulouseHandler.class);
}
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java (revision 28554)
@@ -24,84 +24,84 @@
public abstract class ToulouseDataSetHandler extends FrenchDataSetHandler implements ToulouseConstants {
-
- public ToulouseDataSetHandler(int portalId) {
- init(portalId);
- }
-
- public ToulouseDataSetHandler(int portalId, String relevantTag) {
- super(relevantTag);
- init(portalId);
- }
-
- public ToulouseDataSetHandler(int portalId, boolean relevantUnion, String ... relevantTags) {
- super(relevantUnion, relevantTags);
- init(portalId);
- }
+
+ public ToulouseDataSetHandler(int portalId) {
+ init(portalId);
+ }
+
+ public ToulouseDataSetHandler(int portalId, String relevantTag) {
+ super(relevantTag);
+ init(portalId);
+ }
+
+ public ToulouseDataSetHandler(int portalId, boolean relevantUnion, String ... relevantTags) {
+ super(relevantUnion, relevantTags);
+ init(portalId);
+ }
- public ToulouseDataSetHandler(int portalId, String ... relevantTags) {
- this(portalId, false, 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) {
- super(relevantUnion, relevantTags);
- init(portalId);
- }
+ /*public ToulouseDataSetHandler(int portalId, Tag relevantTag) {
+ super(relevantTag);
+ init(portalId);
+ }*/
+
+ public ToulouseDataSetHandler(int portalId, boolean relevantUnion, Tag ... relevantTags) {
+ super(relevantUnion, relevantTags);
+ init(portalId);
+ }
- /*public ToulouseDataSetHandler(int portalId, Tag ... relevantTags) {
- this(portalId, false, relevantTags);
- }*/
-
- private final void init(int portalId) {
- try {
- setLicense(new ToulouseLicense());
- if (portalId > 0) {
- String url = PORTAL + "/les-donnees/-/opendata/card/" + portalId + "--";
- setLocalPortalURL(url);
- //setLicenseURL(url+"/license");
- setDataURL(url+"/resource/document");
- }
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- }
+ /*public ToulouseDataSetHandler(int portalId, Tag ... relevantTags) {
+ this(portalId, false, relevantTags);
+ }*/
+
+ private final void init(int portalId) {
+ try {
+ setLicense(new ToulouseLicense());
+ if (portalId > 0) {
+ String url = PORTAL + "/les-donnees/-/opendata/card/" + portalId + "--";
+ setLocalPortalURL(url);
+ //setLicenseURL(url+"/license");
+ setDataURL(url+"/resource/document");
+ }
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getSource()
- */
- @Override
- public String getSource() {
- return SOURCE_GRAND_TOULOUSE;
- }
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getSource()
+ */
+ @Override
+ public String getSource() {
+ return SOURCE_GRAND_TOULOUSE;
+ }
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getLocalPortalIconName()
- */
- @Override
- public String getLocalPortalIconName() {
- return ICON_CROIX_24;
- }
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getLocalPortalIconName()
+ */
+ @Override
+ public String getLocalPortalIconName() {
+ return ICON_CROIX_24;
+ }
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataLayerIconName()
- */
- @Override
- public String getDataLayerIconName() {
- return ICON_CROIX_16;
- }
-
- protected final void setWikiPage(String wikiPage) {
- if (wikiPage != null && !wikiPage.isEmpty()) {
- setName(wikiPage.replace("_", " "));
- try {
- setWikiURL(WIKI + "/" + wikiPage.replace(" ", "_"));
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- }
- }
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataLayerIconName()
+ */
+ @Override
+ public String getDataLayerIconName() {
+ return ICON_CROIX_16;
+ }
+
+ protected final void setWikiPage(String wikiPage) {
+ if (wikiPage != null && !wikiPage.isEmpty()) {
+ setName(wikiPage.replace("_", " "));
+ try {
+ setWikiURL(WIKI + "/" + wikiPage.replace(" ", "_"));
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ }
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/associations/Club3eAgeHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/associations/Club3eAgeHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/associations/Club3eAgeHandler.java (revision 28554)
@@ -16,4 +16,5 @@
package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.associations;
+import org.apache.commons.lang3.text.WordUtils;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
@@ -22,22 +23,31 @@
public class Club3eAgeHandler extends ToulouseDataSetHandler {
- public Club3eAgeHandler() {
- super(12587, "leisure=club", "club=elderly");
- setWikiPage("Clubs du 3ème âge");
- setCategory(CAT_ASSOCIATIONS);
- }
-
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Club_3E_AGE");
- }
+ public Club3eAgeHandler() {
+ super(12587, "social_facility=outreach", "social_facility:for=senior");
+ setWikiPage("Clubs du 3ème âge");
+ setCategory(CAT_ASSOCIATIONS);
+ }
+
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Club_3E_AGE");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "Nom", "name");
- n.put("leisure", "club");
- n.put("club", "elderly");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "Nom", "name");
+ n.put("name", WordUtils.capitalizeFully(n.get("name")));
+ n.put("social_facility", "outreach");
+ n.put("social_facility:for", "senior");
+ n.remove("Adresse");
+ n.remove("CP");
+ n.remove("Classe");
+ n.remove("CodSTI");
+ n.remove("Description");
+ n.remove("Numero");
+ n.remove("Ville");
+ n.remove("color");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/BureauxVoteHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/BureauxVoteHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/BureauxVoteHandler.java (revision 28554)
@@ -22,21 +22,21 @@
public class BureauxVoteHandler extends ToulouseDataSetHandler {
- public BureauxVoteHandler() {
- super(12550, "polling_station");
- setWikiPage("Bureaux de vote 2012");
- setCategory(CAT_CITOYENNETE);
- }
+ public BureauxVoteHandler() {
+ super(12550, "polling_station");
+ setWikiPage("Bureaux de vote 2012");
+ setCategory(CAT_CITOYENNETE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Lieu_vote_2012");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Lieu_vote_2012");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Relation r : ds.getRelations()) {
- replace(r, "TEXT", "name");
- r.put("polling_station", "2012");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Relation r : ds.getRelations()) {
+ replace(r, "TEXT", "name");
+ r.put("polling_station", "2012");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieAnnexeHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieAnnexeHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieAnnexeHandler.java (revision 28554)
@@ -21,25 +21,25 @@
public class MairieAnnexeHandler extends MairieHandler {
-
- public MairieAnnexeHandler() {
- super(12560, "Mairies annexes");
- setCategory(CAT_CITOYENNETE);
- }
+
+ public MairieAnnexeHandler() {
+ super(12560, "Mairies annexes");
+ setCategory(CAT_CITOYENNETE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Mairie_Annexe");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Mairie_Annexe");
+ }
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.opendata.portals.fr.toulouse.datasets.citoyennete.MairieHandler#updateDataSet(org.openstreetmap.josm.data.osm.DataSet)
- */
- @Override
- public void updateDataSet(DataSet ds) {
- super.updateDataSet(ds);
- for (Node n : ds.getNodes()) {
- replaceFax(n, "Fax");
- n.remove("Num");
- }
- }
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.opendata.portals.fr.toulouse.datasets.citoyennete.MairieHandler#updateDataSet(org.openstreetmap.josm.data.osm.DataSet)
+ */
+ @Override
+ public void updateDataSet(DataSet ds) {
+ super.updateDataSet(ds);
+ for (Node n : ds.getNodes()) {
+ replaceFax(n, "Fax");
+ n.remove("Num");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/MairieHandler.java (revision 28554)
@@ -22,30 +22,30 @@
public class MairieHandler extends ToulouseDataSetHandler {
- public MairieHandler() {
- this(12554, "Mairies");
- setCategory(CAT_CITOYENNETE);
- }
-
- protected MairieHandler(int portalId, String wikiPage) {
- super(portalId, "amenity=townhall");
- setWikiPage(wikiPage);
- }
+ public MairieHandler() {
+ this(12554, "Mairies");
+ setCategory(CAT_CITOYENNETE);
+ }
+
+ protected MairieHandler(int portalId, String wikiPage) {
+ super(portalId, "amenity=townhall");
+ setWikiPage(wikiPage);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Mairie");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Mairie");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "Mairie", "name");
- n.put("amenity", "townhall");
- replaceOpeningHours(n, "Horaire_ouverture");
- n.remove("INSEE");
- n.remove("Libelle");
- replacePhone(n, "Telephone");
- n.remove("Type");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "Mairie", "name");
+ n.put("amenity", "townhall");
+ replaceOpeningHours(n, "Horaire_ouverture");
+ n.remove("INSEE");
+ n.remove("Libelle");
+ replacePhone(n, "Telephone");
+ n.remove("Type");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/PolesTerritoriauxHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/PolesTerritoriauxHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/PolesTerritoriauxHandler.java (revision 28554)
@@ -22,20 +22,20 @@
public class PolesTerritoriauxHandler extends ToulouseDataSetHandler {
- public PolesTerritoriauxHandler() {
- super(12568);
- setName("Pôles territoriaux ");
- setCategory(CAT_CITOYENNETE);
- }
+ public PolesTerritoriauxHandler() {
+ super(12568);
+ setName("Pôles territoriaux ");
+ setCategory(CAT_CITOYENNETE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Poles_territoriaux");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Poles_territoriaux");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Relation r : ds.getRelations()) {
- replace(r, "Nom_pole", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Relation r : ds.getRelations()) {
+ replace(r, "Nom_pole", "name");
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/QuartiersHandler.java (revision 28554)
@@ -22,30 +22,30 @@
public class QuartiersHandler extends ToulouseDataSetHandler {
- public QuartiersHandler() {
- super(12574, "admin_level=11");
- setWikiPage("Quartiers de proximité");
- setCategory(CAT_CITOYENNETE);
- }
+ public QuartiersHandler() {
+ super(12574, "admin_level=11");
+ setWikiPage("Quartiers de proximité");
+ setCategory(CAT_CITOYENNETE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Quartiers");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Quartiers");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Relation r : ds.getRelations()) {
- r.remove("name");
- replace(r, "Quartier", "ref");
- replace(r, "Nom_Quartier", "description");
- r.put("type", "boundary");
- r.put("boundary", "administrative");
- r.put("admin_level", "11");
- r.remove("Adjoint_Secteur");
- r.remove("Elu_Referent_Quartier");
- r.remove("Id");
- r.remove("Nom_Secteur");
- r.remove("Secteur");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Relation r : ds.getRelations()) {
+ r.remove("name");
+ replace(r, "Quartier", "ref");
+ replace(r, "Nom_Quartier", "description");
+ r.put("type", "boundary");
+ r.put("boundary", "administrative");
+ r.put("admin_level", "11");
+ r.remove("Adjoint_Secteur");
+ r.remove("Elu_Referent_Quartier");
+ r.remove("Id");
+ r.remove("Nom_Secteur");
+ r.remove("Secteur");
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/SecteursHandler.java (revision 28554)
@@ -22,27 +22,27 @@
public class SecteursHandler extends ToulouseDataSetHandler {
- public SecteursHandler() {
- super(12580, "admin_level=10");
- setWikiPage("Secteurs de proximité");
- setCategory(CAT_CITOYENNETE);
- }
+ public SecteursHandler() {
+ super(12580, "admin_level=10");
+ setWikiPage("Secteurs de proximité");
+ setCategory(CAT_CITOYENNETE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Secteurs");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Secteurs");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Relation r : ds.getRelations()) {
- r.remove("name");
- replace(r, "Secteur", "ref");
- replace(r, "Nom_Secteur", "description");
- r.put("type", "boundary");
- r.put("boundary", "administrative");
- r.put("admin_level", "10");
- r.remove("Adjoint_Secteur");
- r.remove("Charge_de_Secteur");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Relation r : ds.getRelations()) {
+ r.remove("name");
+ replace(r, "Secteur", "ref");
+ replace(r, "Nom_Secteur", "description");
+ r.put("type", "boundary");
+ r.put("boundary", "administrative");
+ r.put("admin_level", "10");
+ r.remove("Adjoint_Secteur");
+ r.remove("Charge_de_Secteur");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/BibliothequesHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/BibliothequesHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/BibliothequesHandler.java (revision 28554)
@@ -22,22 +22,22 @@
public class BibliothequesHandler extends ToulouseDataSetHandler {
- public BibliothequesHandler() {
- super(12402, "amenity=library");
- setWikiPage("Médiathèques, bibliothèques et bibliobus");
- setCategory(CAT_CULTURE);
- }
+ public BibliothequesHandler() {
+ super(12402, "amenity=library");
+ setWikiPage("Médiathèques, bibliothèques et bibliobus");
+ setCategory(CAT_CULTURE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Bibliotheques");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Bibliotheques");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "Nom", "name");
- replace(n, "Site_Internet", "website");
- n.put("amenity", "library");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "Nom", "name");
+ replace(n, "Site_Internet", "website");
+ n.put("amenity", "library");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/EquipementCulturelBalmaHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/EquipementCulturelBalmaHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/EquipementCulturelBalmaHandler.java (revision 28554)
@@ -22,24 +22,24 @@
public class EquipementCulturelBalmaHandler extends ToulouseDataSetHandler {
- public EquipementCulturelBalmaHandler() {
- super(13997);
- setWikiPage("Équipements Culturels");
- setCategory(CAT_CULTURE);
- }
+ public EquipementCulturelBalmaHandler() {
+ super(13997);
+ setWikiPage("Équipements Culturels");
+ setCategory(CAT_CULTURE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzFilename(filename, "culture");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzFilename(filename, "culture");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- if (n.get("name").equalsIgnoreCase("Bibliothèque")) {
- n.put("amenity", "library");
- } else if (n.get("name").equalsIgnoreCase("Auditorium")) {
- n.put("amenity", "auditorium");
- }
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ if (n.get("name").equalsIgnoreCase("Bibliothèque")) {
+ n.put("amenity", "library");
+ } else if (n.get("name").equalsIgnoreCase("Auditorium")) {
+ n.put("amenity", "auditorium");
+ }
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/LudothequeHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/LudothequeHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/LudothequeHandler.java (revision 28554)
@@ -22,28 +22,28 @@
public class LudothequeHandler extends ToulouseDataSetHandler {
- public LudothequeHandler() {
- super(12420, "amenity=toy_library");
- setWikiPage("Ludothèques");
- setCategory(CAT_CULTURE);
- }
-
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Ludotheques");
- }
+ public LudothequeHandler() {
+ super(12420, "amenity=toy_library");
+ setWikiPage("Ludothèques");
+ setCategory(CAT_CULTURE);
+ }
+
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Ludotheques");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "NOM", "name");
- n.put("amenity", "toy_library");
- n.remove("ADRESSE");
- n.remove("CP");
- n.remove("INSEE");
- n.remove("NATURE");
- n.remove("NUM");
- n.remove("QUARTIER");
- n.remove("STIADR");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "NOM", "name");
+ n.put("amenity", "toy_library");
+ n.remove("ADRESSE");
+ n.remove("CP");
+ n.remove("INSEE");
+ n.remove("NATURE");
+ n.remove("NUM");
+ n.remove("QUARTIER");
+ n.remove("STIADR");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/MuseeHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/MuseeHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/MuseeHandler.java (revision 28554)
@@ -23,35 +23,35 @@
public class MuseeHandler extends ToulouseDataSetHandler {
- public MuseeHandler() {
- super(12426, "tourism=museum");
- setWikiPage("Musées");
- setCategory(CAT_CULTURE);
- }
+ public MuseeHandler() {
+ super(12426, "tourism=museum");
+ setWikiPage("Musées");
+ setCategory(CAT_CULTURE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Musee");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Musee");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "NOMS", "name");
- replace(n, "SITE_INTERNET", "contact:website");
- n.put("tourism", "museum");
- n.remove("ADRESSES");
- n.remove("Num");
- n.remove("Index");
- replacePhone(n, "TELEPHONE");
- String name = WordUtils.capitalizeFully(n.get("name")).replace("Musee", "Musée").replace(" D ", " d'").replace(" L ", " l'").trim();
- int index = name.indexOf("Musée");
- if (index > 1) {
- name = name.substring(index) + " " + name.substring(0, index-1);
- }
- while (name.contains(" ")) {
- name = name.replace(" ", " ");
- }
- n.put("name", name);
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "NOMS", "name");
+ replace(n, "SITE_INTERNET", "contact:website");
+ n.put("tourism", "museum");
+ n.remove("ADRESSES");
+ n.remove("Num");
+ n.remove("Index");
+ replacePhone(n, "TELEPHONE");
+ String name = WordUtils.capitalizeFully(n.get("name")).replace("Musee", "Musée").replace(" D ", " d'").replace(" L ", " l'").trim();
+ int index = name.indexOf("Musée");
+ if (index > 1) {
+ name = name.substring(index) + " " + name.substring(0, index-1);
+ }
+ while (name.contains(" ")) {
+ name = name.replace(" ", " ");
+ }
+ n.put("name", name);
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/TheatreHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/TheatreHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/culture/TheatreHandler.java (revision 28554)
@@ -22,34 +22,34 @@
public class TheatreHandler extends ToulouseDataSetHandler {
- public TheatreHandler() {
- super(12448, "amenity=theatre");
- setWikiPage("Théâtres");
- setCategory(CAT_CULTURE);
- }
+ public TheatreHandler() {
+ super(12448, "amenity=theatre");
+ setWikiPage("Théâtres");
+ setCategory(CAT_CULTURE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Theatre");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Theatre");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "NOMS", "name");
- replace(n, "Site_Internet", "contact:website");
- n.put("amenity", "theatre");
- n.remove("ADRESSES");
- n.remove("Description");
- n.remove("Index");
- n.remove("NUM");
- replacePhone(n, "Telephone");
- String type = n.get("Type");
- if (type != null) {
- if (type.equals("MUNICIPAL")) {
- n.put("operator", "Mairie de Toulouse");
- }
- n.remove("Type");
- }
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "NOMS", "name");
+ replace(n, "Site_Internet", "contact:website");
+ n.put("amenity", "theatre");
+ n.remove("ADRESSES");
+ n.remove("Description");
+ n.remove("Index");
+ n.remove("NUM");
+ replacePhone(n, "Telephone");
+ String type = n.get("Type");
+ if (type != null) {
+ if (type.equals("MUNICIPAL")) {
+ n.put("operator", "Mairie de Toulouse");
+ }
+ n.remove("Type");
+ }
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/CrechesHandler.java (revision 28554)
@@ -22,21 +22,21 @@
public class CrechesHandler extends ToulouseDataSetHandler {
- public CrechesHandler() {
- super(12462, "amenity=kindergarten");
- setWikiPage("Crèches");
- setCategory(CAT_ENFANCE);
- }
+ public CrechesHandler() {
+ super(12462, "amenity=kindergarten");
+ setWikiPage("Crèches");
+ setCategory(CAT_ENFANCE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Creches");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Creches");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("amenity", "kindergarten");
- replace(n, "NOM", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("amenity", "kindergarten");
+ replace(n, "NOM", "name");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleBalmaHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleBalmaHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleBalmaHandler.java (revision 28554)
@@ -22,20 +22,20 @@
public class EcoleBalmaHandler extends ToulouseDataSetHandler {
- public EcoleBalmaHandler() {
- super(13993, "amenity=school");
- setWikiPage("Écoles");
- setCategory(CAT_ENFANCE);
- }
+ public EcoleBalmaHandler() {
+ super(13993, "amenity=school");
+ setWikiPage("Écoles");
+ setCategory(CAT_ENFANCE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzFilename(filename, "Ecoles");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzFilename(filename, "Ecoles");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("amenity", "school");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("amenity", "school");
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleElementaireHandler.java (revision 28554)
@@ -22,26 +22,26 @@
public class EcoleElementaireHandler extends ToulouseDataSetHandler {
- public EcoleElementaireHandler() {
- 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);
- }
- }
+ public EcoleElementaireHandler() {
+ 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);
+ }
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Ecoles_Elem_Publiques");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Ecoles_Elem_Publiques");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("amenity", "school");
- n.put("school:FR", "elementaire");
- n.put("operator", "public");
- replace(n, "Ecole", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("amenity", "school");
+ n.put("school:FR", "elementaire");
+ n.put("operator", "public");
+ replace(n, "Ecole", "name");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleMaternelleHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleMaternelleHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/EcoleMaternelleHandler.java (revision 28554)
@@ -22,26 +22,26 @@
public class EcoleMaternelleHandler extends ToulouseDataSetHandler {
- public EcoleMaternelleHandler() {
- 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);
- }
- }
+ public EcoleMaternelleHandler() {
+ 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);
+ }
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Ecoles_Mat_Publiques");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Ecoles_Mat_Publiques");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("amenity", "school");
- n.put("school:FR", "maternelle");
- n.put("operator", "public");
- replace(n, "Ecole", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("amenity", "school");
+ n.put("school:FR", "maternelle");
+ n.put("operator", "public");
+ replace(n, "Ecole", "name");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/PetiteEnfanceEtJeunesseBalmaHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/PetiteEnfanceEtJeunesseBalmaHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/enfance/PetiteEnfanceEtJeunesseBalmaHandler.java (revision 28554)
@@ -22,22 +22,22 @@
public class PetiteEnfanceEtJeunesseBalmaHandler extends ToulouseDataSetHandler {
- public PetiteEnfanceEtJeunesseBalmaHandler() {
- super(14001);
- setWikiPage("Petite enfance et jeunesse");
- setCategory(CAT_ENFANCE);
- }
+ public PetiteEnfanceEtJeunesseBalmaHandler() {
+ super(14001);
+ setWikiPage("Petite enfance et jeunesse");
+ setCategory(CAT_ENFANCE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzFilename(filename, "Petite enfance et jeunesse");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzFilename(filename, "Petite enfance et jeunesse");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- if (n.get("name").equalsIgnoreCase("Crèche")) {
- n.put("amenity", "kindergarten");
- }
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ if (n.get("name").equalsIgnoreCase("Crèche")) {
+ n.put("amenity", "kindergarten");
+ }
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupEmballageHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupEmballageHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupEmballageHandler.java (revision 28554)
@@ -22,27 +22,27 @@
public class RecupEmballageHandler extends ToulouseDataSetHandler {
- public RecupEmballageHandler() {
- super(12494, "amenity=recycling");
- setWikiPage("Récup' Emballage");
- setCategory(CAT_ENVIRONNEMENT);
- }
+ public RecupEmballageHandler() {
+ super(12494, "amenity=recycling");
+ setWikiPage("Récup' Emballage");
+ setCategory(CAT_ENVIRONNEMENT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Recup_Emballage");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Recup_Emballage");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.remove("name");
- n.put("amenity", "recycling");
- n.put("recycling_type", "container");
- n.put("recycling:plastic_bottles", "yes");
- n.put("recycling:beverage_cartons", "yes");
- n.put("recycling:cardboard", "yes");
- n.put("recycling:newspaper", "yes");
- n.put("recycling:magazines", "yes");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.remove("name");
+ n.put("amenity", "recycling");
+ n.put("recycling_type", "container");
+ n.put("recycling:plastic_bottles", "yes");
+ n.put("recycling:beverage_cartons", "yes");
+ n.put("recycling:cardboard", "yes");
+ n.put("recycling:newspaper", "yes");
+ n.put("recycling:magazines", "yes");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupVerreHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupVerreHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/RecupVerreHandler.java (revision 28554)
@@ -22,23 +22,23 @@
public class RecupVerreHandler extends ToulouseDataSetHandler {
- public RecupVerreHandler() {
- super(12496, "amenity=recycling");
- setWikiPage("Récup' Verre");
- setCategory(CAT_ENVIRONNEMENT);
- }
+ public RecupVerreHandler() {
+ super(12496, "amenity=recycling");
+ setWikiPage("Récup' Verre");
+ setCategory(CAT_ENVIRONNEMENT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Recup_Verre");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Recup_Verre");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.remove("name");
- n.put("amenity", "recycling");
- n.put("recycling:glass", "no");
- n.put("recycling:glass_bottles", "yes");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.remove("name");
+ n.put("amenity", "recycling");
+ n.put("recycling:glass", "no");
+ n.put("recycling:glass_bottles", "yes");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/StationEpurationHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/StationEpurationHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/environnement/StationEpurationHandler.java (revision 28554)
@@ -22,21 +22,21 @@
public class StationEpurationHandler extends ToulouseDataSetHandler {
- public StationEpurationHandler() {
- super(12500, "man_made=wastewater_plant");
- setWikiPage("Stations d'épuration");
- setCategory(CAT_ENVIRONNEMENT);
- }
+ public StationEpurationHandler() {
+ super(12500, "man_made=wastewater_plant");
+ setWikiPage("Stations d'épuration");
+ setCategory(CAT_ENVIRONNEMENT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Stations_epurations");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Stations_epurations");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "NOM_STATION", "name");
- n.put("man_made", "wastewater_plant");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "NOM_STATION", "name");
+ n.put("man_made", "wastewater_plant");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1680Handler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1680Handler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1680Handler.java (revision 28554)
@@ -22,20 +22,20 @@
public class Parcelles1680Handler extends ToulouseDataSetHandler {
- public Parcelles1680Handler() {
- super(12514);
- setName("Parcellaire de 1680");
- setCategory(CAT_PATRIMOINE);
- }
+ public Parcelles1680Handler() {
+ super(12514);
+ setName("Parcellaire de 1680");
+ setCategory(CAT_PATRIMOINE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Parcelles_1680");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Parcelles_1680");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Relation r : ds.getRelations()) {
- replace(r, "Nom_prenom", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Relation r : ds.getRelations()) {
+ replace(r, "Nom_prenom", "name");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1830Handler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1830Handler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/patrimoine/Parcelles1830Handler.java (revision 28554)
@@ -22,20 +22,20 @@
public class Parcelles1830Handler extends ToulouseDataSetHandler {
- public Parcelles1830Handler() {
- super(12534);
- setName("Parcellaire de 1830");
- setCategory(CAT_PATRIMOINE);
- }
+ public Parcelles1830Handler() {
+ super(12534);
+ setName("Parcellaire de 1830");
+ setCategory(CAT_PATRIMOINE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Parcelles_1830");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Parcelles_1830");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Relation r : ds.getRelations()) {
- replace(r, "Nom_prenom", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Relation r : ds.getRelations()) {
+ replace(r, "Nom_prenom", "name");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveBalmaHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveBalmaHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveBalmaHandler.java (revision 28554)
@@ -22,37 +22,37 @@
public class InstallationSportiveBalmaHandler extends ToulouseDataSetHandler {
- public InstallationSportiveBalmaHandler() {
- super(14010);
- setWikiPage("Installations sportives");
- setCategory(CAT_SPORT);
- }
+ public InstallationSportiveBalmaHandler() {
+ super(14010);
+ setWikiPage("Installations sportives (Balma)");
+ setCategory(CAT_SPORT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzFilename(filename, "Sports");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzFilename(filename, "Sports");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- if (n.get("name").startsWith("Gymnase")) {
- n.put("leisure", "sports_centre");
- } else if (n.get("name").startsWith("Piscine")) {
- n.put("leisure", "swimming_pool");
- n.put("sport", "swimming");
- } else if (n.get("name").startsWith("Skate")) {
- n.put("leisure", "skate_park");
- n.put("sport", "skateboard");
- } else if (n.get("name").startsWith("Tennis")) {
- n.put("leisure", "pitch");
- n.put("sport", "tennis");
- } else if (n.get("name").startsWith("Stade")) {
- n.put("leisure", "pitch");
- } else if (n.get("name").startsWith("Dojo")) {
- n.put("amenity", "dojo");
- } else if (n.get("name").startsWith("Boulodrome")) {
- n.put("sport", "boules");
- }
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ if (n.get("name").startsWith("Gymnase")) {
+ n.put("leisure", "sports_centre");
+ } else if (n.get("name").startsWith("Piscine")) {
+ n.put("leisure", "swimming_pool");
+ n.put("sport", "swimming");
+ } else if (n.get("name").startsWith("Skate")) {
+ n.put("leisure", "skate_park");
+ n.put("sport", "skateboard");
+ } else if (n.get("name").startsWith("Tennis")) {
+ n.put("leisure", "pitch");
+ n.put("sport", "tennis");
+ } else if (n.get("name").startsWith("Stade")) {
+ n.put("leisure", "pitch");
+ } else if (n.get("name").startsWith("Dojo")) {
+ n.put("amenity", "dojo");
+ } else if (n.get("name").startsWith("Boulodrome")) {
+ n.put("sport", "boules");
+ }
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveToulouseHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveToulouseHandler.java (revision 28554)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/sport/InstallationSportiveToulouseHandler.java (revision 28554)
@@ -0,0 +1,58 @@
+// JOSM opendata plugin.
+// Copyright (C) 2011-2012 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.sport;
+
+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 InstallationSportiveToulouseHandler extends ToulouseDataSetHandler {
+
+ public InstallationSportiveToulouseHandler() {
+ super(14413);
+ setWikiPage("Installations sportives (Toulouse)");
+ setCategory(CAT_SPORT);
+ }
+
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzFilename(filename, "Sports");
+ }
+
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ /*if (n.get("name").startsWith("Gymnase")) {
+ n.put("leisure", "sports_centre");
+ } else if (n.get("name").startsWith("Piscine")) {
+ n.put("leisure", "swimming_pool");
+ n.put("sport", "swimming");
+ } else if (n.get("name").startsWith("Skate")) {
+ n.put("leisure", "skate_park");
+ n.put("sport", "skateboard");
+ } else if (n.get("name").startsWith("Tennis")) {
+ n.put("leisure", "pitch");
+ n.put("sport", "tennis");
+ } else if (n.get("name").startsWith("Stade")) {
+ n.put("leisure", "pitch");
+ } else if (n.get("name").startsWith("Dojo")) {
+ n.put("amenity", "dojo");
+ } else if (n.get("name").startsWith("Boulodrome")) {
+ n.put("sport", "boules");
+ }*/
+ }
+ }
+}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/topographie/AltimetrieVoieHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/topographie/AltimetrieVoieHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/topographie/AltimetrieVoieHandler.java (revision 28554)
@@ -21,22 +21,22 @@
public class AltimetrieVoieHandler extends ToulouseDataSetHandler {
-
- public AltimetrieVoieHandler() {
- super(12660, "ele");
- setName("Altimétrie des voies");
- setCategory(CAT_TOPOGRAPHIE);
- }
+
+ public AltimetrieVoieHandler() {
+ super(12660, "ele");
+ setName("Altimétrie des voies");
+ setCategory(CAT_TOPOGRAPHIE);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "XYZ_PT_ALTI_VOIES");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "XYZ_PT_ALTI_VOIES");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- replace(n, "Altimetrie", "ele");
- n.put("name", n.get("ele")); // name pour voir la hauteur directement (hack, FIXME)
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ replace(n, "Altimetrie", "ele");
+ n.put("name", n.get("ele")); // name pour voir la hauteur directement (hack, FIXME)
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersHandler.java (revision 28554)
@@ -22,21 +22,21 @@
public abstract class ChantiersHandler extends ToulouseDataSetHandler {
- public ChantiersHandler(int portalId, String name) {
- super(portalId, "highway=construction");
- setWikiPage("Chantiers en cours");
- setName(name);
- setCategory(CAT_TRANSPORT);
- }
-
- @Override
- public void updateDataSet(DataSet ds) {
- for (OsmPrimitive p : ds.allPrimitives()) {
- if (p.hasKeys()) {
- p.put("highway", "construction");
- p.remove("name");
- p.remove("color");
- replace(p, "Lien", "website");
- }
- }
- }
+ public ChantiersHandler(int portalId, String name) {
+ super(portalId, "highway=construction");
+ setWikiPage("Chantiers en cours");
+ setName(name);
+ setCategory(CAT_TRANSPORT);
+ }
+
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (OsmPrimitive p : ds.allPrimitives()) {
+ if (p.hasKeys()) {
+ p.put("highway", "construction");
+ p.remove("name");
+ p.remove("color");
+ replace(p, "Lien", "website");
+ }
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersLineairesHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersLineairesHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersLineairesHandler.java (revision 28554)
@@ -19,11 +19,11 @@
public class ChantiersLineairesHandler extends ChantiersHandler {
- public ChantiersLineairesHandler() {
- super(14063, "Chantiers en cours (linéaire)");
- }
+ public ChantiersLineairesHandler() {
+ super(14063, "Chantiers en cours (linéaire)");
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Chantiers_Lineaires");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Chantiers_Lineaires");
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersPonctuelsHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersPonctuelsHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ChantiersPonctuelsHandler.java (revision 28554)
@@ -19,12 +19,12 @@
public class ChantiersPonctuelsHandler extends ChantiersHandler {
- public ChantiersPonctuelsHandler() {
- super(14071, "Chantiers en cours (ponctuel)");
- getCsvHandler().setCharset(ISO8859_15);
- }
+ public ChantiersPonctuelsHandler() {
+ super(14071, "Chantiers en cours (ponctuel)");
+ getCsvHandler().setCharset(ISO8859_15);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Chantiers_Ponctuels");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Chantiers_Ponctuels");
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/HorodateurHandler.java (revision 28554)
@@ -26,91 +26,91 @@
public class HorodateurHandler extends ToulouseDataSetHandler {
- public HorodateurHandler() {
- super(12540, "vending=parking_tickets");
- setWikiPage("Horodateurs");
- setCategory(CAT_TRANSPORT);
- }
+ public HorodateurHandler() {
+ super(12540, "vending=parking_tickets");
+ setWikiPage("Horodateurs");
+ setCategory(CAT_TRANSPORT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Horodateur");
- }
-
- private String parseHour(String hour) {
- String s = hour.replaceFirst("[hH]", ":");
- if (s.endsWith(":")) {
- s += "00";
- }
- return s;
- }
-
- protected String parseOpeningHours(String horaire) {
- final String hour = "\\p{Digit}{1,2}[hH]\\p{Digit}{0,2}";
- final String sep = "[ -/]+";
- final String hours = "("+hour+sep+hour+")";
- final Pattern p = Pattern.compile(hours+"(?:"+sep+hours+")*");
- final Matcher m = p.matcher(horaire);
- String opening_hours = "";
- if (m.matches()) {
- for (int i = 1; i<=m.groupCount(); i++) {
- if (m.group(i) != null) {
- if (!opening_hours.isEmpty()) {
- opening_hours += "; ";
- }
- final Pattern p2 = Pattern.compile("("+hour+")"+sep+"("+hour+")");
- final Matcher m2 = p2.matcher(m.group(i));
- if (m2.matches()) {
- opening_hours += parseHour(m2.group(1)) + "-" + parseHour(m2.group(2));
- } else {
- System.err.println(m.group(i)+" does not match "+p2);
- }
- }
- }
- } else {
- System.err.println(horaire+" does not match "+p);
- }
- return opening_hours;
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Horodateur");
+ }
+
+ private String parseHour(String hour) {
+ String s = hour.replaceFirst("[hH]", ":");
+ if (s.endsWith(":")) {
+ s += "00";
+ }
+ return s;
+ }
+
+ protected String parseOpeningHours(String horaire) {
+ final String hour = "\\p{Digit}{1,2}[hH]\\p{Digit}{0,2}";
+ final String sep = "[ -/]+";
+ final String hours = "("+hour+sep+hour+")";
+ final Pattern p = Pattern.compile(hours+"(?:"+sep+hours+")*");
+ final Matcher m = p.matcher(horaire);
+ String opening_hours = "";
+ if (m.matches()) {
+ for (int i = 1; i<=m.groupCount(); i++) {
+ if (m.group(i) != null) {
+ if (!opening_hours.isEmpty()) {
+ opening_hours += "; ";
+ }
+ final Pattern p2 = Pattern.compile("("+hour+")"+sep+"("+hour+")");
+ final Matcher m2 = p2.matcher(m.group(i));
+ if (m2.matches()) {
+ opening_hours += parseHour(m2.group(1)) + "-" + parseHour(m2.group(2));
+ } else {
+ System.err.println(m.group(i)+" does not match "+p2);
+ }
+ }
+ }
+ } else {
+ System.err.println(horaire+" does not match "+p);
+ }
+ return opening_hours;
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("amenity", "vending_machine");
- n.put("vending", "parking_tickets");
- n.remove("name");
- n.remove("Code_Insee");
- n.remove("Lib_voie");
- n.remove("Mot_dir");
- n.remove("No");
- n.remove("Reglementation");
- n.remove("color");
- replace(n, "commune", "operator", new ValueReplacer() {
- @Override
- public String replace(String value) {
- return "Mairie de "+WordUtils.capitalizeFully(value);
- }
- });
- replace(n, "horaire", "opening_hours", new ValueReplacer() {
- @Override
- public String replace(String value) {
- return parseOpeningHours(value);
- }
- });
- replace(n, "maj_date", "source:date", new ValueReplacer() {
- @Override
- public String replace(String value) {
- return value.substring(0, 4)+"-"+value.substring(4, 6)+"-"+value.substring(6, 8);
- }
- });
- replace(n, "observations", "note");
- replace(n, "quartier_residant", "parking:ticket:zone", new ValueReplacer() {
- @Override
- public String replace(String value) {
- return WordUtils.capitalizeFully(value.trim())
- .replace(" Iv", " IV").replace("Sebastopol", "Sébastopol")
- .replace("St ", "Saint-").replace("Peri", "Péri");
- }
- });
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("amenity", "vending_machine");
+ n.put("vending", "parking_tickets");
+ n.remove("name");
+ n.remove("Code_Insee");
+ n.remove("Lib_voie");
+ n.remove("Mot_dir");
+ n.remove("No");
+ n.remove("Reglementation");
+ n.remove("color");
+ replace(n, "commune", "operator", new ValueReplacer() {
+ @Override
+ public String replace(String value) {
+ return "Mairie de "+WordUtils.capitalizeFully(value);
+ }
+ });
+ replace(n, "horaire", "opening_hours", new ValueReplacer() {
+ @Override
+ public String replace(String value) {
+ return parseOpeningHours(value);
+ }
+ });
+ replace(n, "maj_date", "source:date", new ValueReplacer() {
+ @Override
+ public String replace(String value) {
+ return value.substring(0, 4)+"-"+value.substring(4, 6)+"-"+value.substring(6, 8);
+ }
+ });
+ replace(n, "observations", "note");
+ replace(n, "quartier_residant", "parking:ticket:zone", new ValueReplacer() {
+ @Override
+ public String replace(String value) {
+ return WordUtils.capitalizeFully(value.trim())
+ .replace(" Iv", " IV").replace("Sebastopol", "Sébastopol")
+ .replace("St ", "Saint-").replace("Peri", "Péri");
+ }
+ });
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/MetroStationHandler.java (revision 28554)
@@ -22,22 +22,22 @@
public class MetroStationHandler extends ToulouseDataSetHandler {
- public MetroStationHandler() {
- super(12542, "subway=yes");
- setName("Stations de métro");
- setCategory(CAT_TRANSPORT);
- }
+ public MetroStationHandler() {
+ super(12542, "subway=yes");
+ setName("Stations de métro");
+ setCategory(CAT_TRANSPORT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Metro_Station");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Metro_Station");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("public_transport", "stop_position");
- n.put("subway", "yes");
- replace(n, "NOM", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("public_transport", "stop_position");
+ n.put("subway", "yes");
+ replace(n, "NOM", "name");
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PMRHandler.java (revision 28554)
@@ -22,30 +22,30 @@
public class PMRHandler extends ToulouseDataSetHandler {
- public PMRHandler() {
- super(12538, "amenity=parking_space");
- setWikiPage("PMR");
- setCategory(CAT_TRANSPORT);
- }
+ public PMRHandler() {
+ super(12538, "amenity=parking_space");
+ setWikiPage("PMR");
+ setCategory(CAT_TRANSPORT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Emplacements_PMR");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Emplacements_PMR");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.remove("name");
- n.put("amenity", "parking_space");
- n.put("access:disabled", "designated");
- n.put("wheelchair", "designated");
- replace(n, "nb_places", "capacity:disabled");
- n.remove("Lib_voie");
- n.remove("No");
- n.remove("commune");
- n.remove("code_insee");
- n.remove("color");
- replace(n, "id_PMR", "ref:grandtoulouse");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.remove("name");
+ n.put("amenity", "parking_space");
+ n.put("access:disabled", "designated");
+ n.put("wheelchair", "designated");
+ replace(n, "nb_places", "capacity:disabled");
+ n.remove("Lib_voie");
+ n.remove("No");
+ n.remove("commune");
+ n.remove("code_insee");
+ n.remove("color");
+ replace(n, "id_PMR", "ref:grandtoulouse");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/PistesCyclablesHandler.java (revision 28554)
@@ -32,92 +32,92 @@
public class PistesCyclablesHandler extends ToulouseDataSetHandler {
- protected final Map> map = new HashMap>();
-
- private String streetField;
-
- public PistesCyclablesHandler() {
- this("Nom_voie");
- setCategory(CAT_TRANSPORT);
- }
-
- public PistesCyclablesHandler(String streetField) {
- super(12544, true, "cycleway", "cycleway:right", "cycleway:left", "cycleway:both", "highway=cycleway", "ramp:bicycle=yes", "bicycle=yes", "barrier=cycle_barrier");
- setWikiPage("Réseau cyclable et vert");
- addForbiddenTag("cycleway=no");
- this.streetField = streetField;
- map.put("secondary", Arrays.asList(new String[] {"AVENUE", "Av ", "av ", "Avenue ", "avenue ", "BOULEVARD ", "bd ", "ALLEE", "Allee", "allee",
- "PONT ", "Pont ", "PORT ", "ROUTE ", "Rte ", "BOULINGRIN", "boulingrin"}));
- map.put("residential", Arrays.asList(new String[] {"CHEMIN ", "Chemin ", "chemin ", "IMPASSE ", "imp ", "PLACE ", "Place ", "place ",
- "RUE ", "Rue ", "rue ", "QUAI", "VOIE ", "grand rue"}));
- }
-
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Pistes_Cyclables");
- }
-
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.fr.opendata.datasets.SimpleDataSetHandler#getOverpassApiUnion(java.lang.String, java.lang.String[])
- */
- @Override
- protected String getOverpassApiQueries(String bbox, String... conditions) {
- return OverpassApi.query(bbox, NODE, conditions) + "\n" +
- OverpassApi.recurse(NODE_RELATION, RELATION_WAY, WAY_NODE) + "\n" +
- OverpassApi.query(bbox, WAY, conditions) + "\n" +
- OverpassApi.recurse(WAY_NODE, "nodes") + "\n" +
- OverpassApi.recurse(WAY_RELATION);
- }
+ protected final Map> map = new HashMap>();
+
+ private String streetField;
+
+ public PistesCyclablesHandler() {
+ this("Nom_voie");
+ setCategory(CAT_TRANSPORT);
+ }
+
+ public PistesCyclablesHandler(String streetField) {
+ super(12544, true, "cycleway", "cycleway:right", "cycleway:left", "cycleway:both", "highway=cycleway", "ramp:bicycle=yes", "bicycle=yes", "barrier=cycle_barrier");
+ setWikiPage("Réseau cyclable et vert");
+ addForbiddenTag("cycleway=no");
+ this.streetField = streetField;
+ map.put("secondary", Arrays.asList(new String[] {"AVENUE", "Av ", "av ", "Avenue ", "avenue ", "BOULEVARD ", "bd ", "ALLEE", "Allee", "allee",
+ "PONT ", "Pont ", "PORT ", "ROUTE ", "Rte ", "BOULINGRIN", "boulingrin"}));
+ map.put("residential", Arrays.asList(new String[] {"CHEMIN ", "Chemin ", "chemin ", "IMPASSE ", "imp ", "PLACE ", "Place ", "place ",
+ "RUE ", "Rue ", "rue ", "QUAI", "VOIE ", "grand rue"}));
+ }
+
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Pistes_Cyclables");
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.fr.opendata.datasets.SimpleDataSetHandler#getOverpassApiUnion(java.lang.String, java.lang.String[])
+ */
+ @Override
+ protected String getOverpassApiQueries(String bbox, String... conditions) {
+ return OverpassApi.query(bbox, NODE, conditions) + "\n" +
+ OverpassApi.recurse(NODE_RELATION, RELATION_WAY, WAY_NODE) + "\n" +
+ OverpassApi.query(bbox, WAY, conditions) + "\n" +
+ OverpassApi.recurse(WAY_NODE, "nodes") + "\n" +
+ OverpassApi.recurse(WAY_RELATION);
+ }
- private String applyHighwayTag(String name, IPrimitive p) {
- if (name != null && p != null) {
- for (String key : map.keySet()) {
- for (String value : map.get(key)) {
- if (name.startsWith(value)) {
- p.put("highway", key);
- return key;
- }
- }
- }
- }
- return null;
- }
-
- @Override
- public void updateDataSet(DataSet ds) {
- for (Way w : ds.getWays()) {
+ private String applyHighwayTag(String name, IPrimitive p) {
+ if (name != null && p != null) {
+ for (String key : map.keySet()) {
+ for (String value : map.get(key)) {
+ if (name.startsWith(value)) {
+ p.put("highway", key);
+ return key;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Way w : ds.getWays()) {
- w.remove("name");
-
- String obs_type = w.get("obs_type");
- if (obs_type.equals("bande")) {
- w.put("cycleway", "lane");
- } else if (obs_type.equals("bande a contresens") || obs_type.equals("contre allee")) {
- w.put("cycleway", "opposite_lane");
- } else if (obs_type.equals("couloir bus")) {
- w.put("cycleway", "share_busway");
- } else if (obs_type.equals("trottoir")) {
- w.put("cycleway", "track");
- } else if (obs_type.equalsIgnoreCase("cheminement mixte") || obs_type.equals("reseau vert")) {
- w.put("highway", "cycleway");
- w.put("foot", "yes");
- } else if (obs_type.equals("piste") || obs_type.equals("voie verte")) {
- w.put("highway", "cycleway");
- } else if (obs_type.equals("zone 30")) {
- w.put("zone:maxspeed", "FR:30");
- } else {
- System.out.println(obs_type);
- }
-
- String name = w.get(streetField);
- if (name != null) {
- w.remove(streetField);
-
- if (w.get("highway") == null && applyHighwayTag(name, w) == null) {
- w.put("highway", "road");
- }
+ w.remove("name");
+
+ String obs_type = w.get("obs_type");
+ if (obs_type.equals("bande")) {
+ w.put("cycleway", "lane");
+ } else if (obs_type.equals("bande a contresens") || obs_type.equals("contre allee")) {
+ w.put("cycleway", "opposite_lane");
+ } else if (obs_type.equals("couloir bus")) {
+ w.put("cycleway", "share_busway");
+ } else if (obs_type.equals("trottoir")) {
+ w.put("cycleway", "track");
+ } else if (obs_type.equalsIgnoreCase("cheminement mixte") || obs_type.equals("reseau vert")) {
+ w.put("highway", "cycleway");
+ w.put("foot", "yes");
+ } else if (obs_type.equals("piste") || obs_type.equals("voie verte")) {
+ w.put("highway", "cycleway");
+ } else if (obs_type.equals("zone 30")) {
+ w.put("zone:maxspeed", "FR:30");
+ } else {
+ System.out.println(obs_type);
+ }
+
+ String name = w.get(streetField);
+ if (name != null) {
+ w.remove(streetField);
+
+ if (w.get("highway") == null && applyHighwayTag(name, w) == null) {
+ w.put("highway", "road");
+ }
- w.put("name", name);
- }
- }
- }
+ w.put("name", name);
+ }
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/ReseauTisseoHandler.java (revision 28554)
@@ -27,54 +27,54 @@
public class ReseauTisseoHandler extends ToulouseDataSetHandler {
- private static final URL neptuneSchemaUrl = ReseauTisseoHandler.class.getResource(TOULOUSE_NEPTUNE_XSD);
-
- public ReseauTisseoHandler() {
- super(14022, "network=fr_tisseo");
- NeptuneReader.registerSchema(neptuneSchemaUrl);
- setName("Réseau Tisséo (Métro, Bus, Tram)");
- setCategory(CAT_TRANSPORT);
- getZipHandler().setSkipXsdValidation(true);
- }
+ private static final URL neptuneSchemaUrl = ReseauTisseoHandler.class.getResource(TOULOUSE_NEPTUNE_XSD);
+
+ public ReseauTisseoHandler() {
+ super(14022, "network=fr_tisseo");
+ NeptuneReader.registerSchema(neptuneSchemaUrl);
+ setName("Réseau Tisséo (Métro, Bus, Tram)");
+ setCategory(CAT_TRANSPORT);
+ getZipHandler().setSkipXsdValidation(true);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsZipFilename(filename, "14022-reseau-tisseo-metro-bus-tram-") || filename.toLowerCase().endsWith(XML_EXT);
- }
-
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#acceptsFile(java.io.File)
- */
- @Override
- public boolean acceptsFile(File file) {
- return acceptsFilename(file.getName()) && (file.getName().toLowerCase().endsWith(ZIP_EXT) || NeptuneReader.acceptsXmlNeptuneFile(file, neptuneSchemaUrl));
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsZipFilename(filename, "14022-reseau-tisseo-metro-bus-tram-") || filename.toLowerCase().endsWith(XML_EXT);
+ }
+
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#acceptsFile(java.io.File)
+ */
+ @Override
+ public boolean acceptsFile(File file) {
+ return acceptsFilename(file.getName()) && (file.getName().toLowerCase().endsWith(ZIP_EXT) || NeptuneReader.acceptsXmlNeptuneFile(file, neptuneSchemaUrl));
+ }
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler#getSource()
- */
- @Override
- public String getSource() {
- return SOURCE_TISSEO;
- }
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler#getSource()
+ */
+ @Override
+ public String getSource() {
+ return SOURCE_TISSEO;
+ }
- /* (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;
- }
+ /* (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) {
- for (OsmPrimitive p : ds.allPrimitives()) {
- p.put("operator", "Tisséo");
- p.put("network", "fr_tisseo");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (OsmPrimitive p : ds.allPrimitives()) {
+ p.put("operator", "Tisséo");
+ p.put("network", "fr_tisseo");
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/TramwayStationHandler.java (revision 28554)
@@ -22,22 +22,22 @@
public class TramwayStationHandler extends ToulouseDataSetHandler {
- public TramwayStationHandler() {
- super(12611, "tram=yes");
- setName("Stations de tramway");
- setCategory(CAT_TRANSPORT);
- }
+ public TramwayStationHandler() {
+ super(12611, "tram=yes");
+ setName("Stations de tramway");
+ setCategory(CAT_TRANSPORT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Tramway_Stations");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Tramway_Stations");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("public_transport", "stop_position");
- n.put("tram", "yes");
- replace(n, "NOM", "name");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("public_transport", "stop_position");
+ n.put("tram", "yes");
+ replace(n, "NOM", "name");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/VeloToulouseHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/VeloToulouseHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/VeloToulouseHandler.java (revision 28554)
@@ -23,41 +23,41 @@
public class VeloToulouseHandler extends ToulouseDataSetHandler {
- public VeloToulouseHandler() {
- super(12546, "amenity=bicycle_rental");
- setWikiPage("Vélô Toulouse");
- setCategory(CAT_TRANSPORT);
- }
+ public VeloToulouseHandler() {
+ super(12546, "amenity=bicycle_rental");
+ setWikiPage("Vélô Toulouse");
+ setCategory(CAT_TRANSPORT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Velo_Toulouse");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Velo_Toulouse");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.put("amenity", "bicycle_rental");
- n.put("network", "VélôToulouse");
- n.put("operator", "JCDecaux");
- if (n.hasKey("M_en_S_16_nov_07") && n.get("M_en_S_16_nov_07").equals("O")) {
- n.put("start_date", "2007-11-16");
- }
- n.remove("M_en_S_16_nov_07");
- n.remove("Mot_Directeur");
- n.remove("No");
- n.remove("Nrivoli");
- n.remove("street");
- replace(n, "nb_bornettes", "capacity");
- replace(n, "num_station", "ref");
- replace(n, "nom", "name");
- n.put("name", WordUtils.capitalizeFully(n.get("name")));
- n.remove("code_insee");
- n.remove("commune");
- n.remove("color");
- if (n.hasKey("En_service") && n.get("En_service").equals("N")) {
- n.put("fixme", "Station pas en service");
- }
- n.remove("En_service");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.put("amenity", "bicycle_rental");
+ n.put("network", "VélôToulouse");
+ n.put("operator", "JCDecaux");
+ if (n.hasKey("M_en_S_16_nov_07") && n.get("M_en_S_16_nov_07").equals("O")) {
+ n.put("start_date", "2007-11-16");
+ }
+ n.remove("M_en_S_16_nov_07");
+ n.remove("Mot_Directeur");
+ n.remove("No");
+ n.remove("Nrivoli");
+ n.remove("street");
+ replace(n, "nb_bornettes", "capacity");
+ replace(n, "num_station", "ref");
+ replace(n, "nom", "name");
+ n.put("name", WordUtils.capitalizeFully(n.get("name")));
+ n.remove("code_insee");
+ n.remove("commune");
+ n.remove("color");
+ if (n.hasKey("En_service") && n.get("En_service").equals("N")) {
+ n.put("fixme", "Station pas en service");
+ }
+ n.remove("En_service");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/Zone30Handler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/Zone30Handler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/transport/Zone30Handler.java (revision 28554)
@@ -21,38 +21,38 @@
public class Zone30Handler extends VoirieHandler {
-
- public Zone30Handler() {
- super(12548, "Street", "maxspeed=30");
- setWikiPage("Zones 30");
- setCategory(CAT_TRANSPORT);
- }
+
+ public Zone30Handler() {
+ super(12548, "Street", "maxspeed=30");
+ setWikiPage("Zones 30");
+ setCategory(CAT_TRANSPORT);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Zone30");
- }
-
- @Override
- public void updateDataSet(DataSet ds) {
- super.updateDataSet(ds);
-
- for (Way w : ds.getWays()) {
- w.put("zone:maxspeed", "FR:30");
- w.put("maxspeed", "30");
- replace(w, "SensUnique", "oneway", new String[]{"oui", "non"}, new String[]{"yes", "no"});
- replace(w, "Annee", "start_date");
- replace(w, "Longueur", "length");
- w.remove("code_insee");
- w.remove("commune");
- w.remove("MotDir");
- }
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Zone30");
+ }
+
+ @Override
+ public void updateDataSet(DataSet ds) {
+ super.updateDataSet(ds);
+
+ for (Way w : ds.getWays()) {
+ w.put("zone:maxspeed", "FR:30");
+ w.put("maxspeed", "30");
+ replace(w, "SensUnique", "oneway", new String[]{"oui", "non"}, new String[]{"yes", "no"});
+ replace(w, "Annee", "start_date");
+ replace(w, "Longueur", "length");
+ w.remove("code_insee");
+ w.remove("commune");
+ w.remove("MotDir");
+ }
+ }
- /* (non-Javadoc)
- * @see org.openstreetmap.josm.plugins.opendata.portals.fr.toulouse.datasets.urbanisme.VoirieHandler#getStreetId(org.openstreetmap.josm.data.osm.Way)
- */
- @Override
- protected String getStreetId(Way w) {
- return w.get("code_insee")+"/"+w.get("name");
- }
+ /* (non-Javadoc)
+ * @see org.openstreetmap.josm.plugins.opendata.portals.fr.toulouse.datasets.urbanisme.VoirieHandler#getStreetId(org.openstreetmap.josm.data.osm.Way)
+ */
+ @Override
+ protected String getStreetId(Way w) {
+ return w.get("code_insee")+"/"+w.get("name");
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/CommuneHandler.java (revision 28554)
@@ -22,24 +22,24 @@
public class CommuneHandler extends ToulouseDataSetHandler {
- public CommuneHandler() {
- super(12582, "admin_level=8");
- setName("Communes");
- setCategory(CAT_URBANISME);
- }
+ public CommuneHandler() {
+ super(12582, "admin_level=8");
+ setName("Communes");
+ setCategory(CAT_URBANISME);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Limites_Communes");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Limites_Communes");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Relation r : ds.getRelations()) {
- r.put("type", "boundary");
- r.put("boundary", "administrative");
- r.put("admin_level", "8");
- replace(r, "libelle", "name");
- replace(r, "code_insee", "ref:INSEE");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Relation r : ds.getRelations()) {
+ r.put("type", "boundary");
+ r.put("boundary", "administrative");
+ r.put("admin_level", "8");
+ replace(r, "libelle", "name");
+ replace(r, "code_insee", "ref:INSEE");
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/NumerosRueHandler.java (revision 28554)
@@ -28,39 +28,39 @@
public class NumerosRueHandler extends ToulouseDataSetHandler {
- public NumerosRueHandler() {
- super(12673, "addr:housenumber");
- setWikiPage("Numéros de rue");
- setCategory(CAT_URBANISME);
- }
+ public NumerosRueHandler() {
+ super(12673, "addr:housenumber");
+ setWikiPage("Numéros de rue");
+ setCategory(CAT_URBANISME);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Numeros");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Numeros");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- Map associatedStreets = new HashMap();
-
- for (Node n : ds.getNodes()) {
- replace(n, "no", "addr:housenumber");
- n.remove("numero");
- replace(n, "lib_off", "addr:street");
- n.remove("mot_directeur");
- n.remove("name");
- n.remove("rivoli");
- n.remove("nrivoli");
- //n.remove("sti");
- n.remove("color");
- String streetName = NamesFrUtils.checkStreetName(n, "addr:street");
- Relation street = associatedStreets.get(n.get("sti"));
- if (street == null) {
- associatedStreets.put(n.get("sti"), street = new Relation());
- street.put("type", "associatedStreet");
- street.put("name", streetName);
- ds.addPrimitive(street);
- }
- street.addMember(new RelationMember("house", n));
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ Map associatedStreets = new HashMap();
+
+ for (Node n : ds.getNodes()) {
+ replace(n, "no", "addr:housenumber");
+ n.remove("numero");
+ replace(n, "lib_off", "addr:street");
+ n.remove("mot_directeur");
+ n.remove("name");
+ n.remove("rivoli");
+ n.remove("nrivoli");
+ //n.remove("sti");
+ n.remove("color");
+ String streetName = NamesFrUtils.checkStreetName(n, "addr:street");
+ Relation street = associatedStreets.get(n.get("sti"));
+ if (street == null) {
+ associatedStreets.put(n.get("sti"), street = new Relation());
+ street.put("type", "associatedStreet");
+ street.put("name", streetName);
+ ds.addPrimitive(street);
+ }
+ street.addMember(new RelationMember("house", n));
+ }
+ }
}
Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/SanisetteHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/SanisetteHandler.java (revision 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/SanisetteHandler.java (revision 28554)
@@ -22,37 +22,37 @@
public class SanisetteHandler extends ToulouseDataSetHandler {
- public SanisetteHandler() {
- super(12584, "amenity=toilets");
- setWikiPage("Sanisettes");
- setCategory(CAT_URBANISME);
- }
+ public SanisetteHandler() {
+ super(12584, "amenity=toilets");
+ setWikiPage("Sanisettes");
+ setCategory(CAT_URBANISME);
+ }
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsCsvKmzTabFilename(filename, "Sanisette");
- }
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsCsvKmzTabFilename(filename, "Sanisette");
+ }
- @Override
- public void updateDataSet(DataSet ds) {
- for (Node n : ds.getNodes()) {
- n.remove("name");
- n.put("amenity", "toilets");
- n.put("supervised", "no");
- n.put("unisex", "yes");
- n.put("fee", "no");
- n.put("operator", "JCDecaux");
- n.put("opening_hours", "24/7");
- replace(n, "numero", "ref:grandtoulouse");
- replace(n, "PMR", "wheelchair", new String[]{"true", "false"}, new String[]{"yes", "no"});
- String valide = n.get("emplacement_valide");
- if (valide != null && valide.equalsIgnoreCase("non")) {
- n.put("fixme", "L'emplacement semble invalide !");
- } else {
- n.remove("emplacement_valide");
- }
- n.remove("adresse");
- n.remove("INSEE");
- n.remove("color");
- }
- }
+ @Override
+ public void updateDataSet(DataSet ds) {
+ for (Node n : ds.getNodes()) {
+ n.remove("name");
+ n.put("amenity", "toilets");
+ n.put("supervised", "no");
+ n.put("unisex", "yes");
+ n.put("fee", "no");
+ n.put("operator", "JCDecaux");
+ n.put("opening_hours", "24/7");
+ replace(n, "numero", "ref:grandtoulouse");
+ replace(n, "PMR", "wheelchair", new String[]{"true", "false"}, new String[]{"yes", "no"});
+ String valide = n.get("emplacement_valide");
+ if (valide != null && valide.equalsIgnoreCase("non")) {
+ n.put("fixme", "L'emplacement semble invalide !");
+ } else {
+ n.remove("emplacement_valide");
+ }
+ n.remove("adresse");
+ n.remove("INSEE");
+ n.remove("color");
+ }
+ }
}
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 28553)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/urbanisme/VoirieHandler.java (revision 28554)
@@ -31,94 +31,94 @@
public class VoirieHandler extends ToulouseDataSetHandler {
- protected final Map> map = new HashMap>();
-
- private String streetField;
-
- public VoirieHandler() {
- this(12693, "lib_off", "highway");
- setName("Filaire de voirie");
- setCategory(CAT_URBANISME);
- }
-
- protected VoirieHandler(int portalId, String streetField, String relevantKey) {
- super(portalId, relevantKey);
- this.streetField = streetField;
- map.put("motorway", Arrays.asList(new String[] {"A6", "AUTOROUTE "}));
- map.put("trunk", Arrays.asList(new String[] {"ROCADE "}));
- map.put("secondary", Arrays.asList(new String[] {"AV ", "BD ", "ALL ", "PONT ", "RTE ", "PORT ", "BOULINGRIN"}));
- map.put("residential", Arrays.asList(new String[] {"RUE ", "GRANDE-RUE ", "PROM ", "CHE", "CAMINOT ", "IMP ", "COURS ",
- "LOT ", "ANC", "VIEUX ", "PL ", "CLOS ", "CITE ", "RESIDENCE ", "SENTIER ", "QU ", "SQ ", "VOIE ", "ESP "}));
- map.put("unclassified", Arrays.asList(new String[] {"ZONE "}));
- map.put("road", Arrays.asList(new String[] {"VA "}));
- }
-
- @Override
- public boolean acceptsFilename(String filename) {
- return acceptsKmzTabFilename(filename, "Voies");
- }
+ protected final Map> map = new HashMap>();
+
+ private String streetField;
+
+ public VoirieHandler() {
+ this(12693, "lib_off", "highway");
+ setName("Filaire de voirie");
+ setCategory(CAT_URBANISME);
+ }
+
+ protected VoirieHandler(int portalId, String streetField, String relevantKey) {
+ super(portalId, relevantKey);
+ this.streetField = streetField;
+ map.put("motorway", Arrays.asList(new String[] {"A6", "AUTOROUTE "}));
+ map.put("trunk", Arrays.asList(new String[] {"ROCADE "}));
+ map.put("secondary", Arrays.asList(new String[] {"AV ", "BD ", "ALL ", "PONT ", "RTE ", "PORT ", "BOULINGRIN"}));
+ map.put("residential", Arrays.asList(new String[] {"RUE ", "GRANDE-RUE ", "PROM ", "CHE", "CAMINOT ", "IMP ", "COURS ",
+ "LOT ", "ANC", "VIEUX ", "PL ", "CLOS ", "CITE ", "RESIDENCE ", "SENTIER ", "QU ", "SQ ", "VOIE ", "ESP "}));
+ map.put("unclassified", Arrays.asList(new String[] {"ZONE "}));
+ map.put("road", Arrays.asList(new String[] {"VA "}));
+ }
+
+ @Override
+ public boolean acceptsFilename(String filename) {
+ return acceptsKmzTabFilename(filename, "Voies");
+ }
- private String applyHighwayTag(String name, IPrimitive p) {
- if (name != null && p != null) {
- for (String key : map.keySet()) {
- for (String value : map.get(key)) {
- if (name.startsWith(value)) {
- p.put("highway", key);
- return key;
- }
- }
- }
- }
- 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);
- if (name != null) {
- w.remove(streetField);
- w.remove("mot_directeur");
- w.remove("color");
- 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
- w.put("junction", "roundabout");
- } else if (name.matches("RTE D[0-9]+")) {
- w.put("ref", name.split(" ")[1]);
- }
-
- w.put("name", name);
-
- if (name.matches("D[0-9]+.*")) {
- w.put("highway", "secondary");
- replace(w, "name", "ref");
- } else if (!name.startsWith("VA ")) { // Unknown labels
- name = NamesFrUtils.checkStreetName(w, "name");
- }
-
- if (!name.startsWith("VA ")) { // Unknown labels
- Relation street = associatedStreets.get(getStreetId(w));
- if (street == null) {
- associatedStreets.put(getStreetId(w), street = new Relation());
- street.put("type", "associatedStreet");
- street.put("name", name);
- ds.addPrimitive(street);
- }
- street.addMember(new RelationMember("street", w));
- }
- }
- }
- }
+ private String applyHighwayTag(String name, IPrimitive p) {
+ if (name != null && p != null) {
+ for (String key : map.keySet()) {
+ for (String value : map.get(key)) {
+ if (name.startsWith(value)) {
+ p.put("highway", key);
+ return key;
+ }
+ }
+ }
+ }
+ 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);
+ if (name != null) {
+ w.remove(streetField);
+ w.remove("mot_directeur");
+ w.remove("color");
+ 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
+ w.put("junction", "roundabout");
+ } else if (name.matches("RTE D[0-9]+")) {
+ w.put("ref", name.split(" ")[1]);
+ }
+
+ w.put("name", name);
+
+ if (name.matches("D[0-9]+.*")) {
+ w.put("highway", "secondary");
+ replace(w, "name", "ref");
+ } else if (!name.startsWith("VA ")) { // Unknown labels
+ name = NamesFrUtils.checkStreetName(w, "name");
+ }
+
+ if (!name.startsWith("VA ")) { // Unknown labels
+ Relation street = associatedStreets.get(getStreetId(w));
+ if (street == null) {
+ associatedStreets.put(getStreetId(w), street = new Relation());
+ street.put("type", "associatedStreet");
+ street.put("name", name);
+ ds.addPrimitive(street);
+ }
+ street.addMember(new RelationMember("street", w));
+ }
+ }
+ }
+ }
}