- modified the makefile file (contribution from @Paul Munsch on bitbucket)
- fixed an error from using the latest numpy version regarding missing Inf attribute (now it is inf, lower case)
This commit is contained in:
@@ -16,7 +16,10 @@ import logging
|
||||
from copy import deepcopy
|
||||
import simplejson as json
|
||||
import sys
|
||||
from numpy import Inf
|
||||
try:
|
||||
from numpy import Inf
|
||||
except ImportError:
|
||||
from numpy import inf as Inf
|
||||
|
||||
from shapely import Polygon, MultiPolygon, box, Point, LineString, MultiLineString, LinearRing
|
||||
from shapely.ops import unary_union, linemerge
|
||||
|
||||
@@ -6,7 +6,10 @@ from appGUI.GUIElements import VerticalScrollArea, FCLabel, FCButton, FCFrame, G
|
||||
|
||||
import logging
|
||||
from copy import deepcopy
|
||||
from numpy import Inf
|
||||
try:
|
||||
from numpy import Inf
|
||||
except ImportError:
|
||||
from numpy import inf as Inf
|
||||
|
||||
from shapely import Point
|
||||
from shapely.affinity import scale
|
||||
|
||||
@@ -20,7 +20,10 @@ import numpy as np
|
||||
import simplejson as json
|
||||
import sys
|
||||
import traceback
|
||||
from numpy import Inf
|
||||
try:
|
||||
from numpy import Inf
|
||||
except ImportError:
|
||||
from numpy import inf as Inf
|
||||
|
||||
from shapely import LineString, Polygon, MultiLineString, MultiPolygon, Point, LinearRing
|
||||
from shapely.geometry import base
|
||||
|
||||
Reference in New Issue
Block a user