Feature/opentopo-integration #1424
Draft
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
* created test datasets geojson file with 10 samples * Created new test dataset file with full polygon geometry coordinates * corrected the geometry type in full geometry data file * Added description field data from OtCatalog into test dataset files
…and generate a … (#1330) * Add python script to fetch the Opentopo data from git and generate a centerpoint geojson * Update designsafe/apps/rapid/openTopo_Data/scripts/centerpoint_Requirements.txt Co-authored-by: Nathan Franklin <[email protected]> * Add empty __init__.py files to openTopo_Data and scripts directories * Add README.md with installation and run instructions * change Readme.md formatting * change centerpoint_datagenerator.py as per pylint * black reformat centerpoint_datagenerator.py * add pylint ignore to datagenerator script and __init__ * add pylint import errors ignore to centerpoint_datagenerator.py * fix dir name to adhere with snake case * remove pylint file name igonre from init file * rename script file dir to snake case * Add GeoJSON aggregation for original geometries and improve code readability * Fix reformatting - black --------- Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Nathan Franklin <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]>
…enTopo api(OtCatalog) data to construct the complete geojson files. (#1337) * Add python script to fetch the Opentopo data from git and generate a centerpoint geojson * Updated script to fetch required geojson fields from otCatalog API endpoint * increasing the bounding bx height and width to accommodate few data exceptions * Update centerpoint_datagenerator.py * Update designsafe/apps/rapid/openTopo_Data/scripts/centerpoint_Requirements.txt Co-authored-by: Nathan Franklin <[email protected]> * Add empty __init__.py files to openTopo_Data and scripts directories * Add README.md with installation and run instructions * change Readme.md formatting * change centerpoint_datagenerator.py as per pylint * black reformat centerpoint_datagenerator.py * add pylint ignore to datagenerator script and __init__ * add pylint import errors ignore to centerpoint_datagenerator.py * fix dir name to adhere with snake case * remove pylint file name igonre from init file * rename script file dir to snake case * Update designsafe/apps/rapid/openTopo_Data/scripts/centerpoint_Requirements.txt Co-authored-by: Nathan Franklin <[email protected]> * Add empty __init__.py files to openTopo_Data and scripts directories * Add README.md with installation and run instructions * change Readme.md formatting * change centerpoint_datagenerator.py as per pylint * add pylint ignore to datagenerator script and __init__ * add pylint import errors ignore to centerpoint_datagenerator.py * remove pylint file name igonre from init file * rename script file dir to snake case * Optimized API calls to otcatalog to fetch world data at once * resolving merge conflicts with task/DES-3004 * Updated API response handling to throw exception for missing datasets * pylint and black formatting updates * Script to fetch otcatalog data into the full geometry geojson * black formatting updates --------- Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: sajithalapati16 <[email protected]> Co-authored-by: Nathan Franklin <[email protected]> Co-authored-by: Sajith Alapati <[email protected]>
* created test datasets geojson file with 10 samples Resolve the merge conflict * Created new test dataset file with full polygon geometry coordinates Resolve merge conflict * corrected the geometry type in full geometry data file * Added enpoints to opentopo data in views.py * Refactor os.path.join statements for Pythonic style * Add unit tests for new endpoints * update the test data geojson files Resolve merge conflict --------- Co-authored-by: Beulah Karrolla <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]>
* Added endpoints to fetch OtData through tapipy * Using tapis service credentials to run the client * Package and version changes related to tapipy * Test fix using MagicMock * Test fixes using mock patch * Update the requirements for tapipy installation
* temp * Integrate opentopography api data through opentopo api * fix opentopo data event-listing * fix leaflet marker tooltip * modified rapid main-ctrl test file * trail and error - test file fixes * trail and error - test file fixes * trail and error - test file fixes * add color mapping to leaflet markers and riseonhover to opentopo markers * Disabling Recon Portal Tests These will need to be converted to react anyway * Task/des 3030 color mapped leaflet markers (#1363) - Do not show OpenTopography markers by default (DES-3034) - Add additional text to popups to indicate Data Source (DES-3035) - Color map Leaflet markers based on data type for better visualization (DES-3030) - Cache the OpenTopography Api results (DES-3044) --------- Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> * fix: PR comments * fix: polygon pop-up content * fix: rapid-data-service formating * fix: remove url search param for opentopo and clear search param along with reset * fix: remove opentopo data listing and search from event-listing --------- Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: fnets <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]>
…opoData (#1384) * temp * Integrate opentopography api data through opentopo api * fix opentopo data event-listing * fix leaflet marker tooltip * modified rapid main-ctrl test file * trail and error - test file fixes * trail and error - test file fixes * trail and error - test file fixes * add color mapping to leaflet markers and riseonhover to opentopo markers * Disabling Recon Portal Tests These will need to be converted to react anyway * Task/des 3030 color mapped leaflet markers (#1363) - Do not show OpenTopography markers by default (DES-3034) - Add additional text to popups to indicate Data Source (DES-3035) - Color map Leaflet markers based on data type for better visualization (DES-3030) - Cache the OpenTopography Api results (DES-3044) --------- Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> * fix: PR comments * fix: polygon pop-up content * fix: rapid-data-service formating * fix: remove url search param for opentopo and clear search param along with reset * Moved current event filters to the top and added new filters for opentopodata * Update views.py * UI filters arrangement * Filtering functionality included for title and name search, start and end date, key word search for ot data * Added tool-tip information on filters * Hiding the filters in a selected event view --------- Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: fnets <[email protected]> Co-authored-by: sajithalapati16 <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Sajith Alapati <[email protected]> Co-authored-by: Nathan Franklin <[email protected]>
* Rework filter methods This is to address comment in review: #1384 (comment) * Fix tests * Fix tests
* Use cache_page * Decrease memcached item size to 5M * Add unit test
* Rework filter methods This is to address comment in review: #1384 (comment) * Fix tests * Fix tests * - Removes Recon Portal check box - Changes format so each dataset layer is on its own row - WIP: Stills needs additional UI tweaks * - Fixes merge error that prevents OpenTopo markers from appearing when checkbox is selected. * - Adds tiered list of external data source filters * - Remove cache nx --------- Co-authored-by: Nathan Franklin <[email protected]>
1 task
* task/WG-375-Recon-Portal-UI-changes - Removes external dataset header and toggle and associated styles - Changes order of Clear and Hide buttons, adds filter to the wording in the button - Adds search button in button row - Adds checkbox to hide and add Recon Portal data - Removes escape character sanitation now that API handles this through the service - Search button uses search method on click rather than debouncing
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.
Overview:
Feature branch for open topo work using AngularJS client
Notes:
Warning
Do not squash merge!! we want each PR's commit make it to main branch
UI Photos:
Notes: