X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/30ad58c01ff8acae377cfd974fcc94d6898722da..58eb17cb63a3d0b670e395e7a138d40b686f8d24:/app/assets/javascripts/index/browse.js?ds=inline

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index 5bf5246d6..a9bdbf2b7 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -2,197 +2,203 @@
 //= require templates/browse/feature_list
 //= require templates/browse/feature_history
 
-$(document).ready(function () {
-  $("#show_data").click(function (e) {
-    $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
-      startBrowse(sidebarHtml);
-    }});
-    e.preventDefault();
+function initializeBrowse(map, params) {
+  var browseBounds;
+  var layersById;
+  var selectedLayer;
+  var browseObjectList;
+  var areasHidden = false;
+  var locationFilter;
+
+  var dataLayer = map.dataLayer;
+
+  dataLayer.setStyle({
+    way: {
+      weight: 3,
+      color: "#000000",
+      opacity: 0.4
+    },
+    area: {
+      weight: 3,
+      color: "#ff0000"
+    },
+    node: {
+      color: "#00ff00"
+    }
   });
 
-  function startBrowse(sidebarHtml) {
-    var browseMode = "auto";
-    var browseBounds;
-    var layersById;
-    var selectedLayer;
-    var browseObjectList;
-    var areasHidden = false;
-
-    var dataLayer = new L.OSM(null, {
-      styles: {
-        way: {
-          weight: 3,
-          color: "#000000",
-          opacity: 0.4
-        },
-        area: {
-          weight: 3,
-          color: "#ff0000"
-        },
-        node: {
-          color: "#00ff00"
-        }
-      }
-    });
+  dataLayer.isWayArea = function () {
+    return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
+  };
 
-    dataLayer.addTo(map);
+  dataLayer.on("click", function (e) {
+    onSelect(e.layer);
+  });
 
-    dataLayer.isWayArea = function () {
-      return !areasHidden && L.OSM.prototype.isWayArea.apply(this, arguments);
-    };
+  map.on('layeradd', function (e) {
+    if (e.layer === dataLayer) {
+      $.ajax({ url: "/browse/start", success: function (sidebarHtml) {
+        startBrowse(sidebarHtml);
+      }});
+    }
+  });
 
-    var drawHandler = new L.Rectangle.Draw(map, {title: I18n.t('browse.start_rjs.drag_a_box')});
-    map.on('draw:rectangle-created', endDrag);
+  map.on('layerremove', function (e) {
+    if (e.layer === dataLayer) {
+      closeSidebar();
+    }
+  });
+
+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    if (params.layers.indexOf(dataLayer.options.code) >= 0) {
+      map.addLayer(dataLayer);
+    }
+  }
+
+  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();
 
+    if (browseObjectList) loadObjectList();
+
     map.on("moveend", updateData);
     updateData();
 
-    $("#browse_select_view").click(useMap);
+    $("#browse_filter_toggle").click(toggleFilter);
 
     $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-    $("#browse_hide_areas_box").toggle(hideAreas, showAreas);
-
-    function updateData() {
-      if (browseMode == "auto") {
-        if (map.getZoom() >= 15) {
-          useMap();
-        } else {
-          setStatus(I18n.t('browse.start_rjs.zoom_or_select'));
-        }
-      }
-    }
+    $("#browse_hide_areas_box").click(toggleAreas);
 
     $("#sidebar").one("closed", function () {
       map.removeLayer(dataLayer);
+      map.removeLayer(locationFilter);
       map.off("moveend", updateData);
-      map.off('draw:rectangle-created', endDrag);
-      drawHandler.disable();
-    });
-
-    $("#browse_select_box").click(function () {
-      $("#browse_select_box").html(I18n.t('browse.start_rjs.drag_a_box'));
-
-      drawHandler.enable();
-
-      return false;
+      locationFilter.off("change", getData);
     });
+  }
 
-    function useMap() {
-      var bounds = map.getBounds();
-
-      if (!browseBounds || !browseBounds.contains(bounds)) {
-        browseBounds = bounds;
-        browseMode = "auto";
-
-        getData();
-
-        $("#browse_select_view").hide();
+  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'));
       }
-
-      return false;
     }
+  }
 
-    function hideAreas() {
-      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
-
-      areasHidden = true;
-
-      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();
     }
 
-    function showAreas() {
-      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
+    getData();
+  }
 
