Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
CLIMATE-970 - Fix dataset.Bounds issues with the latest Basemap
- countries shapefile has been replaced with files from naturalearthdata.com
  • Loading branch information
huikyole committed Oct 4, 2019
1 parent 8ba9330 commit 129bb0b375d5fe9713251190c1f27a44d3f55fa2
Showing 5 changed files with 3 additions and 3 deletions.
BIN +381 KB (290%) ocw/shape/countries.dbf 100755 → 100644
Binary file not shown.
2 ocw/shape/countries.prj 100755 → 100644
@@ -1 +1 @@
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]]
GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.017453292519943295]]
BIN -21.6 MB (28%) ocw/shape/countries.shp 100755 → 100644
Binary file not shown.
BIN -80 Bytes (96%) ocw/shape/countries.shx 100755 → 100644
Binary file not shown.
@@ -507,7 +507,7 @@ def shapefile_boundary(boundary_type, region_names):
regions = []
shapefile_dir = os.sep.join([os.path.dirname(__file__), 'shape'])
map_read.readshapefile(os.path.join(shapefile_dir, boundary_type),
boundary_type, drawbounds=False)
boundary_type, drawbounds=False, default_encoding='latin-1')
# Note: The shapefile may contain countries or states with latin letters.
# Hence, the output of readshapefile can be a mix of ascii and unicode
# strings. Because python 2 and 3 treat them differently, we must
@@ -524,7 +524,7 @@ def shapefile_boundary(boundary_type, region_names):
for region_name in region_names:
region_name = _force_unicode(region_name)
for iregion, region_info in enumerate(map_read.countries_info):
country = _force_unicode(region_info['COUNTRY'], 'latin-1')
country = _force_unicode(region_info['NAME_EN'], 'latin-1')
if (country.replace(" ", "").lower() ==
region_name.replace(" ", "").lower()):
regions.append(np.array(map_read.countries[iregion]))

0 comments on commit 129bb0b

Please sign in to comment.