ENH: Add additional shapefile metadata files

Also set a correct default ellipse for these data, which are on NAD83 rather than WGS84.
Unidata · Nov 28, 2023 · bf8075c · bf8075c
1 parent 91543f6
commit bf8075c
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 2 deletions.
diff --git a/src/metpy/plots/cartopy_utils.py b/src/metpy/plots/cartopy_utils.py
@@ -14,7 +14,7 @@ class MetPyMapFeature(Feature):
         def __init__(self, name, scale, **kwargs):
             """Create MetPyMapFeature instance."""
             import cartopy.crs as ccrs
-            super().__init__(ccrs.PlateCarree(), **kwargs)
+            super().__init__(ccrs.PlateCarree(globe=ccrs.Globe('NAD83')), **kwargs)
             self.name = name
 
             if isinstance(scale, str):
@@ -27,7 +27,7 @@ def geometries(self):
 
             # Ensure that the associated files are in the cache
             fname = f'{self.name}_{self.scaler.scale}'
-            for extension in ['.dbf', '.shx']:
+            for extension in ['.cpg', '.dbf', '.prj', '.shx']:
                 get_test_data(fname + extension, as_file_obj=False)
             path = get_test_data(fname + '.shp', as_file_obj=False)
             return iter(tuple(shapereader.Reader(path).geometries()))

diff --git a/staticdata/us_counties_20m.cpg b/staticdata/us_counties_20m.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/staticdata/us_counties_20m.prj b/staticdata/us_counties_20m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/staticdata/us_counties_500k.cpg b/staticdata/us_counties_500k.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/staticdata/us_counties_500k.prj b/staticdata/us_counties_500k.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/staticdata/us_counties_5m.cpg b/staticdata/us_counties_5m.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/staticdata/us_counties_5m.prj b/staticdata/us_counties_5m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/staticdata/us_states_20m.cpg b/staticdata/us_states_20m.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/staticdata/us_states_20m.prj b/staticdata/us_states_20m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/staticdata/us_states_500k.cpg b/staticdata/us_states_500k.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/staticdata/us_states_500k.prj b/staticdata/us_states_500k.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
diff --git a/staticdata/us_states_5m.cpg b/staticdata/us_states_5m.cpg
@@ -0,0 +1 @@
+UTF-8
diff --git a/staticdata/us_states_5m.prj b/staticdata/us_states_5m.prj
@@ -0,0 +1 @@
+GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		GEOGCS["GCS_North_American_1983",DATUM["D_North_American_1983",SPHEROID["GRS_1980",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]