Merge pull request #374 from Labelbox/geo-nb

update to tiled iamge mal notebook

Author: jtsodapop

examples/model_assisted_labeling/tiled_imagery_mal.ipynb

@@ -102,6 +102,9 @@ class TileLayer(BaseModel):
     url: str
     name: Optional[str] = "default"
 
+    def asdict(self):
+        return {"tileLayerUrl": self.url, "name": self.name}
+
     @validator('url')
     def validate_url(cls, url):
         xyz_format = "/{z}/{x}/{y}"
@@ -131,13 +134,34 @@ class TiledImageData(BaseData):
     """
     tile_layer: TileLayer
     tile_bounds: TiledBounds
-    alternative_layers: List[TileLayer] = None
+    alternative_layers: List[TileLayer] = []
     zoom_levels: Tuple[int, int]
     max_native_zoom: Optional[int] = None
     tile_size: Optional[int] = DEFAULT_TMS_TILE_SIZE
     version: Optional[int] = 2
     multithread: bool = True
 
+    def __post_init__(self):
+        if self.max_native_zoom is None:
+            self.max_native_zoom = self.zoom_levels[0]
+
+    def asdict(self):
+        return {
+            "tileLayerUrl": self.tile_layer.url,
+            "bounds": [[
+                self.tile_bounds.bounds[0].x, self.tile_bounds.bounds[0].y
+            ], [self.tile_bounds.bounds[1].x, self.tile_bounds.bounds[1].y]],
+            "minZoom": self.zoom_levels[0],
+            "maxZoom": self.zoom_levels[1],
+            "maxNativeZoom": self.max_native_zoom,
+            "epsg": self.tile_bounds.epsg.name,
+            "tileSize": self.tile_size,
+            "alternativeLayers": [
+                layer.asdict() for layer in self.alternative_layers
+            ],
+            "version": self.version
+        }
+
     def as_raster_data(self,
                        zoom: int = 0,
                        max_tiles: int = 32,
@@ -149,9 +173,24 @@ def as_raster_data(self,
         """
         if self.tile_bounds.epsg == EPSG.SIMPLEPIXEL:
             xstart, ystart, xend, yend = self._get_simple_image_params(zoom)
-
+        elif self.tile_bounds.epsg == EPSG.EPSG4326:
+            xstart, ystart, xend, yend = self._get_3857_image_params(zoom)
         elif self.tile_bounds.epsg == EPSG.EPSG3857:
+            #transform to 4326
+            transformer = EPSGTransformer.create_geo_to_geo_transformer(
+                EPSG.EPSG3857, EPSG.EPSG4326)
+            self.tile_bounds.bounds = [
+                transformer(self.tile_bounds.bounds[0]),
+                transformer(self.tile_bounds.bounds[1])
+            ]
             xstart, ystart, xend, yend = self._get_3857_image_params(zoom)
+            #transform back to 3857
+            transformer = EPSGTransformer.create_geo_to_geo_transformer(
+                EPSG.EPSG4326, EPSG.EPSG3857)
+            self.tile_bounds.bounds = [
+                transformer(self.tile_bounds.bounds[0]),
+                transformer(self.tile_bounds.bounds[1])
+            ]
         else:
             raise ValueError(f"Unsupported epsg found: {self.tile_bounds.epsg}")
 
@@ -202,8 +241,8 @@ def _get_3857_image_params(self, zoom) -> Tuple[float, float, float, float]:
             1].x, self.tile_bounds.bounds[0].x
 
         # Convert to zoom 0 tile coordinates
-        xstart, ystart = self._latlng_to_tile(lat_start, lng_start, zoom)
-        xend, yend = self._latlng_to_tile(lat_end, lng_end, zoom)
+        xstart, ystart = self._latlng_to_tile(lat_start, lng_start)
+        xend, yend = self._latlng_to_tile(lat_end, lng_end)
 
         # Make sure that the tiles are increasing in order
         xstart, xend = min(xstart, xend), max(xstart, xend)

labelbox/data/annotation_types/data/tiled_image.py

@@ -4,6 +4,7 @@
 from pydantic import BaseModel, validator
 
 import labelbox
+from labelbox.data.annotation_types.data.tiled_image import TiledImageData
 from labelbox.schema import ontology
 from .annotation import (ClassificationAnnotation, ObjectAnnotation,
                          VideoClassificationAnnotation, VideoObjectAnnotation)
@@ -35,7 +36,7 @@ class Label(BaseModel):
         extra: additional context
     """
     uid: Optional[Cuid] = None
-    data: Union[VideoData, ImageData, TextData]
+    data: Union[VideoData, ImageData, TextData, TiledImageData]
     annotations: List[Union[ClassificationAnnotation, ObjectAnnotation,
                             VideoObjectAnnotation,
                             VideoClassificationAnnotation, ScalarMetric,