shakemap-modules 1.1.2__tar.gz → 1.1.4__tar.gz

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # main
 
+## 1.1.4 / 2025-04-07
+    - Fixed a bug in sm_clone that prevented the preferred Atlas shakemap from being chosen by default.
+    - Fixed a bug that caused sm_clone to incorrectly fail on older fault text files.
+
+## 1.1.3 / 2025-03-20
+    - Added an option to mapping module to save figure objects to files that can be overplotted later.
+
 ## 1.1.2 / 2025-03-13
     - Fix points mode in model to use the same bounds that grid mode would use, insuring consistent bias between modes.
     - Set a fixed seed for FFSimmer RNG (RFF) to make results between runs and across deployments consistent.

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: shakemap-modules
-Version: 1.1.2
+Version: 1.1.4
 Summary: USGS Earthquake Impact ShakeMap Modules
 Author-email: Bruce Worden <cbworden@contractor.usgs.gov>, Eric Thompson <emthompsone@usgs.gov>, Mike Hearne <mhearne@usgs.gov>
 License: License
@@ -90,6 +90,7 @@ Requires-Dist: scipy; extra == "kml"
 Requires-Dist: shapely; extra == "kml"
 Requires-Dist: simplekml>=1.3.6; extra == "kml"
 Provides-Extra: mapping
+Requires-Dist: dill; extra == "mapping"
 Requires-Dist: esi-utils-colors>=1.0.3; extra == "mapping"
 Requires-Dist: esi-utils-geo>=0.9.2; extra == "mapping"
 Requires-Dist: esi-utils-gmice>=1.0; extra == "mapping"
@@ -162,6 +163,7 @@ Requires-Dist: twine; extra == "build"
 Requires-Dist: esi-releases; extra == "build"
 Provides-Extra: all
 Requires-Dist: shakemap-modules[assemble,associate,augment,contour,coverage,dyfi,exception,gridxml,history,info,kml,mapping,model,plotregr,raster,rupture,save,shape,sleep,sm-select,stations,transfer-email,transfer-pdl,transfer-scp,uncertaintymaps,xtestimage,xtestplot,xtestplot-multi,xtestplot-spectra]; extra == "all"
+Dynamic: license-file
 
 # shakemap-modules
 

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/code.json

