X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8fe18995964717ff6f88858291c6f464cc40397f..c985c2d4ce1e239b8154cf8583d74598ffcd3161:/lib/bounding_box.rb diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb index c01808f54..11e831cfe 100644 --- a/lib/bounding_box.rb +++ b/lib/bounding_box.rb @@ -43,14 +43,22 @@ class BoundingBox # only try to expand the bbox if there is a value for every coordinate # which there will be from the previous line as long as array does not contain a nil if bbox.complete? - @min_lon = [-SCALED_LON_LIMIT, - bbox.min_lon + margin * (min_lon - max_lon)].max if bbox.min_lon < min_lon - @min_lat = [-SCALED_LAT_LIMIT, - bbox.min_lat + margin * (min_lat - max_lat)].max if bbox.min_lat < min_lat - @max_lon = [+SCALED_LON_LIMIT, - bbox.max_lon + margin * (max_lon - min_lon)].min if bbox.max_lon > max_lon - @max_lat = [+SCALED_LAT_LIMIT, - bbox.max_lat + margin * (max_lat - min_lat)].min if bbox.max_lat > max_lat + if bbox.min_lon < min_lon + @min_lon = [-SCALED_LON_LIMIT, + bbox.min_lon + margin * (min_lon - max_lon)].max + end + if bbox.min_lat < min_lat + @min_lat = [-SCALED_LAT_LIMIT, + bbox.min_lat + margin * (min_lat - max_lat)].max + end + if bbox.max_lon > max_lon + @max_lon = [+SCALED_LON_LIMIT, + bbox.max_lon + margin * (max_lon - min_lon)].min + end + if bbox.max_lat > max_lat + @max_lat = [+SCALED_LAT_LIMIT, + bbox.max_lat + margin * (max_lat - min_lat)].min + end end self end @@ -58,15 +66,17 @@ class BoundingBox def check_boundaries # check the bbox is sane if min_lon > max_lon - fail OSM::APIBadBoundingBox.new( - "The minimum longitude must be less than the maximum longitude, but it wasn't") + raise OSM::APIBadBoundingBox.new( + "The minimum longitude must be less than the maximum longitude, but it wasn't" + ) end if min_lat > max_lat - fail OSM::APIBadBoundingBox.new( - "The minimum latitude must be less than the maximum latitude, but it wasn't") + raise OSM::APIBadBoundingBox.new( + "The minimum latitude must be less than the maximum latitude, but it wasn't" + ) end if min_lon < -LON_LIMIT || min_lat < -LAT_LIMIT || max_lon > +LON_LIMIT || max_lat > +LAT_LIMIT - fail OSM::APIBadBoundingBox.new("The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," + + raise OSM::APIBadBoundingBox.new("The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," + " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}") end self @@ -75,7 +85,7 @@ class BoundingBox def check_size(max_area = MAX_REQUEST_AREA) # check the bbox isn't too large if area > max_area - fail OSM::APIBadBoundingBox.new("The maximum bbox size is " + max_area.to_s + + raise OSM::APIBadBoundingBox.new("The maximum bbox size is " + max_area.to_s + ", and your request was too large. Either request a smaller area, or use planet.osm") end self @@ -161,8 +171,9 @@ class BoundingBox def from_bbox_array(bbox_array) unless bbox_array - fail OSM::APIBadUserInput.new( - "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat") + raise OSM::APIBadUserInput.new( + "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat" + ) end # Take an array of length 4, create a bounding box with min_lon, min_lat, max_lon and # max_lat within their respective boundaries.