Skip to content

Commit

Permalink
Merge branch '2.x' into 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jbelien authored May 25, 2024
2 parents 30d1e49 + d591f60 commit 8db0a41
Show file tree
Hide file tree
Showing 33 changed files with 2,584 additions and 2,071 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: composer validate --strict
- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
- name: 'Checkout Repository'
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v3
uses: actions/dependency-review-action@v4
1 change: 1 addition & 0 deletions assets/regions/asia/thailand.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"type":"Polygon","coordinates":[[[97.3,18.58],[97.31,18.54],[97.31,18.52],[97.35,18.49],[97.43,18.28],[97.48,18.23],[97.52,18.23],[97.57,18.26],[97.57,18.21],[97.64,18.14],[97.64,18.05],[97.68,18.02],[97.69,17.98],[97.65,17.95],[97.63,17.87],[97.66,17.8],[97.71,17.76],[97.76,17.65],[97.79,17.64],[97.81,17.6],[97.87,17.56],[97.89,17.51],[97.94,17.49],[98.01,17.43],[98.01,17.41],[98.07,17.34],[98.08,17.29],[98.15,17.22],[98.17,17.22],[98.19,17.18],[98.23,17.15],[98.25,17.08],[98.32,17.01],[98.39,17.01],[98.44,16.95],[98.44,16.92],[98.47,16.89],[98.45,16.85],[98.46,16.82],[98.42,16.76],[98.42,16.73],[98.47,16.66],[98.47,16.63],[98.54,16.59],[98.53,16.56],[98.54,16.53],[98.6,16.47],[98.63,16.26],[98.66,16.23],[98.72,16.23],[98.76,16.3],[98.79,16.3],[98.86,16.38],[98.87,16.37],[98.87,16.28],[98.83,16.26],[98.81,16.23],[98.82,16.18],[98.81,16.16],[98.77,16.17],[98.74,16.16],[98.69,16.18],[98.64,16.15],[98.63,16.1],[98.59,16.12],[98.56,16.11],[98.52,16.06],[98.52,16.02],[98.56,15.98],[98.54,15.91],[98.56,15.85],[98.53,15.8],[98.51,15.69],[98.51,15.59],[98.55,15.47],[98.54,15.41],[98.51,15.43],[98.45,15.43],[98.39,15.4],[98.35,15.34],[98.27,15.35],[98.24,15.27],[98.19,15.28],[98.16,15.25],[98.17,15.18],[98.15,15.17],[98.14,15.09],[98.18,15.04],[98.17,14.96],[98.2,14.92],[98.19,14.87],[98.21,14.86],[98.21,14.8],[98.24,14.78],[98.27,14.71],[98.33,14.66],[98.33,14.64],[98.42,14.57],[98.43,14.5],[98.47,14.49],[98.47,14.46],[98.52,14.4],[98.57,14.29],[98.67,14.24],[98.69,14.21],[98.78,14.16],[98.79,14.14],[98.83,14.13],[98.84,14.1],[98.87,14.09],[98.88,14.07],[98.93,14.06],[98.93,14.02],[98.96,14],[98.98,13.93],[99.03,13.9],[99.06,13.86],[99.08,13.76],[99.13,13.71],[99.12,13.57],[99.15,13.53],[99.17,13.39],[99.15,13.33],[99.16,13.25],[99.13,13.25],[99.09,13.22],[99.08,13.15],[99.09,13.12],[99.06,13.1],[99.06,13.06],[99.09,13.01],[99.14,12.99],[99.15,12.97],[99.12,12.94],[99.12,12.92],[99.14,12.9],[99.16,12.81],[99.18,12.81],[99.19,12.79],[99.19,12.72],[99.21,12.69],[99.25,12.68],[99.27,12.64],[99.31,12.63],[99.33,12.6],[99.39,12.57],[99.36,12.44],[99.4,12.4],[99.39,12.33],[99.42,12.27],[99.44,12.26],[99.43,12.22],[99.45,12.19],[99.43,12.17],[99.43,12.12],[99.46,12.09],[99.5,12.09],[99.5,12],[99.51,11.98],[99.55,11.97],[99.55,11.85],[99.6,11.8],[99.6,11.76],[99.55,11.71],[99.54,11.67],[99.5,11.68],[99.43,11.64],[99.42,11.53],[99.35,11.47],[99.36,11.41],[99.33,11.4],[99.27,11.33],[99.28,11.29],[99.23,11.24],[99.22,11.19],[99.19,11.17],[99.19,11.14],[99.14,11.1],[99.14,11.07],[99.08,11.05],[99.06,11],[98.99,11],[98.96,10.94],[98.96,10.87],[98.94,10.86],[98.92,10.87],[98.88,10.83],[98.83,10.81],[98.74,10.7],[98.73,10.61],[98.78,10.52],[98.71,10.4],[98.68,10.26],[98.61,10.17],[98.59,10.08],[98.55,10.03],[98.54,9.98],[98.46,10.01],[98.38,9.99],[98.31,9.92],[98.24,9.78],[98.21,9.68],[98.1,9.59],[98.05,9.57],[97.97,9.57],[97.88,9.62],[97.72,9.65],[97.68,9.63],[97.59,9.45],[97.61,9.32],[97.66,9.26],[97.57,9.12],[97.59,8.96],[97.56,8.9],[97.47,8.84],[97.42,8.76],[97.39,8.56],[97.43,8.39],[97.47,8.31],[97.52,8.27],[97.63,8.23],[97.73,8.24],[97.79,8.27],[97.91,8.39],[97.94,8.5],[97.91,8.61],[97.95,8.62],[97.99,8.66],[97.97,8.59],[97.97,8.48],[98.02,8.37],[98.03,8.26],[98.02,8.23],[98.05,8.14],[98.02,8.04],[98.03,7.83],[98.05,7.79],[98.06,7.67],[98.11,7.58],[98.08,7.51],[98.08,7.39],[98.11,7.33],[98.18,7.26],[98.28,7.22],[98.35,7.22],[98.41,7.24],[98.52,7.33],[98.55,7.43],[98.59,7.49],[98.65,7.44],[98.65,7.35],[98.7,7.25],[98.82,7.18],[98.83,7.11],[98.89,7.02],[98.94,6.98],[99,6.96],[99.12,6.96],[99.16,6.98],[99.18,6.97],[99.26,6.86],[99.27,6.82],[99.17,6.82],[99.05,6.77],[98.97,6.69],[98.92,6.56],[98.93,6.43],[98.98,6.35],[99.05,6.29],[99.1,6.26],[99.33,6.23],[99.49,6.28],[99.54,6.46],[99.66,6.44],[99.87,6.49],[99.98,6.39],[100.14,6.38],[100.2,6.46],[100.2,6.54],[100.22,6.55],[100.21,6.63],[100.22,6.65],[100.26,6.66],[100.28,6.64],[100.27,6.58],[100.35,6.5],[100.38,6.5],[100.4,6.48],[100.45,6.49],[100.5,6.45],[100.56,6.45],[100.64,6.4],[100.72,6.43],[100.77,6.42],[100.78,6.34],[100.8,6.32],[100.8,6.24],[100.82,6.2],[100.91,6.19],[100.97,6.21],[100.98,6.23],[101.02,6.2],[101.05,6.21],[101.04,6.18],[101.02,6.17],[101.02,6.12],[101.04,6.1],[101.07,6.1],[101.06,6.03],[101.07,5.98],[101.06,5.96],[101,5.95],[100.97,5.89],[100.97,5.84],[100.94,5.8],[101,5.71],[101.04,5.7],[101.07,5.67],[101.09,5.64],[101.09,5.6],[101.11,5.58],[101.15,5.57],[101.22,5.61],[101.3,5.69],[101.3,5.76],[101.38,5.78],[101.42,5.83],[101.5,5.83],[101.56,5.88],[101.58,5.88],[101.6,5.84],[101.62,5.84],[101.62,5.8],[101.67,5.72],[101.71,5.71],[101.75,5.74],[101.79,5.7],[101.83,5.69],[101.86,5.71],[101.87,5.75],[101.9,5.76],[101.91,5.79],[101.97,5.83],[101.98,5.96],[102.1,6.07],[102.1,6.09],[102.13,6.12],[102.12,6.21],[102.21,6.47],[102.3,6.65],[102.23,7.45],[100.93,8.55],[100.33,9.67],[100.32,9.8],[100.19,10.09],[100.01,10.3],[99.69,10.58],[99.76,10.65],[99.78,10.73],[99.76,10.92],[99.81,11.01],[99.82,11.23],[99.86,11.32],[99.86,11.38],[99.94,11.42],[100.01,11.51],[100.02,11.59],[100.07,11.66],[100.08,11.7],[100.08,11.88],[100.2,12],[100.26,12.12],[100.28,12.17],[100.28,12.29],[100.25,12.34],[100.75,12.35],[100.9,12.25],[101.03,12.24],[101.11,12.28],[101.2,12.4],[101.22,12.4],[101.27,12.33],[101.37,12.26],[101.47,12.26],[101.54,12.2],[101.64,12.16],[101.76,12.18],[101.81,12.22],[101.87,12.14],[102,12.09],[101.99,12.01],[102.06,11.85],[102.18,11.64],[102.37,11.41],[102.54,11.31],[102.79,11.37],[102.95,11.63],[102.95,11.77],[102.87,11.87],[102.86,11.94],[102.82,12],[102.81,12.09],[102.75,12.16],[102.77,12.29],[102.76,12.35],[102.82,12.38],[102.83,12.43],[102.81,12.47],[102.77,12.5],[102.77,12.53],[102.72,12.56],[102.67,12.65],[102.64,12.65],[102.6,12.69],[102.54,12.71],[102.58,12.77],[102.57,12.83],[102.55,12.85],[102.55,12.91],[102.53,12.94],[102.57,12.99],[102.57,13.02],[102.52,13.05],[102.5,13.1],[102.46,13.13],[102.41,13.25],[102.39,13.34],[102.4,13.53],[102.53,13.52],[102.6,13.55],[102.6,13.57],[102.66,13.58],[102.66,13.63],[102.61,13.67],[102.77,13.75],[102.77,13.8],[102.81,13.85],[102.82,13.91],[102.87,13.96],[102.92,13.97],[102.95,14],[102.94,14.07],[102.96,14.08],[102.98,14.17],[103.03,14.18],[103.1,14.26],[103.16,14.27],[103.18,14.29],[103.23,14.28],[103.27,14.31],[103.39,14.31],[103.43,14.33],[103.47,14.32],[103.5,14.35],[103.52,14.35],[103.55,14.39],[103.58,14.39],[103.61,14.36],[103.67,14.37],[103.69,14.34],[103.73,14.34],[103.76,14.32],[103.85,14.32],[103.86,14.3],[103.96,14.29],[103.98,14.31],[104.15,14.31],[104.25,14.33],[104.27,14.35],[104.32,14.33],[104.41,14.33],[104.44,14.31],[104.57,14.31],[104.6,14.32],[104.64,14.37],[104.73,14.36],[104.78,14.37],[104.8,14.39],[104.81,14.36],[104.89,14.37],[104.95,14.34],[104.94,14.32],[104.95,14.29],[104.97,14.28],[105,14.2],[105.04,14.17],[105.11,14.17],[105.14,14.18],[105.19,14.23],[105.19,14.27],[105.21,14.3],[105.24,14.29],[105.35,14.35],[105.41,14.36],[105.42,14.38],[105.45,14.38],[105.57,14.53],[105.58,14.64],[105.56,14.66],[105.57,14.69],[105.56,14.7],[105.58,14.7],[105.59,14.74],[105.56,14.77],[105.57,14.78],[105.56,14.79],[105.6,14.82],[105.6,14.85],[105.62,14.86],[105.61,14.92],[105.66,14.96],[105.66,15],[105.63,15.03],[105.61,15.03],[105.59,15.09],[105.52,15.12],[105.53,15.16],[105.52,15.16],[105.55,15.19],[105.55,15.21],[105.6,15.22],[105.63,15.25],[105.62,15.34],[105.59,15.37],[105.62,15.39],[105.64,15.43],[105.64,15.53],[105.67,15.56],[105.68,15.63],[105.67,15.69],[105.64,15.71],[105.64,15.74],[105.62,15.76],[105.57,15.79],[105.49,15.81],[105.46,15.79],[105.43,15.83],[105.39,15.93],[105.4,15.95],[105.44,15.95],[105.47,15.99],[105.44,16.05],[105.32,16.08],[105.24,16.08],[105.12,16.13],[105.08,16.13],[105.05,16.2],[105.06,16.25],[105.05,16.27],[104.98,16.32],[104.95,16.37],[104.92,16.38],[104.87,16.49],[104.8,16.52],[104.77,16.56],[104.78,16.63],[104.8,16.66],[104.8,16.76],[104.78,16.78],[104.78,16.81],[104.8,16.83],[104.8,16.87],[104.77,16.93],[104.77,17.01],[104.84,17.14],[104.85,17.33],[104.84,17.41],[104.78,17.47],[104.76,17.53],[104.73,17.56],[104.51,17.67],[104.41,17.8],[104.39,17.85],[104.35,17.88],[104.3,17.89],[104.26,18.01],[104.14,18.13],[104.1,18.21],[104.1,18.24],[104.05,18.29],[104.03,18.34],[103.98,18.38],[103.93,18.38],[103.87,18.34],[103.83,18.38],[103.71,18.38],[103.64,18.44],[103.58,18.44],[103.53,18.47],[103.49,18.46],[103.39,18.49],[103.35,18.47],[103.29,18.47],[103.2,18.37],[103.21,18.31],[103.15,18.3],[103.11,18.24],[103.11,18.19],[103.05,18.16],[103.03,18.1],[103.04,18.04],[103.03,18.02],[103,18.04],[102.92,18.04],[102.83,18.01],[102.81,17.98],[102.76,17.97],[102.73,17.92],[102.69,17.92],[102.66,17.89],[102.65,17.96],[102.63,17.99],[102.57,18.01],[102.53,18],[102.46,18.01],[102.39,18.07],[102.31,18.09],[102.22,18.17],[102.19,18.24],[102.14,18.26],[102.12,18.25],[102.07,18.26],[102.01,18.22],[102,18.18],[101.94,18.14],[101.89,18.07],[101.81,18.11],[101.75,18.1],[101.72,18.06],[101.72,18.02],[101.69,17.95],[101.59,17.93],[101.58,17.91],[101.56,17.91],[101.53,17.88],[101.51,17.81],[101.38,17.77],[101.33,17.7],[101.29,17.69],[101.23,17.63],[101.2,17.57],[101.15,17.56],[101.14,17.53],[101.05,17.58],[101.03,17.6],[101.04,17.66],[101.03,17.66],[101.05,17.68],[101.04,17.77],[101.07,17.81],[101.07,17.87],[101.1,17.88],[101.13,17.92],[101.15,17.92],[101.16,17.98],[101.22,18.04],[101.21,18.16],[101.23,18.19],[101.23,18.24],[101.2,18.26],[101.2,18.29],[101.22,18.31],[101.22,18.36],[101.12,18.41],[101.11,18.44],[101.13,18.46],[101.13,18.49],[101.16,18.49],[101.18,18.52],[101.21,18.53],[101.22,18.57],[101.28,18.62],[101.28,18.64],[101.31,18.67],[101.31,18.71],[101.28,18.73],[101.3,18.8],[101.29,18.88],[101.33,18.91],[101.34,18.96],[101.38,18.99],[101.38,19.02],[101.4,19.04],[101.39,19.08],[101.33,19.12],[101.29,19.17],[101.3,19.25],[101.28,19.27],[101.28,19.35],[101.26,19.36],[101.26,19.38],[101.24,19.38],[101.25,19.42],[101.31,19.46],[101.33,19.58],[101.27,19.64],[101.21,19.65],[101.12,19.62],[101.05,19.67],[100.95,19.66],[100.87,19.67],[100.79,19.55],[100.76,19.55],[100.66,19.6],[100.59,19.59],[100.57,19.56],[100.53,19.56],[100.53,19.61],[100.48,19.66],[100.49,19.71],[100.46,19.76],[100.49,19.82],[100.54,19.85],[100.56,19.89],[100.57,19.98],[100.61,20.08],[100.62,20.18],[100.56,20.22],[100.52,20.2],[100.49,20.25],[100.44,20.29],[100.4,20.39],[100.34,20.44],[100.25,20.44],[100.15,20.33],[100.13,20.33],[100.12,20.4],[100.09,20.43],[100.03,20.45],[99.99,20.5],[99.85,20.48],[99.79,20.38],[99.71,20.39],[99.68,20.36],[99.67,20.38],[99.59,20.38],[99.57,20.4],[99.53,20.4],[99.5,20.43],[99.44,20.43],[99.42,20.41],[99.42,20.34],[99.47,20.31],[99.46,20.29],[99.48,20.23],[99.51,20.19],[99.49,20.19],[99.43,20.13],[99.3,20.16],[99.26,20.15],[99.23,20.17],[99.13,20.17],[99.11,20.15],[99.06,20.14],[99.03,20.11],[99,20.04],[99,19.96],[98.98,19.94],[98.99,19.84],[98.95,19.81],[98.91,19.81],[98.86,19.85],[98.82,19.85],[98.77,19.8],[98.7,19.81],[98.56,19.74],[98.5,19.76],[98.48,19.74],[98.31,19.74],[98.28,19.72],[98.24,19.77],[98.22,19.77],[98.19,19.81],[98.15,19.83],[98.12,19.83],[98.1,19.85],[98.01,19.84],[97.99,19.81],[97.98,19.72],[97.99,19.68],[97.95,19.67],[97.91,19.62],[97.85,19.62],[97.82,19.59],[97.81,19.53],[97.83,19.5],[97.8,19.48],[97.79,19.44],[97.75,19.42],[97.77,19.32],[97.74,19.26],[97.8,19.2],[97.79,19.12],[97.75,19.11],[97.7,19.06],[97.7,19.01],[97.63,18.97],[97.63,18.91],[97.7,18.85],[97.73,18.63],[97.7,18.61],[97.64,18.62],[97.58,18.59],[97.57,18.57],[97.47,18.55],[97.38,18.64],[97.34,18.64],[97.3,18.58]],[[97.58,18.27],[97.57,18.26],[97.57,18.27],[97.58,18.28],[97.58,18.27]],[[97.59,18.28],[97.58,18.28],[97.58,18.29],[97.59,18.29],[97.59,18.28]]]}
1 change: 1 addition & 0 deletions assets/regions/north-america/guatemala.geojson

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/regions/south-america/brazil.geojson

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
"symfony/proxy-manager-bridge": "~6.4.0",
"symfony/runtime": "~6.4.0",
"symfony/security-bundle": "~6.3.0",
"symfony/serializer": "~6.3.0",
"symfony/serializer": "~6.4.7",
"symfony/string": "~6.4.2",
"symfony/translation": "~6.4.2",
"symfony/twig-bundle": "~6.3.0",
"symfony/twig-bundle": "~6.4.7",
"symfony/validator": "~6.4.2",
"symfony/web-link": "~6.4.0",
"symfony/webpack-encore-bundle": "^2.0",
Expand Down
Loading

0 comments on commit 8db0a41

Please sign in to comment.