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

Files:

• ParisLicense.java (added)
• datasets/ParisDataSetHandler.java (modified) (3 diffs)
• datasets/urbanisme/SanisettesHandler.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/ParisDataSetHandler.java

@@ -22 +22 @@
 import org.openstreetmap.josm.plugins.opendata.core.datasets.fr.FrenchDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.paris.ParisConstants;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.paris.ParisLicense;
 
 public abstract class ParisDataSetHandler extends FrenchDataSetHandler implements ParisConstants {
@@ -53 +54 @@
         private final void init(int documentId) {
                 this.documentId = documentId;
+                setLicense(new ParisLicense());
+                try {
+                        if (documentId > 0) {
+                                setLocalPortalURL(PORTAL + "jsp/site/Portal.jsp?document_id="+documentId + "&portlet_id="+portletId);
+                        }
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
         }
 
@@ -69 +78 @@
         public String getLocalPortalIconName() {
                 return ICON_PARIS_24;
-        }
-
-        public final URL getLocalPortalURL() {
-                try {
-                        if (documentId > 0) {
-                                return new URL(PORTAL + "jsp/site/Portal.jsp?document_id="+documentId + "&portlet_id="+portletId);
-                        }
-                } catch (MalformedURLException e) {
-                        e.printStackTrace();
-                }
-                return null;
         }
         

applications/editors/josm/plugins/opendata/modules/fr.paris/src/org/openstreetmap/josm/plugins/opendata/modules/fr/paris/datasets/urbanisme/SanisettesHandler.java

@@ -32 +32 @@
                 super(93);
                 setName("Sanisettes");
+                getShpHandler().setCheckNodeProximity(true);
         }
 
@@ -116 +117 @@
                 return PORTAL+"hn/sanisettes.zip";
         }
-
-        /* (non-Javadoc)
-         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#checkShpNodeProximity()
-         */
-        @Override
-        public boolean checkShpNodeProximity() {
-                return true;
-        }
 }