Add tests for make_friend and remove_friend

[rails.git] / app / views / browse / start.js.erb

diff --git a/app/views/browse/start.js.erb b/app/views/browse/start.js.erb
index e986213a7c00d84d747fb97f24fd9417e2120dc3..1a32a3a79a2dff10f98f936c59893c09f8c911e8 100644 (file)
--- a/app/views/browse/start.js.erb
+++ b/app/views/browse/start.js.erb
@@ -32,9 +32,11 @@ function startBrowse() {
   browseBoxControl.handler.callbacks.done = endDrag;
   map.addControl(browseBoxControl);
 
   browseBoxControl.handler.callbacks.done = endDrag;
   map.addControl(browseBoxControl);
 

-  map.events.register("moveend", map, showData);
+  map.events.register("moveend", map, updateData);

   map.events.triggerEvent("moveend");
 
   map.events.triggerEvent("moveend");
 

+  $("#browse_select_view").click(useMap);
+

   $("#browse_select_box").click(startDrag);
 
   $("#browse_hide_areas_box").html("<%=j t 'browse.start_rjs.hide_areas' %>");
   $("#browse_select_box").click(startDrag);
 
   $("#browse_hide_areas_box").html("<%=j t 'browse.start_rjs.hide_areas' %>");


@@ -42,7 +44,7 @@ function startBrowse() {
   $("#browse_hide_areas_box").click(hideAreas);
 }
 
   $("#browse_hide_areas_box").click(hideAreas);
 }
 

-function showData() {
+function updateData() {

   if (browseMode == "auto") {
     if (map.getZoom() >= 15) {
         useMap(false);
   if (browseMode == "auto") {
     if (map.getZoom() >= 15) {
         useMap(false);


@@ -77,7 +79,7 @@ function stopBrowse() {
     } 
 
     map.dataLayer.setVisibility(false);
     } 
 
     map.dataLayer.setVisibility(false);

-    map.events.unregister("moveend", map, showData);
+    map.events.unregister("moveend", map, updateData);

   }    
 }
 
   }    
 }
 


@@ -133,8 +135,6 @@ function showAreas() {
   useMap(true);
 }
 
   useMap(true);
 }
 

-$("#browse_select_view").click(useMap);
-

 function endDrag(bbox) {
   var bounds = bbox.getBounds();
   var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
 function endDrag(bbox) {
   var bounds = bbox.getBounds();
   var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);


@@ -149,59 +149,42 @@ function endDrag(bbox) {
   $("#browse_select_view").show();
 }
 
   $("#browse_select_view").show();
 }
 

-function displayFeatureWarning() {
+function displayFeatureWarning(count, limit, callback) {

   clearStatus();
 
   var div = document.createElement("div");
 
   var p = document.createElement("p");
   clearStatus();
 
   var div = document.createElement("div");
 
   var p = document.createElement("p");

-  p.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.loaded_an_area_with_num_features' %>", { num_features: browseFeatureList.length })));
+  p.appendChild(document.createTextNode(i18n("<%=j t 'browse.start_rjs.loaded_an_area_with_num_features' %>", { num_features: count, max_features: limit })));

   div.appendChild(p);
 
   var input = document.createElement("input");
   input.type = "submit";
   input.value = "<%=j t 'browse.start_rjs.load_data' %>";
   div.appendChild(p);
 
   var input = document.createElement("input");
   input.type = "submit";
   input.value = "<%=j t 'browse.start_rjs.load_data' %>";

-  input.onclick = loadFeatureList;
+  input.onclick = callback;

   div.appendChild(input); 
 
   $("#browse_content").html("");
   $("#browse_content").append(div);
 }
 
   div.appendChild(input); 
 
   $("#browse_content").html("");
   $("#browse_content").append(div);
 }
 

-function loadFeatureList() {
-  browseDataLayer.addFeatures(browseFeatureList);
-  browseDataLayer.events.triggerEvent("loadend");
-
-  browseFeatureList = []; 
-
-  return false;
-}    
-
-function customDataLoader(request) {
-  if (this.map.dataLayer.active) {
+function customDataLoader(resp, options) {
+  if (map.dataLayer.active) {
+    var request = resp.priv;

     var doc = request.responseXML;
 
     if (!doc || !doc.documentElement) {
       doc = request.responseText;
     }
 
     var doc = request.responseXML;
 
     if (!doc || !doc.documentElement) {
       doc = request.responseText;
     }
 

-    var options = {};
-
-    OpenLayers.Util.extend(options, this.formatOptions);
-
-    if (this.map && !this.projection.equals(this.map.getProjectionObject())) {
-      options.externalProjection = this.projection;
-      options.internalProjection = this.map.getProjectionObject();
-    }    
-
-    var gml = this.format ? new this.format(options) : new OpenLayers.Format.GML(options);
-
-    browseFeatureList = gml.read(doc);
+    resp.features = this.format.read(doc);

 
 

-    if (!this.maxFeatures || browseFeatureList.length <= this.maxFeatures) {
-      loadFeatureList();
+    if (!this.maxFeatures || resp.features.length <= this.maxFeatures) {
+      options.callback.call(options.scope, resp);

     } else {
     } else {

-      displayFeatureWarning();
+      displayFeatureWarning(resp.features.length, this.maxFeatures, function () {
+        options.callback.call(options.scope, resp);
+      });

     }
   }
 }
     }
   }
 }


