Fixed unnecessary GDAL dependency. #100
Conversation
djgeojson/views.py
Outdated
| @@ -149,7 +150,8 @@ def get_queryset(self): | |||
| # Won't trim point geometries to a boundary | |||
| model_field = qs.model._meta.get_field(self.geometry_field) | |||
| self.trim_to_boundary = (self.trim_to_boundary and | |||
| not isinstance(model_field, PointField)) | |||
| not isinstance(model_field, PointField) and | |||
| Intersection) | |||
There was a problem hiding this comment.
Intersection is not None would be easier to read I think
There was a problem hiding this comment.
Good point. Fix incoming.
|
The failing tests are all for Django 1.8, which has been desupported for more than 6 months. Every other test suite passes. I could change the patch to not affect the Django 1.8 code path, but then the two code paths would have different behavior based on whether GDAL is installed or not, even though the Django 1.8 code (apparently) doesn't use it. So I'm not sure what the right solution is. |
|
The devs at makinacorpus should confirm if they're ok with that breaking change (ie. dropping 1.8) Otherwise, at least drop them from Travis |
|
@gutard @Gagaro @LePetitTim ping? |
Geotrek now requires Django 1.11 so it's OK to drop Django 1.8 support. |
|
I'm ok with dropping support for 1.8 as well. All the travis test are failing because of travis though, I'll take care of fixing everything and updating the travis conf. |
|
Released in 2.12.0. Thanks @coredumperror 👍 . |
This PR fixes #75, as far as I can tell. At least, I can get through a
manage.py makemigrationsnow while usingGeoJSONLayerViewin one of my files. There may be other places where this check forImproperlyConfiguredneeds to be added.