Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix /map & POST lat/lng #7

Merged
merged 14 commits into from
Sep 14, 2021
Merged

Fix /map & POST lat/lng #7

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a524534
add map to river-runner
Sep 9, 2021
b5cd8ff
Merge branch 'ksonda:main' into main
webb-ben Sep 9, 2021
7c8add9
add limit to bbox expansion
Sep 9, 2021
f0cdeff
Merge branch 'ksonda:main' into main
webb-ben Sep 9, 2021
ccb140b
reduce max # of bboxes, tell client when no features returned, add en…
Sep 10, 2021
c7320e5
Merge remote-tracking branch 'upstream/main' into main
Sep 10, 2021
359e199
Merge branch 'ksonda:main' into main
webb-ben Sep 13, 2021
417f3d7
Add 'GET' to processes/.../execution
Sep 13, 2021
4917213
move plugin loading to happen every execution
Sep 13, 2021
f595f66
Fix POST non-list lat,lng
Sep 13, 2021
441e8d9
revert changes
webb-ben Sep 13, 2021
3c1b6a5
Merge branch 'ksonda:main' into main
webb-ben Sep 13, 2021
60a19a6
Fix post lat long
Sep 13, 2021
062ef4e
Merge branch 'ksonda:main' into main
webb-ben Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions pygeoapi/river_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
'minOccurs': 0,
'maxOccurs': 1,
'metadata': None, # TODO how to use?
'keywords': ['coordinates', 'geography']
'keywords': ['coordinates', 'latitude', 'longitude']
},
'lat': {
'title': 'Latitude',
Expand All @@ -94,7 +94,7 @@
'minOccurs': 0,
'maxOccurs': 1,
'metadata': None, # TODO how to use?
'keywords': ['coordinates', 'longitude']
'keywords': ['coordinates', 'latitude']
},
'lng': {
'title': 'Longitude',
Expand All @@ -105,7 +105,7 @@
'minOccurs': 0,
'maxOccurs': 1,
'metadata': None, # TODO how to use?
'keywords': ['coordinates', 'latitude']
'keywords': ['coordinates', 'longitude']
}
},
'outputs': {
Expand Down Expand Up @@ -140,7 +140,6 @@ def __init__(self, processor_def):
super().__init__(processor_def, PROCESS_METADATA)

def execute(self, data):
p = load_plugin('provider', PROVIDER_DEF)
mimetype = 'application/json'
outputs = {
'id': 'echo',
Expand All @@ -156,18 +155,21 @@ def execute(self, data):

for k, v in data.items():
if isinstance(v, str):
data[k] = ','.join(v.split(',')).strip('()[]').split(',')
data[k] = ','.join(v.split(',')).strip('()[]')
if k in ['latlng', 'bbox']:
data[k] = data[k].split(',')

if data.get('bbox', []):
bbox = data.get('bbox')
elif data.get('latlng', ''):
bbox = data.get('latlng')
else:
bbox = (*data.get('lng'), *data.get('lat'))
bbox = (data.get('lng'), data.get('lat'))

bbox = bbox * 2 if len(bbox) == 2 else bbox
bbox = self._expand_bbox(bbox)

p = load_plugin('provider', PROVIDER_DEF)
value = p.query(bbox=bbox)
i = 1
while len(value['features']) < 1 and i < 3:
Expand Down