Convert openstreetbugs javascript to new style api

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 69e2a0b27a1672264f8f017d0d6da80549e1e3bc..9098c1a8853740ac175cbb424471d97eb125ff3c 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -126,6 +126,11 @@ end
 
   OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
 
+  function createBugCallBack() {
+       map.osbControl.deactivate();
+       document.getElementById("map_OpenLayers_Container").style.cursor = "default";
+  }
+
   function mapInit(){
     map = createMap("map");
 
@@ -135,7 +140,7 @@ end
       map.addLayer(map.dataLayer);
 
       map.osbLayer = new OpenLayers.Layer.OpenStreetBugs("OpenStreetBugs", {
-          serverURL : "/api/0.6/bugs/",
+          serverURL : "/api/0.6/",
           iconOpen : new OpenLayers.Icon("http://openstreetbugs.schokokeks.org/client/open_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
           iconClosed : new OpenLayers.Icon("http://openstreetbugs.schokokeks.org/client/closed_bug_marker.png", new OpenLayers.Size(22, 22), new OpenLayers.Pixel(-11, -11)),
           readonly : false,

diff --git a/public/javascripts/openstreetbugs.js b/public/javascripts/openstreetbugs.js
index be308772fe499b92a388d0c4160293efbf35489b..72eeb60cfde165cb949364f14320586fc42649c5 100644 (file)
--- a/public/javascripts/openstreetbugs.js
+++ b/public/javascripts/openstreetbugs.js
@@ -246,11 +246,11 @@ OpenLayers.Layer.OpenStreetBugs = new OpenLayers.Class(OpenLayers.Layer.Markers,
                if(!bounds) return false;
                bounds.transform(this.map.getProjectionObject(), this.apiProjection);
 
-               this.apiRequest("getBugs"
-                       + "?t="+this.round(bounds.top, 5)
-                       + "&r="+this.round(bounds.right, 5)
-                       + "&b="+this.round(bounds.bottom, 5)
-                       + "&l="+this.round(bounds.left, 5));
+               this.apiRequest("bugs"
+                       + "?bbox="+this.round(bounds.left, 5)
+            + ","+this.round(bounds.bottom, 5)
+                   + ","+this.round(bounds.right, 5)                   
+                       + ","+this.round(bounds.top, 5));
        },
 
        /**
@@ -448,12 +448,14 @@ OpenLayers.Layer.OpenStreetBugs = new OpenLayers.Class(OpenLayers.Layer.Markers,
         * @param String description
        */
        createBug: function(lonlat, description) {
-               this.apiRequest("addPOIexec"
+               this.apiRequest("bug/create"
                        + "?lat="+encodeURIComponent(lonlat.lat)
                        + "&lon="+encodeURIComponent(lonlat.lon)
-                       + "&text="+encodeURIComponent(description + " [" + this.getUserName() + "]")
+                       + "&text="+encodeURIComponent(description)
+                       + "&name="+encodeURIComponent(this.getUserName())
                        + "&format=js"
                );
+               createBugCallBack();
        },
 
        /**
@@ -462,9 +464,9 @@ OpenLayers.Layer.OpenStreetBugs = new OpenLayers.Class(OpenLayers.Layer.Markers,
         * @param String comment
        */
        submitComment: function(id, comment) {
-               this.apiRequest("editPOIexec"
-                       + "?id="+encodeURIComponent(id)
-                       + "&text="+encodeURIComponent(comment + " [" + this.getUserName() + "]")
+               this.apiRequest("bug/"+encodeURIComponent(id)+"/comment"
+                       + "?text="+encodeURIComponent(comment)
+                       + "&name="+encodeURIComponent(this.getUserName())
                        + "&format=js"
                );
        },
@@ -474,9 +476,8 @@ OpenLayers.Layer.OpenStreetBugs = new OpenLayers.Class(OpenLayers.Layer.Markers,
         * @param Number id
        */
        closeBug: function(id) {
-               this.apiRequest("closePOIexec"
-                       + "?id="+encodeURIComponent(id)
-                       + "&format=js"
+               this.apiRequest("bug/"+encodeURIComponent(id)+"/close"
+                       + "?format=js"
                );
        },