Skip to content

Commit 1042517

Browse files
committed
Better None checks on properties lookup.
1 parent 85e2dd0 commit 1042517

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

geemap/map_widgets.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,18 +434,19 @@ def last_feature(self):
434434
def count(self):
435435
return len(self.geometries)
436436

437-
def reset(self, clear_draw_control=True):
437+
def reset(self):
438438
"""Resets the draw controls."""
439439
if self.layer is not None:
440440
self.host_map.remove_layer(self.layer)
441441
self.geometries = []
442442
self.properties = []
443443
self.last_geometry = None
444444
self.layer = None
445-
if clear_draw_control:
446-
self._clear_draw_control()
445+
self._clear_draw_control()
447446

448447
def remove_geometry(self, geometry):
448+
if not geometry:
449+
return
449450
index = self.geometries.index(geometry)
450451
if index >= 0:
451452
del self.geometries[index]
@@ -459,13 +460,17 @@ def remove_geometry(self, geometry):
459460
self._redraw_layer()
460461

461462
def get_geometry_properties(self, geometry):
463+
if not geometry:
464+
return None
462465
index = self.geometries.index(geometry)
463466
if index >= 0:
464467
return self.properties[index]
465468
else:
466469
return None
467470

468471
def set_geometry_properties(self, geometry, property):
472+
if not geometry:
473+
return
469474
index = self.geometries.index(geometry)
470475
if index >= 0:
471476
self.properties[index] = property

0 commit comments

Comments
 (0)