Replace query marker fade animation with css

[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..09e4de31e0c6e78faf57444534b55fa3c5653292 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,10 +1,8 @@
-//= require jquery.simulate
-//= require querystring
+//= 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,32 +38,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("mousedown", ".query-results li.query-result", function () {
-      var moved = false;
-      $(this).one("click", function (e) {
-        if (!moved) {
-          var geometry = $(this).data("geometry");
-          if (geometry) map.removeLayer(geometry);
-
-          if (!$(e.target).is("a")) {
-            $(this).find("a").simulate("click", e);
-          }
-        }
-      }).one("mousemove", function () {
-        moved = true;
-      });
-    });
+    .on("mouseover", ".query-results a", showResultGeometry)
+    .on("mouseout", ".query-results a", hideResultGeometry);

 
   function interestingFeature(feature) {
     if (feature.tags) {
 
   function interestingFeature(feature) {
     if (feature.tags) {


@@ -105,8 +92,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 +109,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 +156,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 +166,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) {


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

-              .addClass("query-result list-group-item")
-              .data("geometry", featureGeometry(element))
+              .addClass("list-group-item list-group-item-action")

               .text(featurePrefix(element) + " ")
               .appendTo($ul);
 
             $("<a>")
               .text(featurePrefix(element) + " ")
               .appendTo($ul);
 
             $("<a>")

+              .addClass("stretched-link")

               .attr("href", "/" + element.type + "/" + element.id)
               .attr("href", "/" + element.type + "/" + element.id)

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

               .text(featureName(element))
               .appendTo($li);
           }
               .text(featureName(element))
               .appendTo($li);
           }


@@ -228,20 +215,23 @@ OSM.Query = function (map) {
 
         if (results.remark) {
           $("<li>")
 
         if (results.remark) {
           $("<li>")

+            .addClass("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("list-group-item")

             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
         }
       },
       error: function (xhr, status, error) {
             .text(I18n.t("javascripts.query.nothing_found"))
             .appendTo($ul);
         }
       },
       error: function (xhr, status, error) {

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

 
         $("<li>")
 
         $("<li>")

+          .addClass("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);
       }


@@ -263,9 +253,9 @@ OSM.Query = function (map) {
    * To find nearby objects we ask overpass for the union of the
    * following sets:
    *
    * To find nearby objects we ask overpass for the union of the
    * following sets:
    *

-   *   node(around:<radius>,<lat>,lng>)
-   *   way(around:<radius>,<lat>,lng>)
-   *   relation(around:<radius>,<lat>,lng>)
+   *   node(around:<radius>,<lat>,<lng>)
+   *   way(around:<radius>,<lat>,<lng>)
+   *   relation(around:<radius>,<lat>,<lng>)

    *
    * to find enclosing objects we first find all the enclosing areas:
    *
    *
    * to find enclosing objects we first find all the enclosing areas:
    *


@@ -299,18 +289,10 @@ OSM.Query = function (map) {
       .hide();
 
     if (marker) map.removeLayer(marker);
       .hide();
 
     if (marker) map.removeLayer(marker);

-    marker = L.circle(latlng, radius, featureStyle).addTo(map);
-
-    $(document).everyTime(75, "fadeQueryMarker", function (i) {
-      if (i === 10) {
-        map.removeLayer(marker);
-      } else {
-        marker.setStyle({
-          opacity: 1 - (i * 0.1),
-          fillOpacity: 0.5 - (i * 0.05)
-        });
-      }
-    }, 10);
+    marker = L.circle(latlng, Object.assign({
+      radius: radius,
+      className: "query-marker"
+    }, featureStyle)).addTo(map);

 
     runQuery(latlng, radius, nearby, $("#query-nearby"), false);
     runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize);
 
     runQuery(latlng, radius, nearby, $("#query-nearby"), false);
     runQuery(latlng, radius, isin, $("#query-isin"), true, compareSize);


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


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

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

     }
   };
 
     }
   };