Wrap message action buttons in divs

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

diff --git a/app/assets/javascripts/index/query.js b/app/assets/javascripts/index/query.js
index 7d02760ced95afb9a0ed1793cb2a3c74b0df505f..59c3a8b495c29638e57cd25ca677b064009f9b98 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,10 +1,9 @@
-//= require jquery.simulate
-//= require querystring
+//= require jquery-simulate/jquery.simulate
+//= require qs/dist/qs

 
 OSM.Query = function (map) {
 
 OSM.Query = function (map) {

-  var querystring = require("querystring-component");
-

   var url = OSM.OVERPASS_URL,
   var url = OSM.OVERPASS_URL,

+      credentials = OSM.OVERPASS_CREDENTIALS,

       queryButton = $(".control-query .control-button"),
       uninterestingTags = ["source", "source_ref", "source:ref", "history", "attribution", "created_by", "tiger:county", "tiger:tlid", "tiger:upload_uuid", "KSJ2:curve_id", "KSJ2:lat", "KSJ2:lon", "KSJ2:coordinate", "KSJ2:filename", "note:ja"],
       marker;
       queryButton = $(".control-query .control-button"),
       uninterestingTags = ["source", "source_ref", "source:ref", "history", "attribution", "created_by", "tiger:county", "tiger:tlid", "tiger:upload_uuid", "KSJ2:curve_id", "KSJ2:lat", "KSJ2:lon", "KSJ2:coordinate", "KSJ2:filename", "note:ja"],
       marker;


@@ -40,17 +39,21 @@ OSM.Query = function (map) {
     }
   });
 
     }
   });
 

+  function showResultGeometry() {
+    var geometry = $(this).data("geometry");
+    if (geometry) map.addLayer(geometry);
+    $(this).addClass("selected");
+  }
+
+  function hideResultGeometry() {
+    var geometry = $(this).data("geometry");
+    if (geometry) map.removeLayer(geometry);
+    $(this).removeClass("selected");
+  }
+

   $("#sidebar_content")
   $("#sidebar_content")

-    .on("mouseover", ".query-results li.query-result", function () {
-      var geometry = $(this).data("geometry");
-      if (geometry) map.addLayer(geometry);
-      $(this).addClass("selected");
-    })
-    .on("mouseout", ".query-results li.query-result", function () {
-      var geometry = $(this).data("geometry");
-      if (geometry) map.removeLayer(geometry);
-      $(this).removeClass("selected");
-    })
+    .on("mouseover", ".query-results li.query-result", showResultGeometry)
+    .on("mouseout", ".query-results li.query-result", hideResultGeometry)

     .on("mousedown", ".query-results li.query-result", function () {
       var moved = false;
       $(this).one("click", function (e) {
     .on("mousedown", ".query-results li.query-result", function () {
       var moved = false;
       $(this).one("click", function (e) {


@@ -105,8 +108,8 @@ OSM.Query = function (map) {
         value = tags[key];
 
         if (prefixes[key]) {
         value = tags[key];
 
         if (prefixes[key]) {

-          var first = value.substr(0, 1).toUpperCase(),
-              rest = value.substr(1).replace(/_/g, " ");
+          var first = value.slice(0, 1).toUpperCase(),
+              rest = value.slice(1).replace(/_/g, " ");

 
           return first + rest;
         }
 
           return first + rest;
         }


@@ -122,7 +125,7 @@ OSM.Query = function (map) {
 
   function featureName(feature) {
     var tags = feature.tags,
 
   function featureName(feature) {
     var tags = feature.tags,

-        locales = I18n.locales.get();
+        locales = OSM.preferred_languages;

 
     for (var i = 0; i < locales.length; i++) {
       if (tags["name:" + locales[i]]) {
 
     for (var i = 0; i < locales.length; i++) {
       if (tags["name:" + locales[i]]) {


@@ -169,10 +172,6 @@ OSM.Query = function (map) {
     $ul.empty();
     $section.show();
 
     $ul.empty();
     $section.show();
 

-    $section.find(".loader").oneTime(1000, "loading", function () {
-      $(this).show();
-    });
-

     if ($section.data("ajax")) {
       $section.data("ajax").abort();
     }
     if ($section.data("ajax")) {
       $section.data("ajax").abort();
     }


@@ -183,10 +182,13 @@ OSM.Query = function (map) {
       data: {
         data: "[timeout:10][out:json];" + query
       },
       data: {
         data: "[timeout:10][out:json];" + query
       },

+      xhrFields: {
+        withCredentials: credentials
+      },

       success: function (results) {
         var elements;
 
       success: function (results) {
         var elements;
 

-        $section.find(".loader").stopTime("loading").hide();
+        $section.find(".loader").hide();

 
         if (merge) {
           elements = results.elements.reduce(function (hash, element) {
 
         if (merge) {
           elements = results.elements.reduce(function (hash, element) {


@@ -241,7 +243,7 @@ OSM.Query = function (map) {
         }
       },
       error: function (xhr, status, error) {
         }
       },
       error: function (xhr, status, error) {

-        $section.find(".loader").stopTime("loading").hide();
+        $section.find(".loader").hide();

 
         $("<li>")
           .addClass("query-result list-group-item")
 
         $("<li>")
           .addClass("query-result list-group-item")


@@ -350,7 +352,7 @@ OSM.Query = function (map) {
   };
 
   page.load = function (path, noCentre) {
   };
 
   page.load = function (path, noCentre) {

-    var params = querystring.parse(path.substring(path.indexOf("?") + 1)),
+    var params = Qs.parse(path.substring(path.indexOf("?") + 1)),

         latlng = L.latLng(params.lat, params.lon);
 
     if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) {
         latlng = L.latLng(params.lat, params.lon);
 
     if (!window.location.hash && !noCentre && !map.getBounds().contains(latlng)) {


@@ -365,6 +367,7 @@ OSM.Query = function (map) {
   page.unload = function (sameController) {
     if (!sameController) {
       disableQueryMode();
   page.unload = function (sameController) {
     if (!sameController) {
       disableQueryMode();

+      $("#sidebar_content .query-results li.query-result.selected").each(hideResultGeometry);

     }
   };
 
     }
   };