Changeset 28113 in osm for applications/editors/josm/plugins/opendata/modules/fr.lemans/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

File:

• applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java (modified) (4 diffs)

applications/editors/josm/plugins/opendata/modules/fr.lemans/src/org/openstreetmap/josm/plugins/opendata/modules/fr/lemans/datasets/LeMansDataSetHandler.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDataSetHandler;
+import org.openstreetmap.josm.plugins.opendata.core.licenses.License;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.lemans.LeMansConstants;
 import org.openstreetmap.josm.tools.Pair;
 
 public abstract class LeMansDataSetHandler extends FrenchDataSetHandler implements LeMansConstants {
-        
-        private String uuid;
         
         private String kmzUuid;
@@ -58 +57 @@
 
         private final void init(String uuid) {
-                this.uuid = uuid;
+                try {
+                        setLicense(License.ODbL);
+                        if (uuid != null && !uuid.isEmpty()) {
+                                setLocalPortalURL(PORTAL + "page.do?t=2&uuid=" + uuid);
+                        }
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
         }
                 
@@ -73 +79 @@
                 return SOURCE_LE_MANS;
         }
-
-        public final URL getLocalPortalURL() {
-                try {
-                        if (uuid != null && !uuid.isEmpty()) {
-                                return new URL(PORTAL + "page.do?t=2&uuid=" + uuid);
-                        }
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                }
-                return null;
-        }
         
         /* (non-Javadoc)
          * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getLicenseURL()
          */
-        @Override
+        /*@Override
         public URL getLicenseURL() {
                 try {
@@ -96 +91 @@
                 }
                 return null;
-        }
-        
+        }*/
+
         /* (non-Javadoc)
          * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataURLs()