[JPP-Devel] SVN: [6553] core/trunk/src/org/openjump/core/ui/plugin/tools/generate/ RasterizePlugIn.java

[jump-pilot-svn--- via Jump-pilot-devel]

Revision: 6553
          http://sourceforge.net/p/jump-pilot/code/6553
Author:   ma15569
Date:     2020-09-28 04:28:42 +0000 (Mon, 28 Sep 2020)
Log Message:
-----------
small fix

Modified Paths:
--------------
    
core/trunk/src/org/openjump/core/ui/plugin/tools/generate/RasterizePlugIn.java

Modified: 
core/trunk/src/org/openjump/core/ui/plugin/tools/generate/RasterizePlugIn.java
===================================================================
--- 
core/trunk/src/org/openjump/core/ui/plugin/tools/generate/RasterizePlugIn.java  
    2020-09-27 20:53:57 UTC (rev 6552)
+++ 
core/trunk/src/org/openjump/core/ui/plugin/tools/generate/RasterizePlugIn.java  
    2020-09-28 04:28:42 UTC (rev 6553)
@@ -226,26 +226,36 @@
 
        Envelope envWanted, fix;
        
+       //Expand the envelope in order to recover data on last column and row
        private void getCroppedEnvelope(Layer layer) {
+                Envelope env;
                if (externalLayerCheck.isSelected()) {
-        envWanted = new Envelope();
-        final Layerable slayer = (Layerable) layerableComboBox
-                    .getSelectedItem();
-           if (slayer instanceof WFSLayer) {
-                envWanted.expandToInclude(((WFSLayer) slayer)
-                        .getFeatureCollectionWrapper().getEnvelope());
-            } else if (slayer instanceof Layer) {
-                envWanted.expandToInclude(((Layer) slayer)
-                        .getFeatureCollectionWrapper().getEnvelope());
-            } else if (slayer instanceof RasterImageLayer) {
-                envWanted.expandToInclude(((RasterImageLayer) slayer)
-                        .getWholeImageEnvelope());
-            }
-          fix = 
envWanted.intersection(layer.getFeatureCollectionWrapper().getEnvelope());
+       envWanted = new Envelope();
+      
+       final Layerable slayer = (Layerable) layerableComboBox
+                   .getSelectedItem();
+          if (slayer instanceof WFSLayer) {
+               envWanted.expandToInclude(((WFSLayer) slayer)
+                       .getFeatureCollectionWrapper().getEnvelope());
+           } else if (slayer instanceof Layer) {
+               envWanted.expandToInclude(((Layer) slayer)
+                       .getFeatureCollectionWrapper().getEnvelope());
+           } else if (slayer instanceof RasterImageLayer) {
+               envWanted.expandToInclude(((RasterImageLayer) slayer)
+                       .getWholeImageEnvelope());
+           }
+          env = 
envWanted.intersection(layer.getFeatureCollectionWrapper().getEnvelope());
+               
                }
                else { 
-                       
fix=sourceLayer.getFeatureCollectionWrapper().getEnvelope();
+                       
env=sourceLayer.getFeatureCollectionWrapper().getEnvelope();
                }
+               
+               double minX = env.getMinX();
+               double minY = env.getMinY();
+               double maxX = 
env.getMinX()+Math.round(env.getWidth())+cellValue;
+               double maxY = 
env.getMinY()+Math.round(env.getHeight())+cellValue;
+               fix = new Envelope(minX, maxX, minY, maxY);
        }
        
        
@@ -355,7 +365,7 @@
                } catch (RuntimeException e1) {
                }
                context.getLayerManager().addLayerable(category, ril);
-               ril.setName(selAttribute);
+             //  ril.setName(selAttribute);
            }
    
     



_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel