Merge branch 'pull/3692'

[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 514d6dbb25b6b6619a481de954802cbbd2f10ea4..d1668f247351fd5d1fa5d77496eb56119d55c122 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;


@@ -105,8 +104,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;
         }


@@ -183,6 +182,9 @@ 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;
 


@@ -228,12 +230,14 @@ OSM.Query = function (map) {
 
         if (results.remark) {
           $("<li>")
 
         if (results.remark) {
           $("<li>")

+            .addClass("query-result list-group-item")

             .text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
             .appendTo($ul);
         }
 
         if ($ul.find("li").length === 0) {
           $("<li>")
             .text(I18n.t("javascripts.query.error", { server: url, error: results.remark }))
             .appendTo($ul);
         }
 
         if ($ul.find("li").length === 0) {
           $("<li>")

+            .addClass("query-result list-group-item")

             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
         }
             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
         }


@@ -242,6 +246,7 @@ OSM.Query = function (map) {
         $section.find(".loader").stopTime("loading").hide();
 
         $("<li>")
         $section.find(".loader").stopTime("loading").hide();
 
         $("<li>")

+          .addClass("query-result list-group-item")

           .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
           .appendTo($ul);
       }
           .text(I18n.t("javascripts.query." + status, { server: url, error: error }))
           .appendTo($ul);
       }


@@ -347,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)) {