plMapcalc

@@ -1 +1 @@

-683

+737

@@ -30,6 +30,7 @@ typedef struct {

   GDALRasterBandH band_h;

   int is_no_data;

   double no_data;

+  int shift_cols, shift_rows;

   double *buffer;

   double *iobuffer;

 } layer;

@@ -312,6 +313,34 @@ int get_band_number(const char *data) {

 	return result;

 }

+int get_shift_cols(const char *data) {

+    int l = (int)strlen(data)+2;

+    char *s = (char *)malloc(l);

+    strcpy(s,data);

+    char **toks = str_tokens(s,':');

+    char *tok = toks[2];

+    int result = 0;

+    if(tok!=NULL && *tok!='\0') 

+      result = atoi(tok);

+    free(s);

+    free(toks);

+    return result;

+}

+

+int get_shift_rows(const char *data) {

+    int l = (int)strlen(data)+2;

+    char *s = (char *)malloc(l);

+    strcpy(s,data);

+    char **toks = str_tokens(s,':');

+    char *tok = toks[3];

+    int result = 0;

+    if(tok!=NULL && *tok!='\0') 

+      result = atoi(tok);

+    free(s);

+    free(toks);

+    return result;

+}

+

 layer *open_inputs(struct arg_str *input) {

   int i;

@@ -339,6 +368,8 @@ layer *open_inputs(struct arg_str *input) {

       fname = get_file_name(input->sval[i]);

       band = get_band_number(input->sval[i]);

+      layers[i].shift_cols = get_shift_cols(input->sval[i]);

+      layers[i].shift_rows = get_shift_rows(input->sval[i]);

       layers[i].dataset_h = GDALOpenShared(fname,GA_ReadOnly);

       if(!(layers[i].dataset_h)) {

@@ -360,7 +391,7 @@ layer *open_inputs(struct arg_str *input) {

       layers[i].buffer = (double *)malloc(cols*sizeof(double));

       layers[i].iobuffer = (double *)malloc(cols*sizeof(double));

-      fprintf(stderr,"Input layer %s, band: %d", fname, band);

+      fprintf(stderr,"Input layer %s, band: %d, shift: %d,%d", fname, band, layers[i].shift_cols, layers[i].shift_rows);

       if(layers[i].is_no_data==1)

         fprintf(stderr,", no_data: %lf",layers[i].no_data);

       fprintf(stderr,"\n");

@@ -489,19 +520,62 @@ void close_outputs(layer **layers) {

   free(*layers);

   *layers = NULL;

 }

+/*

+void read_buffers(int ninputs, layer *layers, int row) {

+  int i;

+  CPLErr res;

+  for(i=0; i<ninputs; i++) {

+

+    res=GDALRasterIO(layers[i].band_h, GF_Read, 0, row, cols, 1,

+                       layers[i].buffer, cols, 1, GDT_Float64, 0, 0);

+    if(res>2) {

+      show_message(stderr, "Error in data reading!");

+      exit(1);

+    }

+  }

+}*/

 void read_buffers(int ninputs, layer *layers, int row) {

   int i;

   CPLErr res;

   for(i=0; i<ninputs; i++) {

+    double d = 0.0;

+    double *p;

+    row -= layers[i].shift_rows;

+    if(row<0 || row>=rows) {

+      if(layers[i].is_no_data) d = layers[i].no_data;

+      p = layers[i].buffer;

+      for(i=0; i<cols; i++)

+        *(p++) = d;

+    } else {

+      if(layers[i].shift_cols==0)

         res=GDALRasterIO(layers[i].band_h, GF_Read, 0, row, cols, 1,

                          layers[i].buffer, cols, 1, GDT_Float64, 0, 0);

+      else if(layers[i].shift_cols<0) {

+        res=GDALRasterIO(layers[i].band_h, GF_Read,0, row, cols+layers[i].shift_cols, 1,

+                         layers[i].buffer-layers[i].shift_cols, cols + layers[i].shift_cols, 1, 

+                         GDT_Float64, 0, 0);

+        if(layers[i].is_no_data) d = layers[i].no_data;

+        p = layers[i].buffer;

+        for(i=0; i<-layers[i].shift_cols; i++)

+          *(p++) = d;

+      } else { // >0

+        res=GDALRasterIO(layers[i].band_h, GF_Read, layers[i].shift_cols, row, cols-layers[i].shift_cols, 1,

+                         layers[i].buffer, cols - layers[i].shift_cols, 1, GDT_Float64, 0, 0);

+        if(layers[i].is_no_data) d = layers[i].no_data;

+        p = layers[i].buffer + (cols - layers[i].shift_cols);

+        for(i=0; i<layers[i].shift_cols; i++)

+          *(p++) = d;

+      }

+    }

     if(res>2) {

       show_message(stderr, "Error in data reading!");

       exit(1);

     }

+    printf("layer[%d], row%d; ",i,row);

   }

+  printf("\n");

 }

 void write_buffers(int noutputs, layer *layers, int row) {

@@ -518,8 +592,7 @@ void write_buffers(int noutputs, layer *layers, int row) {

     }

   }

 }

-

-

+/*

 void read_iobuffer(layer *l, int cols, int row) {

   CPLErr res;

   res=GDALRasterIO(l->band_h, GF_Read, 0, row, cols, 1,

@@ -528,6 +601,45 @@ void read_iobuffer(layer *l, int cols, int row) {

     show_message(stderr, "Error in data reading!");

     exit(1);

   }

+}*/

+

+void read_iobuffer(layer *l, int cols, int row) {

+

+    int i;

+    CPLErr res = 0;

+    double d = 0.0;

+    double *p;

+    row += l->shift_rows;

+    if(row<0 || row>=rows) {

+      if(l->is_no_data) d = l->no_data;

+      p = l->iobuffer;

+      for(i=0; i<cols; i++)

+        *(p++) = d;

+    } else {

+      if(l->shift_cols==0)

+        res=GDALRasterIO(l->band_h, GF_Read, 0, row, cols, 1,

+                         l->iobuffer, cols, 1, GDT_Float64, 0, 0);

+      else if(l->shift_cols<0) {

+        res=GDALRasterIO(l->band_h, GF_Read,0, row, cols+l->shift_cols, 1,

+                         l->iobuffer-l->shift_cols, cols + l->shift_cols, 1, 

+                         GDT_Float64, 0, 0);

+        if(l->is_no_data) d = l->no_data;

+        p = l->iobuffer;

+        for(i=0; i<-l->shift_cols; i++)

+          *(p++) = d;

+      } else { // >0

+        res=GDALRasterIO(l->band_h, GF_Read, l->shift_cols, row, cols-l->shift_cols, 1,

+                         l->iobuffer, cols - l->shift_cols, 1, GDT_Float64, 0, 0);

+        if(l->is_no_data) d = l->no_data;

+        p = l->iobuffer + (cols - l->shift_cols);

+        for(i=0; i<l->shift_cols; i++)

+          *(p++) = d;

+      }

+    }

+    if(res>2) {

+      show_message(stderr, "Error in data reading!");

+      exit(1);

+    }

 }

 void write_iobuffer(layer *l, int cols, int row) {

@@ -787,7 +899,7 @@ int main(int argc,char **argv) {

     struct arg_lit  *overwrite = arg_lit0("f", "force", "force to overwrite output file");

     struct arg_lit  *nan = arg_lit0(NULL, "use-nan", "force to treat NAN as a value (default: no-data)");

     struct arg_int  *threads = arg_int0("t", "threads", "<n>","number of threads");

-    struct arg_str  *input = arg_strn("i", "input", "file.tif[:band]",1,MAX_INPUTS,"input layer(s) (GeoTIFF)");

+    struct arg_str  *input = arg_strn("i", "input", "file.tif[[[:band]:shit_x]:shif_y]",1,MAX_INPUTS,"input layer(s) (GeoTIFF or any other GDAL raster format), optionally followed by the band number, horizontal shift by the specified number of cells (a negative value means a rightward shift), vertical shift by the specified number of cells (a negative value means a downward shift)");

     struct arg_str  *output = arg_strn("o", "output", "file.tif[:type[:no_data:[compression]]]",0,MAX_OUTPUTS,"output layer(s): file name, data type (Byte, Int16, UInt16, Int32, UInt32, Float32, default Float64), no_data value (default 0.0), compress (NONE, DEFLATE, DEFLATE2, DEFLATE3, LZW, LZW2, LZW3). (GeoTIFF)");

     struct arg_int  *mem = arg_int0("m", "memory", "<n>","number of memory cells to store temporary data");

     struct arg_str  *memstore = arg_str0("s", "memory-store", "<file name>","file to store memory cells (TXT)");