Skip to content
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

Jump to bottom

Full implementation of OGC API - Features Part 2 (CRS and CRS-BBOX) #1155

Merged
merged 35 commits into from
Mar 14, 2023
Merged

Full implementation of OGC API - Features Part 2 (CRS and CRS-BBOX) #1155

merged 35 commits into from
Mar 14, 2023

Conversation

justb4
Copy link
Member

@justb4 justb4 commented Feb 22, 2023 •
edited
Loading

Overview

Full implementation OGC API - Features Part 2.

Related Issue / Discussion

#1128 and PR #1149

Additional Information

Full implementation of OGC API - Features Part 2 entails:

  • metadata support: conformance clause in Landing Page, CRS and StorageCRS in Collection Metadata
  • support CRS and StorageCRS in pygeoapi config
  • request handling
  • documentation
  • unit tests
  • official CITE tests
  • demo service on https://github.com/geopython/demo.pygeoapi.io (separate issue+PR there)

And possibly more. This PR will basically follow OGC API - Features Part 2 more or less line-by-line, adapting pygeoapi until conformant to the spec.

Two other PRs are doing similar work, we are currently discussing and coordinating:

Our coordinated strategy is to first merge this PR #1155 and then #1149. These 2 PRs together will completely implement the "Part 2" support.

Contributions and Licensing

