Changeset 28699 in osm for applications/editors/josm/plugins/opendata

Timestamp:

2012-09-08T20:52:36+02:00 (12 years ago)

Author:

donvip

Message:

[josm_opendata] Basic support for splitting by municipalities

Location:

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

Files:

• ToulouseModule.java (modified) (3 diffs)
• datasets/ToulouseDataSetHandler.java (modified) (3 diffs)
• datasets/ToulouseMunicipalities.java (added)

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

@@ -120 +120 @@
             @Override
             public int compare(Relation o1, Relation o2) {
-                return o1.get("ref").compareTo(o2.get("ref"));
+                if (o1.hasKey("name") && o2.hasKey("name")) {
+                    return o1.get("name").compareTo(o2.get("name"));
+                } else if (o1.hasKey("ref") && o2.hasKey("ref")) {
+                    return o1.get("ref").compareTo(o2.get("ref"));
+                } else {
+                    return o1.get("description").compareTo(o2.get("description"));
+                }
             }
         });
@@ -138 +144 @@
             if (data.allPrimitives().isEmpty()) {
                 for (final ToulouseDataSetHandler handler : new ToulouseDataSetHandler[]{
-                        new SecteursHandler(), new QuartiersHandler()}) {
+                        new CommuneHandler(), new SecteursHandler(), new QuartiersHandler()}) {
                     Main.worker.submit(new Runnable() {
                         @Override
@@ -159 +165 @@
     }
     
+    public static final Collection<Relation> getMunicipalities() {
+        return getBoundaries(8);
+    }
+    
     public static final Collection<Relation> getSectors() {
         return getBoundaries(10);

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

@@ -92 +92 @@
                 setDataURL(url+"/resource/document");
             }
+            addTool(new SplitByMunicipality());
             addTool(new SplitBySector());
             addTool(new SplitByNeighbourhood());
@@ -159 +160 @@
                     }
                 }
-                Main.main.addLayer(new OdDataLayer(data, baseName+"/"+boundary.get("ref"), null, ToulouseDataSetHandler.this));
+                if (!data.allPrimitives().isEmpty()) {
+                    String name = boundary.get("name");
+                    if (name == null || name.isEmpty()) {
+                        name = boundary.get("ref");
+                    }
+                    if (name == null || name.isEmpty()) {
+                        name = boundary.get("description");
+                    }
+                    Main.main.addLayer(new OdDataLayer(data, baseName+"/"+name, null, ToulouseDataSetHandler.this));
+                }
             }
         }
@@ -189 +199 @@
     }
     
+    protected class SplitByMunicipality extends SplitAction {
+        public SplitByMunicipality() {
+            super(marktr("Split by municipality"), tr("Split this data by municipality (admin_level=8)."));
+        }
+        @Override
+        protected Collection<Relation> getBoundaries() {
+            return ToulouseModule.getMunicipalities();
+        }
+    }
+
     protected class SplitBySector extends SplitAction {
         public SplitBySector() {