Merge branch 'master' into openstreetbugs

[rails.git] / app / views / browse / start.rjs

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index c7a795b9806562082d750a26ac07a512a7c4354b..b96e8c39c6ecd1d29859123264f4fd1d559bb898 100644 (file)
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -2,7 +2,6 @@ page.replace_html :sidebar_title, t('browse.start_rjs.data_frame_title')
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var browseBoxControl;
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var browseBoxControl;

-  var browseActive;

   var browseMode = "auto";
   var browseBounds;
   var browseFeatureList;
   var browseMode = "auto";
   var browseBounds;
   var browseFeatureList;


@@ -10,12 +9,13 @@ page << <<EOJ
   var browseDataLayer;
   var browseSelectControl;
   var browseObjectList;
   var browseDataLayer;
   var browseSelectControl;
   var browseObjectList;

+  var areasHidden = false;

 
   OpenLayers.Feature.Vector.style['default'].strokeWidth = 3;
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {
 
   OpenLayers.Feature.Vector.style['default'].strokeWidth = 3;
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {

-    browseActive = true;
+    map.dataLayer.active = true;

 
     openSidebar({ onclose: stopBrowse });
 
 
     openSidebar({ onclose: stopBrowse });
 


@@ -26,20 +26,24 @@ page << <<EOJ
         sides: 4,
         snapAngle: 90,
         irregular: true,
         sides: 4,
         snapAngle: 90,
         irregular: true,

-        persist: true,
-        callbacks: { done: endDrag }
+        persist: true

       }
     });
       }
     });

+    browseBoxControl.handler.callbacks.done = endDrag;

     map.addControl(browseBoxControl);
 
     map.events.register("moveend", map, showData);
     map.events.triggerEvent("moveend");
     map.addControl(browseBoxControl);
 
     map.events.register("moveend", map, showData);
     map.events.triggerEvent("moveend");

