Also support natural=water + water=fjord|harbour in analyser_osmosis_…

…water osm-fr#448
frodrigo · Jun 21, 2019 · 76a57a2 · 76a57a2
1 parent 523bf4e
commit 76a57a2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/analysers/analyser_osmosis_water.py b/analysers/analyser_osmosis_water.py
@@ -43,7 +43,7 @@
     tags->'natural' = 'water' AND
     (
       NOT tags?'water' OR
-      tags->'water' IN ('lake', 'reservoir', 'river', 'canal', 'lagoon', 'pond')
+      tags->'water' IN ('lake', 'reservoir', 'river', 'canal', 'lagoon', 'pond', 'fjord', 'harbour')
     )
   ) OR (
     tags?'natural' AND
@@ -80,7 +80,7 @@
     relations.tags->'natural' = 'water' AND
     (
       NOT relations.tags?'water' OR
-      relations.tags->'water' IN ('lake', 'reservoir', 'river', 'canal', 'lagoon', 'pond')
+      relations.tags->'water' IN ('lake', 'reservoir', 'river', 'canal', 'lagoon', 'pond', 'fjord', 'harbour')
     )
   ) OR (
     relations.tags?'natural' AND
@@ -141,7 +141,7 @@
   LEFT JOIN water ON
     (objects.type != 'W' OR water.id != objects.id) AND
     objects.bbox && water.linestring AND
-    ST_DistanceSphere(objects.geom, water.linestring) < 30
+    ST_Distance_Sphere(objects.geom, water.linestring) < 30
 WHERE
   water IS NULL
 """