Merge branch 'main' into caster-everywhere

clickbar · Dec 27, 2024 · 881f235 · 881f235
2 parents 788bd58 + d37f0d5
commit 881f235
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,22 +16,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Added `GeometryCast` to cast geometries instead of the `GeometryWKBCast`
-- Added `ST::asGeoJson` to convert geometries to GeoJSON via the database
+
+### Removed
+
+- Removed `magellan:update-postgis-columns` command
+- Removed `magellan.eloquent` & `magellan.model_directories` configs
+
+## [1.7.0](https://github.com/clickbar/laravel-magellan/tree/1.7.0) - 2024-12-27
+
+### Added
+
 - PostGIS ST_LineSubstring support
 - PostGIS ST_LineFromEncodedPolyline support
 - PostGIS ST_LineLocatePoint support
+- Added `ST::asGeoJson` function to convert geometries to GeoJSON via the database
 
 ### Fixed
 
-- Fixed missing schema prefix to first-level `ST` functions
 - Fixed `Expression` types in SRID-related functions
+- Fixed missing schema prefix for generated SQL of first-level `ST` functions
 - Fixed numeric SRID queries in `ST::transform` and `ST::setSRID` (thanks @BezBIS #91)
-- `ST::buffer`: Renamed `styleMitreLevel` to `styleMitreLimit`
-
-### Removed
-
-- Removed `magellan:update-postgis-columns` command
-- Removed `magellan.eloquent` & `magellan.model_directories` configs
+- Fixed `ST::buffer` & `ST:offsetCurve`: Correctly renamed `styleMitreLevel` to `styleMitreLimit`
 
 ## [1.6.1](https://github.com/clickbar/laravel-magellan/tree/1.6.1) - 2024-08-08
 

diff --git a/src/Database/PostgisFunctions/MagellanGeometryProcessingFunctions.php b/src/Database/PostgisFunctions/MagellanGeometryProcessingFunctions.php
@@ -242,7 +242,7 @@ public static function orientedEnvelope($geometry): MagellanGeometryExpression
      *
      * @see https://postgis.net/docs/ST_OffsetCurve.html
      */
-    public static function offsetCurve($geometry, float|Expression|\Closure $signedDistance, int|Expression|\Closure|null $numSegQuarterCircle = null, ?Join $styleJoin = null, float|Expression|\Closure|null $styleMitreLevel = null): MagellanGeometryExpression
+    public static function offsetCurve($geometry, float|Expression|\Closure $signedDistance, int|Expression|\Closure|null $numSegQuarterCircle = null, ?Join $styleJoin = null, float|Expression|\Closure|null $styleMitreLimit = null): MagellanGeometryExpression
     {
         $arguments = [
             GeoParam::wrap($geometry),
@@ -252,7 +252,7 @@ public static function offsetCurve($geometry, float|Expression|\Closure $signedD
         $styleParts = [
             "quad_segs=$numSegQuarterCircle",
             "join=$styleJoin?->value",
-            "mitre_level=$styleMitreLevel",
+            "mitre_limit=$styleMitreLimit",
         ];
 
         $styleParameter = collect($styleParts)

diff --git a/src/Enums/GeojsonOutputOption.php b/src/Enums/GeojsonOutputOption.php
@@ -5,7 +5,8 @@
 enum GeojsonOutputOption: int
 {
     case NoOption = 0;
+    case Bbox = 1;
     case ShortCrs = 2;
-    case LongCrs = 3;
+    case LongCrs = 4;
     case ShortCrsIfNot4326 = 8;
 }