Catching-up On Source Code Changes #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rict-nesting Flatten "division-district" structure to office
modify-nwdm-basin-extents
…ents update-mvp-basin-extents
change filename to absolute pathname
added product key directory
change ftp URL to http
…ariable use environment variable CWMSGRID change ftp URL to http
Remove config_local.py.example; Add config_local.py
…wrapper wrapper-for-process_extents.py
…rint Updated print statements to be Python 3 compliant
Begin to use hecgridloaders.flt2dss python wrapper for Java grid loading utility Change Function and Variable Names: WriteZeroDStoAsc() --> WriteZeroGrid() Remove format references from variable names (ex. ascbasename, ref to ASCII) Code simplifications: Convert some string concat operations (i.e. " " +) to format statements Eliminated some code duplication between WriteZeroGrid() and WriteGrid()
Fix non-existent variable projgrid used in flt2dss.Task() call Misc refactoring changes
* Remove from osgeo.gdalconst import * * Prefix gdalconst variables (i.e. GDT_Float32 --> gdal.GDT_Float32) * from hecgridloaders import (flt2dss2 --> flt2dss)
…ith config_local.py Simplified creating directories Eliminated variable dstr
…TORY_STRUCTURE Removed LEGACY_DIRECTORY_STRUCTURE. Same result can be accomplished w…
- Eliminate file copy from tmpdir to projfltdir - Convert string concatenations to .format() syntax - Eliminate use of "easiername" and "enameDict" - Eliminate variables "snodaslist" and "zerolist" - Eliminate variables "p" and "dtype" - Change SetProps(): remove incremental dictionary build - Change SetProps(): add data units property for all variables
…-eliminate-file-copy Simplifications. Admittedly too many changes for a single commit:
…-tmpdir Change scratch file writes from projfltdir to tmpdir
…ng-tarfile-extract Add exception handling in function prepare_source_data_for_date()
"to_srs"
Corrected to exact definition of "Standard Hydrologic Grid" (SHG) (EPSG:5070)
EPSG:5070 (SHG) uses spheroid "GRS 1980" (correct spheroid for SHG)
Previous PROJ.4 string used spheroid "WGS 84"
"s_srs"
No change to projection definition. See equivalence tests below.
Checked equivalence with gdalsrsinfo - results below.
test: t_srs
-----------
gdalsrsinfo '+proj=aea +lat_1=29.5n +lat_2=45.5n +lat_0=23.0n +lon_0=96.0w +x_0=0.0 +y_0=0.0 +units=m +datum=WGS84'
PROJ.4 : +proj=aea +lat_1=29.5 +lat_2=45.5 +lat_0=23 +lon_0=-96 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs
OGC WKT :
PROJCS["unnamed",
GEOGCS["WGS 84",
DATUM["WGS_1984",
SPHEROID["WGS 84",6378137,298.257223563,
AUTHORITY["EPSG","7030"]],
AUTHORITY["EPSG","6326"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","4326"]],
PROJECTION["Albers_Conic_Equal_Area"],
PARAMETER["standard_parallel_1",29.5],
PARAMETER["standard_parallel_2",45.5],
PARAMETER["latitude_of_center",23],
PARAMETER["longitude_of_center",-96],
PARAMETER["false_easting",0],
PARAMETER["false_northing",0],
UNIT["Meter",1]]
----
----
gdalsrsinfo "EPSG:5070"
PROJ.4 : +proj=aea +lat_1=29.5 +lat_2=45.5 +lat_0=23 +lon_0=-96 +x_0=0 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs
OGC WKT :
PROJCS["NAD83 / Conus Albers",
GEOGCS["NAD83",
DATUM["North_American_Datum_1983",
SPHEROID["GRS 1980",6378137,298.257222101,
AUTHORITY["EPSG","7019"]],
TOWGS84[0,0,0,0,0,0,0],
AUTHORITY["EPSG","6269"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","4269"]],
PROJECTION["Albers_Conic_Equal_Area"],
PARAMETER["standard_parallel_1",29.5],
PARAMETER["standard_parallel_2",45.5],
PARAMETER["latitude_of_center",23],
PARAMETER["longitude_of_center",-96],
PARAMETER["false_easting",0],
PARAMETER["false_northing",0],
UNIT["metre",1,
AUTHORITY["EPSG","9001"]],
AXIS["X",EAST],
AXIS["Y",NORTH],
AUTHORITY["EPSG","5070"]]
----
test: s_srs
-----------
gdalsrsinfo "+proj=longlat +datum=WGS84"
PROJ.4 : +proj=longlat +datum=WGS84 +no_defs
OGC WKT :
GEOGCS["WGS 84",
DATUM["WGS_1984",
SPHEROID["WGS 84",6378137,298.257223563,
AUTHORITY["EPSG","7030"]],
AUTHORITY["EPSG","6326"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","4326"]]
----
----
gdalsrsinfo EPSG:4326
PROJ.4 : +proj=longlat +datum=WGS84 +no_defs
OGC WKT :
GEOGCS["WGS 84",
DATUM["WGS_1984",
SPHEROID["WGS 84",6378137,298.257223563,
AUTHORITY["EPSG","7030"]],
AUTHORITY["EPSG","6326"]],
PRIMEM["Greenwich",0,
AUTHORITY["EPSG","8901"]],
UNIT["degree",0.0174532925199433,
AUTHORITY["EPSG","9122"]],
AUTHORITY["EPSG","4326"]]
----
brettpalmberg
force-pushed
the
master
branch
from
a713783 to
65bba54
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catching up on source code changes.
Changes made via feature branches in separable commits in an attempt to provide clear history on why changes were made. Thanks and let me know if you have questions.