Merge pull request #3 from Terralego/geostore_0.5.1_compat

Fix deprecated functions from geostore

.github/workflows/python-package.yml

@@ -12,6 +12,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
     services:
       postgres:
         image: pgrouting/pgrouting:10-2.5-2.6.3
@@ -40,6 +41,7 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
+        continue-on-error: ${{ matrix.experimental }}
 
     - name: Install dependencies
       run: |

CHANGES.md

@@ -1,9 +1,11 @@
 CHANGELOG
 =========
 
-0.9.4.dev0     (XXXX-XX-XX)
+0.9.4          (2020-10-28)
 ---------------------------
 
+* Improve compatibility with django-geostore > 0.5.0
+
 
 0.9.3          (2020-10-27)
 ---------------------------

geostore_routing/VERSION.md

@@ -1 +1 @@
-0.9.4.dev0
+0.9.4

geostore_routing/functions.py

@@ -0,0 +1,6 @@
+from django.contrib.gis.db.models import GeometryField
+from django.contrib.gis.db.models.functions import GeoFunc
+
+
+class LineSubstring(GeoFunc):
+    output_field = GeometryField()

geostore_routing/helpers.py

@@ -1,17 +1,18 @@
 import json
 
 from django import VERSION as DJANGO_VERSION
-from django.contrib.gis.db.models.functions import Distance
+from django.contrib.gis.db.models.functions import Distance, LineLocatePoint
+
+from geostore_routing.functions import LineSubstring
 
 if DJANGO_VERSION >= (3, 0):
     from django.contrib.gis.db.models.functions import GeometryDistance
 from django.contrib.gis.geos import GEOSGeometry, MultiLineString, LineString, Point
 from django.core.cache import cache
 from django.db import connection
-from django.db.models import F, Value
+from django.db.models import F
 
 from geostore_routing import settings as app_settings
-from geostore.tiles.funcs import ST_LineLocatePoint, ST_LineSubstring
 
 
 class RoutingException(Exception):
@@ -128,7 +129,7 @@ def _serialize_routes(self, routes):
         }
 
     def _get_points_in_lines(self, points):
-        '''Returns position of the point in the closed geometry'''
+        """ Returns position of the point in the closed geometry """
         snapped_points = []
 
         for point in points:
@@ -155,7 +156,7 @@ def _get_closest_geometry(self, point):
 
     def _snap_point_on_feature(self, point, feature):
         return self.layer.features.filter(pk=feature.pk).annotate(
-            fraction=ST_LineLocatePoint(F('geom'), Value(str(point))),
+            fraction=LineLocatePoint('geom', point),
         ).only('id', 'geom').first()
 
     def _points_route(self):
@@ -187,9 +188,9 @@ def _get_segment(self, from_point, to_point):
 
     def _get_line_substring(self, feature, fractions):
         feature = self.layer.features.annotate(
-            splitted_geom=ST_LineSubstring(F('geom'),
-                                           float(min(fractions)),
-                                           float(max(fractions)))
+            splitted_geom=LineSubstring('geom',
+                                        float(min(fractions)),
+                                        float(max(fractions)))
         ).get(pk=feature.pk)
 
         return {