# HG changeset patch
# User Tom Gottfried <tom.gottfried@intevation.de>
# Date 1363271489 -3600
# Node ID 71a24278322c606a1f7dc7bcaf87b2d5b78645e4
# Parent  7d29c277000e18b9e1794a29fea83ca0891c15e1
fixed import of fixpoints and hydraulic boundaries (made by A. Heinecke)

diff -r 7d29c277000e -r 71a24278322c flys-backend/contrib/shpimporter/boundaries.py
--- a/flys-backend/contrib/shpimporter/boundaries.py	Thu Mar 14 15:01:36 2013 +0100
+++ b/flys-backend/contrib/shpimporter/boundaries.py	Thu Mar 14 15:31:29 2013 +0100
@@ -112,5 +112,5 @@
         else:
             newFeat.SetField("river_id", self.river_id)
 
-        return newFeat
+        return utils.convertToMultiPolygon(newFeat)
 
diff -r 7d29c277000e -r 71a24278322c flys-backend/contrib/shpimporter/fixpoints.py
--- a/flys-backend/contrib/shpimporter/fixpoints.py	Thu Mar 14 15:01:36 2013 +0100
+++ b/flys-backend/contrib/shpimporter/fixpoints.py	Thu Mar 14 15:31:29 2013 +0100
@@ -52,6 +52,7 @@
         elif self.IsFieldSet(feat, "ELBE_KM"):
             newFeat.SetField("km", feat.GetFieldAsDouble("ELBE_KM"))
         else:
+            global fixpoints_no_km_logged
             if not fixpoints_no_km_logged:
                 logger.error("Could not find KM attribute")
                 fixpoints_no_km_logged = True