Changeset 17528 in osm for applications/editors/josm

Timestamp:

2009-09-08T23:14:16+02:00 (15 years ago)

Author:

guggis

Message:

Updating to JOSM r2082

Location:

applications/editors/josm/plugins/cadastre-fr

Files:

• build.xml (modified) (1 diff)
• src/cadastre_fr/CadastrePlugin.java (modified) (1 diff)
• src/cadastre_fr/CheckSourceUploadHook.java (modified) (2 diffs)
• src/cadastre_fr/DownloadSVGBuilding.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/build.xml

@@ -27 +27 @@
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/Cadastre"/>
                 <attribute name="Plugin-Mainversion" value="2012"/>
-                <attribute name="Plugin-Stage" value="60"/>
+                <attribute name="Plugin-Stage" value="2082"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java

@@ -124 +124 @@
         refreshMenu();
 
-        // add a hook at uploading to insert/verify the source=cadastre tag
-        LinkedList<UploadHook> hooks = ((UploadAction) Main.main.menu.upload).uploadHooks;
-        hooks.add(0, new CheckSourceUploadHook());
+        UploadAction.registerUploadHook(new CheckSourceUploadHook());
     }
 

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java

@@ -16 +16 @@
 import org.openstreetmap.josm.actions.UploadAction.UploadHook;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -35 +36 @@
      * Add the tag "source" if it doesn't exist for all new Nodes and Ways before uploading
      */
-    public boolean checkUpload(Collection<OsmPrimitive> add, Collection<OsmPrimitive> update, Collection<OsmPrimitive> delete)
+    public boolean checkUpload(APIDataSet apiDataSet) 
     {
-        if (CadastrePlugin.autoSourcing && CadastrePlugin.pluginUsed && !add.isEmpty()) {
+        if (CadastrePlugin.autoSourcing && CadastrePlugin.pluginUsed && !apiDataSet.getPrimitivesToAdd().isEmpty()) {
             Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
-            for (OsmPrimitive osm : add) {
+            for (OsmPrimitive osm : apiDataSet.getPrimitivesToAdd()) {
                 if ((osm instanceof Node || osm instanceof Way)
                         && (osm.getKeys() == null || !tagSourceExist(osm))) {

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java

@@ -143 +143 @@
                         }
                     if (w.getNodesCount() == replaced)
-                        w.delete(true);
+                        w.setDeleted(true);
                 }
-                n.delete(true);
+                n.setDeleted(true);
             }
 
@@ -152 +152 @@
         Collection<Command> cmds = new LinkedList<Command>();
         for (Node node : svgDataSet.nodes)
-            if (!node.deleted)
+            if (!node.isDeleted())
                 cmds.add(new AddCommand(node));
         for (Way way : svgDataSet.ways)
-            if (!way.deleted)
+            if (!way.isDeleted())
                 cmds.add(new AddCommand(way));
         Main.main.undoRedo.add(new SequenceCommand(tr("Create buildings"), cmds));
@@ -191 +191 @@
         double epsilon = 0.05; // smallest distance considering duplicate node
         for (Node n : nodes) {
-            if (!n.deleted && !n.incomplete) {
+            if (!n.isDeleted() && !n.incomplete) {
                 double dist = n.getEastNorth().distance(nodeToAdd.getEastNorth());
                 if (dist < epsilon) {