Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
where
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
SRCT
where
Commits
750ba0f1
Commit
750ba0f1
authored
Feb 18, 2020
by
Zach Perkins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added some more test cases and made a basic function to search points
parent
a471ce06
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
8 deletions
+54
-8
where/__init__.py
where/__init__.py
+0
-0
where/app.py
where/app.py
+49
-6
where/model/sa.py
where/model/sa.py
+5
-2
No files found.
where/__init__.py
deleted
100644 → 0
View file @
a471ce06
where/app.py
View file @
750ba0f1
from
flask
import
Flask
,
redirect
,
jsonify
,
abort
from
flask
import
Flask
,
redirect
,
jsonify
,
abort
,
request
from
where.model.field_types
import
FieldType
from
where.model.sa
import
Category
,
Point
,
Field
,
with_session
...
...
@@ -32,6 +32,21 @@ def test_data(session):
wf
.
icon
=
"https://karel.pw/water.png"
session
.
add
(
wf
)
session
.
commit
()
# Building
bd
=
Category
()
bd
.
name
=
"Building"
bd
.
icon
=
"https://hips.hearstapps.com/hmg-prod.s3.amazonaws.com/images/basket-building-news-photo-1572015168.jpg?resize=980:*"
session
.
add
(
bd
)
session
.
commit
()
# Radius (Really the simplest metric we can have for building size)
rd
=
Field
()
rd
.
name
=
"Radius"
rd
.
slug
=
"radius"
rd
.
type
=
FieldType
.
FLOAT
rd
.
category_id
=
bd
.
id
session
.
add
(
rd
)
session
.
commit
()
# coldness
cd
=
Field
()
cd
.
name
=
"Coldness"
...
...
@@ -47,14 +62,29 @@ def test_data(session):
session
.
add
(
cd
)
session
.
add
(
fl
)
session
.
commit
()
# an actual instance!
# The johnson center
jc
=
Point
()
jc
.
category
=
bd
jc
.
name
=
"Johnson Center"
jc
.
lat
=
38
jc
.
lon
=
-
77
jc
.
parent
=
None
jc
.
attributes
=
{
"radius"
:
{
"value"
:
2.0
}
}
session
.
add
(
jc
)
# A water fountain inside the JC
fn
=
Point
()
fn
.
name
=
None
fn
.
lat
=
38.829791
fn
.
lon
=
-
77.307043
# fn.category_id = wf.id
fn
.
category
=
wf
fn
.
parent
_id
=
None
fn
.
parent
=
jc
fn
.
attributes
=
{
"coldness"
:
{
"num_reviews"
:
32
,
...
...
@@ -64,6 +94,8 @@ def test_data(session):
"value"
:
True
}
}
session
.
add
(
fn
)
session
.
commit
()
return
redirect
(
'/'
)
...
...
@@ -88,10 +120,21 @@ def get_point(session, id):
else
:
abort
(
404
)
@
app
.
route
(
'/
point
'
,
methods
=
[
'POST'
])
@
app
.
route
(
'/
query_points
'
,
methods
=
[
'POST'
])
@
with_session
def
query_point
():
pass
def
query_points
(
session
):
data
=
request
.
get_json
()
q
=
session
.
query
(
Point
)
if
'category'
in
data
:
q
=
q
.
filter
(
Point
.
category_id
==
data
[
'category'
])
if
'parent'
in
data
:
q
=
q
.
filter
(
Point
.
parent_id
==
data
[
'parent'
])
return
jsonify
(
list
(
map
(
lambda
p
:
p
.
as_json
(),
q
.
all
())))
if
__name__
==
'__main__'
:
...
...
where/model/sa.py
View file @
750ba0f1
...
...
@@ -6,7 +6,7 @@ from sqlalchemy.orm import relationship, validates
from
sqlalchemy.schema
import
Column
from
.field_types
import
FieldType
from
.meta
import
Session
from
.meta
import
Session
,
engine
@
contextmanager
...
...
@@ -25,7 +25,7 @@ def session_context():
def
with_session
(
func
):
def
wrapper
(
*
args
,
**
kwargs
):
with
session_context
()
as
session
:
func
(
session
,
*
args
,
**
kwargs
)
return
func
(
session
,
*
args
,
**
kwargs
)
# Flask identifies endpoint handlers based on their name
wrapper
.
__name__
=
func
.
__name__
...
...
@@ -130,3 +130,6 @@ class Field(Base):
"name"
:
self
.
name
,
"type"
:
self
.
type
.
name
}
# uh putting this here doesn't feel right but there's not anything *too* wrong with it
Base
.
metadata
.
create_all
(
engine
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment