Switch to bootstrap for dropdowns and tooltips

[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 8a190a90ab3f7c1356d3c5c3c642fae0f3086fc9..7d02760ced95afb9a0ed1793cb2a3c74b0df505f 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,6 +1,9 @@
 //= require jquery.simulate
 //= require jquery.simulate

+//= require querystring

 
 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"],


@@ -211,28 +214,28 @@ OSM.Query = function (map) {
 
           if (interestingFeature(element)) {
             var $li = $("<li>")
 
           if (interestingFeature(element)) {
             var $li = $("<li>")

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

               .data("geometry", featureGeometry(element))
               .data("geometry", featureGeometry(element))

-              .appendTo($ul);
-            var $p = $("<p>")

               .text(featurePrefix(element) + " ")
               .text(featurePrefix(element) + " ")

-              .appendTo($li);
+              .appendTo($ul);

 
             $("<a>")
               .attr("href", "/" + element.type + "/" + element.id)
               .text(featureName(element))
 
             $("<a>")
               .attr("href", "/" + element.type + "/" + element.id)
               .text(featureName(element))

-              .appendTo($p);
+              .appendTo($li);

           }
         }
 
         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);
         }


@@ -241,6 +244,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);
       }


@@ -281,7 +285,11 @@ OSM.Query = function (map) {
   function queryOverpass(lat, lng) {
     var latlng = L.latLng(lat, lng).wrap(),
         bounds = map.getBounds().wrap(),
   function queryOverpass(lat, lng) {
     var latlng = L.latLng(lat, lng).wrap(),
         bounds = map.getBounds().wrap(),

-        bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(),
+        precision = OSM.zoomPrecision(map.getZoom()),
+        bbox = bounds.getSouth().toFixed(precision) + "," +
+               bounds.getWest().toFixed(precision) + "," +
+               bounds.getNorth().toFixed(precision) + "," +
+               bounds.getEast().toFixed(precision),

         radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
         around = "around:" + radius + "," + lat + "," + lng,
         nodes = "node(" + around + ")",
         radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
         around = "around:" + radius + "," + lat + "," + lng,
         nodes = "node(" + around + ")",