Skip to content

Commit

Permalink
Fix: proj4 doesn't work on macos (#2386)
Browse files Browse the repository at this point in the history
* add PROJ_LIB config location for macos

* update proj db files

* update proj db files for macos
  • Loading branch information
lixun910 committed May 9, 2022
1 parent 9254121 commit 6cbc040
Show file tree
Hide file tree
Showing 31 changed files with 1,862 additions and 176 deletions.
4 changes: 2 additions & 2 deletions BuildTools/CommonDistFiles/osx/proj/CH
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
#
<metadata> +origin=Swisstopo +lastupdate=2012-02-27
# CH1903/LV03
<1903_LV03> +proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=600000 +y_0=200000 +ellps=bessel +units=m +nadgrids=CHENYX06_etrs.gsb +no_defs
<1903_LV03> +proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=600000 +y_0=200000 +ellps=bessel +units=m +nadgrids=CHENyx06_ETRS.gsb +no_defs
# CH1903
<1903> +proj=longlat +ellps=bessel +nadgrids=CHENYX06_etrs.gsb +no_defs <>
<1903> +proj=longlat +ellps=bessel +nadgrids=CHENyx06_ETRS.gsb +no_defs <>
Binary file modified BuildTools/CommonDistFiles/osx/proj/proj.db
Binary file not shown.
21 changes: 17 additions & 4 deletions BuildTools/CommonDistFiles/osx/proj/projjson.schema.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$id": "https://proj.org/schemas/v0.2/projjson.schema.json",
"$id": "https://proj.org/schemas/v0.4/projjson.schema.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"description": "Schema for PROJJSON (v0.2.1)",
"description": "Schema for PROJJSON (v0.4)",
"$comment": "This file exists both in data/ and in schemas/vXXX/. Keep both in sync. And if changing the value of $id, change PROJJSON_CURRENT_VERSION accordingly in io.cpp",