+  function toggleAreas() {
+    if (areasHidden) {
+      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
       areasHidden = false;
-
-      getData();
+    } else {
+      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
+      areasHidden = true;
     }
 
-    function endDrag(e) {
-      browseBounds = e.rect.getBounds();
-      browseMode = "manual";
+    getData();
+  }
 
-      getData();
+  function displayFeatureWarning(count, limit, callback) {
+    clearStatus();
 
-      $("#browse_select_box").html(I18n.t('browse.start_rjs.manually_select'));
-      $("#browse_select_view").show();
+    var div = document.createElement("div");
 
-      drawHandler.disable();
-    }
+    var p = document.createElement("p");
+    p.appendChild(document.createTextNode(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit })));
+    div.appendChild(p);
 
-    function displayFeatureWarning(count, limit, callback) {
-      clearStatus();
+    var input = document.createElement("input");
+    input.type = "submit";
+    input.value = I18n.t('browse.start_rjs.load_data');
+    input.onclick = callback;
+    div.appendChild(input);
 
-      var div = document.createElement("div");
+    $("#browse_content").html("");
+    $("#browse_content").append(div);
+  }
 
-      var p = document.createElement("p");
-      p.appendChild(document.createTextNode(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit })));
-      div.appendChild(p);
+  var dataLoader;
 
-      var input = document.createElement("input");
-      input.type = "submit";
-      input.value = I18n.t('browse.start_rjs.load_data');
-      input.onclick = callback;
-      div.appendChild(input);
+  function getData() {
+    var bounds = locationFilter.isEnabled() ? locationFilter.getBounds() : map.getBounds();
+    var size = bounds.getSize();
 
-      $("#browse_content").html("");
-      $("#browse_content").append(div);
+    if (size > OSM.MAX_REQUEST_AREA) {
+      setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
+      return;
     }
 
-    function getData() {
-      var size = browseBounds.getSize();
+    setStatus(I18n.t('browse.start_rjs.loading'));
+
+    var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
+
+    /*
+     * Modern browsers are quite happy showing far more than 100 features in
+     * the data browser, so increase the limit to 2000 by default, but keep
+     * it restricted to 500 for IE8 and 100 for older IEs.
+     */
+    var maxFeatures = 2000;
 
-      if (size > OSM.MAX_REQUEST_AREA) {
-        setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size }));
-        return;
+    /*@cc_on
+      if (navigator.appVersion < 8) {
+        maxFeatures = 100;
+      } else if (navigator.appVersion < 9) {
+        maxFeatures = 500;
       }
+    @*/
 
-      setStatus(I18n.t('browse.start_rjs.loading'));
+    if (dataLoader) dataLoader.abort();
 
