added support for init from ITRF, Compound EPSG, & urn projection str…

…ings
pyproj4 · May 12, 2019 · c9e7609 · c9e7609
1 parent 309583a
commit c9e7609
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/pyproj/_crs.pyx b/pyproj/_crs.pyx
@@ -1124,7 +1124,7 @@ cdef class _CRS(Base):
     def __init__(self, proj_string):
         # setup proj initialization string.
         if not is_wkt(proj_string) \
-                and not re.match("^\w+:\d+$", proj_string.strip())\
+                and "=" in proj_string\
                 and "type=crs" not in proj_string:
             proj_string += " +type=crs"
         # initialize projection

diff --git a/test/test_crs.py b/test/test_crs.py
@@ -568,3 +568,18 @@ def test_to_proj4_enum():
     crs = CRS.from_epsg(4326)
     assert crs.to_proj4(4) == crs.to_proj4(ProjVersion.PROJ_4)
     assert crs.to_proj4(5) == crs.to_proj4(ProjVersion.PROJ_5)
+
+
+def test_itrf_init():
+    crs = CRS("ITRF2000")
+    assert crs.name == "ITRF2000"
+
+
+def test_compound_crs_init():
+    crs = CRS("EPSG:2393+5717")
+    assert crs.name == "KKJ / Finland Uniform Coordinate System + N60 height"
+
+
+def test_compound_crs_urn_init():
+    crs = CRS("urn:ogc:def:crs,crs:EPSG::2393,crs:EPSG::5717")
+    assert crs.name == "KKJ / Finland Uniform Coordinate System + N60 height"