From 9624758e4570d62a16348937dd776f5cf5584d21 Mon Sep 17 00:00:00 2001 From: Anton Bakker Date: Tue, 19 Nov 2024 20:13:19 +0100 Subject: [PATCH] use CRS.to_2d() for transforming with compound CRS's --- .../assets/config.yaml | 8 + .../crs_transform.py | 82 ++++------ tests/data/bonaire_validation_data.csv | 20 +-- tests/data/nl_validation_data.csv | 147 ------------------ tests/data/saba_validation_data.csv | 42 ++--- tests/data/st_eustatius_validation_data.csv | 38 ++--- tests/test_cityjson_transformation.py | 4 +- tests/test_geojson_transformation.py | 2 +- .../test_get_individual_crs_from_compound.py | 36 ----- tests/util.py | 11 +- 10 files changed, 91 insertions(+), 299 deletions(-) delete mode 100644 tests/test_get_individual_crs_from_compound.py diff --git a/src/coordinate_transformation_api/assets/config.yaml b/src/coordinate_transformation_api/assets/config.yaml index b0a8612..0595ae6 100644 --- a/src/coordinate_transformation_api/assets/config.yaml +++ b/src/coordinate_transformation_api/assets/config.yaml @@ -469,6 +469,10 @@ EPSG:7415: uri: http://www.opengis.net/def/crs/EPSG/0/7415 NSGI:Bonaire_DPnet_KADpeil: exclude-transformations: + - EPSG:7789 + - EPSG:7912 + - EPSG:4979 + - OGC:CRS84h - EPSG:28992 - EPSG:3034 - EPSG:3035 @@ -924,6 +928,8 @@ NSGI:St_Eustatius2020_GEOGRAPHIC_3D: EPSG:7912: exclude-transformations: - EPSG:9289 + - NSGI:Bonaire_DPnet_KADpeil + - NSGI:Bonaire_DPnet uri: http://www.opengis.net/def/crs/EPSG/0/7912 EPSG:4979: exclude-transformations: @@ -1056,4 +1062,6 @@ NSGI:St_Eustatius2020_GEOCENTRIC: EPSG:7789: exclude-transformations: - EPSG:9289 + - NSGI:Bonaire_DPnet_KADpeil + - NSGI:Bonaire_DPnet uri: http://www.opengis.net/def/crs/EPSG/0/7789 diff --git a/src/coordinate_transformation_api/crs_transform.py b/src/coordinate_transformation_api/crs_transform.py index 615e4bb..c26827d 100644 --- a/src/coordinate_transformation_api/crs_transform.py +++ b/src/coordinate_transformation_api/crs_transform.py @@ -35,7 +35,6 @@ ) from coordinate_transformation_api.models import ( TransformationNotPossibleError, - UnknownCrsError, ) from coordinate_transformation_api.types import CoordinatesType, ShapelyGeometry @@ -196,18 +195,6 @@ def check_axis(s_crs: CRS, t_crs: CRS) -> None: def get_transformer(source_crs: CRS, target_crs: CRS, epoch: float | None) -> Transformer: # quit - check_axis(source_crs, target_crs) - - if exclude_transformation( - "{}:{}".format(*source_crs.to_authority()), - "{}:{}".format(*target_crs.to_authority()), - ): - raise TransformationNotPossibleError( - "{}:{}".format(*source_crs.to_authority()), - "{}:{}".format(*target_crs.to_authority()), - "Transformation Excluded", - ) - # Get available transformer through TransformerGroup # TODO check/validate if always_xy=True is correct tfg = transformer.TransformerGroup(source_crs, target_crs, allow_ballpark=False, always_xy=True) @@ -243,18 +230,6 @@ def get_transformer(source_crs: CRS, target_crs: CRS, epoch: float | None) -> Tr return tfg.transformers[0] -def get_individual_crs_from_compound(compound_crs: CRS) -> tuple[CRS, CRS]: - horizontal = compound_crs - vertical = compound_crs - for crs in compound_crs.sub_crs_list: - if len(crs.axis_info) == HORIZONTAL_AXIS_LENGTH: - horizontal = crs - elif len(crs.axis_info) == VERTICAL_AXIS_LENGTH: - vertical = crs - - return (horizontal, vertical) - - def build_input_coord(coord: CoordinatesType, epoch: float | None) -> CoordinatesType: # When 2D input is given with an epoch we need to add a height. So pyproj knows to # that the epoch is an epoch and not the height, without this intervention the epoch @@ -311,45 +286,35 @@ def get_transform_crs_fun( if precision is None: precision = get_precision(target_crs) - # We need to do something special for transformation targetting a Compound CRS of 2D coordinates with another height system, like NAP or a LAT height + check_axis(source_crs, target_crs) + if exclude_transformation( + "{}:{}".format(*source_crs.to_authority()), + "{}:{}".format(*target_crs.to_authority()), + ): + raise TransformationNotPossibleError( + "{}:{}".format(*source_crs.to_authority()), + "{}:{}".format(*target_crs.to_authority()), + "Transformation Excluded", + ) + + # We need to do something special for transformation involving a Compound CRS of 2D coordinates with another height system, like NAP or a LAT height # - RD + NAP (EPSG:7415) # - ETRS89 + NAP (EPSG:9286) # - ETRS89 + LAT-NL (EPSG:9289) - # These transformations need to be splitted in a horizontal and vertical transformation. - if target_crs is not None and source_crs is not target_crs and target_crs.is_compound: - check_axis(source_crs, target_crs) - - target_crs_horizontal, target_crs_vertical = get_individual_crs_from_compound(target_crs) - - if source_crs is not None and source_crs.is_compound: - ( - source_crs_horizontal, - source_crs_vertical, - ) = get_individual_crs_from_compound(source_crs) - else: - source_crs_horizontal = source_crs - source_crs_vertical = source_crs - - h_transformer = get_transformer(source_crs_horizontal, target_crs_horizontal, epoch) - - # Not all transformation that are possible are defined - # When no transformation is found we fall back on the original COMPOUND CRS - # Issue is that in some case a transformation is found but not the correct one - # These we identify by the laking of a AUTO:CODE, because all our CRS should be - # coded. These are also defaulted to the original COMPOUND CRS. - try: - v_transformer = get_transformer(source_crs_vertical, target_crs_vertical, epoch) - if v_transformer.source_crs is not None and v_transformer.source_crs.to_authority() is None: - raise UnknownCrsError() # empty error, we catch it the line below - except (TransformationNotPossibleError, UnknownCrsError): - v_transformer = get_transformer(source_crs, target_crs, epoch) + # These transformations need to be splitted in a horizontal and vertical transformation (vertical transformation actually attempts the 3d transformation). + if target_crs is not None and source_crs is not target_crs and (target_crs.is_compound or source_crs.is_compound): + target_crs_horizontal = target_crs.to_2d() + h_transformer = get_transformer(source_crs, target_crs_horizontal, epoch) + v_transformer = get_transformer( + source_crs, target_crs, epoch + ) # this will do the 3d transformation that might fail, in that case Z/H value is dropped # note transformers are injected in transform_compound_crs so they are instantiated only once _transform_compound_crs = partial(transform_compound_crs, h_transformer, v_transformer, precision, epoch) return _transform_compound_crs else: transformer = get_transformer(source_crs, target_crs, epoch) - # note transformer is injected in transform_compound_crs is instantiated once + # note transformer is injected in transform_crs is instantiated once # creating transformers is expensive _transform_crs = partial(transform_crs, transformer, precision, epoch) return _transform_crs @@ -379,7 +344,9 @@ def transform_compound_crs( output_2d = Position2D(*h[:2]) output: Position = output_2d - if len(v) == THREE_DIMENSIONAL and not math.isinf(v[2]): + if len(v) >= THREE_DIMENSIONAL and not math.isinf( + v[2] + ): # note len(v) can be larger than three when epoch is supplied output = Position3D(*output_2d, v[2]) else: # height coordinate dropped, since v[2] not added @@ -421,6 +388,9 @@ def transform_crs( _output = tuple(map(_round_h, transformer.transform(*input)[0:dim])) + # - 1 van de twee compound + # - + output_2d = Position2D(*_output[:2]) output: Position = output_2d if len(_output) >= THREE_DIMENSIONAL: diff --git a/tests/data/bonaire_validation_data.csv b/tests/data/bonaire_validation_data.csv index 17bf20a..0ab96dd 100644 --- a/tests/data/bonaire_validation_data.csv +++ b/tests/data/bonaire_validation_data.csv @@ -78,16 +78,16 @@ EPSG:7912,EPSG:7789,(inf inf inf inf) EPSG:7912,EPSG:7912,(inf inf inf inf) EPSG:7912,EPSG:4979,(inf inf inf inf) EPSG:7912,OGC:CRS84h,(inf inf inf inf) -EPSG:4979,NSGI:Bonaire_DPnet_KADpeil,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,NSGI:Bonaire_DPnet,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,NSGI:Bonaire2004_GEOCENTRIC,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,NSGI:Bonaire2004_GEOGRAPHIC_2D,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,NSGI:Bonaire2004_GEOGRAPHIC_3D,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,EPSG:32619,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,EPSG:7789,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,EPSG:7912,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,EPSG:4979,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) -EPSG:4979,OGC:CRS84h,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) +EPSG:4979,NSGI:Bonaire_DPnet_KADpeil,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,NSGI:Bonaire_DPnet,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,NSGI:Bonaire2004_GEOCENTRIC,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,NSGI:Bonaire2004_GEOGRAPHIC_2D,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,NSGI:Bonaire2004_GEOGRAPHIC_3D,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,EPSG:32619,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,EPSG:7789,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,EPSG:7912,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,EPSG:4979,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) +EPSG:4979,OGC:CRS84h,(-68.2537259371291 12.14970719200454 -40.252278505824506 2000.0) OGC:CRS84h,NSGI:Bonaire_DPnet_KADpeil,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) OGC:CRS84h,NSGI:Bonaire_DPnet,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) OGC:CRS84h,NSGI:Bonaire2004_GEOCENTRIC,(-68.2537259371291 12.149707191615798 -40.2522831344977 2000.0) diff --git a/tests/data/nl_validation_data.csv b/tests/data/nl_validation_data.csv index ddbfdc0..dc93c28 100644 --- a/tests/data/nl_validation_data.csv +++ b/tests/data/nl_validation_data.csv @@ -10,7 +10,6 @@ EPSG:7415,OGC:CRS84,(0 400000 43 2000) EPSG:7415,EPSG:4326,(0 400000 43 2000) EPSG:7415,EPSG:3857,(0 400000 43 2000) EPSG:7415,EPSG:9000,(0 400000 43 2000) -EPSG:7415,EPSG:9755,(0 400000 43 2000) EPSG:7415,EPSG:4937,(0 400000 43 2000) EPSG:7415,EPSG:4936,(0 400000 43 2000) EPSG:7415,EPSG:9286,(0 400000 43 2000) @@ -20,8 +19,6 @@ EPSG:7415,OGC:CRS84h,(0 400000 43 2000) EPSG:7415,EPSG:4979,(0 400000 43 2000) EPSG:7415,EPSG:7912,(0 400000 43 2000) EPSG:7415,EPSG:7789,(0 400000 43 2000) -EPSG:7415,EPSG:9754,(0 400000 43 2000) -EPSG:7415,EPSG:9753,(0 400000 43 2000) EPSG:7415,EPSG:9289,(0 400000 43 2000) EPSG:7415,EPSG:3395,(0 400000 43 2000) EPSG:28992,EPSG:7415,(0 400000 43 2000) @@ -36,7 +33,6 @@ EPSG:28992,OGC:CRS84,(0 400000 43 2000) EPSG:28992,EPSG:4326,(0 400000 43 2000) EPSG:28992,EPSG:3857,(0 400000 43 2000) EPSG:28992,EPSG:9000,(0 400000 43 2000) -EPSG:28992,EPSG:9755,(0 400000 43 2000) EPSG:28992,EPSG:4937,(0 400000 43 2000) EPSG:28992,EPSG:4936,(0 400000 43 2000) EPSG:28992,EPSG:9286,(0 400000 43 2000) @@ -46,8 +42,6 @@ EPSG:28992,OGC:CRS84h,(0 400000 43 2000) EPSG:28992,EPSG:4979,(0 400000 43 2000) EPSG:28992,EPSG:7912,(0 400000 43 2000) EPSG:28992,EPSG:7789,(0 400000 43 2000) -EPSG:28992,EPSG:9754,(0 400000 43 2000) -EPSG:28992,EPSG:9753,(0 400000 43 2000) EPSG:28992,EPSG:9289,(0 400000 43 2000) EPSG:28992,EPSG:3395,(0 400000 43 2000) EPSG:4258,EPSG:7415,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -62,7 +56,6 @@ EPSG:4258,OGC:CRS84,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:4326,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:3857,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:9000,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:4258,EPSG:9755,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:4937,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:4936,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:9286,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -72,8 +65,6 @@ EPSG:4258,OGC:CRS84h,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:4979,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:7912,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:7789,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:4258,EPSG:9754,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:4258,EPSG:9753,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:9289,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4258,EPSG:3395,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:3035,EPSG:7415,(3846937.0570072928 3184144.8383089327 43.0 2000.0) @@ -88,7 +79,6 @@ EPSG:3035,OGC:CRS84,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:4326,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:3857,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:9000,(3846937.0570072928 3184144.8383089327 43.0 2000.0) -EPSG:3035,EPSG:9755,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:4937,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:4936,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:9286,(3846937.0570072928 3184144.8383089327 43.0 2000.0) @@ -98,8 +88,6 @@ EPSG:3035,OGC:CRS84h,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:4979,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:7912,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:7789,(3846937.0570072928 3184144.8383089327 43.0 2000.0) -EPSG:3035,EPSG:9754,(3846937.0570072928 3184144.8383089327 43.0 2000.0) -EPSG:3035,EPSG:9753,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:9289,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3035,EPSG:3395,(3846937.0570072928 3184144.8383089327 43.0 2000.0) EPSG:3034,EPSG:7415,(3542076.040361498 2774765.575388267 43.0 2000.0) @@ -114,7 +102,6 @@ EPSG:3034,OGC:CRS84,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:4326,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:3857,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:9000,(3542076.040361498 2774765.575388267 43.0 2000.0) -EPSG:3034,EPSG:9755,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:4937,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:4936,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:9286,(3542076.040361498 2774765.575388267 43.0 2000.0) @@ -124,8 +111,6 @@ EPSG:3034,OGC:CRS84h,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:4979,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:7912,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:7789,(3542076.040361498 2774765.575388267 43.0 2000.0) -EPSG:3034,EPSG:9754,(3542076.040361498 2774765.575388267 43.0 2000.0) -EPSG:3034,EPSG:9753,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:9289,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3034,EPSG:3395,(3542076.040361498 2774765.575388267 43.0 2000.0) EPSG:3043,EPSG:7415,(510492.798264153 5712950.306645692 43.0 2000.0) @@ -140,7 +125,6 @@ EPSG:3043,OGC:CRS84,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:4326,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:3857,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:9000,(510492.798264153 5712950.306645692 43.0 2000.0) -EPSG:3043,EPSG:9755,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:4937,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:4936,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:9286,(510492.798264153 5712950.306645692 43.0 2000.0) @@ -150,8 +134,6 @@ EPSG:3043,OGC:CRS84h,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:4979,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:7912,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:7789,(510492.798264153 5712950.306645692 43.0 2000.0) -EPSG:3043,EPSG:9754,(510492.798264153 5712950.306645692 43.0 2000.0) -EPSG:3043,EPSG:9753,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:9289,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3043,EPSG:3395,(510492.798264153 5712950.306645692 43.0 2000.0) EPSG:3044,EPSG:7415,(94792.58271069895 5729165.023405696 43.0 2000.0) @@ -166,7 +148,6 @@ EPSG:3044,OGC:CRS84,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:4326,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:3857,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:9000,(94792.58271069895 5729165.023405696 43.0 2000.0) -EPSG:3044,EPSG:9755,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:4937,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:4936,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:9286,(94792.58271069895 5729165.023405696 43.0 2000.0) @@ -176,8 +157,6 @@ EPSG:3044,OGC:CRS84h,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:4979,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:7912,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:7789,(94792.58271069895 5729165.023405696 43.0 2000.0) -EPSG:3044,EPSG:9754,(94792.58271069895 5729165.023405696 43.0 2000.0) -EPSG:3044,EPSG:9753,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:9289,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:3044,EPSG:3395,(94792.58271069895 5729165.023405696 43.0 2000.0) EPSG:9067,EPSG:7415,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -192,7 +171,6 @@ EPSG:9067,OGC:CRS84,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:4326,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:3857,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:9000,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:9067,EPSG:9755,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:4937,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:4936,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:9286,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -202,8 +180,6 @@ EPSG:9067,OGC:CRS84h,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:4979,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:7912,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:7789,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:9067,EPSG:9754,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:9067,EPSG:9753,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:9289,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9067,EPSG:3395,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:7415,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -218,7 +194,6 @@ OGC:CRS84,OGC:CRS84,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:4326,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:3857,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:9000,(3.1513891871235318 51.56753001291082 43.0 2000.0) -OGC:CRS84,EPSG:9755,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:4937,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:4936,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:9286,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -228,8 +203,6 @@ OGC:CRS84,OGC:CRS84h,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:4979,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:7912,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:7789,(3.1513891871235318 51.56753001291082 43.0 2000.0) -OGC:CRS84,EPSG:9754,(3.1513891871235318 51.56753001291082 43.0 2000.0) -OGC:CRS84,EPSG:9753,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:9289,(3.1513891871235318 51.56753001291082 43.0 2000.0) OGC:CRS84,EPSG:3395,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:4326,EPSG:7415,(3.151391324787773 51.56753219645518 43.0 2000.0) @@ -244,7 +217,6 @@ EPSG:4326,OGC:CRS84,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:4326,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:3857,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:9000,(3.151391324787773 51.56753219645518 43.0 2000.0) -EPSG:4326,EPSG:9755,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:4937,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:4936,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:9286,(3.151391324787773 51.56753219645518 43.0 2000.0) @@ -254,8 +226,6 @@ EPSG:4326,OGC:CRS84h,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:4979,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:7912,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:7789,(3.151391324787773 51.56753219645518 43.0 2000.0) -EPSG:4326,EPSG:9754,(3.151391324787773 51.56753219645518 43.0 2000.0) -EPSG:4326,EPSG:9753,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:9289,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:4326,EPSG:3395,(3.151391324787773 51.56753219645518 43.0 2000.0) EPSG:3857,EPSG:7415,(350811.27756571467 6722304.3038301505 43.0 2000.0) @@ -270,7 +240,6 @@ EPSG:3857,OGC:CRS84,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:4326,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:3857,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:9000,(350811.27756571467 6722304.3038301505 43.0 2000.0) -EPSG:3857,EPSG:9755,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:4937,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:4936,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:9286,(350811.27756571467 6722304.3038301505 43.0 2000.0) @@ -280,8 +249,6 @@ EPSG:3857,OGC:CRS84h,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:4979,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:7912,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:7789,(350811.27756571467 6722304.3038301505 43.0 2000.0) -EPSG:3857,EPSG:9754,(350811.27756571467 6722304.3038301505 43.0 2000.0) -EPSG:3857,EPSG:9753,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:9289,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:3857,EPSG:3395,(350811.27756571467 6722304.3038301505 43.0 2000.0) EPSG:9000,EPSG:7415,(3.151391324787773 51.567532197373374 43.0 2000.0) @@ -296,7 +263,6 @@ EPSG:9000,OGC:CRS84,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:4326,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:3857,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:9000,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9000,EPSG:9755,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:4937,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:4936,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:9286,(3.151391324787773 51.567532197373374 43.0 2000.0) @@ -306,36 +272,8 @@ EPSG:9000,OGC:CRS84h,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:4979,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:7912,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:7789,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9000,EPSG:9754,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9000,EPSG:9753,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:9289,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:9000,EPSG:3395,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:7415,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:28992,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:4258,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:3035,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:3034,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:3043,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:3044,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:9067,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,OGC:CRS84,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:4326,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:3857,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:9000,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:9755,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:4937,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:4936,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:9286,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:7931,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:7930,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,OGC:CRS84h,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:4979,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:7912,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:7789,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:9754,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:9753,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:9289,(3.151391324787773 51.567532197373374 43.0 2000.0) -EPSG:9755,EPSG:3395,(3.151391324787773 51.567532197373374 43.0 2000.0) EPSG:4937,EPSG:7415,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:28992,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:4258,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) @@ -348,7 +286,6 @@ EPSG:4937,OGC:CRS84,(3.1513891871235318 51.56753001291082 87.26477656263367 2000 EPSG:4937,EPSG:4326,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:3857,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:9000,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -EPSG:4937,EPSG:9755,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:4937,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:4936,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:9286,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) @@ -358,8 +295,6 @@ EPSG:4937,OGC:CRS84h,(3.1513891871235318 51.56753001291082 87.26477656263367 200 EPSG:4937,EPSG:4979,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:7912,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:7789,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -EPSG:4937,EPSG:9754,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -EPSG:4937,EPSG:9753,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:9289,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4937,EPSG:3395,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4936,EPSG:7415,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) @@ -374,7 +309,6 @@ EPSG:4936,OGC:CRS84,(3966812.221426605 218403.35598874904 4973104.479846011 2000 EPSG:4936,EPSG:4326,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:3857,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:9000,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) -EPSG:4936,EPSG:9755,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:4937,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:4936,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:9286,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) @@ -384,8 +318,6 @@ EPSG:4936,OGC:CRS84h,(3966812.221426605 218403.35598874904 4973104.479846011 200 EPSG:4936,EPSG:4979,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:7912,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:7789,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) -EPSG:4936,EPSG:9754,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) -EPSG:4936,EPSG:9753,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:9289,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:4936,EPSG:3395,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:9286,EPSG:7415,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -400,7 +332,6 @@ EPSG:9286,OGC:CRS84,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:4326,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:3857,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:9000,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:9286,EPSG:9755,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:4937,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:4936,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:9286,(3.1513891871235318 51.56753001291082 43.0 2000.0) @@ -410,8 +341,6 @@ EPSG:9286,OGC:CRS84h,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:4979,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:7912,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:7789,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:9286,EPSG:9754,(3.1513891871235318 51.56753001291082 43.0 2000.0) -EPSG:9286,EPSG:9753,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:9289,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:9286,EPSG:3395,(3.1513891871235318 51.56753001291082 43.0 2000.0) EPSG:7931,EPSG:7415,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) @@ -426,7 +355,6 @@ EPSG:7931,OGC:CRS84,(3.1513891871235318 51.56753001291082 87.26477656263367 2000 EPSG:7931,EPSG:4326,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:3857,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:9000,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -EPSG:7931,EPSG:9755,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:4937,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:4936,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:9286,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) @@ -436,8 +364,6 @@ EPSG:7931,OGC:CRS84h,(3.1513891871235318 51.56753001291082 87.26477656263367 200 EPSG:7931,EPSG:4979,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:7912,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:7789,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -EPSG:7931,EPSG:9754,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -EPSG:7931,EPSG:9753,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:9289,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7931,EPSG:3395,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:7930,EPSG:7415,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) @@ -452,7 +378,6 @@ EPSG:7930,OGC:CRS84,(3966812.221426605 218403.35598874904 4973104.479846011 2000 EPSG:7930,EPSG:4326,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:3857,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:9000,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) -EPSG:7930,EPSG:9755,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:4937,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:4936,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:9286,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) @@ -462,8 +387,6 @@ EPSG:7930,OGC:CRS84h,(3966812.221426605 218403.35598874904 4973104.479846011 200 EPSG:7930,EPSG:4979,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:7912,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:7789,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) -EPSG:7930,EPSG:9754,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) -EPSG:7930,EPSG:9753,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:9289,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) EPSG:7930,EPSG:3395,(3966812.221426605 218403.35598874904 4973104.479846011 2000.0) OGC:CRS84h,EPSG:7415,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) @@ -478,7 +401,6 @@ OGC:CRS84h,OGC:CRS84,(3.1513891871235318 51.56753001291082 87.26477656263367 200 OGC:CRS84h,EPSG:4326,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:3857,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:9000,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -OGC:CRS84h,EPSG:9755,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:4937,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:4936,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:9286,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) @@ -488,8 +410,6 @@ OGC:CRS84h,OGC:CRS84h,(3.1513891871235318 51.56753001291082 87.26477656263367 20 OGC:CRS84h,EPSG:4979,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:7912,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:7789,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -OGC:CRS84h,EPSG:9754,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) -OGC:CRS84h,EPSG:9753,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:9289,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) OGC:CRS84h,EPSG:3395,(3.1513891871235318 51.56753001291082 87.26477656263367 2000.0) EPSG:4979,EPSG:7415,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) @@ -504,7 +424,6 @@ EPSG:4979,OGC:CRS84,(3.1513913247924816 51.567532196450436 87.26684206258506 200 EPSG:4979,EPSG:4326,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:3857,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:9000,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) -EPSG:4979,EPSG:9755,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:4937,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:4936,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:9286,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) @@ -514,8 +433,6 @@ EPSG:4979,OGC:CRS84h,(3.1513913247924816 51.567532196450436 87.26684206258506 20 EPSG:4979,EPSG:4979,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:7912,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:7789,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) -EPSG:4979,EPSG:9754,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) -EPSG:4979,EPSG:9753,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:9289,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:4979,EPSG:3395,(3.1513913247924816 51.567532196450436 87.26684206258506 2000.0) EPSG:7912,EPSG:7415,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) @@ -530,7 +447,6 @@ EPSG:7912,OGC:CRS84,(3.1513913247924816 51.56753219736863 87.26690630149096 2000 EPSG:7912,EPSG:4326,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:3857,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:9000,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) -EPSG:7912,EPSG:9755,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:4937,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:4936,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:9286,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) @@ -540,8 +456,6 @@ EPSG:7912,OGC:CRS84h,(3.1513913247924816 51.56753219736863 87.26690630149096 200 EPSG:7912,EPSG:4979,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:7912,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:7789,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) -EPSG:7912,EPSG:9754,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) -EPSG:7912,EPSG:9753,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:9289,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7912,EPSG:3395,(3.1513913247924816 51.56753219736863 87.26690630149096 2000.0) EPSG:7789,EPSG:7415,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) @@ -556,7 +470,6 @@ EPSG:7789,OGC:CRS84,(3966812.0245012934 218403.49359436508 4973104.632588593 200 EPSG:7789,EPSG:4326,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:3857,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:9000,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) -EPSG:7789,EPSG:9755,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:4937,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:4936,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:9286,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) @@ -566,62 +479,8 @@ EPSG:7789,OGC:CRS84h,(3966812.0245012934 218403.49359436508 4973104.632588593 20 EPSG:7789,EPSG:4979,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:7912,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:7789,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) -EPSG:7789,EPSG:9754,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) -EPSG:7789,EPSG:9753,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:9289,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) EPSG:7789,EPSG:3395,(3966812.0245012934 218403.49359436508 4973104.632588593 2000.0) -EPSG:9754,EPSG:7415,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:28992,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:4258,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:3035,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:3034,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:3043,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:3044,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:9067,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,OGC:CRS84,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:4326,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:3857,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:9000,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:9755,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:4937,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:4936,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:9286,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:7931,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:7930,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,OGC:CRS84h,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:4979,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:7912,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:7789,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:9754,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:9753,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:9289,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9754,EPSG:3395,(3.1513913247924816 51.56753219736863 87.26477656263367 2000.0) -EPSG:9753,EPSG:7415,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:28992,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:4258,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:3035,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:3034,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:3043,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:3044,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:9067,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,OGC:CRS84,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:4326,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:3857,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:9000,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:9755,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:4937,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:4936,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:9286,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:7931,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:7930,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,OGC:CRS84h,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:4979,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:7912,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:7789,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:9754,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:9753,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:9289,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) -EPSG:9753,EPSG:3395,(3966812.023139433 218403.49351938418 4973104.631034102 2000.0) EPSG:9289,EPSG:7415,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:28992,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:4258,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) @@ -634,7 +493,6 @@ EPSG:9289,OGC:CRS84,(3.1513891871235318 51.56753001291082 -45.15603059121305 200 EPSG:9289,EPSG:4326,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:3857,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:9000,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) -EPSG:9289,EPSG:9755,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:4937,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:4936,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:9286,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) @@ -644,8 +502,6 @@ EPSG:9289,OGC:CRS84h,(3.1513891871235318 51.56753001291082 -45.15603059121305 20 EPSG:9289,EPSG:4979,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:7912,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:7789,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) -EPSG:9289,EPSG:9754,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) -EPSG:9289,EPSG:9753,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:9289,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:9289,EPSG:3395,(3.1513891871235318 51.56753001291082 -45.15603059121305 2000.0) EPSG:3395,EPSG:7415,(350811.27756571467 6688811.540230417 43.0 2000.0) @@ -660,7 +516,6 @@ EPSG:3395,OGC:CRS84,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:4326,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:3857,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:9000,(350811.27756571467 6688811.540230417 43.0 2000.0) -EPSG:3395,EPSG:9755,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:4937,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:4936,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:9286,(350811.27756571467 6688811.540230417 43.0 2000.0) @@ -670,7 +525,5 @@ EPSG:3395,OGC:CRS84h,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:4979,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:7912,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:7789,(350811.27756571467 6688811.540230417 43.0 2000.0) -EPSG:3395,EPSG:9754,(350811.27756571467 6688811.540230417 43.0 2000.0) -EPSG:3395,EPSG:9753,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:9289,(350811.27756571467 6688811.540230417 43.0 2000.0) EPSG:3395,EPSG:3395,(350811.27756571467 6688811.540230417 43.0 2000.0) diff --git a/tests/data/saba_validation_data.csv b/tests/data/saba_validation_data.csv index 586a143..f389f2c 100644 --- a/tests/data/saba_validation_data.csv +++ b/tests/data/saba_validation_data.csv @@ -4,7 +4,7 @@ NSGI:Saba_DPnet_Height,NSGI:Saba_DPnet_Height,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,NSGI:Saba2020_GEOCENTRIC,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,NSGI:Saba2020_GEOGRAPHIC_2D,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,NSGI:Saba2020_GEOGRAPHIC_3D,(5000.0 1000.0 300.0 2000) -NSGI:Saba_DPnet_Height,EPSG:32619,(5000.0 1000.0 300.0 2000) +NSGI:Saba_DPnet_Height,EPSG:32620,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,EPSG:7789,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,EPSG:7912,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,EPSG:4979,(5000.0 1000.0 300.0 2000) @@ -15,7 +15,7 @@ NSGI:Saba_DPnet,NSGI:Saba_DPnet_Height,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet,NSGI:Saba2020_GEOCENTRIC,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet,NSGI:Saba2020_GEOGRAPHIC_2D,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet,NSGI:Saba2020_GEOGRAPHIC_3D,(5000.0 1000.0 300.0 2000) -NSGI:Saba_DPnet,EPSG:32619,(5000.0 1000.0 300.0 2000) +NSGI:Saba_DPnet,EPSG:32620,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet,EPSG:7789,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet,EPSG:7912,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet,EPSG:4979,(5000.0 1000.0 300.0 2000) @@ -26,7 +26,7 @@ NSGI:Saba_DPnet_Height,NSGI:Saba_DPnet_Height,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,NSGI:Saba2020_GEOCENTRIC,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,NSGI:Saba2020_GEOGRAPHIC_2D,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,NSGI:Saba2020_GEOGRAPHIC_3D,(5000.0 1000.0 300.0 2000) -NSGI:Saba_DPnet_Height,EPSG:32619,(5000.0 1000.0 300.0 2000) +NSGI:Saba_DPnet_Height,EPSG:32620,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,EPSG:7789,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,EPSG:7912,(5000.0 1000.0 300.0 2000) NSGI:Saba_DPnet_Height,EPSG:4979,(5000.0 1000.0 300.0 2000) @@ -37,7 +37,7 @@ NSGI:Saba2020_GEOCENTRIC,NSGI:Saba_DPnet_Height,(2738386.6860441198 -5429268.990 NSGI:Saba2020_GEOCENTRIC,NSGI:Saba2020_GEOCENTRIC,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) NSGI:Saba2020_GEOCENTRIC,NSGI:Saba2020_GEOGRAPHIC_2D,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) NSGI:Saba2020_GEOCENTRIC,NSGI:Saba2020_GEOGRAPHIC_3D,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) -NSGI:Saba2020_GEOCENTRIC,EPSG:32619,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) +NSGI:Saba2020_GEOCENTRIC,EPSG:32620,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) NSGI:Saba2020_GEOCENTRIC,EPSG:7789,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) NSGI:Saba2020_GEOCENTRIC,EPSG:7912,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) NSGI:Saba2020_GEOCENTRIC,EPSG:4979,(2738386.6860441198 -5429268.990323882 1919210.970141334 2000.0) @@ -48,7 +48,7 @@ NSGI:Saba2020_GEOGRAPHIC_2D,NSGI:Saba_DPnet_Height,(-63.23477197588805 17.627494 NSGI:Saba2020_GEOGRAPHIC_2D,NSGI:Saba2020_GEOCENTRIC,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_2D,NSGI:Saba2020_GEOGRAPHIC_2D,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_2D,NSGI:Saba2020_GEOGRAPHIC_3D,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) -NSGI:Saba2020_GEOGRAPHIC_2D,EPSG:32619,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) +NSGI:Saba2020_GEOGRAPHIC_2D,EPSG:32620,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_2D,EPSG:7789,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_2D,EPSG:7912,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_2D,EPSG:4979,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) @@ -59,29 +59,29 @@ NSGI:Saba2020_GEOGRAPHIC_3D,NSGI:Saba_DPnet_Height,(-63.23477197588805 17.627494 NSGI:Saba2020_GEOGRAPHIC_3D,NSGI:Saba2020_GEOCENTRIC,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_3D,NSGI:Saba2020_GEOGRAPHIC_2D,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_3D,NSGI:Saba2020_GEOGRAPHIC_3D,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) -NSGI:Saba2020_GEOGRAPHIC_3D,EPSG:32619,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) +NSGI:Saba2020_GEOGRAPHIC_3D,EPSG:32620,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_3D,EPSG:7789,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_3D,EPSG:7912,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_3D,EPSG:4979,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) NSGI:Saba2020_GEOGRAPHIC_3D,OGC:CRS84h,(-63.23477197588805 17.62749496310654 257.5641337847337 2000.0) -EPSG:32619,NSGI:Saba_DPnet_Height,(inf inf inf inf) -EPSG:32619,NSGI:Saba_DPnet,(inf inf inf inf) -EPSG:32619,NSGI:Saba_DPnet_Height,(inf inf inf inf) -EPSG:32619,NSGI:Saba2020_GEOCENTRIC,(inf inf inf inf) -EPSG:32619,NSGI:Saba2020_GEOGRAPHIC_2D,(inf inf inf inf) -EPSG:32619,NSGI:Saba2020_GEOGRAPHIC_3D,(inf inf inf inf) -EPSG:32619,EPSG:32619,(inf inf inf inf) -EPSG:32619,EPSG:7789,(inf inf inf inf) -EPSG:32619,EPSG:7912,(inf inf inf inf) -EPSG:32619,EPSG:4979,(inf inf inf inf) -EPSG:32619,OGC:CRS84h,(inf inf inf inf) +EPSG:32620,NSGI:Saba_DPnet_Height,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,NSGI:Saba_DPnet,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,NSGI:Saba_DPnet_Height,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,NSGI:Saba2020_GEOCENTRIC,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,NSGI:Saba2020_GEOGRAPHIC_2D,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,NSGI:Saba2020_GEOGRAPHIC_3D,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,EPSG:32620,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,EPSG:7789,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,EPSG:7912,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,EPSG:4979,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) +EPSG:32620,OGC:CRS84h,(475094.4994806724 1948988.986236465 257.5641337847337 2000.0) EPSG:7789,NSGI:Saba_DPnet_Height,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,NSGI:Saba_DPnet,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,NSGI:Saba_DPnet_Height,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,NSGI:Saba2020_GEOCENTRIC,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,NSGI:Saba2020_GEOGRAPHIC_2D,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,NSGI:Saba2020_GEOGRAPHIC_3D,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) -EPSG:7789,EPSG:32619,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) +EPSG:7789,EPSG:32620,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,EPSG:7789,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,EPSG:7912,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) EPSG:7789,EPSG:4979,(2738386.5408441196 -5429269.159923881 1919210.699541334 2000.0) @@ -92,7 +92,7 @@ EPSG:7912,NSGI:Saba_DPnet_Height,(-63.234773917104256 17.62749239762325 257.5641 EPSG:7912,NSGI:Saba2020_GEOCENTRIC,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) EPSG:7912,NSGI:Saba2020_GEOGRAPHIC_2D,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) EPSG:7912,NSGI:Saba2020_GEOGRAPHIC_3D,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) -EPSG:7912,EPSG:32619,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) +EPSG:7912,EPSG:32620,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) EPSG:7912,EPSG:7789,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) EPSG:7912,EPSG:7912,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) EPSG:7912,EPSG:4979,(-63.234773917104256 17.62749239762325 257.5641889395192 2000.0) @@ -103,7 +103,7 @@ EPSG:4979,NSGI:Saba_DPnet_Height,(-63.234773917104256 17.62749239707808 257.5641 EPSG:4979,NSGI:Saba2020_GEOCENTRIC,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) EPSG:4979,NSGI:Saba2020_GEOGRAPHIC_2D,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) EPSG:4979,NSGI:Saba2020_GEOGRAPHIC_3D,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) -EPSG:4979,EPSG:32619,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) +EPSG:4979,EPSG:32620,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) EPSG:4979,EPSG:7789,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) EPSG:4979,EPSG:7912,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) EPSG:4979,EPSG:4979,(-63.234773917104256 17.62749239707808 257.5641793552786 2000.0) @@ -114,7 +114,7 @@ OGC:CRS84h,NSGI:Saba_DPnet_Height,(-63.23477197588805 17.627494962561368 257.564 OGC:CRS84h,NSGI:Saba2020_GEOCENTRIC,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) OGC:CRS84h,NSGI:Saba2020_GEOGRAPHIC_2D,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) OGC:CRS84h,NSGI:Saba2020_GEOGRAPHIC_3D,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) -OGC:CRS84h,EPSG:32619,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) +OGC:CRS84h,EPSG:32620,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) OGC:CRS84h,EPSG:7789,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) OGC:CRS84h,EPSG:7912,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) OGC:CRS84h,EPSG:4979,(-63.23477197588805 17.627494962561368 257.56412420235574 2000.0) diff --git a/tests/data/st_eustatius_validation_data.csv b/tests/data/st_eustatius_validation_data.csv index f0bf7fc..d744e65 100644 --- a/tests/data/st_eustatius_validation_data.csv +++ b/tests/data/st_eustatius_validation_data.csv @@ -3,7 +3,7 @@ NSGI:St_Eustatius_DPnet_Height,NSGI:St_Eustatius_DPnet,(502000.0 1934000.0 100.0 NSGI:St_Eustatius_DPnet_Height,NSGI:St_Eustatius2020_GEOCENTRIC,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet_Height,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet_Height,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(502000.0 1934000.0 100.0 2000) -NSGI:St_Eustatius_DPnet_Height,EPSG:32619,(502000.0 1934000.0 100.0 2000) +NSGI:St_Eustatius_DPnet_Height,EPSG:32620,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet_Height,EPSG:7789,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet_Height,EPSG:7912,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet_Height,EPSG:4979,(502000.0 1934000.0 100.0 2000) @@ -13,7 +13,7 @@ NSGI:St_Eustatius_DPnet,NSGI:St_Eustatius_DPnet,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet,NSGI:St_Eustatius2020_GEOCENTRIC,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(502000.0 1934000.0 100.0 2000) -NSGI:St_Eustatius_DPnet,EPSG:32619,(502000.0 1934000.0 100.0 2000) +NSGI:St_Eustatius_DPnet,EPSG:32620,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet,EPSG:7789,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet,EPSG:7912,(502000.0 1934000.0 100.0 2000) NSGI:St_Eustatius_DPnet,EPSG:4979,(502000.0 1934000.0 100.0 2000) @@ -23,7 +23,7 @@ NSGI:St_Eustatius2020_GEOCENTRIC,NSGI:St_Eustatius_DPnet,(2764408.9408813603 -54 NSGI:St_Eustatius2020_GEOCENTRIC,NSGI:St_Eustatius2020_GEOCENTRIC,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) NSGI:St_Eustatius2020_GEOCENTRIC,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) NSGI:St_Eustatius2020_GEOCENTRIC,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) -NSGI:St_Eustatius2020_GEOCENTRIC,EPSG:32619,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) +NSGI:St_Eustatius2020_GEOCENTRIC,EPSG:32620,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) NSGI:St_Eustatius2020_GEOCENTRIC,EPSG:7789,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) NSGI:St_Eustatius2020_GEOCENTRIC,EPSG:7912,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) NSGI:St_Eustatius2020_GEOCENTRIC,EPSG:4979,(2764408.9408813603 -5420906.046472443 1904924.7184807751 2000.0) @@ -33,7 +33,7 @@ NSGI:St_Eustatius2020_GEOGRAPHIC_2D,NSGI:St_Eustatius_DPnet,(-62.98054174892307 NSGI:St_Eustatius2020_GEOGRAPHIC_2D,NSGI:St_Eustatius2020_GEOCENTRIC,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_2D,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_2D,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) -NSGI:St_Eustatius2020_GEOGRAPHIC_2D,EPSG:32619,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) +NSGI:St_Eustatius2020_GEOGRAPHIC_2D,EPSG:32620,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_2D,EPSG:7789,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_2D,EPSG:7912,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_2D,EPSG:4979,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) @@ -43,27 +43,27 @@ NSGI:St_Eustatius2020_GEOGRAPHIC_3D,NSGI:St_Eustatius_DPnet,(-62.98054174892307 NSGI:St_Eustatius2020_GEOGRAPHIC_3D,NSGI:St_Eustatius2020_GEOCENTRIC,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_3D,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_3D,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) -NSGI:St_Eustatius2020_GEOGRAPHIC_3D,EPSG:32619,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) +NSGI:St_Eustatius2020_GEOGRAPHIC_3D,EPSG:32620,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_3D,EPSG:7789,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_3D,EPSG:7912,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_3D,EPSG:4979,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) NSGI:St_Eustatius2020_GEOGRAPHIC_3D,OGC:CRS84h,(-62.98054174892307 17.49267703432161 58.119714772328734 2000.0) -EPSG:32619,NSGI:St_Eustatius_DPnet_Height,(inf inf inf inf) -EPSG:32619,NSGI:St_Eustatius_DPnet,(inf inf inf inf) -EPSG:32619,NSGI:St_Eustatius2020_GEOCENTRIC,(inf inf inf inf) -EPSG:32619,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(inf inf inf inf) -EPSG:32619,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(inf inf inf inf) -EPSG:32619,EPSG:32619,(inf inf inf inf) -EPSG:32619,EPSG:7789,(inf inf inf inf) -EPSG:32619,EPSG:7912,(inf inf inf inf) -EPSG:32619,EPSG:4979,(inf inf inf inf) -EPSG:32619,OGC:CRS84h,(inf inf inf inf) +EPSG:32620,NSGI:St_Eustatius_DPnet_Height,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,NSGI:St_Eustatius_DPnet,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,NSGI:St_Eustatius2020_GEOCENTRIC,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,EPSG:32620,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,EPSG:7789,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,EPSG:7912,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,EPSG:4979,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) +EPSG:32620,OGC:CRS84h,(502065.4997283431 1934058.5665426834 58.119714772328734 2000.0) EPSG:7789,NSGI:St_Eustatius_DPnet_Height,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) EPSG:7789,NSGI:St_Eustatius_DPnet,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) EPSG:7789,NSGI:St_Eustatius2020_GEOCENTRIC,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) EPSG:7789,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) EPSG:7789,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) -EPSG:7789,EPSG:32619,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) +EPSG:7789,EPSG:32620,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) EPSG:7789,EPSG:7789,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) EPSG:7789,EPSG:7912,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) EPSG:7789,EPSG:4979,(2764408.7922813604 -5420906.221272443 1904924.438080775 2000.0) @@ -73,7 +73,7 @@ EPSG:7912,NSGI:St_Eustatius_DPnet,(-62.980543743101954 17.492674378377597 58.119 EPSG:7912,NSGI:St_Eustatius2020_GEOCENTRIC,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) EPSG:7912,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) EPSG:7912,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) -EPSG:7912,EPSG:32619,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) +EPSG:7912,EPSG:32620,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) EPSG:7912,EPSG:7789,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) EPSG:7912,EPSG:7912,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) EPSG:7912,EPSG:4979,(-62.980543743101954 17.492674378377597 58.119564707390964 2000.0) @@ -83,7 +83,7 @@ EPSG:4979,NSGI:St_Eustatius_DPnet,(-62.980543743101954 17.49267437783604 58.1195 EPSG:4979,NSGI:St_Eustatius2020_GEOCENTRIC,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) EPSG:4979,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) EPSG:4979,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) -EPSG:4979,EPSG:32619,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) +EPSG:4979,EPSG:32620,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) EPSG:4979,EPSG:7789,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) EPSG:4979,EPSG:7912,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) EPSG:4979,EPSG:4979,(-62.980543743101954 17.49267437783604 58.1195552656427 2000.0) @@ -93,7 +93,7 @@ OGC:CRS84h,NSGI:St_Eustatius_DPnet,(-62.98054174892307 17.492677033780048 58.119 OGC:CRS84h,NSGI:St_Eustatius2020_GEOCENTRIC,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) OGC:CRS84h,NSGI:St_Eustatius2020_GEOGRAPHIC_2D,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) OGC:CRS84h,NSGI:St_Eustatius2020_GEOGRAPHIC_3D,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) -OGC:CRS84h,EPSG:32619,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) +OGC:CRS84h,EPSG:32620,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) OGC:CRS84h,EPSG:7789,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) OGC:CRS84h,EPSG:7912,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) OGC:CRS84h,EPSG:4979,(-62.98054174892307 17.492677033780048 58.11970532871783 2000.0) diff --git a/tests/test_cityjson_transformation.py b/tests/test_cityjson_transformation.py index 2af30de..0534224 100644 --- a/tests/test_cityjson_transformation.py +++ b/tests/test_cityjson_transformation.py @@ -10,9 +10,9 @@ def test_cityjson_transformed(): cj = CityjsonV113.model_validate(data) cj_original = CityjsonV113.model_validate(data) - cj.crs_transform(str_to_crs("EPSG:7415"), str_to_crs("EPSG:9753"), 2010.0) + cj.crs_transform(str_to_crs("EPSG:7415"), str_to_crs("EPSG:7931"), 2010.0) assert cj.metadata.geographicalExtent != cj_original.metadata.geographicalExtent assert cj.vertices != cj_original.vertices - assert cj.metadata.referenceSystem == "https://www.opengis.net/def/crs/EPSG/0/9753" + assert cj.metadata.referenceSystem == "https://www.opengis.net/def/crs/EPSG/0/7931" assert cj.transform is not None assert cj.transform != cj_original.transform diff --git a/tests/test_geojson_transformation.py b/tests/test_geojson_transformation.py index d3cd39d..e222001 100644 --- a/tests/test_geojson_transformation.py +++ b/tests/test_geojson_transformation.py @@ -46,7 +46,7 @@ def test_transformer_object_created_thrice_while_transforming_7930_7415(): ) as get_transformer_call: _ = crs_transform(geojson_obj, str_to_crs("EPSG:7930"), str_to_crs("EPSG:7415")) # get_transformer is called 3 times, once for horizontal, once for vertical causes exc, exc caught -> one more call to get_tranformer - expected_call_count = 3 + expected_call_count = 2 assert get_transformer_call.call_count == expected_call_count diff --git a/tests/test_get_individual_crs_from_compound.py b/tests/test_get_individual_crs_from_compound.py deleted file mode 100644 index 2597557..0000000 --- a/tests/test_get_individual_crs_from_compound.py +++ /dev/null @@ -1,36 +0,0 @@ -import pytest -from pyproj import CRS - -from coordinate_transformation_api.crs_transform import get_individual_crs_from_compound - - -@pytest.mark.parametrize( - ("compound_crs", "expectation"), - [ - ( - "EPSG:7415", - ( - "EPSG:28992", - "EPSG:5709", - ), - ), - ( - "EPSG:7931", - ( - "EPSG:7931", - "EPSG:7931", - ), - ), - ], -) -def test_time_dependant_operation_method(compound_crs, expectation): - authorities = get_authorities_id_from_result(get_individual_crs_from_compound(CRS.from_user_input(compound_crs))) - assert expectation == authorities - - -def get_authorities_id_from_result(crss: tuple[CRS, CRS]) -> tuple[str, str]: - result = [] - for crs in crss: - result.append("{}:{}".format(*crs.to_authority())) - - return tuple(result) diff --git a/tests/util.py b/tests/util.py index 2bfbe25..5ef4957 100644 --- a/tests/util.py +++ b/tests/util.py @@ -55,7 +55,6 @@ def nl_eu_validation_data(): "EPSG:4326", "EPSG:3857", "EPSG:9000", - "EPSG:9755", "EPSG:4937", "EPSG:4936", "EPSG:9286", @@ -65,8 +64,6 @@ def nl_eu_validation_data(): "EPSG:4979", "EPSG:7912", "EPSG:7789", - "EPSG:9754", - "EPSG:9753", "EPSG:9289", "EPSG:3395", ] @@ -92,7 +89,7 @@ def nl_eu_validation_data(): ) ) - nl_eu_validation_data() + return nl_eu_validation_data() def nl_bonaire_validation_data(): @@ -129,8 +126,8 @@ def nl_bonaire_validation_data(): "({} {} {} {})".format(*source_coord), ) ) - - nl_bonaire_validation_data() + # still read data and return it + return nl_bonaire_validation_data() def nl_st_eustatius_validation_data(): @@ -168,7 +165,7 @@ def nl_st_eustatius_validation_data(): ) ) - nl_st_eustatius_validation_data() + return nl_st_eustatius_validation_data() def nl_saba_validation_data():