@@ -1,4 +1,76 @@
 [
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.1.4",
+        "status": "Development",
+        "organization": "U.S. Geological Survey",
+        "vcs": "git",
+        "repositoryURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules.git",
+        "homepageURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules",
+        "downloadURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/archive/v1.1.4/shakemap-modules-v1.1.4.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.4/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.4/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2025-03-20"
+        }
+    },
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.1.3",
+        "status": "Development",
+        "organization": "U.S. Geological Survey",
+        "vcs": "git",
+        "repositoryURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules.git",
+        "homepageURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules",
+        "downloadURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/archive/v1.1.3/shakemap-modules-v1.1.3.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.3/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.3/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2025-03-20"
+        }
+    },
     {
         "name": "shakemap-modules",
         "description": "ShakeMap processing modules.",

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/install.sh

@@ -58,7 +58,7 @@ conda activate base
 
 # Create a conda virtual environment
 echo "Creating the $VENV virtual environment:"
-conda create -y -n $VENV -c conda-forge python=3.9
+conda create -y -n $VENV -c conda-forge python=3.11
 
 
 # Bail out at this point if the conda create command fails.

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/pyproject.toml

@@ -71,6 +71,7 @@ kml = [
     "simplekml>=1.3.6",
 ]
 mapping = [
+    "dill",
     "esi-utils-colors>=1.0.3",
     "esi-utils-geo>=0.9.2",
     "esi-utils-gmice>=1.0",

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/src/shakemap_modules/coremods/mapping.py

@@ -5,21 +5,19 @@ import copy
 import inspect
 import json
 import os.path
-from PIL import Image
-from configobj import ConfigObj
 
 # third party
 import cartopy.crs as ccrs
 import cartopy.feature as cfeature
+import dill
 import matplotlib
 import matplotlib.pyplot as plt
-from matplotlib.ticker import NullLocator
 import numpy as np
 import rasterio.features
 from cartopy.feature import ShapelyFeature
 from cartopy.io.shapereader import Reader
-from scipy.interpolate import griddata
-
+from configobj import ConfigObj
+from esi_shakelib.utils.imt_string import oq_to_file
 
 # local imports
 from esi_utils_colors.cpalette import ColorPalette
@@ -28,8 +26,11 @@ from esi_utils_io.smcontainers import ShakeMapOutputContainer
 from mapio.geodict import GeoDict
 from mapio.grid2d import Grid2D
 from mapio.reader import read
-from esi_shakelib.utils.imt_string import oq_to_file
+from matplotlib.ticker import NullLocator
+from PIL import Image
+from scipy.interpolate import griddata
 from shakemap_modules.base.base import Contents, CoreModule
+from shakemap_modules.base.cli import get_cli_args
 from shakemap_modules.mapping.mapmaker import draw_map
 from shakemap_modules.utils.config import (
     check_extra_values,
@@ -39,10 +40,8 @@ from shakemap_modules.utils.config import (
     get_custom_validator,
     get_data_path,
 )
-from shakemap_modules.base.cli import get_cli_args
 from shakemap_modules.utils.logging import get_generic_logger
 
-
 WATERCOLOR = "#7AA1DA"
 
 
@@ -67,6 +66,7 @@ class MappingModule(CoreModule):
     configs = ["products.conf"]
 
     display_magnitude = None
+    pickle_plots = False
 
     def __init__(self, eventid, process="shakemap", logger=None):
         super(MappingModule, self).__init__(eventid, logger=logger)
@@ -87,6 +87,13 @@ class MappingModule(CoreModule):
             type=float,
             help="Override the magnitude displayed in " "map labels.",
         )
+        parser.add_argument(
+            "-p",
+            "--pickle-plots",
+            action="store_true",
+            default=False,
+            help="Save the figure objects from each plot as a binary file that can be plotted over.",
+        )
         #
         # This line should be in any modules that overrides this
         # one. It will collect up everything after the current
@@ -99,6 +106,8 @@ class MappingModule(CoreModule):
         args = parser.parse_args(arglist)
         if args.display_magnitude:
             self.display_magnitude = args.display_magnitude
+        if args.pickle_plots:
+            self.pickle_plots = args.pickle_plots
         return args.rem
 
     def execute(self, datafile=None, outdir=None, config=None):
@@ -342,6 +351,7 @@ class MappingModule(CoreModule):
                 "config": model_config,
                 "tdict": text_dict,
                 "display_magnitude": self.display_magnitude,
+                "pickle_plots": self.pickle_plots,
                 "pdf_dpi": config["products"]["mapping"]["pdf_dpi"],
                 "img_dpi": config["products"]["mapping"]["img_dpi"],
                 "license_logo": llogo,
@@ -444,11 +454,19 @@ def make_map(adict):
         fig2.gca().xaxis.set_major_locator(NullLocator())
         fig2.gca().yaxis.set_major_locator(NullLocator())
         fig2.savefig(legend_file, bbox_inches="tight", pad_inches=0)
+        if adict["pickle_plots"]:
+            pickle_name = os.path.join(adict["datadir"], "intensity.pickle")
+            with open(pickle_name, "wb") as fobj:
+                dill.dump(fig1, fobj)
         plt.close(fig2)
     else:
         fileimt = oq_to_file(imtype)
         pdf_file = os.path.join(adict["datadir"], f"{fileimt}.pdf")
         jpg_file = os.path.join(adict["datadir"], f"{fileimt}.jpg")
+        if adict["pickle_plots"]:
+            pickle_name = os.path.join(adict["datadir"], f"{fileimt}.pickle")
+            with open(pickle_name, "wb") as fobj:
+                dill.dump(fig1, fobj)
 
     fig1.savefig(pdf_file, bbox_inches="tight", dpi=adict["pdf_dpi"])
     fig1.savefig(jpg_file, bbox_inches="tight", dpi=adict["img_dpi"])

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/src/shakemap_modules/utils/smclone.py

@@ -16,10 +16,7 @@ import pandas as pd
 import requests
 from configobj import ConfigObj
 from esi_shakelib.station import StationList
-from esi_utils_rupture.factory import (
-    rupture_from_dict_and_origin,
-    text_to_json,
-)
+from esi_utils_rupture.factory import rupture_from_dict_and_origin, text_to_json
 from esi_utils_rupture.origin import Origin, write_event_file
 from shakemap_modules.coremods.dyfi import _get_dyfi_dataframe
 from shakemap_modules.coremods.sm_select import SelectModule
@@ -27,7 +24,9 @@ from shakemap_modules.utils.comcat import get_bytes
 from shakemap_modules.utils.dataframe import dataframe_to_xml
 from shakemap_modules.utils.utils import get_network_name
 
-EVENT_URL_TEMPLATE = "https://earthquake.usgs.gov/earthquakes/feed/v1.0/detail/{eventid}.geojson"
+EVENT_URL_TEMPLATE = (
+    "https://earthquake.usgs.gov/earthquakes/feed/v1.0/detail/{eventid}.geojson"
+)
 EVENT_SCENARIO_TEMPLATE = (
     "https://earthquake.usgs.gov/fdsnws/scenario/1"
     "/query?eventid={eventid}&format=geojson"
@@ -87,13 +86,12 @@ class ShakeClone:
                     for prefsource in DEFAULT_SOURCE_PREFERENCES:
                         if prefsource in sources:
                             idx = sources.index(prefsource)
+                            break
 
                 self.shakemap = shakemaps[idx]
         self.event_dict = event_dict
         if self.event_dict is None:
-            self.event_dict = self.get_event_dict(
-                is_online_scenario=is_online_scenario
-            )
+            self.event_dict = self.get_event_dict(is_online_scenario=is_online_scenario)
 
         self.origin = Origin(self.event_dict)
 
@@ -123,9 +121,7 @@ class ShakeClone:
                     / "modules.conf"
                 )
             select_file = (
-                importlib_resources.files("shakemap_modules")
-                / "data"
-                / "select.conf"
+                importlib_resources.files("shakemap_modules") / "data" / "select.conf"
             )
             model, messages = self.get_model_conf(
                 module_file, select_file, skip_bounds=skip_bounds
@@ -137,12 +133,10 @@ class ShakeClone:
                 model.write()
                 model_filename = model.filename
         if get_dyfi or get_instrumented or get_macroseismic:
-            macroseismic_json, instrumented_json, dyfi_json = (
-                self.get_data_dicts(
-                    dyfi=get_dyfi,
-                    macroseismic=get_macroseismic,
-                    instrumented=get_instrumented,
-                )
+            macroseismic_json, instrumented_json, dyfi_json = self.get_data_dicts(
+                dyfi=get_dyfi,
+                macroseismic=get_macroseismic,
+                instrumented=get_instrumented,
             )
             for jsonstr, data_type in zip(
                 [macroseismic_json, instrumented_json, dyfi_json],
@@ -190,39 +184,22 @@ class ShakeClone:
                     rupture_text = response.text
 
                     rupture_io = StringIO(rupture_text)
-                    # text_to_json doesn't flip lat/lons around if lats come first
-                    # detect and fix that
-                    df = pd.read_csv(
-                        rupture_io,
-                        delimiter=r"\s+",
-                        names=["x1", "x2", "depth"],
-                    )
-                    # if any values in 2nd column
-                    c2_lon = (df["x2"] > 90).any() or (df["x2"] < -90).any()
-                    if c2_lon:
-                        df["tmp"] = df["x2"].copy()
-                        df["x2"] = df["x1"].copy()
-                        df["x1"] = df["tmp"]
-                        df.drop(labels=["tmp"], axis="columns", inplace=True)
-                        rupture_io = StringIO()
-                        df.to_csv(
-                            rupture_io, sep=" ", index=False, header=False
-                        )
-                        rupture_io.seek(0)
                     try:
-                        rupture_dict = text_to_json(
-                            rupture_io, new_format=True
+                        rupture_dict = text_to_json(rupture_io, new_format=True)
+                        rupture = rupture_from_dict_and_origin(
+                            rupture_dict, self.origin
                         )
-
                     except Exception as ve:
                         try:
-                            rupture_dict = text_to_json(
-                                rupture_io, new_format=False
+                            rupture_io.seek(0)
+                            rupture_dict = text_to_json(rupture_io, new_format=False)
+                            rupture = rupture_from_dict_and_origin(
+                                rupture_dict, self.origin
                             )
                             has_coordinates = len(
-                                rupture_dict["features"][0]["geometry"][
-                                    "coordinates"
-                                ][0]
+                                rupture_dict["features"][0]["geometry"]["coordinates"][
+                                    0
+                                ]
                             )
                             if not has_coordinates:
                                 raise Exception("No coordinates found.")
@@ -233,9 +210,7 @@ class ShakeClone:
                                     f"{rupture_url}, error: '{e}'"
                                 )
                             )
-                    rupture = rupture_from_dict_and_origin(
-                        rupture_dict, self.origin
-                    )
+
                     break
 
         return rupture
@@ -416,9 +391,7 @@ class ShakeClone:
                 netname = self.event_json["properties"]["net"]
                 etype = "SCENARIO"
             else:
-                netname = get_network_name(
-                    self.event_json["properties"]["net"]
-                )
+                netname = get_network_name(self.event_json["properties"]["net"])
                 etype = "ACTUAL"
             edict = {
                 "id": eventid,
@@ -448,9 +421,7 @@ class ShakeClone:
         if self.shakemap is not None:
             infourl = self.shakemap["contents"]["download/info.json"]["url"]
             jdict = json.loads(get_bytes(infourl).decode("utf8"))
-            versiondict = jdict["processing"]["shakemap_versions"][
-                "map_data_history"
-            ]
+            versiondict = jdict["processing"]["shakemap_versions"]["map_data_history"]
         return versiondict
 
     def get_data_dicts(

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/src/shakemap_modules.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: shakemap-modules
-Version: 1.1.2
+Version: 1.1.4
 Summary: USGS Earthquake Impact ShakeMap Modules
 Author-email: Bruce Worden <cbworden@contractor.usgs.gov>, Eric Thompson <emthompsone@usgs.gov>, Mike Hearne <mhearne@usgs.gov>
 License: License
@@ -90,6 +90,7 @@ Requires-Dist: scipy; extra == "kml"
 Requires-Dist: shapely; extra == "kml"
 Requires-Dist: simplekml>=1.3.6; extra == "kml"
 Provides-Extra: mapping
+Requires-Dist: dill; extra == "mapping"
 Requires-Dist: esi-utils-colors>=1.0.3; extra == "mapping"
 Requires-Dist: esi-utils-geo>=0.9.2; extra == "mapping"
 Requires-Dist: esi-utils-gmice>=1.0; extra == "mapping"
@@ -162,6 +163,7 @@ Requires-Dist: twine; extra == "build"
 Requires-Dist: esi-releases; extra == "build"
 Provides-Extra: all
 Requires-Dist: shakemap-modules[assemble,associate,augment,contour,coverage,dyfi,exception,gridxml,history,info,kml,mapping,model,plotregr,raster,rupture,save,shape,sleep,sm-select,stations,transfer-email,transfer-pdl,transfer-scp,uncertaintymaps,xtestimage,xtestplot,xtestplot-multi,xtestplot-spectra]; extra == "all"
+Dynamic: license-file
 
 # shakemap-modules
 

{shakemap_modules-1.1.2 → shakemap_modules-1.1.4}/src/shakemap_modules.egg-info/requires.txt

@@ -64,6 +64,7 @@ shapely
 simplekml>=1.3.6
 
 [mapping]
+dill
 esi-utils-colors>=1.0.3
 esi-utils-geo>=0.9.2
 esi-utils-gmice>=1.0