shakemap-modules 1.1.18__tar.gz → 1.2.0__tar.gz

{shakemap_modules-1.1.18 → shakemap_modules-1.2.0}/CHANGELOG.md

@@ -1,5 +1,27 @@
 # main
 
+## 1.2.0 / 2026-08-10
+    - Optimize mapping performance:
+        o Render the static basemap/faults/roads layers once instead of once per IMT map
+        o Vectorize the station plotting
+        o Deduplicate the contour reprojection
+        o Clip faults/roads to the map bounds before handing them to Cartopy
+    - Refactor model:
+        o Refactor model.py into a suite of smaller modules.
+        o Create unit tests for all of the new modules.
+        o Optimize performance of model.
+        o Remove max_workers config parameter; add row_block.
+    - Make the RNG seed for FFSimmer a function of event ID instead of a constant.
+    - Change esi-core>=1.2.8, gmpacket>=0.1.10, and esi-shakelib>=1.2.2 in pyproject.toml.
+
+## 1.1.19 / 2026-07-31
+
+    - Reset xmax/ymin when adjusting grid resolution.
+    - Set xres/yres to 1k in model.conf.
+    - Update Python version to 3.12 in pyproject.toml and install.sh
+    - model.py: Remove redundant application of GAFs when a virtual IPE is used.
+    - Update DYFI module to use latest uncertainty calculation (from upcoming paper)
+
 ## 1.1.18 / 2026-04-29
 
     - Add product_version argument to AssembleModule (can override version number)

{shakemap_modules-1.1.18 → shakemap_modules-1.2.0}/PKG-INFO

@@ -1,25 +1,25 @@
 Metadata-Version: 2.4
 Name: shakemap-modules
-Version: 1.1.18
+Version: 1.2.0
 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-Expression: CC0-1.0
-Requires-Python: >=3.9
+Requires-Python: <3.13,>=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: configobj>=5.0.8
-Requires-Dist: esi-shakelib>=1.2.1
+Requires-Dist: esi-shakelib>=1.2.2
 Requires-Dist: h5py>=3.8.0
 Requires-Dist: importlib-resources>=6.0.0
 Provides-Extra: assemble
 Requires-Dist: mapio>=0.8.8; extra == "assemble"
 Requires-Dist: defusedxml>=0.7.1; extra == "assemble"
-Requires-Dist: gmpacket>=0.1.2; extra == "assemble"
+Requires-Dist: gmpacket>=0.1.10; extra == "assemble"
 Requires-Dist: pandas>=2.0.2; extra == "assemble"
 Provides-Extra: associate
 Provides-Extra: augment
 Requires-Dist: defusedxml>=0.7.1; extra == "augment"
-Requires-Dist: gmpacket>=0.1.2; extra == "augment"
+Requires-Dist: gmpacket>=0.1.10; extra == "augment"
 Provides-Extra: contour
 Requires-Dist: fiona>=1.9.4.post1; extra == "contour"
 Provides-Extra: coverage
@@ -29,12 +29,12 @@ Requires-Dist: openpyxl; extra == "dyfi"
 Requires-Dist: pandas>=2.0.2; extra == "dyfi"
 Provides-Extra: exception
 Provides-Extra: gridxml
-Requires-Dist: esi-core>=1.2.3; extra == "gridxml"
+Requires-Dist: esi-core>=1.2.8; extra == "gridxml"
 Requires-Dist: mapio>=0.8.8; extra == "gridxml"
 Provides-Extra: history
 Provides-Extra: info
 Provides-Extra: kml
-Requires-Dist: esi-core>=1.2.3; extra == "kml"
+Requires-Dist: esi-core>=1.2.8; extra == "kml"
 Requires-Dist: esi-utils-colors>=1.0.5; extra == "kml"
 Requires-Dist: mapio>=0.8.8; extra == "kml"
 Requires-Dist: fiona>=1.9.4.post1; extra == "kml"
@@ -54,7 +54,7 @@ Requires-Dist: matplotlib>=3.7.1; extra == "mapping"
 Requires-Dist: rasterio; extra == "mapping"
 Requires-Dist: scipy; extra == "mapping"
 Provides-Extra: model
-Requires-Dist: esi-core>=1.2.3; extra == "model"
+Requires-Dist: esi-core>=1.2.8; extra == "model"
 Requires-Dist: mapio>=0.8.8; extra == "model"
 Requires-Dist: cartopy>=0.22.0; extra == "model"
 Requires-Dist: fiona>=1.9.4.post1; extra == "model"
@@ -66,7 +66,7 @@ Requires-Dist: mapio>=0.8.8; extra == "raster"
 Provides-Extra: rupture
 Provides-Extra: save
 Provides-Extra: shape