"oneOf": [
Expand Down Expand Up @@ -111,12 +111,20 @@

"bound_crs": {
"type": "object",
"allOf": [{ "$ref": "#/definitions/object_usage" }],
"properties": {
"$schema" : { "type": "string" },
"type": { "type": "string", "enum": ["BoundCRS"] },
"name": { "type": "string" },
"source_crs": { "$ref": "#/definitions/crs" },
"target_crs": { "$ref": "#/definitions/crs" },
"transformation": { "$ref": "#/definitions/abridged_transformation" }
"transformation": { "$ref": "#/definitions/abridged_transformation" },
"scope": {},
"area": {},
"bbox": {},
"usages": {},
"remarks": {},
"id": {}, "ids": {}
},
"required" : [ "source_crs", "target_crs", "transformation" ],
"additionalProperties": false
Expand Down Expand Up @@ -604,7 +612,12 @@
"authority": { "type": "string" },
"code": {
"oneOf": [ { "type": "string" }, { "type": "integer" } ]
}
},
"version": {
"oneOf": [ { "type": "string" }, { "type": "number" } ]
},
"authority_citation": { "type": "string" },
"uri": { "type": "string" }
},
"required" : [ "authority", "code" ],
"additionalProperties": false
Expand Down
10 changes: 9 additions & 1 deletion BuildTools/CommonDistFiles/osx/proj/triangulation.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"format_version": {
"type": "string",
"enum": [
"1.0"
"1.0", "1.1"
]
},
"name": {
Expand All @@ -28,6 +28,14 @@
"$ref": "#/definitions/datetime",
"description": "The date on which this version of the triangulation was published (or possibly the date on which it takes effect?)"
},
"fallback_strategy": {
"type": "string",
"enum": [
"none",
"nearest_side",
"nearest_centroid"
]
},
"license": {
"type": "string",
"description": "License under which the file is published"
Expand Down
Binary file removed BuildTools/CommonDistFiles/proj/BETA2007.gsb
Binary file not shown.
4 changes: 2 additions & 2 deletions BuildTools/CommonDistFiles/proj/CH
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
#
<metadata> +origin=Swisstopo +lastupdate=2012-02-27
# CH1903/LV03
<1903_LV03> +proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=600000 +y_0=200000 +ellps=bessel +units=m +nadgrids=CHENYX06_etrs.gsb +no_defs
<1903_LV03> +proj=somerc +lat_0=46.95240555555556 +lon_0=7.439583333333333 +k_0=1 +x_0=600000 +y_0=200000 +ellps=bessel +units=m +nadgrids=CHENyx06_ETRS.gsb +no_defs
# CH1903
<1903> +proj=longlat +ellps=bessel +nadgrids=CHENYX06_etrs.gsb +no_defs <>
<1903> +proj=longlat +ellps=bessel +nadgrids=CHENyx06_ETRS.gsb +no_defs <>
Binary file removed BuildTools/CommonDistFiles/proj/FL
Binary file not shown.
18 changes: 9 additions & 9 deletions BuildTools/CommonDistFiles/proj/ITRF2014
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,24 @@
# Z. Altamimi et al, 2017, ITRF2014 plate motion model,
# doi: 10.1093/gji/ggx136

<ANTA> +proj=helmert +drx=0.000248 +dry=0.000324 +drz=0.000675 +convention=position_vector
<ANTA> +proj=helmert +drx=-0.000248 +dry=-0.000324 +drz=0.000675 +convention=position_vector

<ARAB> +proj=helmert +drx=0.001154 +dry=0.000136 +drz=0.001444 +convention=position_vector
<ARAB> +proj=helmert +drx=0.001154 +dry=-0.000136 +drz=0.001444 +convention=position_vector

<AUST> +proj=helmert +drx=0.001510 +dry=0.001182 +drz=0.001215 +convention=position_vector

<EURA> +proj=helmert +drx=0.000085 +dry=0.000531 +drz=0.000770 +convention=position_vector
<EURA> +proj=helmert +drx=-0.000085 +dry=-0.000531 +drz=0.000770 +convention=position_vector

<INDI> +proj=helmert +drx=0.001154 +dry=0.000005 +drz=0.001454 +convention=position_vector
<INDI> +proj=helmert +drx=0.001154 +dry=-0.000005 +drz=0.001454 +convention=position_vector

<NAZC> +proj=helmert +drx=0.000333 +dry=0.001544 +drz=0.001623 +convention=position_vector
<NAZC> +proj=helmert +drx=-0.000333 +dry=-0.001544 +drz=0.001623 +convention=position_vector

<NOAM> +proj=helmert +drx=0.000024 +dry=-0.000694 +drz=-0.000063 +convention=position_vector

<NUBI> +proj=helmert +drx=0.000099 +dry=0.000614 +drz=0.000733 +convention=position_vector
<NUBI> +proj=helmert +drx=0.000099 +dry=-0.000614 +drz=0.000733 +convention=position_vector

<PCFC> +proj=helmert +drx=0.000409 +dry=0.001047 +drz=-0.002169 +convention=position_vector
<PCFC> +proj=helmert +drx=-0.000409 +dry=0.001047 +drz=-0.002169 +convention=position_vector

<SOAM> +proj=helmert +drx=0.000270 +dry=0.000301 +drz=0.000140 +convention=position_vector
<SOAM> +proj=helmert +drx=-0.000270 +dry=-0.000301 +drz=-0.000140 +convention=position_vector

<SOMA> +proj=helmert +drx=0.000121 +dry=0.000794 +drz=0.000884 +convention=position_vector
<SOMA> +proj=helmert +drx=-0.000121 +dry=-0.000794 +drz=0.000884 +convention=position_vector
Binary file removed BuildTools/CommonDistFiles/proj/MD
Binary file not shown.
158 changes: 0 additions & 158 deletions BuildTools/CommonDistFiles/proj/README.DATUMGRID

This file was deleted.

Binary file removed BuildTools/CommonDistFiles/proj/TN
Binary file not shown.
Binary file removed BuildTools/CommonDistFiles/proj/WI
Binary file not shown.
Binary file removed BuildTools/CommonDistFiles/proj/WO
Binary file not shown.
Binary file removed BuildTools/CommonDistFiles/proj/alaska
Binary file not shown.
Binary file removed BuildTools/CommonDistFiles/proj/conus
Binary file not shown.
Loading

0 comments on commit 6cbc040

Please sign in to comment.