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

Timestamp:

2012-03-09T22:06:09+01:00 (13 years ago)

Author:

donvip

Message:

opendata: Neptune file support, fix crash on layer righ click, view license of data sets

Location:

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

Files:

• ToulouseConstants.java (modified) (1 diff)
• ToulouseModule.java (modified) (2 diffs)
• datasets/ToulouseDataSetHandler.java (modified) (2 diffs)
• datasets/transport/ReseauTisseoHandler.java (modified) (2 diffs)
• datasets/transport/TisseoHandler.java (deleted)

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

@@ -21 +21 @@
         
         /**
-         * Source
+         * Sources
          */
-        public static final String SOURCE = "GrandToulouse";
+        public static final String SOURCE_GRAND_TOULOUSE = "GrandToulouse";
+        public static final String SOURCE_TISSEO = "Tisséo SMTC";
         
         /**

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

@@ -47 +47 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.PistesCyclablesHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.ReseauTisseoHandler;
-import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.TisseoHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.TramwayStationHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport.VeloToulouseHandler;
@@ -96 +95 @@
         handlers.add(new EquipementCulturelBalmaHandler());
         handlers.add(new InstallationSportiveBalmaHandler());
-        handlers.add(new TisseoHandler());
     }
 }

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

@@ -54 +54 @@
         @Override
         public String getSource() {
-                return SOURCE;
+                return SOURCE_GRAND_TOULOUSE;
         }
 
@@ -85 +85 @@
         
         /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getLicenseURL()
+         */
+        @Override
+        public URL getLicenseURL() {
+                try {
+                        return new URL(getLocalPortalURL().toString()+"/license");
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+
+        /* (non-Javadoc)
          * @see org.openstreetmap.josm.plugins.fr.opendata.datasets.AbstractDataSetHandler#getWikiURL()
          */

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

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.transport;
 
+import java.io.File;
+import java.net.URL;
+
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler;
 
@@ -27 +31 @@
         @Override
         public boolean acceptsFilename(String filename) {
-                return acceptsZipFilename(filename, "14022-reseau-tisseo-metro-bus-tram-");
+                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) || acceptsXmlNeptuneFile(file));
+        }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDataSetHandler#getNeptuneSchema()
+         */
+        @Override
+        protected URL getNeptuneSchema() {
+                return ReseauTisseoHandler.class.getResource(TOULOUSE_NEPTUNE_XSD);
+        }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler#getSource()
+         */
+        @Override
+        public String getSource() {
+                return SOURCE_TISSEO;
         }
 
         @Override
         public void updateDataSet(DataSet ds) {
-                // TODO Auto-generated method stub
-                
+                for (OsmPrimitive p : ds.allPrimitives()) {
+                        p.put("operator", "Tisséo");
+                        p.put("network", "fr_tisseo");
+                }
         }
 }