-

Author: docuracy

__pycache__/desCartes.cpython-310.pyc

@@ -94,6 +94,8 @@ def get_nearest_parallel_linestring(gdf, geoindex, test_point, max_distance, tan
                 break
             except ValueError: # Tried to find tangent using point beyond end of linestring
                 continue
+        if candidate_tangent_point.is_empty:
+            continue
         dx = candidate_tangent_point.x - candidate_closest_point.x
         dy = candidate_tangent_point.y - candidate_closest_point.y
         candidate_angle = math.atan2(dy, dx)
@@ -351,52 +353,6 @@ def desCartes(map_directory,
     footpaths_single_EPSG4326_gdf.to_file(map_directory + 'desCartes.gpkg', layer="single_dashes", driver="GPKG")
 
     binary_image = np.where(footpaths == 255, 255, binary_image) # Remove dashes
-    
-    # std_deviation_multiplier = 3
-    # area_range = (dash_detector['area']['mean'] - std_deviation_multiplier * dash_detector['area']['std_dev'], dash_detector['area']['mean'] + std_deviation_multiplier * dash_detector['area']['std_dev'])
-    # convexity_range = (dash_detector['convexity']['mean'] - std_deviation_multiplier * dash_detector['convexity']['std_dev'], 1)
-    # aspect_ratio_range = (dash_detector['aspect_ratio']['mean'] - std_deviation_multiplier * dash_detector['aspect_ratio']['std_dev'], dash_detector['aspect_ratio']['mean'] + std_deviation_multiplier * dash_detector['aspect_ratio']['std_dev'])
-    # contours, _ = cv2.findContours(binary_image_otsu, cv2.RETR_LIST, cv2.CHAIN_APPROX_SIMPLE)
-    # footpaths = np.zeros_like(binary_image)
-    # for contour in contours: 
-    #     # Calculate areas of contour and its convex hull
-    #     contour_area = cv2.contourArea(contour)
-    #     if not area_range[0] <= contour_area <= area_range[1]:
-    #         continue
-    #     hull = cv2.convexHull(contour)
-    #     hull_area = cv2.contourArea(hull)
-    #     convexity = contour_area / hull_area
-    #     if not convexity_range[0] <= convexity <= convexity_range[1]:
-    #         continue
-    #     # Calculate aspect ratio
-    #     rect = cv2.minAreaRect(contour)
-    #     rect_width, rect_height = rect[1]
-    #     if rect_width == 0 or rect_height == 0:
-    #         continue # Reject contour
-    #     else:
-    #         aspect_ratio = min(rect_width, rect_height) / max(rect_width, rect_height)
-    #     if not aspect_ratio_range[0] <= aspect_ratio <= aspect_ratio_range[1]:
-    #         continue
-    #     cv2.drawContours(footpaths, [contour], -1, 255, -1)
-    #
-    # binary_image = np.where(footpaths == 255, 255, binary_image) # Remove dashes
-    # # Dilate to merge double-dash lines    
-    # kernel = cv2.getStructuringElement(cv2.MORPH_ELLIPSE, (6, 6))
-    # footpaths_merged = cv2.dilate(footpaths, kernel, iterations=2)
-    # footpaths_double = cv2.erode(footpaths_merged, kernel, iterations=3)
-    # footpaths_double = cv2.dilate(footpaths_double, kernel, iterations=4)
-    # footpaths_single = cv2.subtract(footpaths_merged, footpaths_double)
-    # footpaths_double = skeletonize(footpaths_double / 255.).astype(np.uint8) * 255
-    # footpaths_single = skeletonize(footpaths_single / 255.).astype(np.uint8) * 255
-    # footpaths_double = vector_skeleton(footpaths_double)
-    # footpaths_single = vector_skeleton(footpaths_single)
-    # footpaths_double = gpd.GeoDataFrame({'geometry': footpaths_double})
-    # footpaths_single = gpd.GeoDataFrame({'geometry': footpaths_single})
-    #
-    # footpaths_double_EPSG4326_gdf = XY_to_EPSG4326(footpaths_double, raster.transform)
-    # footpaths_double_EPSG4326_gdf.to_file(map_directory + 'desCartes.gpkg', layer="double_dashes", driver="GPKG")
-    # footpaths_single_EPSG4326_gdf = XY_to_EPSG4326(footpaths_single, raster.transform)
-    # footpaths_single_EPSG4326_gdf.to_file(map_directory + 'desCartes.gpkg', layer="single_dashes", driver="GPKG")
 
     # Thin all black lines to 1px
     binary_image = np.invert(binary_image)  

__pycache__/tiles_to_tiff.cpython-310.pyc

@@ -26,6 +26,7 @@
 # from find_areas import find_areas
 from desCartes import desCartes
 from coloured_roads import coloured_roads
+from realign_1950s_to_1890s import realign_1950s_to_1890s
 import json
 
 #####################
@@ -35,32 +36,41 @@
 # A simple way to get the extent coordinates is to open a Google map in a browser,
 # then right-click on the south-west corner of the area of interest. Then click on 
 # the displayed coordinates and then paste them below. Repeat for the north-east corner.
-EXTENT_SOUTHWEST_LAT, EXTENT_SOUTHWEST_LNG = 52.567900, -1.990716
-EXTENT_NORTHEAST_LAT, EXTENT_NORTHEAST_LNG = 52.588912, -1.957963
 
-EXTENT_SOUTHWEST_LNG, EXTENT_SOUTHWEST_LAT, EXTENT_NORTHEAST_LNG, EXTENT_NORTHEAST_LAT = -1.935997009277344,52.56137658013496,-1.898918151855469,52.58339467314521
+EXTENT_SOUTHWEST_LAT, EXTENT_SOUTHWEST_LNG = 51.50349919463678, -2.3478318403222653
+EXTENT_NORTHEAST_LAT, EXTENT_NORTHEAST_LNG = 51.511351738991365, -2.332338484447449
+LOCATION_NAME = 'tormarton'
+
+# EXTENT_SOUTHWEST_LAT, EXTENT_SOUTHWEST_LNG = 52.567939367463715, -1.992658440245488
+# EXTENT_NORTHEAST_LAT, EXTENT_NORTHEAST_LNG = 52.591446281961645, -1.9622368833162331
+# LOCATION_NAME = 'walsall'
+
+# EXTENT_SOUTHWEST_LNG, EXTENT_SOUTHWEST_LAT, EXTENT_NORTHEAST_LNG, EXTENT_NORTHEAST_LAT = -1.935997009277344,52.56137658013496,-1.898918151855469,52.58339467314521
+# LOCATION_NAME = 'great_barr'
 
 ## The location name will be used to name the directory where files are stored.
 ## If a geotiff already exist in this directory, it will be re-used, and the coordinates given above ignored.
-LOCATION_NAME = 'test3'
+# LOCATION_NAME = 'test5'
 # LOCATION_NAME = 'test2'
-# LOCATION_NAME = 'tormarton'
-# LOCATION_NAME = 'walsall'
 # LOCATION_NAME = 'sutton_coldfield'
 
 ## Uncomment one of these methods, or create your own in the IMAGE PROCESSING CALLS section.
 ## Any name you type here will be used in creating a filename, so avoid funky characters.
 # METHOD = 'road_contours'
 # METHOD = 'progressive'
 # METHOD = 'development'
-METHOD = 'colour'
+# METHOD = 'colour'
+METHOD = '1950s_to_1890s'
 
-# RASTER_TILE_KEY = 'ySlCyGP2kmmfm9Dgtiqj' # TO USE THE URL GIVEN BELOW, GET YOUR OWN KEY FROM https://cloud.maptiler.com/account/keys/
-# RASTER_TILE_URL = 'https://api.maptiler.com/tiles/uk-osgb10k1888/{z}/{x}/{y}.jpg?key=' + RASTER_TILE_KEY
-RASTER_TILE_URL = 'https://api.maptiler.com/tiles/uk-osgb63k1955/{z}/{x}/{y}.jpg?key=ySlCyGP2kmmfm9Dgtiqj'
-# RASTER_TILE_ZOOM = 17
 # RASTER_TILE_URL = 'https://overlays.humap.site/layersoflondon/os_drawings/{z}/{x}/{y}.png'
-RASTER_TILE_ZOOM = 15
+# RASTER_TILE_ZOOM = 15
+
+RASTER_TILE_KEY = 'ySlCyGP2kmmfm9Dgtiqj' # TO USE THE URL GIVEN BELOW, GET YOUR OWN KEY FROM https://cloud.maptiler.com/account/keys/
+RASTER_TILE_URL = 'https://api.maptiler.com/tiles/uk-osgb10k1888/{z}/{x}/{y}.jpg?key=' + RASTER_TILE_KEY
+RASTER_TILE_ZOOM = 17
+
+# RASTER_TILE_URL = 'https://api.maptiler.com/tiles/uk-osgb63k1955/{z}/{x}/{y}.jpg?key=ySlCyGP2kmmfm9Dgtiqj'
+# RASTER_TILE_ZOOM = 15
 
 ## The ROADFILE must contain LineStrings only, reprojected if necessary to EPSG:4326 (WGS84)
 ## It should be placed in the DATADIR defined below.
@@ -371,6 +381,18 @@
         # result_binary, _ = erase_areas(result_binary, raster_image_gray, 2000, closed = True, SHOW_IMAGES = SHOW_IMAGES, OUTPUTDIR = OUTPUTDIR) # Erase white shapes
         # result_binary, _ = erase_areas(result_binary, raster_image_gray, 3, contours = False, SHOW_IMAGES = SHOW_IMAGES, OUTPUTDIR = OUTPUTDIR) # Erase white noise
 
+    case '1950s_to_1890s':
+        realign_1950s_to_1890s(
+            map_directory = f"./output/{LOCATION_NAME}/", 
+            extent = {
+                    "sw_lng": EXTENT_SOUTHWEST_LNG,
+                    "sw_lat": EXTENT_SOUTHWEST_LAT, 
+                    "ne_lng": EXTENT_NORTHEAST_LNG,
+                    "ne_lat": EXTENT_NORTHEAST_LAT
+                    }
+            )
+    
+    
     case _: # Default 
         contours, skeleton, result_images, message = desCartes(OUTPUTDIR, template_dir = './../data/templates', show_images = True, shape_filter = False, MAX_ROAD_WIDTH = 40)