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.

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

New scenario on upload #1624

Merged
merged 54 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
3eee5a0
initital view handler
lastminutediorama Jul 14, 2024
228b1f4
functioning for happy path
lastminutediorama Jul 19, 2024
4b5e802
convert some geoms
lastminutediorama Jul 19, 2024
ae32616
refactoring
lastminutediorama Jul 20, 2024
1b6badd
trim unused code
lastminutediorama Jul 20, 2024
e05f773
more cleanup
lastminutediorama Jul 20, 2024
cee9c59
lint
lastminutediorama Jul 20, 2024
5d62ebe
more tidying
lastminutediorama Jul 20, 2024
b9b84d3
user projarea serializer
lastminutediorama Jul 22, 2024
8ddce1d
add some logging
lastminutediorama Jul 22, 2024
b1d2724
clarify comments
lastminutediorama Jul 22, 2024
48a85a7
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Jul 22, 2024
2d392b4
fix containment test
lastminutediorama Jul 22, 2024
021cabc
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Jul 23, 2024
2dd9338
fix conversion
lastminutediorama Jul 23, 2024
5f13443
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Jul 29, 2024
b289c64
update to fit new url formats
lastminutediorama Jul 29, 2024
cf12cb8
move test
lastminutediorama Jul 29, 2024
1ab621f
replace test
lastminutediorama Jul 29, 2024
9cddf56
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 1, 2024
bd62b34
fix tests
lastminutediorama Aug 1, 2024
40fe2e8
repair bad merge
lastminutediorama Aug 1, 2024
9f32188
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 14, 2024
12c7731
move upload_shapefile endpoint to scenarioviewset
lastminutediorama Aug 15, 2024
77c9e93
lint lint lint
lastminutediorama Aug 15, 2024
427542a
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 15, 2024
4d49035
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 16, 2024
bb2df17
simplify w shpjs changes
lastminutediorama Aug 19, 2024
ee91add
lint
lastminutediorama Aug 19, 2024
dca5603
rm unused fixtures
lastminutediorama Aug 19, 2024
5c13e64
rm unused functions
lastminutediorama Aug 19, 2024
e5aea16
undo a removal
lastminutediorama Aug 19, 2024
8c2e8c2
collect projectarea keys
lastminutediorama Aug 20, 2024
f8d7677
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 20, 2024
f5ce019
simplify union function
lastminutediorama Aug 22, 2024
16e0461
fix import
lastminutediorama Aug 22, 2024
32d0d9f
add origin for uploaded scenario
lastminutediorama Aug 22, 2024
6160392
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 22, 2024
10dff72
update faq link
lastminutediorama Aug 23, 2024
b60b9f5
include tests for origin and project_area_ids
lastminutediorama Aug 23, 2024
35d512e
Merge branch 'main' of github.com:OurPlanscape/Planscape
lastminutediorama Aug 27, 2024
6244ed1
Merge branch 'main' of github.com:OurPlanscape/Planscape
lastminutediorama Aug 27, 2024
0c794f4
Merge branch 'main' of github.com:OurPlanscape/Planscape
lastminutediorama Aug 30, 2024
4e9febd
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 30, 2024
ccde8cf
tidying
lastminutediorama Aug 30, 2024
359d684
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Aug 30, 2024
5cf02b7
update serializer
lastminutediorama Sep 24, 2024
ea9aedb
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Sep 24, 2024
a1407fc
lint
lastminutediorama Sep 24, 2024
2eb554d
add multipolygon transform
lastminutediorama Sep 25, 2024
1c8a093
reinstate geojsonserializer
lastminutediorama Sep 25, 2024
321efae
Merge branch 'main' into new-scenario-on-upload
lastminutediorama Sep 25, 2024
ce43f36
adding partial suggestion
lastminutediorama Sep 25, 2024
9333357
Merge branch 'new-scenario-on-upload' of github.com:OurPlanscape/Plan…
lastminutediorama Sep 25, 2024
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
5 changes: 2 additions & 3 deletions src/interface/src/app/services/plan.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,12 @@ export class PlanService {
planId: string
) {
return this.http.post(
environment.backend_endpoint.concat(
'/v2/planningareas/' + planId + '/upload_shapefiles/'
),
environment.backend_endpoint.concat('/v2/scenarios/upload_shapefiles/'),
lastminutediorama marked this conversation as resolved.
Show resolved Hide resolved
{
geometry: shape,
name: scenarioName,
stand_size: standSize,
planning_area: planId,
},
{
withCredentials: true,
Expand Down
20 changes: 20 additions & 0 deletions src/planscape/planning/fixtures/around_LA.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"coordinates": [
[
[-118.339233, 34.402377],
[-118.602905, 34.261757],
[-118.443604, 34.043557],
[-118.339233, 33.870416],
[-117.971191, 33.756315],
[-117.734985, 33.582591],
[-117.504272, 33.449777],
[-117.04834, 33.674069],
[-116.878052, 33.906896],
[-116.92749, 34.284453],
[-117.471313, 34.492975],
[-117.943726, 34.533712],
[-118.339233, 34.402377]
]
],
"type": "Polygon"
}
53 changes: 53 additions & 0 deletions src/planscape/planning/fixtures/near_pasadena_pomona.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"features": [
{
"geometry": {
"bbox": [
-118.19263501773341, 34.08278210579428, -118.08128135438794,
34.15177868615852
],
"coordinates": [
[
[-118.1604194924888, 34.15177868615852],
[-118.08898506694642, 34.13554926129836],
[-118.08128135438794, 34.095542017058484],
[-118.1436113923612, 34.08278210579428],
[-118.19263501773341, 34.115258096703165],
[-118.1604194924888, 34.15177868615852]
]
],
"type": "Polygon"
},
"properties": {
"id": 1
},
"type": "Feature"
},
{
"geometry": {
"bbox": [
-117.90479630304802, 33.9846986886452, -117.75632475192076,
34.06479896698317
],
"coordinates": [
[
[-117.78713960215471, 34.052614671849355],
[-117.75632475192076, 34.00560170150721],
[-117.79694432722913, 33.9846986886452],
[-117.79694432722913, 33.9846986886452],
[-117.90479630304802, 34.03810727503426],
[-117.84876930262259, 34.06479896698317],
[-117.78713960215471, 34.052614671849355]
]
],
"type": "Polygon"
},
"properties": {
"id": 2
},
"type": "Feature"
}
],
"fileName": "near_pasadena_pomona/near_pasadena_pomona",
"type": "FeatureCollection"
}
120 changes: 120 additions & 0 deletions src/planscape/planning/fixtures/palmsprings_sanbernardino.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
{
"type": "FeatureCollection",
"features": [
{
"type": "Feature",
"geometry": {
"bbox": [
-116.59000730822105,
33.76094007811721,
-116.46372359000742,
33.86288159982813
],
"type": "Polygon",
"coordinates": [
[
[
-116.5301572048023,
33.86139064872427
],
[
-116.53075570583647,
33.85840866841697
],
[
-116.53195270790485,
33.86288159982813
],
[
-116.52955870376809,
33.86089365923777
],
[
-116.46551909311,
33.83454907768415
],
[
-116.46372359000742,
33.792281376404524
],
[
-116.52058118825529,
33.76094007811721
],
[
-116.58521929994758,
33.776860900708314
],
[
-116.59000730822105,
33.82709158924555
],
[
-116.57624178443476,
33.84449138356989
],
[
-116.5301572048023,
33.86139064872427
]
]
]
},
"properties": {
"id": null
}
},
{
"type": "Feature",
"geometry": {
"bbox": [
-117.36393144521908,
34.03950544279183,
-117.19620895578856,
34.14367901861189
],
"type": "Polygon",
"coordinates": [
[
[
-117.30765613626542,
34.14367901861189
],
[
-117.28117363793427,
34.14093925150775
],
[
-117.22048457925877,
34.13363277157728
],
[
-117.19620895578856,
34.08886680080183
],
[
-117.22158801668924,
34.03950544279183
],
[
-117.34517300890116,
34.07058816903606
],
[
-117.36393144521908,
34.10074579569706
],
[
-117.30765613626542,
34.14367901861189
]
]
]
},
"properties": {
"id": null
}
}
],
"fileName": "palmsprings_sanbernardino/palm_springs_san_bernardino"
}
21 changes: 21 additions & 0 deletions src/planscape/planning/fixtures/riverside.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"bbox": [
-117.43427169179705, 33.92100451310846, -117.27748946309077,
34.02786815076917
],
"type": "Polygon",
"coordinates": [
[
[-117.34263641657144, 34.017484525813835],
[-117.30039828189717, 34.01273730273981],
[-117.27748946309077, 33.97564048618635],
[-117.27748946309077, 33.97564048618635],
[-117.34048871480834, 33.92100451310846],
[-117.34084666510222, 33.92100451310846],
[-117.43427169179705, 33.98038978258641],
[-117.4052777179952, 34.018374600587144],
[-117.36984063890402, 34.02786815076917],
[-117.34263641657144, 34.017484525813835]
]
]
}
18 changes: 18 additions & 0 deletions src/planscape/planning/fixtures/sandiego.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"coordinates": [
[
[-117.117792, 32.695041],
[-117.156318, 32.719002],
[-117.208244, 32.752818],
[-117.214944, 32.821819],
[-117.137892, 32.847153],
[-117.010589, 32.816188],
[-116.953638, 32.726048],
[-117.064191, 32.649921],
[-117.104392, 32.661204],
[-117.147943, 32.695041],
[-117.117792, 32.695041]
]
],
"type": "Polygon"
}
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name="projectarea",
name="data",
field=models.JSONField(help_text="Project Area data from Forsys.", null=True),
field=models.JSONField(
help_text="Project Area data from Forsys.", null=True
),
),
migrations.AlterField(
model_name="projectarea",
Expand Down
Loading
Loading