Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/ksonda/global-river-runner …
Browse files Browse the repository at this point in the history 
…into main
  • Loading branch information
@ksonda
ksonda committed Oct 5, 2021
2 parents c30ebb5 + 6bdebf2 commit 57e1b50
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 231 deletions.
2 changes: 1 addition & 1 deletion pygeoapi/Dockerfile_gcp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM webbben/pygeoapi-river-runner:latest
#last update 2021-09-23T18
#last update 2021-10-05T16:26

#add requirements and mods
COPY ./pygeoapi.config.gcp.yml /pygeoapi/local.config.yml
Expand Down
140 changes: 10 additions & 130 deletions pygeoapi/pygeoapi.config.gcp.yml
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
#
# LAST UPDATE: 2021-06-04 15:25:00-5
# LAST UPDATE: 2021-09-29 15:25:00-5
#=================================================================
#
# Authors: Tom Kralidis <[email protected]>
#
# Copyright (c) 2020 Tom Kralidis
#
# Permission is hereby granted, free of charge, to any person
# obtaining a copy of this software and associated documentation
# files (the "Software"), to deal in the Software without
# restriction, including without limitation the rights to use,
# copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following
# conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
# OTHER DEALINGS IN THE SOFTWARE.
#
# =================================================================

server:
bind:
Expand Down Expand Up @@ -87,6 +61,7 @@ metadata:
email: [email protected]
url: https://internetofwater.org
role: pointOfContact

resources:
merit:
type: collection
Expand Down Expand Up @@ -124,11 +99,6 @@ resources:
begin: null
end: null
providers:
# - type: feature
# name: SQLiteGPKG
# data: /data/merit_plus_simplify.gpkg
# id_field: comid
# table: merit_plus
- type: feature
name: PostgreSQL
data:
Expand All @@ -143,8 +113,8 @@ resources:

river-runner:
type: process
version: 0.1.0
id: river-runner
processor:
name: RiverRunner
title:
en: River Runner
description:
Expand All @@ -167,100 +137,10 @@ resources:
- type: application/html
rel: cannonical
title: application
href: https://river-runner.samlearner.com/
href: https://river-runner-global.vercel.app/
hreflang: en-US
- type: application/html
rel: canonical
title: information
href: https://www.usgs.gov/core-science-systems/ngp/national-hydrography/value-added-attributes-vaas
hreflang: en-US
processor:
name: RiverRunner
inputs:
bbox:
title:
en: Bounding Box
description:
en: Boundary box to begin a river runner query from
keywords:
en: [box, coordinates]
schema:
type: object
default: []
minOccurs: 0
maxOccurs: 1
metadata: null
lat:
title:
en: Latitude
description:
en: Latitude of a point
keywords:
en: [latitude, coordinate, eastwest]
schema:
type: number
default: null
minOccurs: 0
maxOccurs: 1
metadata: null
lng:
title:
en: Longitude
description:
en: Longitude of a point
keywords:
en: [longitude, coordinate, northsouth]
schema:
type: number
default: null
minOccurs: 0
maxOccurs: 1
metadata: null
latlng:
title:
en: Latitude and Longitude
description:
en: Coordinates in order [Long, Lat]
keywords:
en: [coordinates, world, point]
schema:
type: object
default: []
minOccurs: 0
maxOccurs: 1
metadata: null
sorted:
title:
en: Sorted
description:
en: 'Sort features by flow direction'
keywords:
en: [downstream, upstream, unset]
schema:
type: string
default: downstream
minOccurs: 0
maxOccurs: 1
metadata: null
sortby:
title:
en: Sort By
description:
en: 'Property to sort featurs with'
keywords:
en: [sort, hydroseq, nameid, comid]
schema:
type: string
default: hydroseq
minOccurs: 0
maxOccurs: 1
metadata: null
outputs:
echo:
title:
en: Feature Collection
description:
en: A geoJSON Feature Collection of the River Runner process
schema:
type: object
contentMediaType: application/json
example:
inputs:
bbox: [-86.2, 39.7, -86.15, 39.75]
sorted: downstream

111 changes: 11 additions & 100 deletions pygeoapi/pygeoapi.config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,14 @@ resources:
href: https://www.sciencebase.gov/catalog/item/614a8864d34e0df5fb97572d
hreflang: en-US
- type: application/html
rel: canonical
title: download
href: https://prod-is-usgs-sb-prod-publish.s3.amazonaws.com/614a8864d34e0df5fb97572d/merit_plus_simplify.zip
rel: cannonical
title: github
href: https://github.com/ksonda/global-river-runner
hreflang: en-US
- type: application/html
rel: cannonical
title: application
href: https://river-runner-global.vercel.app/
hreflang: en-US
- type: application/html
rel: canonical
Expand Down Expand Up @@ -139,12 +144,12 @@ resources:

river-runner:
type: process
version: 0.1.0
id: river-runner
processor:
name: RiverRunner
title:
en: River Runner
description:
en: A process that takes a set of coordinates in the world, and returns the largest flowpath from it to its terminal flowpoint.
en: A process that takes a set of coordinates in the world, and returns the largest flowpath to its terminal flowpoint.
keywords:
en:
- rivers
Expand All @@ -165,97 +170,3 @@ resources:
title: application
href: https://river-runner.samlearner.com/
hreflang: en-US
processor:
name: RiverRunner
inputs:
bbox:
title:
en: Bounding Box
description:
en: Boundary box to begin a river runner query from
keywords:
en: [box, coordinates]
schema:
type: object
default: []
minOccurs: 0
maxOccurs: 1
metadata: null
lat:
title:
en: Latitude
description:
en: Latitude of a point
keywords:
en: [latitude, coordinate, eastwest]
schema:
type: number
default: null
minOccurs: 0
maxOccurs: 1
metadata: null
lng:
title:
en: Longitude
description:
en: Longitude of a point
keywords:
en: [longitude, coordinate, northsouth]
schema:
type: number
default: null
minOccurs: 0
maxOccurs: 1
metadata: null
latlng:
title:
en: Latitude and Longitude
description:
en: Coordinates in order [Long, Lat]
keywords:
en: [coordinates, world, point]
schema:
type: object
default: []
minOccurs: 0
maxOccurs: 1
metadata: null
sorted:
title:
en: Sorted
description:
en: 'Sort features by flow direction'
keywords:
en: [downstream, upstream, unset]
schema:
type: string
default: downstream
minOccurs: 0
maxOccurs: 1
metadata: null
sortby:
title:
en: Sort By
description:
en: 'Property to sort featurs with'
keywords:
en: [sort, hydroseq, nameid, comid]
schema:
type: string
default: hydroseq
minOccurs: 0
maxOccurs: 1
metadata: null
outputs:
echo:
title:
en: Feature Collection
description:
en: A geoJSON Feature Collection of the River Runner process
schema:
type: object
contentMediaType: application/json
example:
inputs:
bbox: [-86.2, 39.7, -86.15, 39.75]
sorted: downstream

0 comments on commit 57e1b50

Please sign in to comment.