Merge remote-tracking branch 'randomjunk/minor-updates'

diff --git a/potlatch2.mxml b/potlatch2.mxml
index c8b210b62ca8ee0a0a5cebdb995f61738f7bbb86..a00c46d79ef2defdb1e6441e3fe31cb0a9d4b8bf 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -434,7 +434,10 @@
 
                        // Get the tags
             var tags:Array = event.dragSource.dataForFormat('tags') as Array;
-            var mapLoc:Point = Globals.vars.root.globalToLocal(new Point(event.stageX, event.stageY));
+
+            // If you dnd quick enough, this exposes a flex bug and event.stageX/Y become negative.
+            // Take the mouse positions from a displayObject's stage for consistent results.
+            var mapLoc:Point = Globals.vars.root.globalToLocal(new Point(event.target.stage.mouseX, event.target.stage.mouseY));
             var lat:Number = Globals.vars.root.coord2lat(mapLoc.y);
             var lon:Number = Globals.vars.root.coord2lon(mapLoc.x);
             

diff --git a/resources/imagery.xml b/resources/imagery.xml
index b246a52f4926fbd98c2983dacd1debf5641d1aea..0a0de6771159e6f75da8e553b981bf39244693dc 100644 (file)
--- a/resources/imagery.xml
+++ b/resources/imagery.xml
@@ -46,7 +46,7 @@
        </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS 7th Series historic</name>
-               <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.png</url>
+               <url>http://ooc.openstreetmap.org/os7/$z/$x/$y.jpg</url>
                <sourcetag>OS7</sourcetag>
        </set>
        <set minlat="49.8" minlon="-5.8" maxlat="55.8" maxlon="1.9">