Changeset 28044 in osm for applications/editors/josm/plugins/opendata/modules/fr.paris/src

Timestamp:

2012-03-11T17:50:51+01:00 (13 years ago)

Author:

donvip

Message:

opendata: allow to download Paris and Toulouse data

Location:

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

Files:

• ParisConstants.java (modified) (1 diff)
• datasets/ParisDataSetHandler.java (modified) (2 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/ParisConstants.java

@@ -28 +28 @@
          * Portal
          */
-        public static final String PORTAL = "http://opendata.paris.fr/opendata/jsp/site/Portal.jsp?";
+        public static final String PORTAL = "http://opendata.paris.fr/opendata/";
 
         /**

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

@@ -26 +26 @@
         
         private int documentId;
-        private int portletId;
+        private static final int portletId = 106; // FIXME
         
-        public ParisDataSetHandler(int documentId, int portletId) {
-                init(documentId, portletId);
+        public ParisDataSetHandler(int documentId) {
+                init(documentId);
         }
         
-        public ParisDataSetHandler(int documentId, int portletId, String relevantTag) {
+        public ParisDataSetHandler(int documentId, String relevantTag) {
                 super(relevantTag);
-                init(documentId, portletId);
+                init(documentId);
         }
         
-        public ParisDataSetHandler(int documentId, int portletId, boolean relevantUnion, String ... relevantTags) {
+        public ParisDataSetHandler(int documentId, boolean relevantUnion, String ... relevantTags) {
                 super(relevantUnion, relevantTags);
-                init(documentId, portletId);
+                init(documentId);
         }
 
-        public ParisDataSetHandler(int documentId, int portletId, String ... relevantTags) {
-                this(documentId, portletId, false, relevantTags);
+        public ParisDataSetHandler(int documentId, String ... relevantTags) {
+                this(documentId, false, relevantTags);
         }
 
-        public ParisDataSetHandler(int documentId, int portletId, boolean relevantUnion, Tag ... relevantTags) {
+        public ParisDataSetHandler(int documentId, boolean relevantUnion, Tag ... relevantTags) {
                 super(relevantUnion, relevantTags);
-                init(documentId, portletId);
+                init(documentId);
         }
 
-        private final void init(int documentId, int portletId) {
+        private final void init(int documentId) {
                 this.documentId = documentId;
-                this.portletId = portletId;
         }
 
@@ -75 +74 @@
                 try {
                         if (documentId > 0) {
-                                return new URL(PORTAL + "document_id="+documentId + "&portlet_id="+portletId);
+                                return new URL(PORTAL + "jsp/site/Portal.jsp?document_id="+documentId + "&portlet_id="+portletId);
+                        }
+                } catch (MalformedURLException e) {
+                        e.printStackTrace();
+                }
+                return null;
+        }
+        
+        protected abstract String getDirectLink();
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#getDataURL()
+         */
+        @Override
+        public URL getDataURL() {
+                try {
+                        if (documentId > 0) {
+                                return new URL(PORTAL + "rating/download/?id_resource="+documentId + "&type_resource=document&url="+getDirectLink());
                         }
                 } catch (MalformedURLException e) {

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

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.opendata.modules.fr.paris.datasets.urbanisme;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.openstreetmap.josm.corrector.UserCancelException;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.opendata.core.datasets.WayCombiner;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.paris.datasets.ParisDataSetHandler;
 
@@ -22 +30 @@
 
         public SanisettesHandler() {
-                super(93, 106);
+                super(93);
+                setName("Sanisettes");
         }
 
         @Override
         public boolean acceptsFilename(String filename) {
-                return acceptsShpFilename(filename, "sanisettes");
+                return acceptsShpFilename(filename, "sanisettes") || acceptsZipFilename(filename, "sanisettes");
+        }
+
+        private boolean wayBelongsTo(Way a, List<Way> ways) {
+                for (Way b : ways) {
+                        if (a.getNode(0).equals(b.getNode(0)) || a.getNode(0).equals(b.getNode(b.getNodesCount()-1))
+                         || a.getNode(a.getNodesCount()-1).equals(b.getNode(0)) || a.getNode(a.getNodesCount()-1).equals(b.getNode(b.getNodesCount()-1))) {
+                                return true;
+                        }
+                }
+                return false;
+        }
+        
+        private boolean wayProcessed(Way a, List<List<Way>> waysToCombine) {
+                for (List<Way> ways : waysToCombine) {
+                        for (Way b : ways) {
+                                if (a.equals(b)) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+        
+        @Override
+        public void updateDataSet(DataSet ds) {
+                
+                List<Way> sourceWays = new ArrayList<Way>(ds.getWays());
+                List<List<Way>> waysToCombine = new ArrayList<List<Way>>();
+                
+                for (Iterator<Way> it = sourceWays.iterator(); it.hasNext();) {
+                        Way w = it.next();
+                        it.remove();
+                        if (!wayProcessed(w, waysToCombine)) {
+                                List<Way> list = new ArrayList<Way>();
+                                list.add(w);
+                                boolean finished = false;
+                                List<Way> sourceWays2 = new ArrayList<Way>(sourceWays);
+                                while (!finished) {
+                                        int before = list.size();
+                                        for (Iterator<Way> it2 = sourceWays2.iterator(); it2.hasNext();) {
+                                                Way w2 = it2.next();
+                                                if (wayBelongsTo(w2, list)) {
+                                                        list.add(w2);
+                                                        it2.remove();
+                                                }
+                                        }
+                                        int after = list.size();
+                                        finished = (after == before);
+                                }
+                                if (list.size() > 1) {
+                                        waysToCombine.add(list);
+                                }
+                        }
+                }
+                                
+                for (List<Way> ways : waysToCombine) {
+                        try {
+                                WayCombiner.combineWays(ways);
+                        } catch (UserCancelException e) {
+                                return;
+                        }
+                }
+                
+                for (Way w : ds.getWays()) {
+                        if (w.getNodesCount() <= 3) {
+                                ds.removePrimitive(w);
+                                for (Node n : w.getNodes()) {
+                                        ds.removePrimitive(n);
+                                }
+                        } else {
+                                w.put("amenity", "toilets");
+                        }
+                }
         }
 
         @Override
-        public void updateDataSet(DataSet ds) {
+        protected String getDirectLink() {
+                return PORTAL+"hn/sanisettes.zip";
+        }
+
+        /* (non-Javadoc)
+         * @see org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler#checkShpNodeProximity()
+         */
+        @Override
+        public boolean checkShpNodeProximity() {
+                return true;
         }
 }