Merge branch 'master' into 4.0.x

Author: dvdoug

.github/workflows/ci.yml

@@ -58,7 +58,7 @@ jobs:
       run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
     - name: Set up build cache
-      uses: "actions/cache@v2.1.4"
+      uses: "actions/cache@v2"
       with:
         path: |
           ${{ steps.composercache.outputs.dir }}
@@ -67,6 +67,9 @@ jobs:
         key: "php-${{ matrix.php-version }}-deps-${{ matrix.dependencies }}-${{ hashFiles('composer.json') }}"
         restore-keys: "php-${{ matrix.php-version }}-deps-${{ matrix.dependencies }}"
 
+    - name: Remove manual import-only deps
+      run: composer remove --dev --no-update "gasparesganga/php-shapefile";
+
     - name: Remove PHP-CS-Fixer if not called
       if: matrix.php-version != '7.4' || matrix.dependencies != 'highest'
       run: composer remove --dev --no-update "friendsofphp/php-cs-fixer";

.gitignore

@@ -7,4 +7,4 @@
 /.php_cs.cache
 /.phpunit.result.cache
 
-/resources/epsg/*.sql*
+/resources/epsg/

.php_cs.dist

@@ -30,6 +30,7 @@ return $config = (new PhpCsFixer\Config())
                 'header' => "PHPCoord.\n\n@author Doug Wright",
             ],
             'phpdoc_line_span' => true,
+            'phpdoc_to_comment' => false,
         ]
     )
     ->setRiskyAllowed(true)

CHANGELOG.md

@@ -2,12 +2,20 @@
 
 ## [Unreleased]
 
+## [4.2.0] - 2021-04-19
+### Added
+- More accurate extent data
+### Fixed
+ - Ensure projections still work even when origin points are on the other side of the antimeridian
+### Changed
+ - Updates to data for Australia, Poland, UK and US Gulf of Mexico.
+
 ## [4.1.0] - 2021-03-03
 ### Added
 - Added `UTMPoint` as a better way of handling UTM zones than the EPSG model does it
 - Improved conversion chaining for `CompoundPoint`s
 ### Changed
-- moved `verticalOffsetAndSlope` method from `CompoundPoint` to `VerticalPoint`. This is technically a breaking change, but since the code is only 2 days old shouldn't affect anyone.
+- Moved `verticalOffsetAndSlope` method from `CompoundPoint` to `VerticalPoint`. This is technically a breaking change, but since the code is only 2 days old shouldn't affect anyone.
 
 ## [4.0.1] - 2021-03-01
 ### Fixed

composer.json

@@ -18,8 +18,9 @@
     "require-dev": {
         "ext-sqlite3": "*",
         "friendsofphp/php-cs-fixer": "^2.18.0",
-        "phpunit/phpunit": "^9.5.0",
-        "nikic/php-parser": "^4.10"
+        "gasparesganga/php-shapefile": "^3.4",
+        "nikic/php-parser": "^4.10",
+        "phpunit/phpunit": "^9.5.0"
     },
     "config": {
         "preferred-install": {
@@ -29,6 +30,11 @@
         "bin-compat" : "full",
         "optimize-autoloader": true
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.x-dev"
+        }
+    },
     "autoload": {
         "psr-4": {
             "PHPCoord\\": "src/"

docs/coordinate_conversions_easy.rst

@@ -27,7 +27,7 @@ between almost any two CRSs is possible as long as they have a common link.
     $from = ProjectedPoint::createFromEastingNorthing(
         new Metre(577275),
         new Metre(69741),
-        Projected::fromSRID(Projected::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID)
+        Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID)
     );
     $toCRS = Projected::fromSRID(Projected::EPSG_WGS_84_UTM_ZONE_31N);
     $to = $from->convert($toCRS);

docs/creating_points_compound.rst

@@ -28,7 +28,7 @@ Example:
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Horizontal location of Ben Nevis peak using British National Grid
-    $horizontalCRS = Projected::fromSRID(Projected::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID);
+    $horizontalCRS = Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID);
     $horizontalPoint = ProjectedPoint::createFromEastingNorthing(
         new Metre(216692),
         new Metre(771274),
@@ -43,7 +43,7 @@ Example:
     );
 
     // Full coordinate of Ben Nevis Peak
-    $compoundCRS = Compound::fromSRID(Compound::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID_PLUS_ODN_HEIGHT);
+    $compoundCRS = Compound::fromSRID(Compound::EPSG_OSGB36_BRITISH_NATIONAL_GRID_PLUS_ODN_HEIGHT);
     $point = CompoundPoint::create(
         $horizontalPoint,
         $verticalPoint,

docs/creating_points_projected.rst

@@ -49,15 +49,15 @@ Examples:
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Nelson's Column in British National Grid (unknown date), traditional arguments
-    $crs = Projected::fromSRID(Projected::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID);
+    $crs = Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID);
     $point = ProjectedPoint::createFromEastingNorthing(
         new Metre(530017),
         new Metre(180419),
         $crs
     );
 
     // Nelson's Column in British National Grid (2020-02-01), traditional arguments
-    $crs = Projected::fromSRID(Projected::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID);
+    $crs = Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID);
     $point = ProjectedPoint::createFromEastingNorthing(
         new Metre(530017),
         new Metre(180419),
@@ -66,15 +66,15 @@ Examples:
     );
 
     // Nelson's Column in British National Grid (unknown date), named arguments
-    $crs = Projected::fromSRID(Projected::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID);
+    $crs = Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID);
     $point = ProjectedPoint::createFromEastingNorthing(
         easting: new Metre(530017),
         northing: new Metre(180419),
         crs: $crs
     );
 
     // Nelson's Column in British National Grid (2020-02-01), named arguments
-    $crs = Projected::fromSRID(Projected::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID);
+    $crs = Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID);
     $point = ProjectedPoint::createFromEastingNorthing(
         easting: new Metre(530017),
         northing: new Metre(180419),
@@ -139,7 +139,7 @@ Examples:
     use PHPCoord\UnitOfMeasure\Length\Metre;
 
     // Nelson's Column
-    $crs = Projected::fromSRID(Projected::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID);
+    $crs = Projected::fromSRID(Projected::EPSG_OSGB36_BRITISH_NATIONAL_GRID);
     $point = ProjectedPoint::createFromEastingNorthing(
         new Metre(530017),
         new Metre(180419),

docs/reflection/coordinatereferencesystem/compound.txt

@@ -155,6 +155,32 @@ DB_REF / 3-degree Gauss-Kruger zone 5 (E-N) + DHHN92 height
     CoordinateReferenceSystem::fromSRID('urn:ogc:def:crs:EPSG::5835')
 
 
+ETRF2000-PL + Baltic 1986 height
+--------------------------------
+
+| Used: Poland - onshore.
+
+.. code-block:: php
+
+    Compound::fromSRID(Compound::EPSG_ETRF2000_PL_PLUS_BALTIC_1986_HEIGHT)
+    Compound::fromSRID('urn:ogc:def:crs:EPSG::9656')
+    CoordinateReferenceSystem::fromSRID(Compound::EPSG_ETRF2000_PL_PLUS_BALTIC_1986_HEIGHT)
+    CoordinateReferenceSystem::fromSRID('urn:ogc:def:crs:EPSG::9656')
+
+
+ETRF2000-PL + EVRF2007-PL height
+--------------------------------
+
+| Used: Poland - onshore.
+
+.. code-block:: php
+
+    Compound::fromSRID(Compound::EPSG_ETRF2000_PL_PLUS_EVRF2007_PL_HEIGHT)
+    Compound::fromSRID('urn:ogc:def:crs:EPSG::9657')
+    CoordinateReferenceSystem::fromSRID(Compound::EPSG_ETRF2000_PL_PLUS_EVRF2007_PL_HEIGHT)
+    CoordinateReferenceSystem::fromSRID('urn:ogc:def:crs:EPSG::9657')
+
+
 ETRS89 + Alicante height
 ------------------------
 
@@ -3777,16 +3803,16 @@ NZGD2000 + NZVD2016 height
     CoordinateReferenceSystem::fromSRID('urn:ogc:def:crs:EPSG::9528')
 
 
-OSGB 1936 / British National Grid + ODN height
-----------------------------------------------
+OSGB36 / British National Grid + ODN height
+-------------------------------------------
 
 | Used: United Kingdom (UK) - Great Britain onshore - England and Wales - mainland; Scotland - mainland and Inner Hebrides.
 
 .. code-block:: php
 
-    Compound::fromSRID(Compound::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID_PLUS_ODN_HEIGHT)
+    Compound::fromSRID(Compound::EPSG_OSGB36_BRITISH_NATIONAL_GRID_PLUS_ODN_HEIGHT)
     Compound::fromSRID('urn:ogc:def:crs:EPSG::7405')
-    CoordinateReferenceSystem::fromSRID(Compound::EPSG_OSGB_1936_BRITISH_NATIONAL_GRID_PLUS_ODN_HEIGHT)
+    CoordinateReferenceSystem::fromSRID(Compound::EPSG_OSGB36_BRITISH_NATIONAL_GRID_PLUS_ODN_HEIGHT)
     CoordinateReferenceSystem::fromSRID('urn:ogc:def:crs:EPSG::7405')
 
 

docs/reflection/coordinatereferencesystem/geocentric.txt

@@ -212,6 +212,20 @@ ETRF2000
 
 Replaces ETRF97 (code 7928). On the publication of ETRF2005 (code 8397),  the EUREF Technical Working Group recommended that ETRF2000 be the realization of ETRS89. ETRF2014 (code 8401) is technically superior to all earlier realizations of ETRS89.
 
+ETRF2000-PL
+-----------
+
+| Used: Poland - onshore and offshore.
+
+.. code-block:: php
+
+    Geocentric::fromSRID(Geocentric::EPSG_ETRF2000_PL)
+    Geocentric::fromSRID('urn:ogc:def:crs:EPSG::9700')
+    CoordinateReferenceSystem::fromSRID(Geocentric::EPSG_ETRF2000_PL)
+    CoordinateReferenceSystem::fromSRID('urn:ogc:def:crs:EPSG::9700')
+
+Adopted from 2012-12-01.
+
 ETRF2005
 --------