Merge branch 'master' into openID

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

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 70705452680be75283919966e5f718660f570423..b045bc9ea6a9762e43c7467c295fc7ed10fa9233 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;


@@ -15,7 +14,7 @@ page << <<EOJ
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {

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

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


@@ -47,8 +46,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();  


@@ -154,7 +153,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) {


@@ -238,9 +237,9 @@ page << <<EOJ
   }
 
   function dataLoaded() {
   }
 
   function dataLoaded() {

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

       clearStatus();
       clearStatus();

-        
+

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


@@ -262,7 +261,7 @@ page << <<EOJ
         // Link, for viewing in the tab
         var link = document.createElement("a");
         link.href =  "/browse/" + type + "/" + feature.osm_id; 
         // 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);   


@@ -466,8 +465,20 @@ page << <<EOJ
     }
   }
 
     }
   }
 

+  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 {
+      return feature.osm_id;
+    }
+  }
+

   function featureNameSelect(feature) {
   function featureNameSelect(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 if (featureType(feature) == "node") {
       return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.node')}", { id: feature.osm_id });
       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 });


@@ -477,7 +488,9 @@ page << <<EOJ
   }
 
   function featureNameHistory(feature) {
   }
 
   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 if (featureType(feature) == "node") {
       return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.node')}", { id: feature.osm_id });
       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 });