Skip to content

Commit 2496491

Browse files
committed
Fixed camel case on GeometryColumn
1 parent 9b12ca8 commit 2496491

File tree

1 file changed

+19
-18
lines changed

1 file changed

+19
-18
lines changed

src/Eloquent/SpatialTrait.php

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -119,49 +119,50 @@ public function scopeBounding($query, Geometry $bounds, $column_name)
119119
return $query->whereRaw("st_intersects(GeomFromText('{$bounds->toWkt()}'), `{$column_name}`)");
120120
}
121121

122-
public function scopeComparison($query, $geometry_column, $geometry, $relationship)
122+
public function scopeComparison($query, $geometryColumn, $geometry, $relationship)
123123
{
124-
$query->whereRaw("st_{$relationship}(`{$geometry_column}`, GeomFromText('{$geometry->toWkt()}'))");
124+
$query->whereRaw("st_{$relationship}(`{$geometryColumn}`, GeomFromText('{$geometry->toWkt()}'))");
125+
125126
return $query;
126127
}
127128

128-
public function scopeWithin($query, $geometry_column, $polygon)
129+
public function scopeWithin($query, $geometryColumn, $polygon)
129130
{
130-
return $this->scopeComparison($query, $geometry_column, $polygon, 'within');
131+
return $this->scopeComparison($query, $geometryColumn, $polygon, 'within');
131132
}
132133

133-
public function scopeCrosses($query, $geometry_column, $geometry)
134+
public function scopeCrosses($query, $geometryColumn, $geometry)
134135
{
135-
return $this->scopeComparison($query, $geometry_column, $geometry, 'crosses');
136+
return $this->scopeComparison($query, $geometryColumn, $geometry, 'crosses');
136137
}
137138

138-
public function scopeContains($query, $geometry_column, $geometry)
139+
public function scopeContains($query, $geometryColumn, $geometry)
139140
{
140-
return $this->scopeComparison($query, $geometry_column, $geometry, 'contains');
141+
return $this->scopeComparison($query, $geometryColumn, $geometry, 'contains');
141142
}
142143

143-
public function scopeDisjoint($query, $geometry_column, $geometry)
144+
public function scopeDisjoint($query, $geometryColumn, $geometry)
144145
{
145-
return $this->scopeComparison($query, $geometry_column, $geometry, 'disjoint');
146+
return $this->scopeComparison($query, $geometryColumn, $geometry, 'disjoint');
146147
}
147148

148-
public function scopeEquals($query, $geometry_column, $geometry)
149+
public function scopeEquals($query, $geometryColumn, $geometry)
149150
{
150-
return $this->scopeComparison($query, $geometry_column, $geometry, 'equals');
151+
return $this->scopeComparison($query, $geometryColumn, $geometry, 'equals');
151152
}
152153

153-
public function scopeIntersects($query, $geometry_column, $geometry)
154+
public function scopeIntersects($query, $geometryColumn, $geometry)
154155
{
155-
return $this->scopeComparison($query, $geometry_column, $geometry, 'intersects');
156+
return $this->scopeComparison($query, $geometryColumn, $geometry, 'intersects');
156157
}
157158

158-
public function scopeOverlaps($query, $geometry_column, $geometry)
159+
public function scopeOverlaps($query, $geometryColumn, $geometry)
159160
{
160-
return $this->scopeComparison($query, $geometry_column, $geometry, 'overlaps');
161+
return $this->scopeComparison($query, $geometryColumn, $geometry, 'overlaps');
161162
}
162163

163-
public function scopeTouches($query, $geometry_column, $geometry)
164+
public function scopeTouches($query, $geometryColumn, $geometry)
164165
{
165-
return $this->scopeComparison($query, $geometry_column, $geometry, 'touches');
166+
return $this->scopeComparison($query, $geometryColumn, $geometry, 'touches');
166167
}
167168
}

0 commit comments

Comments
 (0)