Merge master with css changes

[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..4b58e6f935b4d513974e0d522de118de707cdb29 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,9 +1,7 @@
-//= 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,
       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"],
   var url = OSM.OVERPASS_URL,
       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"],


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


@@ -350,7 +348,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)) {