-      $("#browse_content").empty();
-      dataLayer.clearLayers();
-      selectedLayer = null;
-
-      var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + browseBounds.toBBOX();
-
-      /*
-       * Modern browsers are quite happy showing far more than 100 features in
-       * the data browser, so increase the limit to 2000 by default, but keep
-       * it restricted to 500 for IE8 and 100 for older IEs.
-       */
-      var maxFeatures = 2000;
-
-      /*@cc_on
-        if (navigator.appVersion < 8) {
-          maxFeatures = 100;
-        } else if (navigator.appVersion < 9) {
-          maxFeatures = 500;
-        }
-      @*/
+    dataLoader = $.ajax({
+      url: url,
+      success: function (xml) {
+        clearStatus();
+
+        $("#browse_content").empty();
+        dataLayer.clearLayers();
+        selectedLayer = null;
 
-      $.ajax({
-        url: url,
-        success: function (xml) {
-          clearStatus();
+        var features = dataLayer.buildFeatures(xml);
 
-          dataLayer.addData(xml);
+        function addFeatures() {
+          dataLayer.addData(features);
 
           layersById = {};
-          var features = [];
 
           dataLayer.eachLayer(function (layer) {
             var feature = layer.feature;
             layersById[feature.id] = layer;
-            features.push({
+            $.extend(feature, {
               typeName: featureTypeName(feature),
               url: "/browse/" + feature.type + "/" + feature.id,
-              name: featureName(feature),
-              id: feature.id
+              name: featureName(feature)
             });
           });
 
@@ -203,128 +209,132 @@ $(document).ready(function () {
 
           loadObjectList();
         }
-      });
-    }
-
-    function viewFeatureLink() {
-      var layer = layersById[$(this).data("feature-id")];
 
-      onSelect(layer);
+        if (features.length < maxFeatures) {
+          addFeatures();
+        } else {
+          displayFeatureWarning(features.length, maxFeatures, addFeatures);
+        }
 
-      if (browseMode != "auto") {
-        map.setCenter(layer.getBounds().getCenter());
+        dataLoader = null;
       }
+    });
+  }
 
-      return false;
-    }
+  function viewFeatureLink() {
+    var layer = layersById[$(this).data("feature-id")];
 
-    function loadObjectList() {
-      $("#browse_content").html(browseObjectList);
-      $("#browse_content").find("a[data-feature-id]").click(viewFeatureLink);
+    onSelect(layer);
 
-      return false;
+    if (locationFilter.isEnabled()) {
+      map.panTo(layer.getBounds().getCenter());
     }
 
-    function onSelect(layer) {
-      // Unselect previously selected feature
-      if (selectedLayer) {
-        selectedLayer.setStyle(selectedLayer.originalStyle);
-      }
+    return false;
+  }
 
-      // Redraw in selected style
-      layer.originalStyle = layer.options;
-      layer.setStyle({color: '#0000ff', weight: 8});
+  function loadObjectList() {
+    $("#browse_content").html(browseObjectList);
+    $("#browse_content").find("a[data-feature-id]").click(viewFeatureLink);
 
-      // 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;
+    return false;
+  }
 
-      $("#browse_content").html(JST["templates/browse/feature"]({
-        name: featureNameSelect(feature),
-        url: "/browse/" + feature.type + "/" + feature.id,
-        attributes: feature.tags
-      }));
+  function onSelect(layer) {
+    // Unselect previously selected feature
+    if (selectedLayer) {
+      selectedLayer.setStyle(selectedLayer.originalStyle);
+    }
 
-      $("#browse_content").find("a.browse_show_list").click(loadObjectList);
-      $("#browse_content").find("a.browse_show_history").click(loadHistory);
+    // Redraw in selected style
+    layer.originalStyle = layer.options;
+    layer.setStyle({color: '#0000ff', weight: 8});
 
-      // Stash the currently drawn feature
-      selectedLayer = layer;
+    // 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();
     }
 
-    dataLayer.on("click", function (e) {
-      onSelect(e.layer);
-    });
+    var feature = layer.feature;
 
-    function loadHistory() {
-      $(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
+    $("#browse_content").html(JST["templates/browse/feature"]({
+      name: featureNameSelect(feature),
+      url: "/browse/" + feature.type + "/" + feature.id,
+      attributes: feature.tags
+    }));
 
-      var feature = selectedLayer.feature;
+    $("#browse_content").find("a.browse_show_list").click(loadObjectList);
+    $("#browse_content").find("a.browse_show_history").click(loadHistory);
 
-      $.ajax({
-        url: "/api/" + OSM.API_VERSION + "/" + feature.type + "/" + feature.id + "/history",
-        success: function (xml) {
-          if (selectedLayer.feature != feature || $("#browse_content").firstChild == browseObjectList) {
-            return;
-          }
+    // Stash the currently drawn feature
+    selectedLayer = layer;
+  }
 
-          $(this).remove();
+  function loadHistory() {
+    $(this).attr("href", "").text(I18n.t('browse.start_rjs.wait'));
 
-          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")
-            });
-          }
+    var feature = selectedLayer.feature;
 
-          $("#browse_content").append(JST["templates/browse/feature_history"]({
-            name: featureNameHistory(feature),
-            url: "/browse/" + feature.type + "/" + feature.id,
-            history: history
-          }));
-        }.bind(this)
-      });
+    $.ajax({
+      url: "/api/" + OSM.API_VERSION + "/" + feature.type + "/" + feature.id + "/history",
+      success: function (xml) {
+        if (selectedLayer.feature != feature || $("#browse_content").firstChild == browseObjectList) {
+          return;
+        }
 
-      return false;
-    }
+        $(this).remove();
 
-    function featureTypeName(feature) {
-      return I18n.t('browse.start_rjs.object_list.type.' + feature.type);
-    }
+        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")
+          });
+        }
 
-    function featureName(feature) {
-      return feature.tags['name:' + $('html').attr('lang')] ||
-        feature.tags.name ||
-        feature.id;
-    }
+        $("#browse_content").append(JST["templates/browse/feature_history"]({
+          name: featureNameHistory(feature),
+          url: "/browse/" + feature.type + "/" + feature.id,
+          history: history
+        }));
+      }.bind(this)
+    });
 
-    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 });
-    }
+    return false;
+  }
 
-    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 featureTypeName(feature) {
+    return I18n.t('browse.start_rjs.object_list.type.' + feature.type);
+  }
 
-    function setStatus(status) {
-      $("#browse_status").html(status);
-      $("#browse_status").show();
-    }
+  function featureName(feature) {
+    return feature.tags['name:' + $('html').attr('lang')] ||
+      feature.tags.name ||
+      feature.id;
+  }
 
-    function clearStatus() {
-      $("#browse_status").html("");
-      $("#browse_status").hide();
-    }
+  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) {
+    $("#browse_status").html(status);
+    $("#browse_status").show();
+  }
+
+  function clearStatus() {
+    $("#browse_status").html("");
+    $("#browse_status").hide();
   }
-});
+}