remove errors that seem to have been introduced in recent days

diff --git a/net/systemeD/potlatch2/controller/SelectedMultiple.as b/net/systemeD/potlatch2/controller/SelectedMultiple.as
index ccb6c6039f8ba7c6499abd53b58633875975183c..1eb56b065a1f6c65c587ed029d18cc02e9b319ef 100644 (file)
--- a/net/systemeD/potlatch2/controller/SelectedMultiple.as
+++ b/net/systemeD/potlatch2/controller/SelectedMultiple.as
@@ -62,7 +62,7 @@ package net.systemeD.potlatch2.controller {
                            var msg:String = 1 + mergers + " ways merged."
                 var conflictTags2:Array = new Array();
                 // there must be a better way of avoiding duplicates...
-                for each (var conflict in conflictTags) conflictTags2.push(conflict);
+                for each (var conflict:String in conflictTags) conflictTags2.push(conflict);
                 if (conflictTags2.length>0)
                     msg += " *Warning* The following tags conflicted and need attention: " + conflictTags2;
                 map.connection.dispatchEvent(new AttentionEvent(AttentionEvent.ALERT, null, msg));

diff --git a/net/systemeD/potlatch2/tools/Circularise.as b/net/systemeD/potlatch2/tools/Circularise.as
index d0e51b6734a8b71225d28f3ce93138c751afb007..6a0cf9f479e72f2dcbb000f14b7f036267dccab5 100644 (file)
--- a/net/systemeD/potlatch2/tools/Circularise.as
+++ b/net/systemeD/potlatch2/tools/Circularise.as
@@ -152,7 +152,6 @@ package net.systemeD.potlatch2.tools {
                        // Average distance to centre
                        // (first + last are the same node, don't use twice)
                        for (var i:uint = 0; i < way.length - 1; i++) {
-                             Math.pow(way.getNode(i).latp-cy,2)));
                                d+=Math.sqrt(Math.pow(way.getNode(i).lon -cx,2)+
                                                         Math.pow(way.getNode(i).latp-cy,2));
                        }