Changeset 28113 in osm for applications/editors/josm/plugins/opendata/modules/fr.sncf/src

Timestamp:

2012-03-19T00:23:49+01:00 (13 years ago)

Author:

donvip

Message:

opendata: large code reorganization, ask for license agreement before downloading, from embedded HTML/RTF files for ODbL and LO/OL

Location:

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

Files:

• SncfLicense.java (added)
• datasets/EquipementsHandler.java (modified) (3 diffs)
• datasets/SncfDataSetHandler.java (modified) (3 diffs)

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

@@ +1 @@
+//    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 <http://www.gnu.org/licenses/>.
 package org.openstreetmap.josm.plugins.opendata.modules.fr.sncf.datasets;
 
@@ -8 +23 @@
 public class EquipementsHandler extends SncfDataSetHandler {
 
+        private class LambertIICsvHandler extends InternalCsvHandler {
+                @Override
+                public LatLon getCoor(EastNorth en, String[] fields) {
+                        // Lambert II coordinates offset by 2000000 (see http://fr.wikipedia.org/wiki/Projection_conique_conforme_de_Lambert#Projections_officielles_en_France_métropolitaine)
+                        return super.getCoor(new EastNorth(en.getX(), en.getY()-2000000), fields);
+                }
+        }
+        
         public EquipementsHandler() {
                 super("equipementsgares");
+                setCsvHandler(new LambertIICsvHandler());
                 setSingleProjection(lambert4Zones[1]); // Lambert II
         }
@@ -25 +49 @@
                 }
         }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDataSetHandler#getSpreadSheetCoor(org.openstreetmap.josm.data.coor.EastNorth, java.lang.String[])
-         */
-        @Override
-        public LatLon getSpreadSheetCoor(EastNorth en, String[] fields) {
-                // Lambert II coordinates offset by 2000000 (see http://fr.wikipedia.org/wiki/Projection_conique_conforme_de_Lambert#Projections_officielles_en_France_métropolitaine)
-                return super.getSpreadSheetCoor(new EastNorth(en.getX(), en.getY()-2000000), fields);
-        }
 }

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

@@ +1 @@
+//    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 <http://www.gnu.org/licenses/>.
 package org.openstreetmap.josm.plugins.opendata.modules.fr.sncf.datasets;
 
 import java.net.MalformedURLException;
-import java.net.URL;
 
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.sncf.SncfConstants;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.sncf.SncfLicense;
 
 public abstract class SncfDataSetHandler extends FrenchDataSetHandler implements SncfConstants {
-        
-        private String portalId;
         
         public SncfDataSetHandler(String portalId) {
@@ -45 +58 @@
         
         private final void init(String portalId) {
-                this.portalId = portalId;
+                setLicense(new SncfLicense());
+                if (portalId != null && !portalId.isEmpty()) {
+                        try {
+                                setLocalPortalURL(PORTAL + portalId);
+                        } catch (MalformedURLException e) {
+                                e.printStackTrace();
+                        }
+                }
         }
 
@@ -71 +91 @@
                 return ICON_16;
         }
-
-        public final URL getLocalPortalURL() {
-                try {
-                        if (portalId != null) {
-                                return new URL(PORTAL + portalId);
-                        }
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                }
-                return null;
-        }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getLicenseURL()
-         */
-        @Override
-        public URL getLicenseURL() {
-                try {
-                        return new URL("http://test.data-sncf.com/licence");
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                }
-                return null;
-        }
 }