@@ -213,11 +196,11 @@ function getData(bounds, reload) {
   if (size > <%= MAX_REQUEST_AREA %>) {
     setStatus(i18n("<%=j t 'browse.start_rjs.unable_to_load_size', :max_bbox_size => MAX_REQUEST_AREA %>", { bbox_size: size }));
   } else {
   if (size > <%= MAX_REQUEST_AREA %>) {
     setStatus(i18n("<%=j t 'browse.start_rjs.unable_to_load_size', :max_bbox_size => MAX_REQUEST_AREA %>", { bbox_size: size }));
   } else {

-    loadGML("/api/<%= API_VERSION %>/map?bbox=" + projected.toBBOX(), reload);
+    loadData("/api/<%= API_VERSION %>/map?bbox=" + projected.toBBOX(), reload);

   }
 }
 
   }
 }
 

-function loadGML(url, reload) {
+function loadData(url, reload) {

   setStatus("<%=j t 'browse.start_rjs.loading' %>");
 
   $("#browse_content").empty();
   setStatus("<%=j t 'browse.start_rjs.loading' %>");
 
   $("#browse_content").empty();


@@ -242,11 +225,17 @@ function loadGML(url, reload) {
 
     if (browseDataLayer) browseDataLayer.destroyFeatures();
 
 
     if (browseDataLayer) browseDataLayer.destroyFeatures();
 

-    browseDataLayer = new OpenLayers.Layer.GML("Data", url, {
-      format: OpenLayers.Format.OSM,
-      formatOptions: formatOptions,
-      maxFeatures: 100,
-      requestSuccess: customDataLoader,
+    browseDataLayer = new OpenLayers.Layer.Vector("Data", {
+      strategies: [ 
+        new OpenLayers.Strategy.Fixed()
+      ],
+      protocol: new OpenLayers.Protocol.HTTP({
+        url: url,
+        format: new OpenLayers.Format.OSM(formatOptions),
+        maxFeatures: <%= @max_features %>,
+        handleRead: customDataLoader
+      }),
+      projection: new OpenLayers.Projection("EPSG:4326"),

       displayInLayerSwitcher: false,
       styleMap: new OpenLayers.StyleMap({
         'default': style,
       displayInLayerSwitcher: false,
       styleMap: new OpenLayers.StyleMap({
         'default': style,


@@ -263,8 +252,7 @@ function loadGML(url, reload) {
     browseSelectControl.activate();
   } else {
     browseDataLayer.destroyFeatures();
     browseSelectControl.activate();
   } else {
     browseDataLayer.destroyFeatures();

-    browseDataLayer.format(formatOptions);
-    browseDataLayer.setUrl(url);
+    browseDataLayer.refresh({ url: url });

   }
 
   browseActiveFeature = null;
   }
 
   browseActiveFeature = null;


@@ -307,7 +295,7 @@ function dataLoaded() {
     browseObjectList.appendChild(list);
 
     var link = document.createElement("a");
     browseObjectList.appendChild(list);
 
     var link = document.createElement("a");

-    link.href = this.url;
+    link.href = this.protocol.url;

     link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.object_list.api' %>"));
     browseObjectList.appendChild(link);
 
     link.appendChild(document.createTextNode("<%=j t 'browse.start_rjs.object_list.api' %>"));
     browseObjectList.appendChild(link);
 


@@ -428,8 +416,8 @@ function loadHistory() {
   this.link.href = "";
   this.link.innerHTML = "<%=j t 'browse.start_rjs.wait' %>";
 
   this.link.href = "";
   this.link.innerHTML = "<%=j t 'browse.start_rjs.wait' %>";
 

-  new Ajax.Request("/api/<%= API_VERSION %>/" + this.type + "/" + this.feature.osm_id + "/history", {
-    onComplete: OpenLayers.Function.bind(displayHistory, this)
+  $.ajax("/api/<%= API_VERSION %>/" + this.type + "/" + this.feature.osm_id + "/history", {
+    complete: OpenLayers.Function.bind(displayHistory, this)

   });
 
   return false;
   });
 
   return false;