Ver Fonte

Ortofoto täiendused.

Ardo Kubjas há 3 anos atrás
pai
commit
e27f399478
4 ficheiros alterados com 92 adições e 57 exclusões
  1. 1 1
      DESCRIPTION
  2. 4 4
      R/LOEMIND.R
  3. 86 51
      R/maaamet_ortofotod.R
  4. 1 1
      man/LOEMIND.Rd

+ 1 - 1
DESCRIPTION

@@ -11,5 +11,5 @@ License: GPL (>= 3)
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.1.9000
+RoxygenNote: 7.2.0
 Imports: ruut, DBI, pool, RPostgreSQL, sf, raster, stars, rgdal, tidyverse, inborutils, rvest, seleniumPipes, rjson, methods, utils, jsonlite, urltools, magrittr, stringr, xml2, purrr, readr, rgeos, sp, dplyr, rlang

+ 4 - 4
R/LOEMIND.R

@@ -1,6 +1,6 @@
 #' LOE MIND
 #'
-#' Siia olen kokku kogunud teadmised 'qgis_process' k\u00e0su juurde, mida ei tohi unustada ja mille uuesti leidmine võtaks liiga palju aega.
+#' Siia olen kokku kogunud teadmised 'qgis_process' kasu juurde, mida ei tohi unustada ja mille uuesti leidmine võtaks liiga palju aega.
 #' @return LOEMIND.
 #' @export
 #' @examples
