X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/037585db3933a2954b43bd4b30ea5e30ade00be2..4634c6bc4233641e84d78b728a69ce4aba49fa7c:/lib/bounding_box.rb diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb index e2dfcd3ff..1fc5dc696 100644 --- a/lib/bounding_box.rb +++ b/lib/bounding_box.rb @@ -6,8 +6,6 @@ class BoundingBox SCALED_LON_LIMIT = LON_LIMIT * GeoRecord::SCALE SCALED_LAT_LIMIT = LAT_LIMIT * GeoRecord::SCALE - public - def initialize(min_lon, min_lat, max_lon, max_lat) @min_lon = min_lon.to_f unless min_lon.nil? @min_lat = min_lat.to_f unless min_lat.nil? @@ -20,23 +18,17 @@ class BoundingBox end def self.from_bbox_params(params) - if params[:bbox] && params[:bbox].count(",") == 3 - bbox_array = params[:bbox].split(",") - end + bbox_array = params[:bbox].split(",") if params[:bbox] && params[:bbox].count(",") == 3 from_bbox_array(bbox_array) end def self.from_lon_lat_params(params) - if params[:minlon] && params[:minlat] && params[:maxlon] && params[:maxlat] - bbox_array = [params[:minlon], params[:minlat], params[:maxlon], params[:maxlat]] - end + bbox_array = [params[:minlon], params[:minlat], params[:maxlon], params[:maxlat]] if params[:minlon] && params[:minlat] && params[:maxlon] && params[:maxlat] from_bbox_array(bbox_array) end def self.from_lrbt_params(params) - if params[:l] && params[:b] && params[:t] && params[:t] - bbox_array = [params[:l], params[:b], params[:r], params[:t]] - end + bbox_array = [params[:l], params[:b], params[:r], params[:t]] if params[:l] && params[:b] && params[:t] && params[:t] from_bbox_array(bbox_array) end @@ -45,31 +37,33 @@ 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 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") - end - if min_lat > max_lat - fail OSM::APIBadBoundingBox.new( - "The minimum latitude must be less than the maximum latitude, but it wasn't") - end + raise OSM::APIBadBoundingBox, "The minimum longitude must be less than the maximum longitude, but it wasn't" if min_lon > max_lon + raise OSM::APIBadBoundingBox, "The minimum latitude must be less than the maximum latitude, but it wasn't" if min_lat > max_lat 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}," + - " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}") + raise OSM::APIBadBoundingBox, "The latitudes must be between #{-LAT_LIMIT} and #{LAT_LIMIT}," \ + " and longitudes between #{-LON_LIMIT} and #{LON_LIMIT}" end self end @@ -77,8 +71,8 @@ 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 + - ", and your request was too large. Either request a smaller area, or use planet.osm") + raise OSM::APIBadBoundingBox, "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 end @@ -129,10 +123,10 @@ class BoundingBox # there are two forms used for bounds with and without an underscore, # cater for both forms eg minlon and min_lon def add_bounds_to(hash, underscore = "") - hash["min#{underscore}lat"] = min_lat.to_s - hash["min#{underscore}lon"] = min_lon.to_s - hash["max#{underscore}lat"] = max_lat.to_s - hash["max#{underscore}lon"] = max_lon.to_s + hash["min#{underscore}lat"] = format("%.7f", min_lat) + hash["min#{underscore}lon"] = format("%.7f", min_lon) + hash["max#{underscore}lat"] = format("%.7f", max_lat) + hash["max#{underscore}lon"] = format("%.7f", max_lon) hash end @@ -158,20 +152,19 @@ class BoundingBox "#{min_lon},#{min_lat},#{max_lon},#{max_lat}" end - private + class << self + private - def self.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") + def from_bbox_array(bbox_array) + raise OSM::APIBadUserInput, "The parameter bbox is required, and must be of the form min_lon,min_lat,max_lon,max_lat" unless bbox_array + # Take an array of length 4, create a bounding box with min_lon, min_lat, max_lon and + # max_lat within their respective boundaries. + min_lon = [[bbox_array[0].to_f, -LON_LIMIT].max, +LON_LIMIT].min + min_lat = [[bbox_array[1].to_f, -LAT_LIMIT].max, +LAT_LIMIT].min + max_lon = [[bbox_array[2].to_f, +LON_LIMIT].min, -LON_LIMIT].max + max_lat = [[bbox_array[3].to_f, +LAT_LIMIT].min, -LAT_LIMIT].max + BoundingBox.new(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. - min_lon = [[bbox_array[0].to_f, -LON_LIMIT].max, +LON_LIMIT].min - min_lat = [[bbox_array[1].to_f, -LAT_LIMIT].max, +LAT_LIMIT].min - max_lon = [[bbox_array[2].to_f, +LON_LIMIT].min, -LON_LIMIT].max - max_lat = [[bbox_array[3].to_f, +LAT_LIMIT].min, -LAT_LIMIT].max - BoundingBox.new(min_lon, min_lat, max_lon, max_lat) end def update!(bbox)