(as per https://github.com/geopython/pygeoapi/blob/master/CONTRIBUTING.md#contributions-and-licensing)

  • I'd like to contribute [feature X|bugfix Y|docs|something else] to pygeoapi. I confirm that my contributions to pygeoapi will be compatible with the pygeoapi license guidelines at the time of contribution.
  • I have already previously agreed to the pygeoapi Contributions and Licensing Guidelines

@justb4 justb4 mentioned this pull request Feb 22, 2023
Merged
2 tasks
@justb4 justb4 changed the title WIP full implemention of OGC API - Features Part 2 (CRS and CRS-BBOX) [WIP] full implemention of OGC API - Features Part 2 (CRS and CRS-BBOX) Feb 22, 2023
@justb4 justb4 self-assigned this Feb 22, 2023
@justb4 justb4 added the enhancement New feature or request label Feb 22, 2023
MTachon
MTachon reviewed Mar 2, 2023
View reviewed changes
pygeoapi/api.py Outdated Show resolved Hide resolved
justb4 added 13 commits March 2, 2023 13:10
@justb4
geopython#1128 utility function and tests for default/mandatory suppr…
4f265ef 
…ted CRS list
@justb4
geopython#1128 default supported CRS adaptation to OAPIF Part 2 standard
e328523
@justb4
Merge remote-tracking branch 'upstream/master' into 1128-oapif-ogc-crs
ffd040d
@justb4
geopython#1128 grr flake8 whitespace
f188837
@justb4
geopython#1128 start adding full API tests OGR for bbox-crs and crs p…
7822742 
…arms
@justb4
geopython#1128 fix flake8
7ca9eb0
@justb4
geopython#1128 fix flake8 - install GDAL in workflow main for OGR tests
ac07ba7
@justb4
geopython#1128 fix flake8 - install GDAL in workflow main for OGR tes…
aaf5a97 
…ts - need pip package?
@justb4
geopython#1128 fix flake8 - install GDAL in workflow main for OGR tes…
0b07fb9 
…ts - using libgdal-dev gdal-bin
@justb4
geopython#1128 fix SensorThings test for main.yml Workflow
e4275c4
@justb4
geopython#1128 fix SensorThings test for main.yml Workflow nr 2
78979dd
@justb4
geopython#1128 make all OGR tests working again
1392d32
@justb4
geopython#1128 make all OGR tests working again - flake8
037c76f
@justb4 justb4 mentioned this pull request Mar 7, 2023
Closed
@justb4 justb4 changed the title [WIP] full implemention of OGC API - Features Part 2 (CRS and CRS-BBOX) Full implementation of OGC API - Features Part 2 (CRS and CRS-BBOX) Mar 7, 2023
francbartoli
francbartoli requested changes Mar 9, 2023
View reviewed changes
pygeoapi/openapi.py Outdated Show resolved Hide resolved
pygeoapi/schemas/config/pygeoapi-config-0.x.yml Show resolved Hide resolved
@webb-ben webb-ben mentioned this pull request Mar 13, 2023
Merged
2 tasks
@justb4 justb4 changed the base branch from master to crs-features-ogc March 14, 2023 18:34
@justb4 justb4 merged commit 59fdf9d into geopython:crs-features-ogc Mar 14, 2023
@justb4 justb4 mentioned this pull request Mar 15, 2023
Merged
2 tasks
GeoSander pushed a commit that referenced this pull request Mar 16, 2023
@justb4 @GeoSander
OGC API - Features Part 2 (groundwork+CRS-BBOX) from PR #1155 - contr…
09baa70 
…ibutes to issue #1128

* #1128 provide conformance class for OAPIF Part 2 in /conformance page

* #1128 bitten by flake8...

* #1128 configurability CRS Feature Providers with syntax, defaults and tests

* #1128 configurability CRS Feature Providers refine for default values

* #1128 display supported CRSs in HTML Collection template

* #1128 config, mmetadata and tests for storageCRS and storageCrsCoordinateEpoch

* #1128 WIP for bbox-crs parameter support

* #1128 utility function and tests for default/mandatory supprted CRS list

* #1128 default supported CRS adaptation to OAPIF Part 2 standard

* #1128 grr flake8 whitespace

* #1128 start adding full API tests OGR for bbox-crs and crs parms

* #1128 fix flake8

* #1128 fix flake8 - install GDAL in workflow main for OGR tests

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - need pip package?

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - using libgdal-dev gdal-bin

* #1128 fix SensorThings test for main.yml Workflow

* #1128 fix SensorThings test for main.yml Workflow nr 2

* #1128 make all OGR tests working again

* #1128 make all OGR tests working again - flake8

* #1128 make all OGR tests working again - GeoSolutions WFS bbox

* #1128 #1155 add documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation to align with #1149

* #1128 #1155 rework from review OAS and pygeoapi config schema

* #1128 #1155 minor: compile Re for CRS URI only once as global var
GeoSander pushed a commit that referenced this pull request Mar 17, 2023
@justb4 @GeoSander
OGC API - Features Part 2 (groundwork+CRS-BBOX) from PR #1155 - contr…
fc05e8b 
…ibutes to issue #1128

* #1128 provide conformance class for OAPIF Part 2 in /conformance page

* #1128 bitten by flake8...

* #1128 configurability CRS Feature Providers with syntax, defaults and tests

* #1128 configurability CRS Feature Providers refine for default values

* #1128 display supported CRSs in HTML Collection template

* #1128 config, mmetadata and tests for storageCRS and storageCrsCoordinateEpoch

* #1128 WIP for bbox-crs parameter support

* #1128 utility function and tests for default/mandatory supprted CRS list

* #1128 default supported CRS adaptation to OAPIF Part 2 standard

* #1128 grr flake8 whitespace

* #1128 start adding full API tests OGR for bbox-crs and crs parms

* #1128 fix flake8

* #1128 fix flake8 - install GDAL in workflow main for OGR tests

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - need pip package?

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - using libgdal-dev gdal-bin

* #1128 fix SensorThings test for main.yml Workflow

* #1128 fix SensorThings test for main.yml Workflow nr 2

* #1128 make all OGR tests working again

* #1128 make all OGR tests working again - flake8

* #1128 make all OGR tests working again - GeoSolutions WFS bbox

* #1128 #1155 add documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation to align with #1149

* #1128 #1155 rework from review OAS and pygeoapi config schema

* #1128 #1155 minor: compile Re for CRS URI only once as global var
tomkralidis pushed a commit that referenced this pull request Apr 11, 2023
@justb4 @MTachon
add CRS Support for OGC API Feature pygeoapi Provider (#1174)
7c69937 
* OGC API - Features Part 2 (groundwork+CRS-BBOX) from PR #1155 - contributes to issue #1128

* #1128 provide conformance class for OAPIF Part 2 in /conformance page

* #1128 bitten by flake8...

* #1128 configurability CRS Feature Providers with syntax, defaults and tests

* #1128 configurability CRS Feature Providers refine for default values

* #1128 display supported CRSs in HTML Collection template

* #1128 config, mmetadata and tests for storageCRS and storageCrsCoordinateEpoch

* #1128 WIP for bbox-crs parameter support

* #1128 utility function and tests for default/mandatory supprted CRS list

* #1128 default supported CRS adaptation to OAPIF Part 2 standard

* #1128 grr flake8 whitespace

* #1128 start adding full API tests OGR for bbox-crs and crs parms

* #1128 fix flake8

* #1128 fix flake8 - install GDAL in workflow main for OGR tests

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - need pip package?

* #1128 fix flake8 - install GDAL in workflow main for OGR tests - using libgdal-dev gdal-bin

* #1128 fix SensorThings test for main.yml Workflow

* #1128 fix SensorThings test for main.yml Workflow nr 2

* #1128 make all OGR tests working again

* #1128 make all OGR tests working again - flake8

* #1128 make all OGR tests working again - GeoSolutions WFS bbox

* #1128 #1155 add documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation for OGC OAPIF Part 2 CRS CRS BBOX support

* #1128 #1155 refine documentation to align with #1149

* #1128 #1155 rework from review OAS and pygeoapi config schema

* #1128 #1155 minor: compile Re for CRS URI only once as global var

* #1128 merge in changes from PR #1173 - fix missing import

* WIP Ogcapi features part 2 - Support for crs query parameter (#1149)

* feat(ogcapi_features_crs): start implementing crs support from ogcapi features part2

* Pass input and output CRSs WKT instead of crs transformation object

* fix longs lines and blank lines

* fix typo

* fix import for type annotation not supported by python version

* fix variable visibility in local scope

* fix tabs/spaces indentations

* Add support for the crs parameter to OGRProvider

* make flake8 happy

* Make crs transformation mechanism more consistent between PostgreSQL and OGR providers

* test(util): add two test functions in util.py

New functions: test_get_crs_from_uri and test_get_transform_from_crs

* fix too long lines...

* Update get_crs_from_uri and corresponding test function

* fix(get_crs_from_uri): make the error more explicit in if wrong crs uri format

* flake8 again...

* Keep support for source_srs/target_srs in config for OGRProvider

* revert changes made to pygeoapi-config-0.x.yml, overlap with PR 1155

* test: add test data and update test config file

* Extract 'crs' and 'storage_crs' and provider level instead of collection level

* feat(crs): new decorator to support coordinates transformation of feature collections

* feat(crs): 'crs' query parameter for CSVProvider

* test(crs): add tests for 'crs' query parameter

* test: update number of collections in test_describe_collections

* test: update number of collections in test_filter_dict_by_key_value

* fix(crs_transform): change the crs transformation decorator

Change the logic of the decorator so that it works for both functions that
return FeatureCollections and for functions tha return single Features.

* test: add tests for get_collection_item end-point with 'crs' parameter

* fix(test_get_collection_item_crs): id as path parameter, not query parameter

* test: unpack coordinates to create point geometry

* feat(crs): add suuport for crs query parameter for all providers of type 'feature'

* docs(crs): add documentation to illustrate use of 'crs' query parameters

* docs(crs): more data access examples

* fix typo and add new line

* refactor: specify None as default value for crs_transform_out parameter in _sqlalchemy_to_feature method

* changes for PR 1149, test_api and style formatting

* CRS84 as default crs also for test_get_collection_items_crs

* test(crs): test coordinates transformation implementation of PostgreSQLProvider

* test(crs): move tests to test_postgresql_provider

* fix test function calls

* change test to ensure returned features are the same

* add json format to request object

* test(crs): test coordinates transformation implementation of OGRProvider

* refactor(crs): make more compact get_collection_item and get_collection_items

Define two new static methods in API class, to create crs_transform_wkt and
setting content-crs header. These methods can be re-used in both
get_collection_item and get_collection_items methods and removes code
duplication.

---------

Co-authored-by: Just van den Broecke <just@justobjects.nl>

* #1178 fix flake8 error

* #1178 use EPSG:28992 i.s.o. 32631 - fix unit test OGR Shapefile

* #1174 use CRS-compliant Axis ordering for crs support

* #1174 fix and honour CRS 4258disable native CRS Transform in OGR Provider - Axis ordering not honoured...

* #1174 remove ADR tests rom test_util.py

* #1174 enable native CRS transform again in OGR Provider

* #1174 enable native CRS transform again in OGR Provider - fix config

* #1174 remove support for source/target_srs in OGRProvider - enforce transforms always based on storageCRS

* #1174 fix tests Postgresql Provider for Transforms

* #1174 fix tests Postgresql Provider for Transforms

* #1174 add tests for OGR Transformation and Axis Order

* #1174 Suppress potential axis-swapping in OGR ExportToJSON

* #1174 minor fix test - unassign spatialref before setgeom infeat

* #1174 minor fix test - unassign spatialref before setgeom infeat - flake8

* #1174 solve CI WFS test failures with GDAL HTTP config options

* #1174 bbox and bbox-crs defs local in openapi.py for CITE validators

* #1174 merge master - #1152 #1203 etc

* #1174 small doc changes

* #1174 move GeomObject typedef to beginning of util.py

* #1174 added debug logging in transform Decorator func

---------

Co-authored-by: Mathieu Tachon <92298764+MTachon@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MTachon MTachon MTachon left review comments

@francbartoli francbartoli francbartoli approved these changes

@tomkralidis tomkralidis Awaiting requested review from tomkralidis

Assignees

@justb4 justb4

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@justb4 @francbartoli @tomkralidis @MTachon