Move sidebar footer elements elsewhere

[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 dcea8e0c0b209ca1528c7765f8efa933bc0a4552..772690ba3c5772d2a16d38f957e95e70e900adad 100644 (file)
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,124 +1,54 @@
-//= require templates/browse/feature
-//= require templates/browse/feature_list
-//= require templates/browse/feature_history
-
-$(document).ready(function () {
+function initializeBrowse(map) {

   var browseBounds;
   var browseBounds;

-  var layersById;

   var selectedLayer;
   var selectedLayer;

-  var browseObjectList;
-  var areasHidden = false;
-  var locationFilter;
-
-  var dataLayer = new L.OSM.DataLayer(null, {
-    styles: {
-      way: {
-        weight: 3,
-        color: "#000000",
-        opacity: 0.4
-      },
-      area: {
-        weight: 3,
-        color: "#ff0000"
-      },
-      node: {
-        color: "#00ff00"
-      }
+  var dataLayer = map.dataLayer;
+
+  dataLayer.setStyle({
+    way: {
+      weight: 3,
+      color: "#000000",
+      opacity: 0.4
+    },
+    area: {
+      weight: 3,
+      color: "#ff0000"
+    },
+    node: {
+      color: "#00ff00"

     }
   });
 
   dataLayer.isWayArea = function () {
     }
   });
 
   dataLayer.isWayArea = function () {

-    return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
+    return false;

   };
 
   dataLayer.on("click", function (e) {
     onSelect(e.layer);
   });
 
   };
 
   dataLayer.on("click", function (e) {
     onSelect(e.layer);
   });
 

-  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-    map.layersControl.addOverlay(dataLayer, I18n.t("browse.start_rjs.data_layer_name"));
-  }
-

   map.on('layeradd', function (e) {
     if (e.layer === dataLayer) {
   map.on('layeradd', function (e) {
     if (e.layer === dataLayer) {

-      $.ajax({ url: "/browse/start", success: function (sidebarHtml) {
-        startBrowse(sidebarHtml);
-      }});
+      map.on("moveend", updateData);
+      updateData();

     }
   });
 
   map.on('layerremove', function (e) {
     if (e.layer === dataLayer) {
     }
   });
 
   map.on('layerremove', function (e) {
     if (e.layer === dataLayer) {

-      closeSidebar();
+      map.off("moveend", updateData);

     }
   });
 
     }
   });
 

-  function startBrowse(sidebarHtml) {
-    locationFilter = new L.LocationFilter({
-      enableButton: false,
-      adjustButton: false
-    }).addTo(map);
-
-    locationFilter.on("change", getData);
-
-    $("#sidebar_title").html(I18n.t('browse.start_rjs.data_frame_title'));
-    $("#sidebar_content").html(sidebarHtml);
-
-    openSidebar();
-
-    map.on("moveend", updateData);
-    updateData();
-
-    $("#browse_filter_toggle").click(toggleFilter);
-
-    $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-    $("#browse_hide_areas_box").click(toggleAreas);
-
-    $("#sidebar").one("closed", function () {
-      map.removeLayer(dataLayer);
-      map.removeLayer(locationFilter);
-      map.off("moveend", updateData);
-      locationFilter.off("change", getData);
-    });
-  }
-

   function updateData() {
   function updateData() {

-    if (!locationFilter.isEnabled()) {
-      if (map.getZoom() >= 15) {
-        var bounds = map.getBounds();
-        if (!browseBounds || !browseBounds.contains(bounds)) {
-          browseBounds = bounds;
-          getData();
-        }
-      } else {
-        setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
+    if (map.getZoom() >= 15) {
+      var bounds = map.getBounds();
+      if (!browseBounds || !browseBounds.contains(bounds)) {
+        browseBounds = bounds;
+        getData();

       }
       }

-    }
-  }
-
-  function toggleFilter() {
-    if (locationFilter.isEnabled()) {
-      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
-      locationFilter.disable();
-    } else {
-      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
-      locationFilter.setBounds(map.getBounds().pad(-0.2));
-      locationFilter.enable();
-    }
-
-    getData();
-  }
-
-  function toggleAreas() {
-    if (areasHidden) {
-      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-      areasHidden = false;

     } else {
     } else {

-      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
-      areasHidden = true;
+      setStatus(I18n.t('browse.start_rjs.zoom_or_select'));

     }
     }

-
-    getData();

   }
 
   function displayFeatureWarning(count, limit, callback) {
   }
 
   function displayFeatureWarning(count, limit, callback) {


@@ -140,8 +70,10 @@ $(document).ready(function () {
     $("#browse_content").append(div);
   }
 
     $("#browse_content").append(div);
   }
 

+  var dataLoader;
+

   function getData() {
   function getData() {

-    var bounds = locationFilter.isEnabled() ? locationFilter.getBounds() : map.getBounds();
+    var bounds = map.getBounds();

     var size = bounds.getSize();
 
     if (size > OSM.MAX_REQUEST_AREA) {
     var size = bounds.getSize();
 
     if (size > OSM.MAX_REQUEST_AREA) {


@@ -151,7 +83,7 @@ $(document).ready(function () {
 
     setStatus(I18n.t('browse.start_rjs.loading'));
 
 
     setStatus(I18n.t('browse.start_rjs.loading'));
 

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

 
     /*
      * Modern browsers are quite happy showing far more than 100 features in
 
     /*
      * Modern browsers are quite happy showing far more than 100 features in


@@ -168,12 +100,13 @@ $(document).ready(function () {
       }
     @*/
 
       }
     @*/
 

-    $.ajax({
+    if (dataLoader) dataLoader.abort();
+
+    dataLoader = $.ajax({

       url: url,
       success: function (xml) {
         clearStatus();
 
       url: url,
       success: function (xml) {
         clearStatus();
 

-        $("#browse_content").empty();

         dataLayer.clearLayers();
         selectedLayer = null;
 
         dataLayer.clearLayers();
         selectedLayer = null;
 


@@ -181,25 +114,6 @@ $(document).ready(function () {
 
         function addFeatures() {
           dataLayer.addData(features);
 
         function addFeatures() {
           dataLayer.addData(features);

-
-          layersById = {};
-
-          dataLayer.eachLayer(function (layer) {
-            var feature = layer.feature;
-            layersById[feature.id] = layer;
-            $.extend(feature, {
-              typeName: featureTypeName(feature),
-              url: "/browse/" + feature.type + "/" + feature.id,
-              name: featureName(feature)
-            });
-          });
-
-          browseObjectList = $(JST["templates/browse/feature_list"]({
-            features: features,
-            url: url
-          }))[0];
-
-          loadObjectList();

         }
 
         if (features.length < maxFeatures) {
         }
 
         if (features.length < maxFeatures) {


@@ -207,29 +121,12 @@ $(document).ready(function () {
         } else {
           displayFeatureWarning(features.length, maxFeatures, addFeatures);
         }
         } else {
           displayFeatureWarning(features.length, maxFeatures, addFeatures);
         }

+
+        dataLoader = null;

       }
     });
   }
 
       }
     });
   }
 

-  function viewFeatureLink() {
-    var layer = layersById[$(this).data("feature-id")];
-
-    onSelect(layer);
-
-    if (locationFilter.isEnabled()) {
-      map.panTo(layer.getBounds().getCenter());
-    }
-
-    return false;
-  }
-
-  function loadObjectList() {
-    $("#browse_content").html(browseObjectList);
-    $("#browse_content").find("a[data-feature-id]").click(viewFeatureLink);
-
-    return false;
-  }
-

   function onSelect(layer) {
     // Unselect previously selected feature
     if (selectedLayer) {
   function onSelect(layer) {
     // Unselect previously selected feature
     if (selectedLayer) {


@@ -240,91 +137,15 @@ $(document).ready(function () {
     layer.originalStyle = layer.options;
     layer.setStyle({color: '#0000ff', weight: 8});
 
     layer.originalStyle = layer.options;
     layer.setStyle({color: '#0000ff', weight: 8});
 

-    // If the current object is the list, don't innerHTML="", since that could clear it.
-    if ($("#browse_content").firstChild == browseObjectList) {
-      $("#browse_content").removeChild(browseObjectList);
-    } else {
-      $("#browse_content").empty();
-    }
-
-    var feature = layer.feature;
-
-    $("#browse_content").html(JST["templates/browse/feature"]({
-      name: featureNameSelect(feature),
-      url: "/browse/" + feature.type + "/" + feature.id,
-      attributes: feature.tags
-    }));
-
-    $("#browse_content").find("a.browse_show_list").click(loadObjectList);
-    $("#browse_content").find("a.browse_show_history").click(loadHistory);
+    OSM.route('/browse/' + layer.feature.type + '/' + layer.feature.id);

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

-  function loadHistory() {
-    $(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
-
-    var feature = selectedLayer.feature;
-
-    $.ajax({
-      url: "/api/" + OSM.API_VERSION + "/" + feature.type + "/" + feature.id + "/history",
-      success: function (xml) {
-        if (selectedLayer.feature != feature || $("#browse_content").firstChild == browseObjectList) {
-          return;
-        }
-
-        $(this).remove();
-
-        var history = [];
-        var nodes = xml.getElementsByTagName(feature.type);
-        for (var i = nodes.length - 1; i >= 0; i--) {
-          history.push({
-            user: nodes[i].getAttribute("user") || I18n.t('browse.start_rjs.private_user'),
-            timestamp: nodes[i].getAttribute("timestamp")
-          });
-        }
-
-        $("#browse_content").append(JST["templates/browse/feature_history"]({
-          name: featureNameHistory(feature),
-          url: "/browse/" + feature.type + "/" + feature.id,
-          history: history
-        }));
-      }.bind(this)
-    });
-
-    return false;
-  }
-
-  function featureTypeName(feature) {
-    return I18n.t('browse.start_rjs.object_list.type.' + feature.type);
-  }
-
-  function featureName(feature) {
-    return feature.tags['name:' + $('html').attr('lang')] ||
-      feature.tags.name ||
-      feature.id;
-  }
-
-  function featureNameSelect(feature) {
-    return feature.tags['name:' + $('html').attr('lang')] ||
-      feature.tags.name ||
-      I18n.t("browse.start_rjs.object_list.selected.type." + feature.type, { id: feature.id });
-  }
-
-  function featureNameHistory(feature) {
-    return feature.tags['name:' + $('html').attr('lang')] ||
-      feature.tags.name ||
-      I18n.t("browse.start_rjs.object_list.history.type." + feature.type, { id: feature.id });
-  }
-

   function setStatus(status) {
   function setStatus(status) {

-    $("#browse_status").html(status);
-    $("#browse_status").show();

   }
 
   function clearStatus() {
   }
 
   function clearStatus() {

-    $("#browse_status").html("");
-    $("#browse_status").hide();

   }
   }

-});
+}