kopia lustrzana https://github.com/OpenDroneMap/ODM
Piero Toffanin
rodzic
ed9d703e3f
commit
51769fe711
|
|
@ -642,6 +642,14 @@ def config(argv=None):
|
|||
'Default: '
|
||||
'%(default)s')
|
||||
|
||||
parser.add_argument('--tiles',
|
||||
action=StoreTrue,
|
||||
nargs=0,
|
||||
default=False,
|
||||
help='Generate static tiles for orthophotos and DEMs that are '
|
||||
'suitable for viewers like Leaflet or OpenLayers. '
|
||||
'Default: %(default)s')
|
||||
|
||||
parser.add_argument('--build-overviews',
|
||||
action=StoreTrue,
|
||||
nargs=0,
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ from edt import edt
|
|||
from rasterio.transform import Affine, rowcol
|
||||
from rasterio.mask import mask
|
||||
from opendm import io
|
||||
from opendm.tiles.tiler import generate_orthophoto_tiles
|
||||
|
||||
def get_orthophoto_vars(args):
|
||||
return {
|
||||
|
|
@ -42,7 +43,7 @@ def generate_png(orthophoto_file):
|
|||
'--config GDAL_CACHEMAX %s%% ' % (orthophoto_file, orthophoto_png, get_max_memory()))
|
||||
|
||||
|
||||
def post_orthophoto_steps(args, bounds_file_path, orthophoto_file):
|
||||
def post_orthophoto_steps(args, bounds_file_path, orthophoto_file, orthophoto_tiles_dir):
|
||||
if args.crop > 0:
|
||||
Cropper.crop(bounds_file_path, orthophoto_file, get_orthophoto_vars(args), keep_original=not args.optimize_disk_space, warp_options=['-dstalpha'])
|
||||
|
||||
|
|
@ -52,6 +53,9 @@ def post_orthophoto_steps(args, bounds_file_path, orthophoto_file):
|
|||
if args.orthophoto_png:
|
||||
generate_png(orthophoto_file)
|
||||
|
||||
if args.tiles:
|
||||
generate_orthophoto_tiles(orthophoto_file, orthophoto_tiles_dir, args.max_concurrency)
|
||||
|
||||
|
||||
def compute_mask_raster(input_raster, vector_mask, output_raster, blend_distance=20, only_max_coords_feature=False):
|
||||
if not os.path.exists(input_raster):
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ def get_submodel_argv(args, submodels_path = None, submodel_name = None):
|
|||
:return the same as argv, but removing references to --split,
|
||||
setting/replacing --project-path and name
|
||||
removing --rerun-from, --rerun, --rerun-all, --sm-cluster
|
||||
removing --pc-las, --pc-csv, --pc-ept flags (processing these is wasteful)
|
||||
removing --pc-las, --pc-csv, --pc-ept, --tiles flags (processing these is wasteful)
|
||||
adding --orthophoto-cutline
|
||||
adding --dem-euclidean-map
|
||||
adding --skip-3dmodel (split-merge does not support 3D model merging)
|
||||
|
|
@ -363,7 +363,7 @@ def get_submodel_argv(args, submodels_path = None, submodel_name = None):
|
|||
reading the contents of --cameras
|
||||
"""
|
||||
assure_always = ['orthophoto_cutline', 'dem_euclidean_map', 'skip_3dmodel']
|
||||
remove_always = ['split', 'split_overlap', 'rerun_from', 'rerun', 'gcp', 'end_with', 'sm_cluster', 'rerun_all', 'pc_csv', 'pc_las', 'pc_ept']
|
||||
remove_always = ['split', 'split_overlap', 'rerun_from', 'rerun', 'gcp', 'end_with', 'sm_cluster', 'rerun_all', 'pc_csv', 'pc_las', 'pc_ept', 'tiles']
|
||||
read_json_always = ['cameras']
|
||||
|
||||
argv = sys.argv
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
0% 255 0 255
|
||||
10% 128 0 255
|
||||
20% 0 0 255
|
||||
30% 0 128 255
|
||||
40% 0 255 255
|
||||
50% 0 255 128
|
||||
60% 0 255 0
|
||||
70% 128 255 0
|
||||
80% 255 255 0
|
||||
90% 255 128 0
|
||||
100% 255 0 0
|
||||
nv 0 0 0 0
|
||||
Plik diff jest za duży
Load Diff
|
|
@ -0,0 +1,234 @@
|
|||
#!/usr/bin/env python
|
||||
#******************************************************************************
|
||||
# $Id$
|
||||
#
|
||||
# Project: GDAL Python Interface
|
||||
# Purpose: Script to merge greyscale as intensity into an RGB(A) image, for
|
||||
# instance to apply hillshading to a dem colour relief.
|
||||
# Author: Frank Warmerdam, warmerdam@pobox.com
|
||||
# Trent Hare (USGS)
|
||||
#
|
||||
#******************************************************************************
|
||||
# Copyright (c) 2009, Frank Warmerdam
|
||||
# Copyright (c) 2010, Even Rouault <even dot rouault at mines-paris dot org>
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||
# copy of this software and associated documentation files (the "Software"),
|
||||
# to deal in the Software without restriction, including without limitation
|
||||
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
# and/or sell copies of the Software, and to permit persons to whom the
|
||||
# Software is furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
# DEALINGS IN THE SOFTWARE.
|
||||
#******************************************************************************
|
||||
|
||||
import sys
|
||||
|
||||
import numpy
|
||||
from osgeo import gdal
|
||||
|
||||
# =============================================================================
|
||||
# rgb_to_hsv()
|
||||
#
|
||||
# rgb comes in as [r,g,b] with values in the range [0,255]. The returned
|
||||
# hsv values will be with hue and saturation in the range [0,1] and value
|
||||
# in the range [0,255]
|
||||
#
|
||||
def rgb_to_hsv( r,g,b ):
|
||||
|
||||
maxc = numpy.maximum(r,numpy.maximum(g,b))
|
||||
minc = numpy.minimum(r,numpy.minimum(g,b))
|
||||
|
||||
v = maxc
|
||||
|
||||
minc_eq_maxc = numpy.equal(minc,maxc)
|
||||
|
||||
# compute the difference, but reset zeros to ones to avoid divide by zeros later.
|
||||
ones = numpy.ones((r.shape[0],r.shape[1]))
|
||||
maxc_minus_minc = numpy.choose( minc_eq_maxc, (maxc-minc,ones) )
|
||||
|
||||
s = (maxc-minc) / numpy.maximum(ones,maxc)
|
||||
rc = (maxc-r) / maxc_minus_minc
|
||||
gc = (maxc-g) / maxc_minus_minc
|
||||
bc = (maxc-b) / maxc_minus_minc
|
||||
|
||||
maxc_is_r = numpy.equal(maxc,r)
|
||||
maxc_is_g = numpy.equal(maxc,g)
|
||||
maxc_is_b = numpy.equal(maxc,b)
|
||||
|
||||
h = numpy.zeros((r.shape[0],r.shape[1]))
|
||||
h = numpy.choose( maxc_is_b, (h,4.0+gc-rc) )
|
||||
h = numpy.choose( maxc_is_g, (h,2.0+rc-bc) )
|
||||
h = numpy.choose( maxc_is_r, (h,bc-gc) )
|
||||
|
||||
h = numpy.mod(h/6.0,1.0)
|
||||
|
||||
hsv = numpy.asarray([h,s,v])
|
||||
|
||||
return hsv
|
||||
|
||||
# =============================================================================
|
||||
# hsv_to_rgb()
|
||||
#
|
||||
# hsv comes in as [h,s,v] with hue and saturation in the range [0,1],
|
||||
# but value in the range [0,255].
|
||||
|
||||
def hsv_to_rgb( hsv ):
|
||||
|
||||
h = hsv[0]
|
||||
s = hsv[1]
|
||||
v = hsv[2]
|
||||
|
||||
#if s == 0.0: return v, v, v
|
||||
i = (h*6.0).astype(int)
|
||||
f = (h*6.0) - i
|
||||
p = v*(1.0 - s)
|
||||
q = v*(1.0 - s*f)
|
||||
t = v*(1.0 - s*(1.0-f))
|
||||
|
||||
r = i.choose( v, q, p, p, t, v )
|
||||
g = i.choose( t, v, v, q, p, p )
|
||||
b = i.choose( p, p, t, v, v, q )
|
||||
|
||||
rgb = numpy.asarray([r,g,b]).astype(numpy.uint8)
|
||||
|
||||
return rgb
|
||||
|
||||
# =============================================================================
|
||||
# Usage()
|
||||
|
||||
def Usage():
|
||||
print("""Usage: hsv_merge.py [-q] [-of format] src_color src_greyscale dst_color
|
||||
|
||||
where src_color is a RGB or RGBA dataset,
|
||||
src_greyscale is a greyscale dataset (e.g. the result of gdaldem hillshade)
|
||||
dst_color will be a RGB or RGBA dataset using the greyscale as the
|
||||
intensity for the color dataset.
|
||||
""")
|
||||
sys.exit(1)
|
||||
|
||||
# =============================================================================
|
||||
# Mainline
|
||||
# =============================================================================
|
||||
|
||||
argv = gdal.GeneralCmdLineProcessor( sys.argv )
|
||||
if argv is None:
|
||||
sys.exit( 0 )
|
||||
|
||||
format = 'GTiff'
|
||||
src_color_filename = None
|
||||
src_greyscale_filename = None
|
||||
dst_color_filename = None
|
||||
quiet = False
|
||||
|
||||
# Parse command line arguments.
|
||||
i = 1
|
||||
while i < len(argv):
|
||||
arg = argv[i]
|
||||
|
||||
if arg == '-of':
|
||||
i = i + 1
|
||||
format = argv[i]
|
||||
|
||||
elif arg == '-q' or arg == '-quiet':
|
||||
quiet = True
|
||||
|
||||
elif src_color_filename is None:
|
||||
src_color_filename = argv[i]
|
||||
|
||||
elif src_greyscale_filename is None:
|
||||
src_greyscale_filename = argv[i]
|
||||
|
||||
elif dst_color_filename is None:
|
||||
dst_color_filename = argv[i]
|
||||
else:
|
||||
Usage()
|
||||
|
||||
i = i + 1
|
||||
|
||||
if dst_color_filename is None:
|
||||
Usage()
|
||||
|
||||
datatype = gdal.GDT_Byte
|
||||
|
||||
hilldataset = gdal.Open( src_greyscale_filename, gdal.GA_ReadOnly )
|
||||
colordataset = gdal.Open( src_color_filename, gdal.GA_ReadOnly )
|
||||
|
||||
#check for 3 or 4 bands in the color file
|
||||
if (colordataset.RasterCount != 3 and colordataset.RasterCount != 4):
|
||||
print('Source image does not appear to have three or four bands as required.')
|
||||
sys.exit(1)
|
||||
|
||||
#define output format, name, size, type and set projection
|
||||
out_driver = gdal.GetDriverByName(format)
|
||||
outdataset = out_driver.Create(dst_color_filename, colordataset.RasterXSize, \
|
||||
colordataset.RasterYSize, colordataset.RasterCount, datatype)
|
||||
outdataset.SetProjection(hilldataset.GetProjection())
|
||||
outdataset.SetGeoTransform(hilldataset.GetGeoTransform())
|
||||
|
||||
#assign RGB and hillshade bands
|
||||
rBand = colordataset.GetRasterBand(1)
|
||||
gBand = colordataset.GetRasterBand(2)
|
||||
bBand = colordataset.GetRasterBand(3)
|
||||
if colordataset.RasterCount == 4:
|
||||
aBand = colordataset.GetRasterBand(4)
|
||||
else:
|
||||
aBand = None
|
||||
|
||||
hillband = hilldataset.GetRasterBand(1)
|
||||
hillbandnodatavalue = hillband.GetNoDataValue()
|
||||
|
||||
#check for same file size
|
||||
if ((rBand.YSize != hillband.YSize) or (rBand.XSize != hillband.XSize)):
|
||||
print('Color and hillshade must be the same size in pixels.')
|
||||
sys.exit(1)
|
||||
|
||||
#loop over lines to apply hillshade
|
||||
for i in range(hillband.YSize):
|
||||
#load RGB and Hillshade arrays
|
||||
rScanline = rBand.ReadAsArray(0, i, hillband.XSize, 1, hillband.XSize, 1)
|
||||
gScanline = gBand.ReadAsArray(0, i, hillband.XSize, 1, hillband.XSize, 1)
|
||||
bScanline = bBand.ReadAsArray(0, i, hillband.XSize, 1, hillband.XSize, 1)
|
||||
hillScanline = hillband.ReadAsArray(0, i, hillband.XSize, 1, hillband.XSize, 1)
|
||||
|
||||
#convert to HSV
|
||||
hsv = rgb_to_hsv( rScanline, gScanline, bScanline )
|
||||
|
||||
# if there's nodata on the hillband, use the v value from the color
|
||||
# dataset instead of the hillshade value.
|
||||
if hillbandnodatavalue is not None:
|
||||
equal_to_nodata = numpy.equal(hillScanline, hillbandnodatavalue)
|
||||
v = numpy.choose(equal_to_nodata,(hillScanline,hsv[2]))
|
||||
else:
|
||||
v = hillScanline
|
||||
|
||||
#replace v with hillshade
|
||||
hsv_adjusted = numpy.asarray( [hsv[0], hsv[1], v] )
|
||||
|
||||
#convert back to RGB
|
||||
dst_color = hsv_to_rgb( hsv_adjusted )
|
||||
|
||||
#write out new RGB bands to output one band at a time
|
||||
outband = outdataset.GetRasterBand(1)
|
||||
outband.WriteArray(dst_color[0], 0, i)
|
||||
outband = outdataset.GetRasterBand(2)
|
||||
outband.WriteArray(dst_color[1], 0, i)
|
||||
outband = outdataset.GetRasterBand(3)
|
||||
outband.WriteArray(dst_color[2], 0, i)
|
||||
if aBand is not None:
|
||||
aScanline = aBand.ReadAsArray(0, i, hillband.XSize, 1, hillband.XSize, 1)
|
||||
outband = outdataset.GetRasterBand(4)
|
||||
outband.WriteArray(aScanline, 0, i)
|
||||
|
||||
#update progress line
|
||||
if not quiet:
|
||||
gdal.TermProgress_nocb( (float(i+1) / hillband.YSize) )
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
import os
|
||||
from opendm import log
|
||||
from opendm import system
|
||||
from opendm import io
|
||||
|
||||
def generate_tiles(geotiff, output_dir, max_concurrency):
|
||||
gdal2tiles = os.path.join(os.path.dirname(__file__), "gdal2tiles.py")
|
||||
system.run('python3 "%s" --processes %s -z 5-21 -n -w none "%s" "%s"' % (gdal2tiles, max_concurrency, geotiff, output_dir))
|
||||
|
||||
def generate_orthophoto_tiles(geotiff, output_dir, max_concurrency):
|
||||
try:
|
||||
generate_tiles(geotiff, output_dir, max_concurrency)
|
||||
except Exception as e:
|
||||
log.ODM_WARNING("Cannot generate orthophoto tiles: %s" % str(e))
|
||||
|
||||
def generate_dem_tiles(geotiff, output_dir, max_concurrency):
|
||||
relief_file = os.path.join(os.path.dirname(__file__), "color_relief.txt")
|
||||
hsv_merge_script = os.path.join(os.path.dirname(__file__), "hsv_merge.py")
|
||||
colored_dem = io.related_file_path(geotiff, postfix="color")
|
||||
hillshade_dem = io.related_file_path(geotiff, postfix="hillshade")
|
||||
colored_hillshade_dem = io.related_file_path(geotiff, postfix="colored_hillshade")
|
||||
|
||||
try:
|
||||
system.run('gdaldem color-relief "%s" "%s" "%s" -alpha -co ALPHA=YES' % (geotiff, relief_file, colored_dem))
|
||||
system.run('gdaldem hillshade "%s" "%s" -z 1.0 -s 1.0 -az 315.0 -alt 45.0' % (geotiff, hillshade_dem))
|
||||
system.run('python3 "%s" "%s" "%s" "%s"' % (hsv_merge_script, colored_dem, hillshade_dem, colored_hillshade_dem))
|
||||
generate_tiles(colored_hillshade_dem, output_dir, max_concurrency)
|
||||
|
||||
# Cleanup
|
||||
for f in [colored_dem, hillshade_dem, colored_hillshade_dem]:
|
||||
if os.path.isfile(f):
|
||||
os.remove(f)
|
||||
except Exception as e:
|
||||
log.ODM_WARNING("Cannot generate DEM tiles: %s" % str(e))
|
||||
|
|
@ -293,6 +293,9 @@ class ODM_Tree(object):
|
|||
self.odm_orthophoto_log = io.join_paths(self.odm_orthophoto, 'odm_orthophoto_log.txt')
|
||||
self.odm_orthophoto_tif_log = io.join_paths(self.odm_orthophoto, 'gdal_translate_log.txt')
|
||||
|
||||
# tiles
|
||||
self.orthophoto_tiles = io.join_paths(self.root_path, "orthophoto_tiles")
|
||||
|
||||
# Split-merge
|
||||
self.submodels_path = io.join_paths(self.root_path, 'submodels')
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ from opendm import gsd
|
|||
from opendm.dem import commands, utils
|
||||
from opendm.cropper import Cropper
|
||||
from opendm import pseudogeo
|
||||
from opendm.tiles.tiler import generate_dem_tiles
|
||||
|
||||
class ODMDEMStage(types.ODM_Stage):
|
||||
def process(self, args, outputs):
|
||||
|
|
@ -128,9 +129,12 @@ class ODMDEMStage(types.ODM_Stage):
|
|||
commands.compute_euclidean_map(unfilled_dem_path,
|
||||
io.related_file_path(dem_geotiff_path, postfix=".euclideand"),
|
||||
overwrite=True)
|
||||
|
||||
|
||||
if pseudo_georeference:
|
||||
pseudogeo.add_pseudo_georeferencing(dem_geotiff_path)
|
||||
|
||||
if args.tiles:
|
||||
generate_dem_tiles(dem_geotiff_path, tree.path("%s_tiles" % product), args.max_concurrency)
|
||||
|
||||
progress += 30
|
||||
self.update_progress(progress)
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ class ODMOrthoPhotoStage(types.ODM_Stage):
|
|||
os.path.join(tree.odm_orthophoto, "odm_orthophoto_cut.tif"),
|
||||
blend_distance=20, only_max_coords_feature=True)
|
||||
|
||||
orthophoto.post_orthophoto_steps(args, bounds_file_path, tree.odm_orthophoto_tif)
|
||||
orthophoto.post_orthophoto_steps(args, bounds_file_path, tree.odm_orthophoto_tif, tree.orthophoto_tiles)
|
||||
|
||||
# Generate feathered orthophoto also
|
||||
if args.orthophoto_cutline:
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ from opendm.remote import LocalRemoteExecutor
|
|||
from opendm.shots import merge_geojson_shots
|
||||
from opendm import point_cloud
|
||||
from pipes import quote
|
||||
|
||||
from opendm.tiles.tiler import generate_dem_tiles
|
||||
|
||||
class ODMSplitStage(types.ODM_Stage):
|
||||
def process(self, args, outputs):
|
||||
|
|
@ -293,7 +293,7 @@ class ODMMergeStage(types.ODM_Stage):
|
|||
|
||||
orthophoto_vars = orthophoto.get_orthophoto_vars(args)
|
||||
orthophoto.merge(all_orthos_and_ortho_cuts, tree.odm_orthophoto_tif, orthophoto_vars)
|
||||
orthophoto.post_orthophoto_steps(args, merged_bounds_file, tree.odm_orthophoto_tif)
|
||||
orthophoto.post_orthophoto_steps(args, merged_bounds_file, tree.odm_orthophoto_tif, tree.orthophoto_tiles)
|
||||
elif len(all_orthos_and_ortho_cuts) == 1:
|
||||
# Simply copy
|
||||
log.ODM_WARNING("A single orthophoto/cutline pair was found between all submodels.")
|
||||
|
|
@ -331,8 +331,12 @@ class ODMMergeStage(types.ODM_Stage):
|
|||
if args.crop > 0:
|
||||
Cropper.crop(merged_bounds_file, dem_file, dem_vars, keep_original=not args.optimize_disk_space)
|
||||
log.ODM_INFO("Created %s" % dem_file)
|
||||
|
||||
if args.tiles:
|
||||
generate_dem_tiles(dem_file, tree.path("%s_tiles" % human_name.lower()), args.max_concurrency)
|
||||
else:
|
||||
log.ODM_WARNING("Cannot merge %s, %s was not created" % (human_name, dem_file))
|
||||
|
||||
else:
|
||||
log.ODM_WARNING("Found merged %s in %s" % (human_name, dem_filename))
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue