mirror
/
OpenDroneMap-WebODM
kopia lustrzana https://github.com/OpenDroneMap/WebODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' of https://github.com/OpenDroneMap/WebODM into mapapi

pull/1496/head
Piero Toffanin 2024-05-07 09:46:57 -04:00
rodzic bf24be7b72 568e80a941
commit 9af1ee018b
2 zmienionych plików z 5 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
app/raster_utils.py
Wyświetl plik

@ -51,14 +51,13 @@ def export_raster(input, output, **opts):
output_raster = output
jpg_background = 255 # white
# KMZ is special, we just export it as PNG with EPSG:4326
# KMZ is special, we just export it as GeoTIFF
# and then call GDAL to tile/package it
kmz = export_format == "kmz"
if kmz:
export_format = "png"
epsg = 4326
export_format = "gtiff-rgb"
path_base, _ = os.path.splitext(output)
output_raster = path_base + ".png"
output_raster = path_base + ".kmz.tif"
if export_format == "jpg":
driver = "JPEG"
@ -282,4 +281,4 @@ def export_raster(input, output, **opts):
if kmz:
subprocess.check_output(["gdal_translate", "-of", "KMLSUPEROVERLAY",
"-co", "Name={}".format(name),
"-co", "FORMAT=PNG", output_raster, output])
"-co", "FORMAT=AUTO", output_raster, output])

2
app/static/app/js/components/ProjectListItem.jsx
Wyświetl plik

@ -219,7 +219,7 @@ class ProjectListItem extends React.Component {
try{
if (file.status === "error"){
if ((file.size / 1024) > this.dz.options.maxFilesize) {
if ((file.size / 1024 / 1024) > this.dz.options.maxFilesize) {
// Delete from upload queue
this.setUploadState({
totalCount: this.state.upload.totalCount - 1,