Merge pull request #334 from jmmluna/master

Versión 1.5

CHANGELOG.md

@@ -8,6 +8,13 @@ You can see the previous changelog [here] (http://www.geowe.org/index.php?id=cha
 - Improve performance
 - More tools
 
+## [1.5]Beta - 2017-02-24
+### Added
+- Preview and print tool
+
+### Fixed
+- issue [#333](https://github.com/geowe/geowe-core/issues/333)
+
 ## [1.4.18]Beta - 2017-02-23
 ### Added
 - Enhanced layer data editing dialog, including paging and tools

pom.xml

@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.geowe</groupId>
 	<artifactId>geowe</artifactId>
-	<version>1.4.18</version>
+	<version>1.5</version>
 	<packaging>war</packaging>
 	<properties>
 		<errai.dev.context>${project.artifactId}</errai.dev.context>

src/main/java/org/geowe/client/local/ImageProvider.java

@@ -375,4 +375,8 @@ public interface ImageProvider extends ClientBundle {
 
 	@Source("images/geowe_cuadrado.png")
 	ImageResource geoweSquareLogo();
+
+	@Source("images/ic_print-24.png")
+	ImageResource printLogo();
+
 }

src/main/java/org/geowe/client/local/initializer/EventListenerInitializer.java

@@ -26,6 +26,7 @@
 
 import org.geowe.client.local.layermanager.LayerManagerWidget;
 import org.geowe.client.local.layermanager.tool.export.ExportDataTool;
+import org.geowe.client.local.main.PreviewWidget;
 import org.geowe.client.local.main.StatusPanelWidget;
 import org.geowe.client.local.main.map.GeoMap;
 import org.geowe.client.local.main.tool.edition.CopyElementTool;
@@ -100,6 +101,9 @@ public class EventListenerInitializer {
 	private ExportLayerTool exportLayerTool;
 	@Inject
 	private SaveProjectTool saveProjectTool;
+	@Inject
+	private PreviewWidget previewWidget;
+
 
 	public void initialize() {
 
@@ -138,6 +142,8 @@ private void addChangelayerListener() {
 		layerManagerWidget.addChangeLayerListener(saveLayerTool);
 		layerManagerWidget.addChangeLayerListener(exportLayerTool);
 		layerManagerWidget.addChangeLayerListener(saveProjectTool);		
+		layerManagerWidget.addChangeLayerListener(previewWidget);
+
 	}
 
 	private void addChangeSelectedWMSLayerListener() {
@@ -148,9 +154,11 @@ private void addRemoveLayerListener() {
 		layerManagerWidget.addRemoveLayerListener(stateBarWidget);
 		layerManagerWidget.addRemoveLayerListener(layerInfoDialog);
 		layerManagerWidget.addRemoveLayerListener(rasterInfoDialog);
+		layerManagerWidget.addRemoveLayerListener(previewWidget);
 	}
 
 	private void addAddLayerListener() {
 		layerManagerWidget.addAddLayerListener(stateBarWidget);
+		layerManagerWidget.addAddLayerListener(previewWidget);
 	}
 }

src/main/java/org/geowe/client/local/initializer/WidgetInitializer.java

@@ -22,18 +22,19 @@
  */
 package org.geowe.client.local.initializer;
 
-import javax.enterprise.context.ApplicationScoped;
-
-import org.geowe.client.local.layermanager.LayerManagerWidget;
-import org.geowe.client.local.layermanager.LayerTree;
-import org.geowe.client.local.main.BasicToolBar;
-import org.geowe.client.local.main.GeocodingPanelWidget;
-import org.geowe.client.local.main.MenuPanelWidget;
-import org.geowe.client.local.main.StatusPanelWidget;
-import org.geowe.client.local.style.VectorLayerStyleWidget;
-import org.jboss.errai.ioc.client.api.builtin.RootPanelProvider;
-
-import com.google.inject.Inject;
+import javax.enterprise.context.ApplicationScoped;
+
+import org.geowe.client.local.layermanager.LayerManagerWidget;
+import org.geowe.client.local.layermanager.LayerTree;
+import org.geowe.client.local.main.BasicToolBar;
+import org.geowe.client.local.main.GeocodingPanelWidget;
+import org.geowe.client.local.main.MenuPanelWidget;
+import org.geowe.client.local.main.PreviewWidget;
+import org.geowe.client.local.main.StatusPanelWidget;
+import org.geowe.client.local.style.VectorLayerStyleWidget;
+import org.jboss.errai.ioc.client.api.builtin.RootPanelProvider;
+
+import com.google.inject.Inject;
 @ApplicationScoped
 public class WidgetInitializer {
 
@@ -50,7 +51,10 @@ public class WidgetInitializer {
 	private VectorLayerStyleWidget vectorLayerStyleWidget;
 
 	@Inject 
-	private StatusPanelWidget statusPanelWidget;
+	private StatusPanelWidget statusPanelWidget;
+
+	@Inject 
+	private PreviewWidget previewWidget;
 
 	@Inject 
 	private BasicToolBar basicToolBar;	
@@ -64,13 +68,17 @@ public void initialize(){
 		rootPanelProvider.get().add(vectorLayerStyleWidget);
 		rootPanelProvider.get().add(basicToolBar);
 		rootPanelProvider.get().add(geocodingPanelWidget);
-		rootPanelProvider.get().add(statusPanelWidget);
+		rootPanelProvider.get().add(statusPanelWidget);
+		//rootPanelProvider.get().add(previewWidget);
+
 
 		iniLayerTree(LayerManagerWidget.RASTER_TAB);
 		iniLayerTree(LayerManagerWidget.VECTOR_TAB);
 
 		layerManagerWidget.updateStatusBar();		
 		statusPanelWidget.setVectorLayers(layerManagerWidget.
+				getLayerTree(LayerManagerWidget.VECTOR_TAB).getLayers());
+		previewWidget.setVectorLayers(layerManagerWidget.
 				getLayerTree(LayerManagerWidget.VECTOR_TAB).getLayers());
 	}
 

src/main/java/org/geowe/client/local/layermanager/tool/export/ExportDataDialog.java

@@ -49,6 +49,7 @@ public class ExportDataDialog extends Dialog {
 
 	private TextButton downloadFileButton;
 	private TextButton gitHubButton;
+
 	private VectorFormatComboBox vectorFormatCombo;
 	private ProjectionComboBox epsgCombo;
 
@@ -78,8 +79,8 @@ public void setVectorLayer(VectorLayer vectorLayer) {
 		setHeadingText(UIMessages.INSTANCE
 				.exportDataToolDialogTitle(vectorLayer.getName()));
 		epsgCombo.setValue(vectorLayer.getProjection().getProjectionCode());
-	}
-
+	}	
+	
 	public TextButton getDownloadFileButton() {
 		return downloadFileButton;
 	}
@@ -104,7 +105,8 @@ private Widget createPanel() {
 		vectorFormatCombo.addSelectionHandler(getVectorComboSelectionHandler());
 		vectorFormatCombo.setValue(VectorFormat.GEO_JSON_FORMAT);
 		epsgCombo = new ProjectionComboBox(comboWidth);
-
+
+
 		downloadFileButton = new TextButton(
 				UIMessages.INSTANCE.downloadfileText());
 		downloadFileButton.setIcon(ImageProvider.INSTANCE.download32());
@@ -125,6 +127,7 @@ private Widget createPanel() {
 		vPanel.add(epsgCombo);
 
 		horizontalGroup.add(vPanel);
+
 		horizontalGroup.add(downloadFileButton);
 		horizontalGroup.add(gitHubButton);
 

src/main/java/org/geowe/client/local/layermanager/tool/export/ExportDataTool.java

@@ -42,6 +42,7 @@
 import org.geowe.client.local.layermanager.tool.export.exporter.GitHubCreateFileExporter;
 import org.geowe.client.local.layermanager.tool.export.exporter.GitHubUpdateFileExporter;
 import org.geowe.client.local.main.map.GeoMap;
+import org.geowe.client.local.main.tool.project.URLProjectLoader;
 import org.geowe.client.local.messages.UIMessages;
 import org.geowe.client.local.model.vector.FeatureSchema;
 import org.geowe.client.local.model.vector.VectorLayer;
@@ -59,9 +60,14 @@
 import org.jboss.errai.common.client.api.tasks.ClientTaskManager;
 import org.slf4j.Logger;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.user.client.ui.Frame;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.sencha.gxt.widget.core.client.Dialog;
 import com.sencha.gxt.widget.core.client.Dialog.PredefinedButton;
 import com.sencha.gxt.widget.core.client.box.ConfirmMessageBox;
+import com.sencha.gxt.widget.core.client.button.TextButton;
 import com.sencha.gxt.widget.core.client.event.SelectEvent;
 import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
 import com.sencha.gxt.widget.core.client.form.TextField;
@@ -96,18 +102,21 @@ public class ExportDataTool extends LayerTool implements
 	private GitHubRepositoryListDialog repositoryListDialog;
 	private Exporter exporter;
 	private FileParameter fileParameter;
+	private static final String URL_BASE = GWT.getHostPageBaseURL()+ "gwtOpenLayersProxy?targetURL=";
 
 	@Inject
 	public ExportDataTool(LayerManagerWidget layerTreeWidget, GeoMap geoMap) {
 		super(layerTreeWidget, geoMap);
 	}
-
+
+
 	@PostConstruct
 	private void configureDownloadButton() {
+
 		exportDataDialog.getDownloadFileButton().addSelectHandler(
 				new SelectHandler() {
 					@Override
-					public void onSelect(SelectEvent event) {						
+					public void onSelect(SelectEvent event) {
 						exporter = new FileExporter();
 						fileParameter = new FileParameter();
 						fileParameter.setFileName(getFileName());
@@ -116,8 +125,10 @@ public void onSelect(SelectEvent event) {
 						if (isSelectedFeatures()) {
 							confirmDownloadSelected();
 						} else {
-
-							fileParameter.setContent(getContent(exportDataDialog.getVectorLayer()));							
+
+							fileParameter
+									.setContent(getContent(exportDataDialog
+											.getVectorLayer()));
 							export();
 						}
 					}
@@ -262,7 +273,7 @@ private boolean isLayerToExportValid(Layer layer) {
 	private boolean isSelectedFeatures() {
 		boolean isSelected = false;
 		final VectorLayer selectedLayer = exportDataDialog.getVectorLayer();
-		
+
 		if (isLayerToExportValid(selectedLayer)) {
 
 			final VectorFeature[] selectedFeatures = selectedLayer
@@ -303,7 +314,7 @@ private GitHubParameter getGitHubParameter() {
 	private String getFileName() {
 
 		final VectorLayer selectedLayer = exportDataDialog.getVectorLayer();
-				
+
 		return selectedLayer.getName();
 	}
 
@@ -334,19 +345,19 @@ private String getContent(VectorLayer selectedLayer) {
 		} else if (vectorFormat.getId() == VectorFormat.CSV_FORMAT.getId()) {
 			content = new CSV(exportDataDialog.getSelectedEpsg())
 					.write(selectedLayer);
-		}
-		else if (vectorFormat.getId() == VectorFormat.GEOJSON_CSS_FORMAT.getId()) {
+		} else if (vectorFormat.getId() == VectorFormat.GEOJSON_CSS_FORMAT
+				.getId()) {
 			format = new GeoJSONCSS();
-			((GeoJSONCSS)format).setLayer(selectedLayer);					
-		} 
+			((GeoJSONCSS) format).setLayer(selectedLayer);
+		}
 
 		if (content.isEmpty()) {
-			content = format.write(getTransformedFeatures(selectedLayer));
+			content = format.write(getTransformedFeatures(selectedLayer, exportDataDialog.getSelectedEpsg()));
 		}
 
 		return content;
 	}
-	
+
 	private VectorLayer getLayerWithSelectedFeature() {
 		final VectorLayer selectedLayer = exportDataDialog.getVectorLayer();
 		final FeatureSchema schema = selectedLayer.getSchema();
@@ -380,22 +391,22 @@ public void onSelect(SelectEvent event) {
 				new SelectHandler() {
 					@Override
 					public void onSelect(SelectEvent event) {
-						fileParameter
-								.setContent(getContent(exportDataDialog.getVectorLayer()));
+						fileParameter.setContent(getContent(exportDataDialog
+								.getVectorLayer()));
 						export();
 					}
 				});
 		messageBox.show();
 	}
 
-	private VectorFeature[] getTransformedFeatures(Vector layer) {
+	public VectorFeature[] getTransformedFeatures(Vector layer, String epsg) {
 		List<VectorFeature> transformedFeatures = new ArrayList<VectorFeature>();
 		if (layer.getFeatures() != null) {
 			for (VectorFeature feature : layer.getFeatures()) {
 				VectorFeature featureToExport = feature.clone();
 				featureToExport.getGeometry().transform(
 						new Projection(geoMap.getMap().getProjection()),
-						new Projection(exportDataDialog.getSelectedEpsg()));
+						new Projection(epsg));
 				transformedFeatures.add(featureToExport);
 			}
 		}

src/main/java/org/geowe/client/local/main/AnchorBuilder.java

@@ -190,5 +190,5 @@ public Widget getTwiterLink() {
 				.setImage(new Image(ImageProvider.INSTANCE.twiter()))
 				.setTitle("Twiter").setBottomBorderOnMouseOver(true).build();
 	}
-
+	
 }

src/main/java/org/geowe/client/local/main/LinksWidget.java

@@ -55,13 +55,18 @@ public class LinksWidget implements IsWidget {
 
 	@Inject
 	private StatusPanelWidget statusPanelWidget;
+
+	@Inject
+	private PreviewWidget previewWidget;
+
 	@Inject
 	private LayerManagerWidget layerManager;
 
 	@Override
 	public Widget asWidget() {
 		if (widget == null) {
-			String width="320px";
+			//String width="320px";
+			String width="370px";
 			String height="50px";
 			widget = new HorizontalLayoutContainer();
 			widget.getElement().getStyle().setPosition(Position.ABSOLUTE);
@@ -89,6 +94,7 @@ public Widget asWidget() {
 	private void setDefaultLinks() {
 		AnchorBuilder abuilder = new AnchorBuilder();
 
+		hp.add(createPreviewDialogAnchor());
 		hp.add(abuilder.getGeoWEWebLink());
 		hp.add(abuilder.getGooglePlusLink());
 		hp.add(abuilder.getFaceBookLink());
@@ -105,7 +111,23 @@ public void addLink(Anchor anchor){
 	public void removeAllLinks(){
 		hp.clear();
 	}
+
+
 
+	private TextButton createPreviewDialogAnchor() {
+		TextButton showButton = new TextButton();
+		showButton.setIcon(ImageProvider.INSTANCE.printLogo());
+		showButton.setTitle("Preview");
+		showButton.addSelectHandler(new SelectHandler() {
+			@Override
+			public void onSelect(SelectEvent event) {
+				showHidePreviewDialog();
+			}
+		});
+
+		return showButton;
+	}
+
 	private TextButton createStatusPanelAnchor() {
 		TextButton showButton = new TextButton();
 		showButton.setIcon(ImageProvider.INSTANCE.info24());
@@ -144,4 +166,8 @@ public void onSelect(SelectEvent event) {
 	private void showHideStatusBar() {
 		statusPanelWidget.showHideStatusBar();
 	}
+
+	private void showHidePreviewDialog() {
+		previewWidget.showHidePreview();
+	}
 }