Merge pull request #2 from iannesbitt/bugfix-1-model_search-int

Adding EPSG integer handling to `model_search`
iannesbitt · Nov 2, 2023 · 10016da · 10016da
2 parents 6a5e988 + 5ffa8a4
commit 10016da
Show file tree

Hide file tree

Showing 12 changed files with 182 additions and 165 deletions.
diff --git a/docs/defs.html b/docs/defs.html
@@ -140,7 +140,7 @@
 
 <dl class="py data">
 <dt class="sig sig-object py" id="pyegt.defs.MODEL_LIST">
-<span class="sig-prename descclassname"><span class="pre">pyegt.defs.</span></span><span class="sig-name descname"><span class="pre">MODEL_LIST</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#list" title="(in Python v3.11)"><span class="pre">list</span></a></em><a class="headerlink" href="#pyegt.defs.MODEL_LIST" title="Permalink to this definition"></a></dt>
+<span class="sig-prename descclassname"><span class="pre">pyegt.defs.</span></span><span class="sig-name descname"><span class="pre">MODEL_LIST</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#list" title="(in Python v3.12)"><span class="pre">list</span></a></em><a class="headerlink" href="#pyegt.defs.MODEL_LIST" title="Permalink to this definition"></a></dt>
 <dd><p>The full list of models from NGS and VDatum APIs described here,
 concatenated from <a class="reference internal" href="#pyegt.defs.NGS_MODELS" title="pyegt.defs.NGS_MODELS"><code class="xref py py-data docutils literal notranslate"><span class="pre">pyegt.defs.NGS_MODELS</span></code></a> and
 <a class="reference internal" href="#pyegt.defs.VDATUM_MODELS" title="pyegt.defs.VDATUM_MODELS"><code class="xref py py-data docutils literal notranslate"><span class="pre">pyegt.defs.VDATUM_MODELS</span></code></a>:</p>

diff --git a/docs/height.html b/docs/height.html
diff --git a/docs/searchindex.js b/docs/searchindex.js
diff --git a/docs/utils.html b/docs/utils.html
diff --git a/docsrc/_build/doctrees/environment.pickle b/docsrc/_build/doctrees/environment.pickle
diff --git a/docsrc/_build/doctrees/utils.doctree b/docsrc/_build/doctrees/utils.doctree
diff --git a/docsrc/_build/html/defs.html b/docsrc/_build/html/defs.html
@@ -140,7 +140,7 @@
 
 <dl class="py data">
 <dt class="sig sig-object py" id="pyegt.defs.MODEL_LIST">
-<span class="sig-prename descclassname"><span class="pre">pyegt.defs.</span></span><span class="sig-name descname"><span class="pre">MODEL_LIST</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#list" title="(in Python v3.11)"><span class="pre">list</span></a></em><a class="headerlink" href="#pyegt.defs.MODEL_LIST" title="Permalink to this definition"></a></dt>
+<span class="sig-prename descclassname"><span class="pre">pyegt.defs.</span></span><span class="sig-name descname"><span class="pre">MODEL_LIST</span></span><em class="property"><span class="p"><span class="pre">:</span></span><span class="w"> </span><a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#list" title="(in Python v3.12)"><span class="pre">list</span></a></em><a class="headerlink" href="#pyegt.defs.MODEL_LIST" title="Permalink to this definition"></a></dt>
 <dd><p>The full list of models from NGS and VDatum APIs described here,
 concatenated from <a class="reference internal" href="#pyegt.defs.NGS_MODELS" title="pyegt.defs.NGS_MODELS"><code class="xref py py-data docutils literal notranslate"><span class="pre">pyegt.defs.NGS_MODELS</span></code></a> and
 <a class="reference internal" href="#pyegt.defs.VDATUM_MODELS" title="pyegt.defs.VDATUM_MODELS"><code class="xref py py-data docutils literal notranslate"><span class="pre">pyegt.defs.VDATUM_MODELS</span></code></a>:</p>

diff --git a/docsrc/_build/html/height.html b/docsrc/_build/html/height.html
diff --git a/docsrc/_build/html/searchindex.js b/docsrc/_build/html/searchindex.js
diff --git a/docsrc/_build/html/utils.html b/docsrc/_build/html/utils.html
diff --git a/pyegt/_version.py b/pyegt/_version.py
@@ -1 +1 @@
-__version__ = '0.1.2'
+__version__ = '0.1.3'
diff --git a/pyegt/utils.py b/pyegt/utils.py
@@ -1,6 +1,8 @@
 import time
 import requests
 from typing import Union, Literal
+from pyproj import CRS
+from logging import getLogger
 
 from . import defs
 
@@ -13,6 +15,9 @@ def model_search(vrs: str=None) -> Union[str, Literal[None]]:
         >>> egm = "EGM2008 height"
         >>> model_search(vrs=egm)
         "EGM2008"
+        >>> egmi = 3855
+        >>> model_search(vrs=egmi)
+        "EGM2008"
         >>> navd88 = "NAVD88 (US Survey Feet)"
         >>> model_search(vrs=navd88)
         "NAVD88"
@@ -24,6 +29,12 @@ def model_search(vrs: str=None) -> Union[str, Literal[None]]:
     :return: A verified model name or ``None`` if none is found
     :rtype: str or None
     """
+    L = getLogger(__name__)
+    L.debug(f"Input vrs={vrs} (Type: {type(vrs)})")
+    if isinstance(vrs, int):
+        L.debug("Integer vrs found, converting to namestring if possible...")
+        vrs = CRS.from_epsg(vrs).name
+        L.debug(f"Named vrs={vrs} (Type: {type(vrs)})")
     for m in defs.MODEL_LIST:
         if m in vrs:
             # sometimes vrs from WKT will be formatted like "EGM2008 height" and this should catch that