@@ -10,7 +10,7 @@
 #'
 #' }
 LOEMIND <- function() {
-  cat("\n1. Pluginate nimekiri, mida saab k\u00e0suliinilt k\u00e0ivitada.\n")
+  cat("\n1. Pluginate nimekiri, mida saab kasuliinilt kaivitada.\n")
   cmd <- "qgis_process plugins"
   cat(sprintf("    Command: %s\n", cmd))
   system(cmd)
@@ -28,9 +28,9 @@ LOEMIND <- function() {
   cat(sprintf("    Command: %s\n", cmd))
   system(cmd)
 
-  cat(sprintf("\n4. !!!!!!!!!!!! Juhul kui plugin on instaleeritud, kuid k\u00e0sk qgis_process run...' annab teate, et algoritm ei ole leitav ja samuti ei ole plugin pluginate nimekirjas ega algoritma algorimide nimekirjas, siis tuleb lisatud plugina kataloogis olevasse faili metadata.txt (https://docs.qgis.org/testing/en/docs/pyqgis_developer_cookbook/plugins/plugins.html#plugin-metadata-table + otsing \"qgis_process is not showing algorithm providers installed via a python plugin\") lisada j\u00e0rgmine rida:\n\n          hasProcessingProvider=yes\n\n!!!!!!!!!!!!\n"))
+  cat(sprintf("\n4. !!!!!!!!!!!! Juhul kui plugin on instaleeritud, kuid kask qgis_process run...' annab teate, et algoritm ei ole leitav ja samuti ei ole plugin pluginate nimekirjas ega algoritma algorimide nimekirjas, siis tuleb lisatud plugina kataloogis olevasse faili metadata.txt (https://docs.qgis.org/testing/en/docs/pyqgis_developer_cookbook/plugins/plugins.html#plugin-metadata-table + otsing \"qgis_process is not showing algorithm providers installed via a python plugin\") lisada jargmine rida:\n\n          hasProcessingProvider=yes\n\n!!!!!!!!!!!!\n"))
 
-  cat("\n5. K\u00e0su 'qgis_process' help.\n")
+  cat("\n5. Kasu 'qgis_process' help.\n")
   cmd <- "qgis_process"
   cat(sprintf("    Command: %s\n", cmd))
   system(cmd)

+ 86 - 51
R/maaamet_ortofotod.R

@@ -15,56 +15,91 @@
 #' conf <- ruut::get_config()
 #' maaamet_ortofotod(epk10t = 54711, dir = "~/ortofotod", conf = conf)
 #' }
-maaamet_ortofotod <- function(epk10t = NULL, dir = "~/ortofotod", conf = NULL) {
-  # epk10t <- 54711; epk10t <- 65813
-  # epk10t numbri õigsuse kontroll
-  epk10t_all <- utils::read.csv(file = system.file("csv", "epk10t.csv", package = "estmap"), header = T)[, "nr"]
-  if (!epk10t %in% epk10t_all) {
-    cat(sprintf("\n---------------\n\nValitud epk10t ruudu number %s ei ole \u00F5ige.\n", epk10t))
-    return()
-  }
-  # GEOTIFF fotode salvestamise kataloog.
-  if (!dir.exists(dir)) dir.create(dir, recursive = T)
+maaamet_ortofotod <-
+  function(epk10t = NULL,
+           dir = "~/ortofotod",
+           conf = NULL) {
+    # epk10t <- 54711; epk10t <- 65813
+    # epk10t numbri õigsuse kontroll
+    epk10t_all <-
+      utils::read.csv(file = system.file("csv", "epk10t.csv", package = "estmap"),
+                      header = T)[, "nr"]
+    if (!epk10t %in% epk10t_all) {
+      cat(
+        sprintf(
+          "\n---------------\n\nValitud epk10t ruudu number %s ei ole \u00F5ige.\n",
+          epk10t
+        )
+      )
+      return()
+    }
+    # GEOTIFF fotode salvestamise kataloog.
+    if (!dir.exists(dir))
+      dir.create(dir, recursive = T)
 
-  ## Geotiff failide allalaadimine
-  # Näidis lehelt mille kaudu saab geotiff faile alla laadida.
-  url_demo <- paste0(
-    "https://geoportaal.maaamet.ee/index.php?",
-    "lang_id=1&plugin_act=otsing&page_id=610&=&",
-    "kaardiruut=62294&andmetyyp=ortofoto_eesti_rgb&_=1612349208090"
-  )
-  url_source <- urltools::url_decode(url_demo)
-  params <- urltools::param_get(urls = url_source) # get params
-  parsed_address <- urltools::url_parse(url_source)
-  # Kui geotiff fail on olemas, siis me seda enam ei alla ei lae.
-  if (length(list.files(path = dir, pattern = as.character(epk10t))) > 0) {
-    cat(sprintf("\nFail %s on juba olemas.\n", epk10t))
-    return()
-  }
-  url_new <- urltools::param_set(url_source, key = "kaardiruut", value = epk10t)
-  ## Allalaadimine
-  html_file <- readLines(url_new)
-  page <- xml2::read_html(html_file[1])
-  website <- ""
-  website <- page %>%
-    rvest::html_nodes("li a") %>%
-    rvest::html_attr("href")
-  parsed_address$parameter <- stringr::str_split(website[1], "[?]")[[1]][2]
-  geotiff_download_url <- urltools::url_compose(parsed_urls = parsed_address)
-  save_to_file <- sprintf("%s/%s.zip", dir, epk10t)
-  utils::download.file(url = geotiff_download_url, method = "curl", extra = "-L", destfile = save_to_file)
-  # zip failide lahtpakkimine
-  cmd <- sprintf("unzip %s -d %s/; mv %s /tmp", save_to_file, dir, save_to_file)
-  system(cmd)
-  cmd <- sprintf("mv %s/*.tab /tmp", dir)
-  system(cmd)
-  cmd <- sprintf("mv %s/*.tfw /tmp", dir)
-  system(cmd)
-  ls <- list.files(path = dir, pattern = sprintf("%s.tif", epk10t))
-  if (length(ls) > 0) {
-    cat(sprintf("\n---------------\n\nValitud epk10t ruudu number %s eba\u00F5nnestus.\n", epk10t))
-  } else {
-    cat(sprintf("\n---------------\n\nValitud epk10t ruudu number %s \u00F5nnestus.\n", epk10t))
+    ## Geotiff failide allalaadimine
+    # Näidis lehelt mille kaudu saab geotiff faile alla laadida.
+    url_demo <- paste0(
+      "https://geoportaal.maaamet.ee/index.php?",
+      "lang_id=1&plugin_act=otsing&page_id=610&=&",
+      "kaardiruut=62294&andmetyyp=ortofoto_eesti_rgb&_=1612349208090"
+    )
+    url_source <- urltools::url_decode(url_demo)
+    params <- urltools::param_get(urls = url_source) # get params
+    parsed_address <- urltools::url_parse(url_source)
+    # Kui geotiff fail on olemas, siis me seda enam ei alla ei lae.
+    if (length(list.files(path = dir, pattern = as.character(epk10t))) > 0) {
+      cat(sprintf("\nFail %s on juba olemas.\n", epk10t))
+      return(TRUE)
+    }
+    url_new <-
+      urltools::param_set(url_source, key = "kaardiruut", value = epk10t)
+    ## Allalaadimine
+    html_file <- readLines(url_new)
+    page <- xml2::read_html(html_file[1])
+    website <- ""
+    website <- page %>%
+      rvest::html_nodes("li a") %>%
+      rvest::html_attr("href")
+    if (length(website) == 0) {
+      return(NULL)
+    }
+    parsed_address$parameter <-
+      stringr::str_split(website[1], "[?]")[[1]][2]
+    geotiff_download_url <-
+      urltools::url_compose(parsed_urls = parsed_address)
+    save_to_file <- sprintf("%s/%s.zip", dir, epk10t)
+    utils::download.file(
+      url = geotiff_download_url,
+      method = "curl",
+      extra = "-L",
+      destfile = save_to_file
+    )
+    # zip failide lahtpakkimine
+    cmd <-
+      sprintf("unzip %s -d %s/; mv %s /tmp", save_to_file, dir, save_to_file)
+    system(cmd)
+    cmd <- sprintf("mv %s/*.tab /tmp", dir)
+    system(cmd)
+    cmd <- sprintf("mv %s/*.tfw /tmp", dir)
+    system(cmd)
+    ls <-
+      list.files(path = dir, pattern = sprintf("%s.tif", epk10t))
+    if (length(ls) > 0) {
+      cat(
+        sprintf(
+          "\n---------------\n\nValitud epk10t ruudu number %s eba\u00F5nnestus.\n",
+          epk10t
+        )
+      )
+      return (NULL)
+    } else {
+      cat(
+        sprintf(
+          "\n---------------\n\nValitud epk10t ruudu number %s \u00F5nnestus.\n",
+          epk10t
+        )
+      )
+      return(geotiff_download_url)
+    }
   }
-  return(geotiff_download_url)
-}

+ 1 - 1
man/LOEMIND.Rd

@@ -10,7 +10,7 @@ LOEMIND()
 LOEMIND.
 }
 \description{
-Siia olen kokku kogunud teadmised 'qgis_process' käsu juurde, mida ei tohi unustada ja mille uuesti leidmine võtaks liiga palju aega.
+Siia olen kokku kogunud teadmised 'qgis_process' kasu juurde, mida ei tohi unustada ja mille uuesti leidmine võtaks liiga palju aega.
 }
 \examples{
 \dontrun{