Allow a configurable delay to keep diary entries from being published in feeds

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

-OSM.Query = function(map) {
-  var protocol = document.location.protocol === "https:" ? "https:" : "http:",
-    url = protocol + OSM.OVERPASS_URL,
+OSM.Query = function (map) {
+  var url = OSM.OVERPASS_URL,

     queryButton = $(".control-query .control-button"),
     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'],
+    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;
 
   var featureStyle = {
     marker;
 
   var featureStyle = {


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


@@ -56,7 +55,7 @@ OSM.Query = function(map) {
           var geometry = $(this).data("geometry");
           if (geometry) map.removeLayer(geometry);
 
           var geometry = $(this).data("geometry");
           if (geometry) map.removeLayer(geometry);
 

-          if (!$(e.target).is('a')) {
+          if (!$(e.target).is("a")) {

             $(this).find("a").simulate("click", e);
           }
         }
             $(this).find("a").simulate("click", e);
           }
         }


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


@@ -179,9 +178,9 @@ 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) {
+      success: function (results) {

         var elements;
 
         $section.find(".loader").stopTime("loading").hide();
         var elements;
 
         $section.find(".loader").stopTime("loading").hide();


@@ -238,7 +237,7 @@ OSM.Query = function(map) {
             .appendTo($ul);
         }
       },
             .appendTo($ul);
         }
       },

-      error: function(xhr, status, error) {
+      error: function (xhr, status, error) {

         $section.find(".loader").stopTime("loading").hide();
 
         $("<li>")
         $section.find(".loader").stopTime("loading").hide();
 
         $("<li>")


@@ -288,7 +287,7 @@ OSM.Query = function(map) {
       nodes = "node(" + around + ")",
       ways = "way(" + around + ")",
       relations = "relation(" + around + ")",
       nodes = "node(" + around + ")",
       ways = "way(" + around + ")",
       relations = "relation(" + around + ")",

-      nearby = "(" + nodes + ";" + ways + ");out tags geom(" + bbox + ");" + relations + ";out geom(" + bbox + ");",
+      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")
       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")


@@ -302,8 +301,8 @@ OSM.Query = function(map) {
         map.removeLayer(marker);
       } else {
         marker.setStyle({
         map.removeLayer(marker);
       } else {
         marker.setStyle({

-          opacity: 1 - i * 0.1,
-          fillOpacity: 0.5 - i * 0.05
+          opacity: 1 - (i * 0.1),
+          fillOpacity: 0.5 - (i * 0.05)

         });
       }
     }, 10);
         });
       }
     }, 10);


@@ -336,14 +335,14 @@ OSM.Query = function(map) {
 
   var page = {};
 
 
   var page = {};
 

-  page.pushstate = page.popstate = function(path) {
+  page.pushstate = page.popstate = function (path) {

     OSM.loadSidebarContent(path, function () {
       page.load(path, true);
     });
   };
 
     OSM.loadSidebarContent(path, function () {
       page.load(path, true);
     });
   };
 

-  page.load = function(path, noCentre) {
-    var params = querystring.parse(path.substring(path.indexOf('?') + 1)),
+  page.load = function (path, noCentre) {
+    var params = querystring.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)) {


@@ -355,7 +354,7 @@ OSM.Query = function(map) {
     queryOverpass(params.lat, params.lon);
   };
 
     queryOverpass(params.lat, params.lon);
   };
 

-  page.unload = function(sameController) {
+  page.unload = function (sameController) {

     if (!sameController) {
       disableQueryMode();
     }
     if (!sameController) {
       disableQueryMode();
     }