Merge pull request #319 from mapswipe/dev

Google format custom tile servers

Author: Hagellach37

mapswipe_workers/mapswipe_workers/utils/tile_functions.py

@@ -36,56 +36,23 @@ def __init__(self, x=0, y=0):
 
 
 def lat_long_zoom_to_pixel_coords(lat, lon, zoom):
-    """
-    The function to compute pixel coordinates from lat-long point at a given zoom level
-
-    Parameters
-    ----------
-    lat : float
-        latitude in degree
-    lon : float
-        longitude in degree
-    zoom : int
-        tile map service zoom level
-
-    Returns
-    -------
-    p : Point
-    """
+    """Compute pixel coordinates from lat-long point at a given zoom level."""
 
     p = Point()
     sinLat = math.sin(lat * math.pi / 180.0)
     x = ((lon + 180) / 360) * 256 * math.pow(2, zoom)
     y = (
         (0.5 - math.log((1 + sinLat) / (1 - sinLat)) / (4 * math.pi))
-        * 256
-        * math.pow(2, zoom)
+        * 256  # noqa: W503
+        * math.pow(2, zoom)  # noqa: W503
     )
     p.x = int(math.floor(x))
     p.y = int(math.floor(y))
     return p
 
 
 def pixel_coords_zoom_to_lat_lon(PixelX, PixelY, zoom):
-    """
-    The function to compute latitude, longituted from pixel coordinates at a given zoom level
-
-    Parameters
-    ----------
-    PixelX : int
-        x coordinate
-    PixelY : int
-        y coordinate
-    zoom : int
-        tile map service zoom level
-
-    Returns
-    -------
-    lon : float
-        the longitude in degree
-    lat : float
-        the latitude in degree
-    """
+    """Compute latitude, longituted from pixel coordinates at a given zoom level."""
 
     MapSize = 256 * math.pow(2, zoom)
     x = (PixelX / MapSize) - 0.5
@@ -97,20 +64,7 @@ def pixel_coords_zoom_to_lat_lon(PixelX, PixelY, zoom):
 
 
 def pixel_coords_to_tile_address(PixelX, PixelY):
-    """
-    The function to compute a tile address from pixel coordinates of point within tile.
-
-    Parameters
-    ----------
-    PixelX : int
-        x coordinate
-    PixelY : int
-        y coordinate
-
-    Returns
-    -------
-    t : Tile
-    """
+    """Compute a tile address from pixel coordinates of point within tile."""
 
     t = Tile()
     t.x = int(math.floor(PixelX / 256))
@@ -121,25 +75,7 @@ def pixel_coords_to_tile_address(PixelX, PixelY):
 def tile_coords_zoom_and_tileserver_to_url(
     tile_x: int, tile_y: int, tile_z: int, tile_server: dict
 ) -> str:
-    """
-    The function to Create a URL for a tile based on tile coordinates, zoom and given tile server
-
-    Parameters
-    ----------
-    tile_x : int
-        x coordinate of tile
-    tile_y : int
-        y coordinate of tile
-    tile_z :  int
-        tile map service zoom level
-    tile_server :  dict
-        the tile server dictionary containing name and url
-
-    Returns
-    -------
-    URL : string
-        the url for the specific tile image
-    """
+    """Create a URL for a tile based on tile coordinates, zoom and given tile server."""
 
     if tile_server["name"] == "bing":
         quadKey = tile_coords_and_zoom_to_quadKey(tile_x, tile_y, tile_z)
@@ -153,12 +89,22 @@ def tile_coords_zoom_and_tileserver_to_url(
             layer=tile_server["wmtsLayerName"],
         )
     elif "maxar" in tile_server["name"]:
-        # maxar uses not the standard TMS tile y coordinate, but the Google tile y coordinate
-        # more information here: https://www.maptiler.com/google-maps-coordinates-tile-bounds-projection/
+        # maxar uses not the standard TMS tile y coordinate,
+        # but the Google tile y coordinate
+        # more information here:
+        # https://www.maptiler.com/google-maps-coordinates-tile-bounds-projection/
         tile_y = int(math.pow(2, tile_z) - tile_y) - 1
         url = tile_server["url"].format(
             key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,
         )
+    elif "{-y}" in tile_server["url"]:
+        # this uses not the standard TMS tile y coordinate,
+        # but the Google tile y coordinate
+        # more information here:
+        # https://www.maptiler.com/google-maps-coordinates-tile-bounds-projection/
+        tile_y = int(math.pow(2, tile_z) - tile_y) - 1
+        url = tile_server["url"].replace("{-y}", "{y}")
+        url = url.format(key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,)
     else:
         url = tile_server["url"].format(
             key=tile_server["apiKey"], x=tile_x, y=tile_y, z=tile_z,
@@ -168,22 +114,7 @@ def tile_coords_zoom_and_tileserver_to_url(
 
 
 def tile_coords_and_zoom_to_quadKey(TileX, TileY, zoom):
-    """
-    The function to create a quadkey for use with certain tileservers that use them, e.g. Bing
-
-    Parameters
-    ----------
-    TileX : int
-         x coordinate of tile
-    TileY : int
-         y coordinate of tile
-    zoom : int
-        tile map service zoom level
-
-    Returns
-    -------
-    quadKey : str
-    """
+    """Create a quadkey for use with certain tileservers that use them, e.g. Bing."""
 
     quadKey = ""
     for i in range(zoom, 0, -1):
@@ -198,47 +129,17 @@ def tile_coords_and_zoom_to_quadKey(TileX, TileY, zoom):
 
 
 def quadKey_to_Bing_URL(quadKey, api_key):
-    """
-    The function to create a tile image URL linking to a Bing tile server
-
-    Parameters
-    ----------
-    quadKey :  str
-        the quad key for Bing for the given tile
-    api_key : str
-        the Bing maps api key
-
-    Returns
-    -------
-    tile_url : str
-        the url for the specific Bing tile image
-    """
+    """Create a tile image URL linking to a Bing tile server."""
 
-    tile_url = "https://ecn.t0.tiles.virtualearth.net/tiles/a{}.jpeg?g=7505&mkt=en-US&token={}".format(
+    tile_url = "https://ecn.t0.tiles.virtualearth.net/tiles/a{}.jpeg?g=7505&mkt=en-US&token={}".format(  # noqa: E501
         quadKey, api_key
     )
 
     return tile_url
 
 
 def geometry_from_tile_coords(TileX, TileY, zoom):
-    """
-    The function to compute the polygon geometry of a tile map service tile
-
-    Parameters
-    ----------
-    TileX : int
-         x coordinate of tile
-    TileY : int
-         y coordinate of tile
-    zoom : int
-        tile map service zoom level
-
-    Returns
-    -------
-    wkt_geom : str
-        the polygon geometry of the tile in WKT format
-    """
+    """Compute the polygon geometry of a tile map service tile."""
 
     # Calculate lat, lon of upper left corner of tile
     PixelX = TileX * 256