]> git.openstreetmap.org Git - potlatch2.git/commitdiff
Merge branch 'master' into mapquest
authorAntony Pegg <antthelimey@gmail.com>
Mon, 18 Apr 2011 15:38:01 +0000 (11:38 -0400)
committerAntony Pegg <antthelimey@gmail.com>
Mon, 18 Apr 2011 15:38:01 +0000 (11:38 -0400)
net/systemeD/halcyon/connection/Connection.as
net/systemeD/halcyon/connection/XMLConnection.as
resources/imagery.xml

index 0821a5b94f9a06ea65ee1f72e976a8a12fbdd2c0..f355b9b935c3560be989cc8a8bf54a8a611898d4 100644 (file)
@@ -388,7 +388,7 @@ package net.systemeD.halcyon.connection {
                public function purgeIfFull(left:Number,right:Number,top:Number,bottom:Number):void {
                        if (waycount<=MAXWAYS) return;
                        purgeOutside(left,right,top,bottom);
-                       loadedBboxes=([left,right,top,bottom]);
+                       loadedBboxes=[[left,right,top,bottom]];
                }
 
                // Changeset tracking
index 0bf342d1e08852e5aa9dc6a5b09a0de315c780fd..a76f5ff352bac36a4a41ae42cbec78cd0186dbc9 100644 (file)
@@ -179,7 +179,8 @@ package net.systemeD.halcyon.connection {
             urlReq.method = "POST";
                        if (xml) { urlReq.data = xml.toXMLString(); } else { urlReq.data = true; }
             urlReq.contentType = "application/xml";
-            urlReq.requestHeaders = new Array(new URLRequestHeader("X_HTTP_METHOD_OVERRIDE", "PUT"));
+            urlReq.requestHeaders = [ new URLRequestHeader("X_HTTP_METHOD_OVERRIDE", "PUT"), 
+                                                 new URLRequestHeader("X-Error-Format", "XML") ];
             var loader:URLLoader = new URLLoader();
             loader.addEventListener(Event.COMPLETE, onComplete);
             loader.addEventListener(IOErrorEvent.IO_ERROR, onError);
index 783f62bdbb21092f3fb7353fca704d1b26437c1e..ddb2b29384a26d336ff8f05858ec6b1893032df9 100644 (file)
@@ -18,7 +18,7 @@
     </set>
        <set>
                <name>OSM - Mapnik</name>
-               <url>http://tile.openstreetmap.org/$z/$x/$y.png</url>
+               <url>http://c.tile.openstreetmap.org/$z/$x/$y.png</url>
        </set>
        <set>
                <name>OSM - Osmarender</name>