X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/05eba790089d8e70d3061cb07f6d40720aee6010..24ddb8657d383487bbfae3a674c9c7db36982c88:/app/assets/javascripts/index/browse.js?ds=sidebyside

diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js
index e7788be18..28a830858 100644
--- a/app/assets/javascripts/index/browse.js
+++ b/app/assets/javascripts/index/browse.js
@@ -1,330 +1,130 @@
-//= require templates/browse/feature
-//= require templates/browse/feature_list
-//= require templates/browse/feature_history
-
-$(document).ready(function () {
-  var areasHidden = false;
-
-  var dataLayer = new L.OSM.DataLayer(null, {
-    styles: {
-      way: {
-        weight: 3,
-        color: "#000000",
-        opacity: 0.4
-      },
-      area: {
-        weight: 3,
-        color: "#ff0000"
-      },
-      node: {
-        color: "#00ff00"
-      }
+OSM.initializeBrowse = function (map) {
+  var browseBounds;
+  var selectedLayer;
+  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 () {
-    return !areasHidden && L.OSM.DataLayer.prototype.isWayArea.apply(this, arguments);
+    return false;
   };
 
-  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
-    map.layersControl.addOverlay(dataLayer, I18n.t("browse.start_rjs.data_layer_name"));
-  }
+  dataLayer.on("click", function (e) {
+    onSelect(e.layer);
+  });
 
   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) {
-      closeSidebar();
-    }
-  });
-
-  function startBrowse(sidebarHtml) {
-    var browseBounds;
-    var layersById;
-    var selectedLayer;
-    var browseObjectList;
-
-    var 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").toggle(enableFilter, disableFilter);
-
-    $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-    $("#browse_hide_areas_box").toggle(hideAreas, showAreas);
-
-    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'));
-        }
-      }
-    }
-
-    $("#sidebar").one("closed", function () {
-      map.removeLayer(dataLayer);
-      map.removeLayer(locationFilter);
       map.off("moveend", updateData);
-      locationFilter.off("change", getData);
-    });
-
-    function enableFilter() {
-      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.view_data'));
-      locationFilter.setBounds(map.getBounds().pad(-0.2));
-      locationFilter.enable();
-      getData();
-    }
-
-    function disableFilter() {
-      $("#browse_filter_toggle").html(I18n.t('browse.start_rjs.manually_select'));
-      locationFilter.disable();
-      getData();
-    }
-
-    function hideAreas() {
-      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.show_areas'));
-      areasHidden = true;
-      getData();
+      $('#browse_status').empty();
     }
+  });
 
-    function showAreas() {
-      $("#browse_hide_areas_box").html(I18n.t('browse.start_rjs.hide_areas'));
-      areasHidden = false;
+  function updateData() {
+    var bounds = map.getBounds();
+    if (!browseBounds || !browseBounds.contains(bounds)) {
       getData();
     }
+  }
 
-    function displayFeatureWarning(count, limit, callback) {
-      clearStatus();
-
-      var div = document.createElement("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);
+  function displayFeatureWarning(count, limit, add, cancel) {
+    $('#browse_status').html(
+      $("<p class='warning'></p>")
+        .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))
+        .prepend(
+          $("<span class='icon close'></span>")
+            .click(cancel))
+        .append(
+          $("<input type='submit'>")
+            .val(I18n.t('browse.start_rjs.load_data'))
+            .click(add)));
+  }
 
-      var input = document.createElement("input");
-      input.type = "submit";
-      input.value = I18n.t('browse.start_rjs.load_data');
-      input.onclick = callback;
-      div.appendChild(input);
+  var dataLoader;
 
-      $("#browse_content").html("");
-      $("#browse_content").append(div);
-    }
+  function getData() {
+    var bounds = map.getBounds();
+    var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
 
-    function getData() {
-      var bounds = locationFilter.isEnabled() ? locationFilter.getBounds() : map.getBounds();
-      var size = bounds.getSize();
+    /*
+     * 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();
 
-      var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBOX();
+    dataLoader = $.ajax({
+      url: url,
+      success: function (xml) {
+        dataLayer.clearLayers();
+        selectedLayer = null;
 
-      /*
-       * 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;
+        var features = dataLayer.buildFeatures(xml);
 
-      /*@cc_on
-        if (navigator.appVersion < 8) {
-          maxFeatures = 100;
-        } else if (navigator.appVersion < 9) {
-          maxFeatures = 500;
+        function addFeatures() {
+          $('#browse_status').empty();
+          dataLayer.addData(features);
+          browseBounds = bounds;
         }
-      @*/
-
-      $.ajax({
-        url: url,
-        success: function (xml) {
-          clearStatus();
-
-          $("#browse_content").empty();
-          dataLayer.clearLayers();
-          selectedLayer = null;
-
-          var features = dataLayer.buildFeatures(xml);
-
-          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) {
-            addFeatures();
-          } else {
-            displayFeatureWarning(features.length, maxFeatures, addFeatures);
-          }
+        function cancelAddFeatures() {
+          $('#browse_status').empty();
         }
-      });
-    }
-
-    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) {
-        selectedLayer.setStyle(selectedLayer.originalStyle);
-      }
 
-      // Redraw in selected style
-      layer.originalStyle = layer.options;
-      layer.setStyle({color: '#0000ff', weight: 8});
+        if (features.length < maxFeatures) {
+          addFeatures();
+        } else {
+          displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures);
+        }
 
-      // 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();
+        dataLoader = null;
       }
-
-      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);
-
-      // Stash the currently drawn feature
-      selectedLayer = layer;
-    }
-
-    dataLayer.on("click", function (e) {
-      onSelect(e.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 onSelect(layer) {
+    // Unselect previously selected feature
+    if (selectedLayer) {
+      selectedLayer.setStyle(selectedLayer.originalStyle);
     }
 
-    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 });
-    }
+    // Redraw in selected style
+    layer.originalStyle = layer.options;
+    layer.setStyle({color: '#0000ff', weight: 8});
 
-    function setStatus(status) {
-      $("#browse_status").html(status);
-      $("#browse_status").show();
-    }
+    OSM.router.route('/' + layer.feature.type + '/' + layer.feature.id);
 
-    function clearStatus() {
-      $("#browse_status").html("");
-      $("#browse_status").hide();
-    }
+    // Stash the currently drawn feature
+    selectedLayer = layer;
   }
-});
+};