Changeset 30097 in osm

Timestamp:

2013-11-25T02:47:26+01:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] update plugin and toulouse module

Location:

applications/editors/josm/plugins/opendata

Files:

• build.xml (modified) (1 diff)
• modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/ToulouseModule.java (modified) (2 diffs)
• modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/BureauxVoteDecoupageHandler.java (added)
• modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/citoyennete/BureauxVoteHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="6358"/>
+    <property name="plugin.main.version" value="6412"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

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

@@ -30 +30 @@
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.ToulouseDataSetHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.associations.Club3eAgeHandler;
+import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.citoyennete.BureauxVoteDecoupageHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.citoyennete.BureauxVoteHandler;
 import org.openstreetmap.josm.plugins.opendata.modules.fr.toulouse.datasets.citoyennete.MairieAnnexeHandler;
@@ -90 +91 @@
         handlers.add(PMRHandler.class);
         handlers.add(PistesCyclablesHandler.class);
+        handlers.add(BureauxVoteDecoupageHandler.class);
         handlers.add(BureauxVoteHandler.class);
         handlers.add(Club3eAgeHandler.class);

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

@@ -38 +38 @@
             replace(r, "TEXT", "name");
             r.put("polling_station", "2012");
+            r.put("building", "yes");
+            String name = r.getName();
+            if (name != null) {
+                if (name.contains("ECOLE") || name.contains("MATERNELLE")) {
+                    r.put("amenity", "school");
+                } else if (name.contains("MAIRIE")) {
+                    r.put("amenity", "townhall");
+                } else if (name.contains("PISCINE")) {
+                    r.put("leisure", "swimming_pool");
+                }
+            }
         }
     }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/DataSetUpdater.java

@@ -21 +21 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.SimplifyWayAction;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 
@@ -40 +45 @@
                         handler.checkDataSetSource(dataSet);
                         handler.checkNames(dataSet);
+                        // Replace multipolygons with single untagged member by their sole member
+                        for (Relation r : dataSet.getRelations()) {
+                            if (r.isMultipolygon() && r.getMembersCount() == 1) {
+                                OsmPrimitive outer = r.getMember(0).getMember();
+                                if (!outer.isTagged()) {
+                                    r.remove("type");
+                                    r.removeMember(0);
+                        outer.setKeys(r.getKeys());
+                                    dataSet.removePrimitive(r);
+                                }
+                            }
+                        }
+                        // Simplify ways geometries
+                        for (Way w : dataSet.getWays()) {
+                            SequenceCommand command = Main.main.menu.simplifyWay.simplifyWay(w, 0.25);
+                            if (command != null) {
+                                Main.main.undoRedo.addNoRedraw(command);
+                            }
+                        }
                 }
         }