Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove Style/OptionalBooleanParameter offense #349

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,3 @@ Naming/VariableNumber:
# Offense count: 60
Style/Documentation:
Enabled: false

# Offense count: 5
# Configuration parameters: AllowedMethods.
# AllowedMethods: respond_to_missing?
Style/OptionalBooleanParameter:
Exclude:
- 'lib/rgeo/coord_sys/cs/entities.rb'
- 'lib/rgeo/wkrep/wkb_generator.rb'
- 'lib/rgeo/wkrep/wkt_generator.rb'
- 'lib/rgeo/wkrep/wkt_parser.rb'
1 change: 1 addition & 0 deletions History.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

* Add `transform` method to `Geometry`. #342
* Fix rubocop_todos and other refactoring. (@thestelz) #338
* Fix Style/OptionalBooleanParameter from rubocop_todos. (@haroon26) #349

**Bug Fixes**

Expand Down
62 changes: 34 additions & 28 deletions lib/rgeo/coord_sys/cs/entities.rb
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def to_s
# <tt>:standard_brackets</tt>
# If true, outputs parentheses rather than square
# brackets. Default is false.
def to_wkt(standard_brackets = false)
def to_wkt(standard_brackets: false)
open, close = brackets(standard_brackets)
content = wkt_content(standard_brackets).map { |obj| ",#{obj}" }.join
authority =
Expand Down Expand Up @@ -369,7 +369,7 @@ def initialize(dx_meters, dy_meters, dz_meters, ex_arc_seconds, ey_arc_seconds,
# Bursa Wolf scaling in in parts per million.
attr_reader :ppm

def to_wkt(standard_brackets = false)
def to_wkt(standard_brackets: false)
open, close = brackets(standard_brackets)
"TOWGS84#{open}#{@dx},#{@dy},#{@dz},#{@ex},#{@ey},#{@ez},#{@ppm}#{close}"
end
Expand Down Expand Up @@ -817,8 +817,8 @@ def create(name, datum_type, ellipsoid, wgs84_parameters, *optional)
private

def wkt_content(standard_brackets)
array = [@ellipsoid.to_wkt(standard_brackets)]
array << @wgs84_parameters.to_wkt(standard_brackets) if @wgs84_parameters
array = [@ellipsoid.to_wkt(standard_brackets: standard_brackets)]
array << @wgs84_parameters.to_wkt(standard_brackets: standard_brackets) if @wgs84_parameters
array
end
end
Expand Down Expand Up @@ -1024,7 +1024,7 @@ def create(name, head, tail, *optional)
private

def wkt_content(standard_brackets)
[@head.to_wkt(standard_brackets), @tail.to_wkt(standard_brackets)]
[@head.to_wkt(standard_brackets: standard_brackets), @tail.to_wkt(standard_brackets: standard_brackets)]
end
end

Expand Down Expand Up @@ -1088,9 +1088,9 @@ def create(name, local_datum, unit, axes, *optional)

def wkt_content(standard_brackets)
[
@local_datum.to_wkt(standard_brackets),
@unit.to_wkt(standard_brackets)
] + @axes.map { |ax| ax.to_wkt(standard_brackets) }
@local_datum.to_wkt(standard_brackets: standard_brackets),
@unit.to_wkt(standard_brackets: standard_brackets)
] + @axes.map { |ax| ax.to_wkt(standard_brackets: standard_brackets) }
end
end

