Update boundaries geometry 3 #5787
Merged
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
norkans7
changed the base branch from
remove-postgis-2
to
update-boundaries-geometry-2
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5787 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 448 448
Lines 25121 25113 -8
=========================================
- Hits 25121 25113 -8 ☔ View full report in Codecov by Sentry. |
norkans7
force-pushed
the
update-boundaries-geometry-3
branch
from
267c7bc to
7563744
Compare
norkans7
force-pushed
the
update-boundaries-geometry-2
branch
2 times, most recently
from
63f458e to
91c9f16
Compare
norkans7
force-pushed
the
update-boundaries-geometry-3
branch
from
7563744 to
f8998bd
Compare
norkans7
force-pushed
the
update-boundaries-geometry-3
branch
from
26831cf to
e47d080
Compare
temba/api/v2/serializers.py
Outdated
| @@ -135,8 +135,8 @@ def get_aliases(self, obj): | |||
| return [alias.name for alias in obj.aliases.all()] | |||
|
|
|||
| def get_geometry(self, obj): | |||
| if self.context["include_geometry"] and obj.simplified_geometry: | |||
| return json.loads(obj.simplified_geometry.geojson) | |||
| if self.context["include_geometry"] and obj.geometry: | |||
There was a problem hiding this comment.
is there such a thing as a location without geometry ?
There was a problem hiding this comment.
also this method can be simplified to return obj.geometry if self.context["include_geometry"] else None
There was a problem hiding this comment.
is there such a thing as a location without geometry ?
Just checked on prod and answer is no
temba/locations/models.py
Outdated
| @@ -67,7 +67,7 @@ def get_geojson_feature(self): | |||
| return geojson.Feature( | |||
| properties=dict(name=self.name, osm_id=self.osm_id, id=self.pk, level=self.level), | |||
| zoomable=True if self.children.all() else False, | |||
| geometry=None if not self.simplified_geometry else geojson.loads(self.simplified_geometry.geojson), | |||
| geometry=self.geometry or None, | |||
There was a problem hiding this comment.
or None doesn't do anything here...
norkans7
force-pushed
the
update-boundaries-geometry-3
branch
from
e47d080 to
ecb09fb
Compare
norkans7
force-pushed
the
update-boundaries-geometry-3
branch
from
ecb09fb to
2f2d35a
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.