Skip to content

feat(types): add support for LineString and MultiLineString #277

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 15, 2025
Merged

feat(types): add support for LineString and MultiLineString #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/Param/ParamValueConverterRegistry.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,19 @@ public function __construct()
{
$formatPoint = static fn (array $point) => sprintf('(%s)', implode(',', $point));
// phpcs:ignore SlevomatCodingStandard.Functions.RequireArrowFunction.RequiredArrowFunction
$formatRing = static function (array $v) use ($formatPoint) {
$formatRingOrLineString = static function (array $v) use ($formatPoint) {
/** @phpstan-var array<array<string>> $v */
return sprintf('[%s]', implode(
',',
array_map($formatPoint, $v),
));
};
// phpcs:ignore SlevomatCodingStandard.Functions.RequireArrowFunction.RequiredArrowFunction
$formatPolygon = static function (array $v) use ($formatRing) {
$formatPolygonOrMultiLineString = static function (array $v) use ($formatRingOrLineString) {
/** @phpstan-var array<array<string>> $v */
return sprintf('[%s]', implode(
',',
array_map($formatRing, $v),
array_map($formatRingOrLineString, $v),
));
};

Expand Down Expand Up @@ -158,18 +158,24 @@ public function __construct()
: $formatPoint($v),
'Ring' => static fn (string|array $v) => is_string($v)
? $v
: $formatRing($v),
: $formatRingOrLineString($v),
'LineString' => static fn (string|array $v) => is_string($v)
? $v
: $formatRingOrLineString($v),
'MultiLineString' => static fn (string|array $v) => is_string($v)
? $v
: $formatPolygonOrMultiLineString($v),
'Polygon' => static fn (string|array $v) => is_string($v)
? $v
: $formatPolygon($v),
: $formatPolygonOrMultiLineString($v),
'MultiPolygon' => static fn (string|array $v) => is_string($v)
? $v
// phpcs:ignore SlevomatCodingStandard.Functions.RequireArrowFunction.RequiredArrowFunction
: (static function (array $vv) use ($formatPolygon) {
: (static function (array $vv) use ($formatPolygonOrMultiLineString) {
/** @phpstan-var array<array<string>> $vv */
return sprintf('[%s]', implode(
',',
array_map($formatPolygon, $vv),
array_map($formatPolygonOrMultiLineString, $vv),
));
})($v),

Expand Down
14 changes: 14 additions & 0 deletions tests/Param/ParamValueConverterRegistryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,20 @@ public static function providerConvert(): Generator
yield 'Point (array)' => ['Point', [1, 2], '(1,2)'];
yield 'Ring' => ['Ring', '[(1,2),(3,4)]', '[(1,2),(3,4)]'];
yield 'Ring (array)' => ['Ring', [[1, 2], [3, 4]], '[(1,2),(3,4)]'];
yield 'LineString' => ['LineString', '[(1,2),(3,4)]', '[(1,2),(3,4)]'];
yield 'LineString (array)' => ['LineString', [[1, 2], [3, 4]], '[(1,2),(3,4)]'];
yield 'MultiLineString' => [
'MultiLineString',
'[[(1,2),(3,4)],[(5,6),(7,8)]]',
'[[(1,2),(3,4)],[(5,6),(7,8)]]',
];

yield 'MultiLineString (array)' => [
'MultiLineString',
[[[1, 2], [3, 4]], [[5, 6], [7, 8]]],
'[[(1,2),(3,4)],[(5,6),(7,8)]]',
];

yield 'Polygon' => ['Polygon', '[[(1,2),(3,4)],[(5,6),(7,8)]]', '[[(1,2),(3,4)],[(5,6),(7,8)]]'];
yield 'Polygon (array)' => ['Polygon', [[[1, 2], [3, 4]], [[5, 6], [7, 8]]], '[[(1,2),(3,4)],[(5,6),(7,8)]]'];
yield 'MultiPolygon' => [
Expand Down
Loading