X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c875a70b312dc7915e66377120989d924177ca9e..5c520a928b197c0075dae8090baf8d2df7f3874f:/app/views/browse/start.rjs

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 9c885870b..d4ef1f530 100644
--- 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;
-  var browseActive;
   var browseMode = "auto";
   var browseBounds;
   var browseFeatureList;
@@ -15,7 +14,7 @@ page << <<EOJ
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {
-    browseActive = true;
+    map.dataLayer.active = true;
 
     openSidebar({ onclose: stopBrowse });
 
@@ -26,10 +25,10 @@ page << <<EOJ
         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);
@@ -47,8 +46,8 @@ page << <<EOJ
   }
 
   function stopBrowse() {
-    if (browseActive) {
-      browseActive = false;
+    if (map.dataLayer.active) {
+      map.dataLayer.active = false;
 
       if (browseSelectControl) {   
         browseSelectControl.destroy();  
@@ -76,7 +75,7 @@ page << <<EOJ
   }
 
   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();
 
@@ -131,7 +130,7 @@ page << <<EOJ
     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");
@@ -154,7 +153,7 @@ page << <<EOJ
   }    
 
   function customDataLoader(request) {
-    if (browseActive) {
+    if (this.map.dataLayer.active) {
       var doc = request.responseXML;
 
       if (!doc || !doc.documentElement) {
@@ -186,8 +185,8 @@ page << <<EOJ
     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 {
       loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
     }
@@ -238,9 +237,9 @@ page << <<EOJ
   }
 
   function dataLoaded() {
-    if (browseActive) {
+    if (this.map.dataLayer.active) {
       clearStatus();
-        
+
       browseObjectList = document.createElement("div")
 
       var heading = document.createElement("p");
@@ -249,24 +248,20 @@ page << <<EOJ
       browseObjectList.appendChild(heading);
 
       var list = document.createElement("ul");
-      // Pull in 118n names for node/way/relation
-      var typeTranslations = new Array();
-      typeTranslations['node']     = "#{I18n.t('browse.start_rjs.object_list.type.node')}"
-      typeTranslations['way']      = "#{I18n.t('browse.start_rjs.object_list.type.way')}"
-      typeTranslations['relation'] = "#{I18n.t('browse.start_rjs.object_list.type.relation')}"
 
       for (var i = 0; i < this.features.length; i++) {
         var feature = this.features[i]; 
             
         // Type, for linking
         var type = featureType(feature);
+        var typeName = featureTypeName(feature);
         var li = document.createElement("li");
-        li.appendChild(document.createTextNode(typeTranslations[type] + " "));
+        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);   
@@ -425,7 +420,7 @@ page << <<EOJ
     table.appendChild(tr);
 
     var heading = document.createElement("td");
-    heading.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.history_for')} " + featureNameHistory(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");
@@ -446,7 +441,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");
-      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);
@@ -461,28 +456,46 @@ page << <<EOJ
       return "way";
     }
   }
-  
-  function featureNameSelect(feature) {
-    if (feature.attributes.name) {
+
+  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) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {
       return feature.attributes.name;
     } else {
-      // Pull in 118n names for node/way
-      var featureNameSelectTypeTranslations = new Array();
-      featureNameSelectTypeTranslations['node'] = "#{I18n.t('browse.start_rjs.object_list.selected.type.node')}"
-      featureNameSelectTypeTranslations['way']  = "#{I18n.t('browse.start_rjs.object_list.selected.type.way')}"
-      return featureNameSelectTypeTranslations[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) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {
       return feature.attributes.name;
-    } else {
-      // Pull in 118n names for node/way
-      var featureNameHistoryTypeTranslations = new Array();
-      featureNameHistoryTypeTranslations['node'] = "#{I18n.t('browse.start_rjs.object_list.history.type.node')}"
-      featureNameHistoryTypeTranslations['way']  = "#{I18n.t('browse.start_rjs.object_list.history.type.way')}"
-      return featureNameHistoryTypeTranslations[featureType(feature)] + " " + feature.osm_id;
+    } 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 });
     }
   }
 
@@ -496,9 +509,5 @@ page << <<EOJ
     $("browse_status").style.display = "none";
   }
 
-  function ucFirst(str) {
-    return str.substr(0,1).toUpperCase() + str.substr(1,str.length);
-  }
-
   startBrowse();
 EOJ