Make Hound and his handler happy

pull/11922/head
Javier Torres 8 years ago
parent 52d0b90003
commit a8df140a37

@ -312,7 +312,9 @@ class Carto::VisualizationQueryBuilder
end
if @bounding_box
bbox_sql = Carto::BoundingBoxUtils.to_polygon(@bounding_box[:minx], @bounding_box[:miny], @bounding_box[:maxx], @bounding_box[:maxy])
bbox_sql = Carto::BoundingBoxUtils.to_polygon(
@bounding_box[:minx], @bounding_box[:miny], @bounding_box[:maxx], @bounding_box[:maxy]
)
query = query.where("visualizations.bbox is not null AND visualizations.bbox && #{bbox_sql}")
end

@ -19,7 +19,9 @@ module Carto::BoundingBoxUtils
def self.to_polygon(minx, miny, maxx, maxy)
return nil unless check_bounds_for(minx, miny) && check_bounds_for(maxx, maxy)
%{ST_Transform(ST_Envelope('SRID=4326;POLYGON((#{minx} #{miny}, #{minx} #{maxy}, #{maxx} #{maxy}, #{maxx} #{miny}, #{minx} #{miny}))'::geometry), 3857)}
"ST_Transform(ST_Envelope('SRID=4326;POLYGON((" \
"#{minx} #{miny}, #{minx} #{maxy}, #{maxx} #{maxy}, #{maxx} #{miny}, #{minx} #{miny}" \
"))'::geometry), 3857)}"
end
def self.to_point(x, y)

Loading…
Cancel
Save