Expand Down Expand Up @@ -1161,13 +1161,13 @@ def create(name, horizontal_datum, prime_meridian, linear_unit, axis0, axis1, ax

def wkt_content(standard_brackets)
arr = [
@horizontal_datum.to_wkt(standard_brackets),
@prime_meridian.to_wkt(standard_brackets),
@linear_unit.to_wkt(standard_brackets)
@horizontal_datum.to_wkt(standard_brackets: standard_brackets),
@prime_meridian.to_wkt(standard_brackets: standard_brackets),
@linear_unit.to_wkt(standard_brackets: standard_brackets)
]
arr << @axis0.to_wkt(standard_brackets) if @axis0
arr << @axis1.to_wkt(standard_brackets) if @axis1
arr << @axis2.to_wkt(standard_brackets) if @axis2
arr << @axis0.to_wkt(standard_brackets: standard_brackets) if @axis0
arr << @axis1.to_wkt(standard_brackets: standard_brackets) if @axis1
arr << @axis2.to_wkt(standard_brackets: standard_brackets) if @axis2
arr
end
end
Expand Down Expand Up @@ -1221,8 +1221,11 @@ def create(name, vertical_datum, vertical_unit, axis, *optional)
private

def wkt_content(standard_brackets)
arr = [@vertical_datum.to_wkt(standard_brackets), @vertical_unit.to_wkt(standard_brackets)]
arr << @axis.to_wkt(standard_brackets) if @axis
arr = [
@vertical_datum.to_wkt(standard_brackets: standard_brackets),
@vertical_unit.to_wkt(standard_brackets: standard_brackets)
]
arr << @axis.to_wkt(standard_brackets: standard_brackets) if @axis
arr
end
end
Expand Down Expand Up @@ -1321,12 +1324,12 @@ def create(name, angular_unit, horizontal_datum, prime_meridian, axis0, axis1, *

def wkt_content(standard_brackets)
arr = [
@horizontal_datum.to_wkt(standard_brackets),
@prime_meridian.to_wkt(standard_brackets),
@angular_unit.to_wkt(standard_brackets)
@horizontal_datum.to_wkt(standard_brackets: standard_brackets),
@prime_meridian.to_wkt(standard_brackets: standard_brackets),
@angular_unit.to_wkt(standard_brackets: standard_brackets)
]
arr << @axis0.to_wkt(standard_brackets) if @axis0
arr << @axis1.to_wkt(standard_brackets) if @axis1
arr << @axis0.to_wkt(standard_brackets: standard_brackets) if @axis0
arr << @axis1.to_wkt(standard_brackets: standard_brackets) if @axis1
arr
end
end
Expand Down Expand Up @@ -1389,11 +1392,14 @@ def create(name, geographic_coordinate_system, projection, linear_unit, axis0, a
private

def wkt_content(standard_brackets)
arr = [@geographic_coordinate_system.to_wkt(standard_brackets), @projection.to_wkt(standard_brackets)]
@projection.each_parameter { |param| arr << param.to_wkt(standard_brackets) }
arr << @linear_unit.to_wkt(standard_brackets)
arr << @axis0.to_wkt(standard_brackets) if @axis0
arr << @axis1.to_wkt(standard_brackets) if @axis1
arr = [
@geographic_coordinate_system.to_wkt(standard_brackets: standard_brackets),
@projection.to_wkt(standard_brackets: standard_brackets)
]
@projection.each_parameter { |param| arr << param.to_wkt(standard_brackets: standard_brackets) }
arr << @linear_unit.to_wkt(standard_brackets: standard_brackets)
arr << @axis0.to_wkt(standard_brackets: standard_brackets) if @axis0
arr << @axis1.to_wkt(standard_brackets: standard_brackets) if @axis1
arr
end
end
Expand Down Expand Up @@ -1540,8 +1546,8 @@ def create(source_cs, target_cs, *optional)
private

def wkt_content(standard_brackets)
source_cs_wkt = "SOURCECS[#{source_cs.to_wkt(standard_brackets)}]"
target_cs_wkt = "TARGETCS[#{target_cs.to_wkt(standard_brackets)}]"
source_cs_wkt = "SOURCECS[#{source_cs.to_wkt(standard_brackets: standard_brackets)}]"
target_cs_wkt = "TARGETCS[#{target_cs.to_wkt(standard_brackets: standard_brackets)}]"

[source_cs_wkt, target_cs_wkt]
end
Expand Down
4 changes: 2 additions & 2 deletions lib/rgeo/wkrep/wkb_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def generate(obj)
has_m = false
end
result = Result.new(has_z, has_m)
generate_feature(obj, result, true)
generate_feature(obj, result, toplevel: true)
result.emit(@hex_format)
end

Expand Down Expand Up @@ -165,7 +165,7 @@ def point_coords(obj, rval, array = [])
array
end

def generate_feature(obj, rval, toplevel = false)
def generate_feature(obj, rval, toplevel: false)
emit_byte(@little_endian ? 1 : 0, rval)
type = obj.geometry_type
type_code = TYPE_CODES[type]
Expand Down
4 changes: 2 additions & 2 deletions lib/rgeo/wkrep/wkt_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def generate(obj)
support_z = factory.property(:has_z_coordinate)
support_m = factory.property(:has_m_coordinate)
end
str = generate_feature(obj, support_z, support_m, true)
str = generate_feature(obj, support_z, support_m, toplevel: true)
case @convert_case
when :upper
str.upcase
Expand All @@ -113,7 +113,7 @@ def generate(obj)

private

def generate_feature(obj, support_z, support_m, toplevel = false)
def generate_feature(obj, support_z, support_m, toplevel: false)
type = obj.geometry_type
type = Feature::LineString if type.subtype_of?(Feature::LineString)
tag = type.type_name.dup
Expand Down
4 changes: 2 additions & 2 deletions lib/rgeo/wkrep/wkt_parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ def parse_type_tag
end
case type
when "point"
parse_point(true)
parse_point(convert_empty: true)
when "linestring"
parse_line_string
when "polygon"
Expand Down Expand Up @@ -273,7 +273,7 @@ def parse_coords
@cur_factory.point(x, y, *extra)
end

def parse_point(convert_empty = false)
def parse_point(convert_empty: false)
if convert_empty && @cur_token == "empty"
point = ensure_factory.multi_point([])
else
Expand Down