+
+    $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.hide_areas')}";
+    $("browse_hide_areas_box").style.display = "inline";
+    $("browse_hide_areas_box").onclick = hideAreas;

   }
 
   function showData() {
     if (browseMode == "auto") {
       if (map.getZoom() >= 15) {
   }
 
   function showData() {
     if (browseMode == "auto") {
       if (map.getZoom() >= 15) {

-          useMap();
+          useMap(false);

       } else {
           setStatus("#{I18n.t('browse.start_rjs.zoom_or_select')}");
       }    
       } else {
           setStatus("#{I18n.t('browse.start_rjs.zoom_or_select')}");
       }    


@@ -47,8 +51,8 @@ page << <<EOJ
   }
 
   function stopBrowse() {
   }
 
   function stopBrowse() {

-    if (browseActive) {
-      browseActive = false;
+    if (map.dataLayer.active) {
+      map.dataLayer.active = false;

 
       if (browseSelectControl) {   
         browseSelectControl.destroy();  
 
       if (browseSelectControl) {   
         browseSelectControl.destroy();  


@@ -57,7 +61,7 @@ page << <<EOJ
 
       if (browseBoxControl) {
        browseBoxControl.destroy();
 
       if (browseBoxControl) {
        browseBoxControl.destroy();

-       browseBoxControl = null;
+        browseBoxControl = null;

       }                
 
       if (browseActiveFeature) {
       }                
 
       if (browseActiveFeature) {


@@ -76,7 +80,7 @@ page << <<EOJ
   }
 
   function startDrag() {
   }
 
   function startDrag() {

-    $("browse_select_box").innerHTML='#{I18n.t('browse.start_rjs.drag_a_box')}';
+    $("browse_select_box").innerHTML="#{I18n.t('browse.start_rjs.drag_a_box')}";

 
     browseBoxControl.activate();
 
 
     browseBoxControl.activate();
 


@@ -85,7 +89,7 @@ page << <<EOJ
 
   $("browse_select_box").onclick = startDrag;
 
 
   $("browse_select_box").onclick = startDrag;
 

-  function useMap() {
+  function useMap(reload) {

     var bounds = map.getExtent();
     var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
 
     var bounds = map.getExtent();
     var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
 


@@ -99,7 +103,7 @@ page << <<EOJ
                                              center.lat + (tileHeight / 2));
 
       browseBounds = tileBounds;
                                              center.lat + (tileHeight / 2));
 
       browseBounds = tileBounds;

-      getData(tileBounds);
+      getData(tileBounds, reload);

 
       browseMode = "auto";
 
 
       browseMode = "auto";
 


@@ -109,6 +113,26 @@ page << <<EOJ
     return false;
   }
 
     return false;
   }
 

+  function hideAreas() {
+      $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.show_areas')}";
+      $("browse_hide_areas_box").style.display = "inline";
+      $("browse_hide_areas_box").onclick = showAreas;
+
+      areasHidden = true;
+
+      useMap(true);
+  }
+
+  function showAreas() {
+      $("browse_hide_areas_box").innerHTML = "#{I18n.t('browse.start_rjs.hide_areas')}";
+      $("browse_hide_areas_box").style.display = "inline";
+      $("browse_hide_areas_box").onclick = hideAreas;
+
+      areasHidden = false;
+
+      useMap(true);
+  }
+

   $("browse_select_view").onclick = useMap;
 
   function endDrag(bbox) {
   $("browse_select_view").onclick = useMap;
 
   function endDrag(bbox) {


@@ -131,7 +155,7 @@ page << <<EOJ
     var div = document.createElement("div");
 
     var p = document.createElement("p");
     var div = document.createElement("div");
 
     var p = document.createElement("p");

-    p.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.loaded_an_area')} " + browseFeatureList.length + " #{I18n.t('browse.start_rjs.browsers')}"));
+    p.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.loaded_an_area_with_num_features')}", { num_features: browseFeatureList.length })));

     div.appendChild(p);
 
     var input = document.createElement("input");
     div.appendChild(p);
 
     var input = document.createElement("input");


@@ -154,7 +178,7 @@ page << <<EOJ
   }    
 
   function customDataLoader(request) {
   }    
 
   function customDataLoader(request) {

-    if (browseActive) {
+    if (this.map.dataLayer.active) {

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


@@ -182,22 +206,29 @@ page << <<EOJ
     }
   }
 
     }
   }
 

-  function getData(bounds) {
+  function getData(bounds, reload) {

     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 
     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 

-    if (size > 0.25) {
-      setStatus("#{I18n.t('browse.start_rjs.unable_to_load')} " + size + " #{I18n.t('browse.start_rjs.must_be_smaller')}");
+    if (size > #{MAX_REQUEST_AREA}) {
+      setStatus(i18n("#{I18n.t('browse.start_rjs.unable_to_load_size', :max_bbox_size => MAX_REQUEST_AREA)}", { bbox_size: size }));

     } else {
     } else {

-      loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
+      loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX(), reload);

     }
   }
 
     }
   }
 

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

     setStatus("#{I18n.t('browse.start_rjs.loading')}");
     $("browse_content").innerHTML = "";
 
     setStatus("#{I18n.t('browse.start_rjs.loading')}");
     $("browse_content").innerHTML = "";
 

-    if (!browseDataLayer) {
+    var formatOptions = {
+      checkTags: true,
+      interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
+    };
+
+    if (areasHidden) formatOptions.areaTags = [];
+
+    if (!browseDataLayer || reload) {

       var style = new OpenLayers.Style();
 
       style.addRules([new OpenLayers.Rule({
       var style = new OpenLayers.Style();
 
       style.addRules([new OpenLayers.Rule({


@@ -208,12 +239,11 @@ page << <<EOJ
         }
       })]);
 
         }
       })]);
 

+      if (browseDataLayer) browseDataLayer.destroyFeatures();
+

       browseDataLayer = new OpenLayers.Layer.GML("Data", url, {
         format: OpenLayers.Format.OSM,
       browseDataLayer = new OpenLayers.Layer.GML("Data", url, {
         format: OpenLayers.Format.OSM,

-        formatOptions: {
-          checkTags: true, 
-          interestingTagsExclude: ['source','source_ref','source:ref','history','attribution','created_by','tiger:county','tiger:tlid','tiger:upload_uuid']
-        },
+        formatOptions: formatOptions,

         maxFeatures: 100,
         requestSuccess: customDataLoader,
         displayInLayerSwitcher: false,
         maxFeatures: 100,
         requestSuccess: customDataLoader,
         displayInLayerSwitcher: false,


@@ -231,6 +261,8 @@ page << <<EOJ
       map.addControl(browseSelectControl);
       browseSelectControl.activate();
     } else {
       map.addControl(browseSelectControl);
       browseSelectControl.activate();
     } else {

+      browseDataLayer.destroyFeatures();
+      browseDataLayer.format(formatOptions);

       browseDataLayer.setUrl(url);
     }
 
       browseDataLayer.setUrl(url);
     }
 


@@ -238,14 +270,14 @@ page << <<EOJ
   }
 
   function dataLoaded() {
   }
 
   function dataLoaded() {

-    if (browseActive) {
+    if (this.map.dataLayer.active) {

       clearStatus();
       clearStatus();

-        
+

       browseObjectList = document.createElement("div")
 
       var heading = document.createElement("p");
       heading.className = "browse_heading";
       browseObjectList = document.createElement("div")
 
       var heading = document.createElement("p");
       heading.className = "browse_heading";

-      heading.appendChild(document.createTextNode("Object list"));
+      heading.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.heading')}"));

       browseObjectList.appendChild(heading);
 
       var list = document.createElement("ul");
       browseObjectList.appendChild(heading);
 
       var list = document.createElement("ul");


@@ -255,14 +287,14 @@ page << <<EOJ
             
         // Type, for linking
         var type = featureType(feature);
             
         // Type, for linking
         var type = featureType(feature);

-        var typeName = ucFirst(type);
+        var typeName = featureTypeName(feature);

         var li = document.createElement("li");
         li.appendChild(document.createTextNode(typeName + " "));
             
         // Link, for viewing in the tab
         var link = document.createElement("a");
         link.href =  "/browse/" + type + "/" + feature.osm_id; 
         var li = document.createElement("li");
         li.appendChild(document.createTextNode(typeName + " "));
             
         // Link, for viewing in the tab
         var link = document.createElement("a");
         link.href =  "/browse/" + type + "/" + feature.osm_id; 

-        var name = feature.attributes.name || feature.osm_id;
+        var name = featureName(feature);

         link.appendChild(document.createTextNode(name));
         link.feature = feature;
         link.onclick = OpenLayers.Function.bind(viewFeatureLink, link);   
         link.appendChild(document.createTextNode(name));
         link.feature = feature;
         link.onclick = OpenLayers.Function.bind(viewFeatureLink, link);   


@@ -275,7 +307,7 @@ page << <<EOJ
 
       var link = document.createElement("a");
       link.href = this.url;
 
       var link = document.createElement("a");
       link.href = this.url;

-      link.appendChild(document.createTextNode("API"));
+      link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.api')}"));

       browseObjectList.appendChild(link);
 
       $("browse_content").innerHTML = "";
       browseObjectList.appendChild(link);
 
       $("browse_content").innerHTML = "";


@@ -336,7 +368,7 @@ page << <<EOJ
     var link = document.createElement("a");
     link.href = "#";
     link.onclick = loadObjectList;
     var link = document.createElement("a");
     link.href = "#";
     link.onclick = loadObjectList;

-    link.appendChild(document.createTextNode("Display object list"));
+    link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.back')}"));

     div.appendChild(link);
 
     var table = document.createElement("table");
     div.appendChild(link);
 
     var table = document.createElement("table");


@@ -348,7 +380,7 @@ page << <<EOJ
     table.appendChild(tr);
 
     var heading = document.createElement("td");
     table.appendChild(tr);
 
     var heading = document.createElement("td");

-    heading.appendChild(document.createTextNode(featureName(feature)));
+    heading.appendChild(document.createTextNode(featureNameSelect(feature)));

     tr.appendChild(heading);
 
     var td = document.createElement("td");
     tr.appendChild(heading);
 
     var td = document.createElement("td");


@@ -358,7 +390,7 @@ page << <<EOJ
     var type = featureType(feature);
     var link = document.createElement("a");   
     link.href = "/browse/" + type + "/" + feature.osm_id;
     var type = featureType(feature);
     var link = document.createElement("a");   
     link.href = "/browse/" + type + "/" + feature.osm_id;

-    link.appendChild(document.createTextNode("Details"));
+    link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.details')}"));

     td.appendChild(link);
 
     var div = document.createElement("div");
     td.appendChild(link);
 
     var div = document.createElement("div");


@@ -421,7 +453,7 @@ page << <<EOJ
     table.appendChild(tr);
 
     var heading = document.createElement("td");
     table.appendChild(tr);
 
     var heading = document.createElement("td");

-    heading.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.history_for')} " + featureName(this.feature)));
+    heading.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.history_for_feature')}", { feature: featureNameHistory(this.feature) })));

     tr.appendChild(heading);
 
     var td = document.createElement("td");
     tr.appendChild(heading);
 
     var td = document.createElement("td");


@@ -442,7 +474,7 @@ page << <<EOJ
       var user = nodes[i].getAttribute("user") || "#{I18n.t('browse.start_rjs.private_user')}";
       var timestamp = nodes[i].getAttribute("timestamp");
       var item = document.createElement("li");
       var user = nodes[i].getAttribute("user") || "#{I18n.t('browse.start_rjs.private_user')}";
       var timestamp = nodes[i].getAttribute("timestamp");
       var item = document.createElement("li");

-      item.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.edited_by')} " + user + " #{I18n.t('browse.start_rjs.at_timestamp')} " + timestamp));
+      item.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.edited_by_user_at_timestamp')}", { user: user, timestamp: timestamp })));

       history.appendChild(item);
     }
     div.appendChild(history);
       history.appendChild(item);
     }
     div.appendChild(history);


@@ -457,12 +489,46 @@ page << <<EOJ
       return "way";
     }
   }
       return "way";
     }
   }

-  
+
+  function featureTypeName(feature) {
+    if (featureType(feature) == "node") {
+      return "#{I18n.t('browse.start_rjs.object_list.type.node')}";
+    } else if (featureType(feature) == "way") {
+      return "#{I18n.t('browse.start_rjs.object_list.type.way')}";
+    }
+  }
+

   function featureName(feature) {
   function featureName(feature) {

-    if (feature.attributes.name) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {

       return feature.attributes.name;
     } else {
       return feature.attributes.name;
     } else {

-      return ucFirst(featureType(feature)) + " " + feature.osm_id;
+      return feature.osm_id;
+    }
+  }
+
+  function featureNameSelect(feature) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {
+      return feature.attributes.name;
+    } else if (featureType(feature) == "node") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.node')}", { id: feature.osm_id });
+    } else if (featureType(feature) == "way") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.way')}", { id: feature.osm_id });
+    }
+  }
+
+  function featureNameHistory(feature) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {
+      return feature.attributes.name;
+    } else if (featureType(feature) == "node") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.node')}", { id: feature.osm_id });
+    } else if (featureType(feature) == "way") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.way')}", { id: feature.osm_id });

     }
   }
 
     }
   }
 


@@ -476,9 +542,5 @@ page << <<EOJ
     $("browse_status").style.display = "none";
   }
 
     $("browse_status").style.display = "none";
   }
 

-  function ucFirst(str) {
-    return str.substr(0,1).toUpperCase() + str.substr(1,str.length);
-  }
-

   startBrowse();
 EOJ
   startBrowse();
 EOJ