X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b9ae40d9784725b75e5b52f55659c80326656d8f..4cf0abb0277dea5350ad09c34233d930e68fb296:/app/controllers/api/map_controller.rb diff --git a/app/controllers/api/map_controller.rb b/app/controllers/api/map_controller.rb index d151d3d39..b0998f7eb 100644 --- a/app/controllers/api/map_controller.rb +++ b/app/controllers/api/map_controller.rb @@ -19,15 +19,15 @@ module Api # check boundary is sane and area within defined # see /config/application.yml begin - bbox = BoundingBox.from_bbox_params(params) - bbox.check_boundaries - bbox.check_size - rescue StandardError => err - report_error(err.message) + @bounds = BoundingBox.from_bbox_params(params) + @bounds.check_boundaries + @bounds.check_size + rescue StandardError => e + report_error(e.message) return end - nodes = Node.bbox(bbox).where(:visible => true).includes(:node_tags).limit(Settings.max_number_of_nodes + 1) + nodes = Node.bbox(@bounds).where(:visible => true).includes(:node_tags).limit(Settings.max_number_of_nodes + 1) node_ids = nodes.collect(&:id) if node_ids.length > Settings.max_number_of_nodes @@ -35,9 +35,6 @@ module Api return end - # add bounds - @bounds = bbox - # get ways # find which ways are needed ways = [] @@ -77,28 +74,23 @@ module Api end end - relations = Relation.nodes(visible_nodes.keys).visible + - Relation.ways(way_ids).visible + @relations = Relation.nodes(visible_nodes.keys).visible + + Relation.ways(way_ids).visible # we do not normally return the "other" partners referenced by an relation, # e.g. if we return a way A that is referenced by relation X, and there's # another way B also referenced, that is not returned. But we do make # an exception for cases where an relation references another *relation*; # in that case we return that as well (but we don't go recursive here) - relations += Relation.relations(relations.collect(&:id)).visible + @relations += Relation.relations(@relations.collect(&:id)).visible # this "uniq" may be slightly inefficient; it may be better to first collect and output # all node-related relations, then find the *not yet covered* way-related ones etc. - @relations = [] - relations.uniq.each do |relation| - @relations << relation - end + @relations.uniq! response.headers["Content-Disposition"] = "attachment; filename=\"map.osm\"" # Render the result - respond_to do |format| - format.xml - end + render :formats => [:xml] end end end