Force the X-Page-Title value to be treated as UTF-8

[rails.git] / app / assets / javascripts / index / browse.js

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 752c84fecee841505b14bc402ce324c9f5cde7d6..d196476f496c6167af4fe77a8e5ea2b4208910da 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -42,14 +42,15 @@ function initializeBrowse(map) {
 
   function updateData() {
     var bounds = map.getBounds();
 
   function updateData() {
     var bounds = map.getBounds();

-    getData(!browseBounds || !browseBounds.contains(bounds));
-    browseBounds = bounds;
+    if (!browseBounds || !browseBounds.contains(bounds)) {
+      getData();
+    }

   }
 
   function displayFeatureWarning(count, limit, callback) {
     $('#browse_status').html(
       $("<p class='warning'></p>")
   }
 
   function displayFeatureWarning(count, limit, callback) {
     $('#browse_status').html(
       $("<p class='warning'></p>")

-        .text(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit }))
+        .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))

         .append(
           $("<input type='submit'>")
             .val(I18n.t('browse.start_rjs.load_data'))
         .append(
           $("<input type='submit'>")
             .val(I18n.t('browse.start_rjs.load_data'))


@@ -58,7 +59,7 @@ function initializeBrowse(map) {
 
   var dataLoader;
 
 
   var dataLoader;
 

-  function getData(inPrevious) {
+  function getData() {

     var bounds = map.getBounds();
     var size = bounds.getSize();
 
     var bounds = map.getBounds();
     var size = bounds.getSize();
 


@@ -69,8 +70,6 @@ function initializeBrowse(map) {
       return;
     }
 
       return;
     }
 

-    if (inPrevious) return;
-

     var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
 
     /*
     var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
 
     /*


@@ -110,6 +109,7 @@ function initializeBrowse(map) {
         }
 
         dataLoader = null;
         }
 
         dataLoader = null;

+        browseBounds = bounds;

       }
     });
   }
       }
     });
   }


@@ -124,7 +124,7 @@ function initializeBrowse(map) {
     layer.originalStyle = layer.options;
     layer.setStyle({color: '#0000ff', weight: 8});
 
     layer.originalStyle = layer.options;
     layer.setStyle({color: '#0000ff', weight: 8});
 

-    OSM.route('/browse/' + layer.feature.type + '/' + layer.feature.id);
+    OSM.router.route('/' + layer.feature.type + '/' + layer.feature.id);

 
     // Stash the currently drawn feature
     selectedLayer = layer;
 
     // Stash the currently drawn feature
     selectedLayer = layer;