-Requires-Dist: esi-core>=1.2.3; extra == "shape"
+Requires-Dist: esi-core>=1.2.8; extra == "shape"
 Requires-Dist: esi-utils-colors>=1.0.5; extra == "shape"
 Requires-Dist: fiona>=1.9.4.post1; extra == "shape"
 Requires-Dist: scikit-image; extra == "shape"

{shakemap_modules-1.1.18 → shakemap_modules-1.2.0}/code.json

@@ -1,4 +1,76 @@
 [
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.2.0",
+        "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.2.0/shakemap-modules-v1.2.0.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.2.0/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.2.0/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2026-08-10"
+        }
+    },
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.1.19",
+        "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.19/shakemap-modules-v1.1.19.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.19/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.19/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2026-07-31"
+        }
+    },
     {
         "name": "shakemap-modules",
         "description": "ShakeMap processing modules.",

{shakemap_modules-1.1.18 → shakemap_modules-1.2.0}/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.11
+conda create -y -n $VENV -c conda-forge python=3.12
 
 
 # Bail out at this point if the conda create command fails.

{shakemap_modules-1.1.18 → shakemap_modules-1.2.0}/pyproject.toml

@@ -20,12 +20,13 @@ authors = [
 license = "CC0-1.0"
 license-files = ["LICENSE.md"]
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.12,<3.13"
+
 
 # Requirements:
 dependencies = [
     "configobj>=5.0.8",
-    "esi-shakelib>=1.2.1",
+    "esi-shakelib>=1.2.2",
     "h5py>=3.8.0",
     "importlib-resources>=6.0.0",
 ]
@@ -34,14 +35,14 @@ dependencies = [
 assemble = [
     "mapio>=0.8.8",
     "defusedxml>=0.7.1",
-    "gmpacket>=0.1.2",
+    "gmpacket>=0.1.10",
     "pandas>=2.0.2",
 ]
 associate = [
 ]
 augment = [
     "defusedxml>=0.7.1",
-    "gmpacket>=0.1.2",
+    "gmpacket>=0.1.10",
 ]
 contour = [
     "fiona>=1.9.4.post1",
@@ -55,13 +56,13 @@ dyfi = [
 ]
 exception = []
 gridxml = [
-    "esi-core>=1.2.3",
+    "esi-core>=1.2.8",
     "mapio>=0.8.8",
 ]
 history = []
 info = []
 kml = [
-    "esi-core>=1.2.3",
+    "esi-core>=1.2.8",
     "esi-utils-colors>=1.0.5",
     "mapio>=0.8.8",
     "fiona>=1.9.4.post1",
@@ -83,7 +84,7 @@ mapping = [
     "scipy",
 ]
 model = [
-    "esi-core>=1.2.3",
+    "esi-core>=1.2.8",
     "mapio>=0.8.8",
     "cartopy>=0.22.0",
     "fiona>=1.9.4.post1",
@@ -98,7 +99,7 @@ raster = [
 rupture = []
 save = []
 shape = [
-    "esi-core>=1.2.3",
+    "esi-core>=1.2.8",
     "esi-utils-colors>=1.0.5",
     "fiona>=1.9.4.post1",
     "scikit-image",

{shakemap_modules-1.1.18 → shakemap_modules-1.2.0}/src/shakemap_modules/coremods/augment.py

@@ -117,15 +117,6 @@ class AugmentModule(CoreModule):
         validator = get_custom_validator()
         shake_config = shake_data.getConfig()
         shake_config = ConfigObj(shake_config, configspec=spec_file)
-        #
-        # This is a weird hack to get around a bug/feature of ConfigObj
-        # that results in the validation failing if max_workers is already
-        # an integer.
-        #
-        if "max_workers" in shake_config["system"]:
-            shake_config["system"]["max_workers"] = str(
-                shake_config["system"]["max_workers"]
-            )
 
         modules_file = os.path.join(install_path, "config", "modules.conf")
         if os.path.isfile(modules_file):

{shakemap_modules-1.1.18 → shakemap_modules-1.2.0}/src/shakemap_modules/coremods/dyfi.py

@@ -50,87 +50,91 @@ OLD_DYFI_COLUMNS_REPLACE = {
 }
 
 MIN_RESPONSES = 1  # minimum number of DYFI responses per grid
-STDDEV_TYPE = 2
+STDDEV_TYPE = 3
 
 STDDEVS_BY_NRESP = [
     [
         1,
         [
-            (1.0, 0.8659),
-            (2.0, 0.8099),
-            (2.5, 0.7899),
-            (3.0, 0.8111),
-            (3.5, 0.8449),
-            (4.0, 0.9016),
-            (4.5, 0.9507),
-            (5.0, 1.0050),
-            (5.5, 1.0253),
-            (6.0, 1.0694),
-            (6.5, 1.0477),
-            (7.0, 0.9897),
-            (7.5, 0.9813),
-            (8.0, 0.9061),
-            (8.5, 0.7202),
-            (9.0, 0.7127),
+            (1.0, 0.866),
+            (2.0, 0.810),
+            (2.5, 0.790),
+            (3.0, 0.811),
+            (3.5, 0.845),
+            (4.0, 0.902),
+            (4.5, 0.951),
+            (5.0, 1.005),
+            (5.5, 1.025),
+            (6.0, 1.069),
+            (6.5, 1.048),
+            (7.0, 0.990),
+            (7.5, 0.981),
+            (8.0, 0.906),
+            (8.5, 0.720),
+            (9.0, 0.713),
         ],
     ],
     [
         3,
         [
-            (1.0, 0.6005),
-            (2.0, 0.6177),
-            (2.5, 0.6123),
-            (3.0, 0.6110),
-            (3.5, 0.6283),
-            (4.0, 0.6695),
-            (4.5, 0.7084),
-            (5.0, 0.7871),
-            (5.5, 0.8747),
-            (6.0, 0.8570),
-            (6.5, 0.7443),
-            (7.0, 0.6244),
-            (7.5, 0.5558),
-            (8.0, 0.5713),
-            (8.5, 0.4731),
-            (9.0, 0.2561),
+            (1.0, 0.606),
+            (2.0, 0.626),
+            (2.5, 0.619),
+            (3.0, 0.624),
+            (3.5, 0.641),
+            (4.0, 0.680),
+            (4.5, 0.713),
+            (5.0, 0.801),
+            (5.5, 0.880),
+            (6.0, 0.883),
+            (6.5, 0.751),
+            (7.0, 0.636),
+            (7.5, 0.588),
+            (8.0, 0.607),
+            (8.5, 0.492),
+            (9.0, 0.271),
         ],
     ],
     [
-        6,
+        5,
         [
-            (2.0, 0.5463),
-            (2.5, 0.5379),
-            (3.0, 0.5397),
-            (3.5, 0.5119),
-            (4.0, 0.5603),
-            (4.5, 0.5827),
-            (5.0, 0.7060),
-            (5.5, 0.8327),
-            (6.0, 0.8009),
-            (6.5, 0.5516),
-            (7.0, 0.4403),
-            (7.5, 0.5014),
-            (8.0, 0.3721),
-            (8.5, 0.2610),
+            (1.0, 0.495),
+            (2.0, 0.557),
+            (2.5, 0.559),
+            (3.0, 0.553),
+            (3.5, 0.552),
+            (4.0, 0.602),
+            (4.5, 0.634),
+            (5.0, 0.718),
+            (5.5, 0.849),
+            (6.0, 0.707),
+            (6.5, 0.589),
+            (7.0, 0.486),
+            (7.5, 0.463),
+            (8.0, 0.409),
+            (8.5, 0.294),
+            (9.0, 0.251),
         ],
     ],
     [
-        10,
+        8,
         [
-            (2.0, 0.5118),
-            (2.5, 0.5229),
-            (3.0, 0.4939),
-            (3.5, 0.4380),
-            (4.0, 0.4889),
-            (4.5, 0.4917),
-            (5.0, 0.5658),
-            (5.5, 0.5669),
-            (6.0, 0.8960),
-            (6.5, 0.5921),
-            (7.0, 0.7533),
-            (7.5, 0.3556),
-            (8.0, 0.2697),
-            (8.5, 0.3418),
+            (1.0, 0.495),
+            (2.0, 0.514),
+            (2.5, 0.530),
+            (3.0, 0.502),
+            (3.5, 0.452),
+            (4.0, 0.497),
+            (4.5, 0.518),
+            (5.0, 0.600),
+            (5.5, 0.633),
+            (6.0, 0.919),
+            (6.5, 0.617),
+            (7.0, 0.662),
+            (7.5, 0.360),
+            (8.0, 0.259),
+            (8.5, 0.300),
+            (9.0, 0.212),
         ],
     ],
 ]
@@ -303,7 +307,7 @@ def _parse_geocoded_json(bytes_data, min_nresp):
 
 
 def get_stddev(dataframe):
-    if STDDEV_TYPE == 2:
+    if STDDEV_TYPE == 3:
         nresp = dataframe["nresp"]
         mi = dataframe["intensity"]
         stddev_function = stddev_function2(nresp, mi)