Avoid using inline javascript to update message list

[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 117d12df3221432a7d471eb1cabbbb2ff61732ef..3da84c7d90e46b214575cf44212070bcbe4217c2 100644 (file)
--- a/app/assets/javascripts/index/query.js
+++ b/app/assets/javascripts/index/query.js
@@ -1,8 +1,7 @@
 //= require jquery.simulate
 
 OSM.Query = function(map) {
 //= require jquery.simulate
 
 OSM.Query = function(map) {

-  var protocol = document.location.protocol === "https:" ? "https:" : "http:",
-    url = protocol + OSM.OVERPASS_URL,
+  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'],
     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;


@@ -12,7 +11,7 @@ OSM.Query = function(map) {
     weight: 4,
     opacity: 1,
     fillOpacity: 0.5,
     weight: 4,
     opacity: 1,
     fillOpacity: 0.5,

-    clickable: false
+    interactive: false

   };
 
   queryButton.on("click", function (e) {
   };
 
   queryButton.on("click", function (e) {


@@ -87,9 +86,10 @@ OSM.Query = function(map) {
       });
     } else {
       var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");
       });
     } else {
       var prefixes = I18n.t("geocoder.search_osm_nominatim.prefix");

+      var key, value;

 
 

-      for (var key in tags) {
-        var value = tags[key];
+      for (key in tags) {
+        value = tags[key];

 
         if (prefixes[key]) {
           if (prefixes[key][value]) {
 
         if (prefixes[key]) {
           if (prefixes[key][value]) {


@@ -98,8 +98,8 @@ OSM.Query = function(map) {
         }
       }
 
         }
       }
 

-      for (var key in tags) {
-        var value = tags[key];
+      for (key in tags) {
+        value = tags[key];

 
         if (prefixes[key]) {
           var first = value.substr(0, 1).toUpperCase(),
 
         if (prefixes[key]) {
           var first = value.substr(0, 1).toUpperCase(),


@@ -145,7 +145,7 @@ OSM.Query = function(map) {
 
     if (feature.type === "node" && feature.lat && feature.lon) {
       geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);
 
     if (feature.type === "node" && feature.lat && feature.lon) {
       geometry = L.circleMarker([feature.lat, feature.lon], featureStyle);

-    } else if (feature.type === "way" && feature.geometry) {
+    } else if (feature.type === "way" && feature.geometry && feature.geometry.length > 0) {

       geometry = L.polyline(feature.geometry.filter(function (point) {
         return point !== null;
       }).map(function (point) {
       geometry = L.polyline(feature.geometry.filter(function (point) {
         return point !== null;
       }).map(function (point) {


@@ -160,7 +160,7 @@ OSM.Query = function(map) {
     return geometry;
   }
 
     return geometry;
   }
 

-  function runQuery(latlng, radius, query, $section, compare) {
+  function runQuery(latlng, radius, query, $section, merge, compare) {

     var $ul = $section.find("ul");
 
     $ul.empty();
     var $ul = $section.find("ul");
 
     $ul.empty();


@@ -178,19 +178,34 @@ OSM.Query = function(map) {
       url: url,
       method: "POST",
       data: {
       url: url,
       method: "POST",
       data: {

-        data: "[timeout:5][out:json];" + query,
+        data: "[timeout:10][out:json];" + query,

       },
       success: function(results) {
         var elements;
 
         $section.find(".loader").stopTime("loading").hide();
 
       },
       success: function(results) {
         var elements;
 
         $section.find(".loader").stopTime("loading").hide();
 

-        if (compare) {
-          elements = results.elements.sort(compare);
+        if (merge) {
+          elements = results.elements.reduce(function (hash, element) {
+            var key = element.type + element.id;
+            if ("geometry" in element) {
+              delete element.bounds;
+            }
+            hash[key] = $.extend({}, hash[key], element);
+            return hash;
+          }, {});
+
+          elements = Object.keys(elements).map(function (key) {
+            return elements[key];
+          });

         } else {
           elements = results.elements;
         }
 
         } else {
           elements = results.elements;
         }
 

+        if (compare) {
+          elements = elements.sort(compare);
+        }
+

         for (var i = 0; i < elements.length; i++) {
           var element = elements[i];
 
         for (var i = 0; i < elements.length; i++) {
           var element = elements[i];
 


@@ -210,6 +225,12 @@ OSM.Query = function(map) {
           }
         }
 
           }
         }
 

+        if (results.remark) {
+          $("<li>")
+            .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.nothing_found"))
         if ($ul.find("li").length === 0) {
           $("<li>")
             .text(I18n.t("javascripts.query.nothing_found"))


@@ -258,16 +279,16 @@ OSM.Query = function(map) {
    * for each object.
    */
   function queryOverpass(lat, lng) {
    * for each object.
    */
   function queryOverpass(lat, lng) {

-    var latlng = L.latLng(lat, lng),
-      bounds = map.getBounds(),
+    var latlng = L.latLng(lat, lng).wrap(),
+      bounds = map.getBounds().wrap(),

       bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(),
       radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
       around = "around:" + radius + "," + lat + "," + lng,
       nodes = "node(" + around + ")",
       ways = "way(" + around + ")",
       relations = "relation(" + around + ")",
       bbox = bounds.getSouth() + "," + bounds.getWest() + "," + bounds.getNorth() + "," + bounds.getEast(),
       radius = 10 * Math.pow(1.5, 19 - map.getZoom()),
       around = "around:" + radius + "," + lat + "," + lng,
       nodes = "node(" + around + ")",
       ways = "way(" + around + ")",
       relations = "relation(" + around + ")",

-      nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");",
-      isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags geom(" + bbox + ");relation(pivot.a);out tags bb;";
+      nearby = "(" + nodes + ";" + ways + ";);out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");",
+      isin = "is_in(" + lat + "," + lng + ")->.a;way(pivot.a);out tags bb;out ids geom(" + bbox + ");relation(pivot.a);out tags bb;";

 
     $("#sidebar_content .query-intro")
       .hide();
 
     $("#sidebar_content .query-intro")
       .hide();


@@ -286,14 +307,15 @@ OSM.Query = function(map) {
       }
     }, 10);
 
       }
     }, 10);
 

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

   }
 
   function clickHandler(e) {
     var precision = OSM.zoomPrecision(map.getZoom()),
   }
 
   function clickHandler(e) {
     var precision = OSM.zoomPrecision(map.getZoom()),

-      lat = e.latlng.lat.toFixed(precision),
-      lng = e.latlng.lng.toFixed(precision);
+      latlng = e.latlng.wrap(),
+      lat = latlng.lat.toFixed(precision),
+      lng = latlng.lng.toFixed(precision);

 
     OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
   }
 
     OSM.router.route("/query?lat=" + lat + "&lon=" + lng);
   }