Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideSubmitCurrentChangesetAction.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideSubmitCurrentChangesetAction.java (revision 34353) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideSubmitCurrentChangesetAction.java (revision 34353) @@ -0,0 +1,122 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.plugins.streetside.actions; + +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.io.IOException; + +import javax.json.Json; +import javax.swing.JOptionPane; + +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.gui.Notification; +import org.openstreetmap.josm.plugins.streetside.StreetsideLayer; +import org.openstreetmap.josm.plugins.streetside.StreetsideLocationChangeset; +import org.openstreetmap.josm.plugins.streetside.gui.StreetsideChangesetDialog; +import org.openstreetmap.josm.plugins.streetside.utils.PluginState; +import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties; +import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.APIv3; +import org.openstreetmap.josm.plugins.streetside.utils.StreetsideUtils; +import org.openstreetmap.josm.plugins.streetside.utils.api.JsonLocationChangesetEncoder; +import org.openstreetmap.josm.tools.I18n; +import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.ImageProvider.ImageSizes; +import org.openstreetmap.josm.tools.Logging; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * Imports a set of picture files into JOSM. They must be in jpg or png format. + */ +public class StreetsideSubmitCurrentChangesetAction extends JosmAction { + + private static final long serialVersionUID = 4995924098228082806L; + private final StreetsideChangesetDialog changesetDialog; + + /** + * Main constructor. + * @param changesetDialog Streetside changeset dialog + */ + public StreetsideSubmitCurrentChangesetAction(StreetsideChangesetDialog changesetDialog) { + super( + I18n.tr("Submit changeset"), + new ImageProvider("dialogs", "streetside-upload").setSize(ImageSizes.DEFAULT), + I18n.tr("Submit the current changeset"), + // CHECKSTYLE.OFF: LineLength + Shortcut.registerShortcut("Submit changeset to Streetside", I18n.tr("Submit the current changeset to Streetside"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE), + // CHECKSTYLE.ON: LineLength + false, + "streetsideSubmitChangeset", + false + ); + this.changesetDialog = changesetDialog; + setEnabled(false); + } + + @Override + public void actionPerformed(ActionEvent event) { + new Thread(() -> { + changesetDialog.setUploadPending(true); + String token = StreetsideProperties.ACCESS_TOKEN.get(); + if (token != null && !token.trim().isEmpty()) { + PluginState.setSubmittingChangeset(true); + StreetsideUtils.updateHelpText(); + HttpClientBuilder builder = HttpClientBuilder.create(); + HttpPost httpPost = new HttpPost(APIv3.submitChangeset().toString()); + httpPost.addHeader("content-type", "application/json"); + httpPost.addHeader("Authorization", "Bearer " + token); + StreetsideLocationChangeset locationChangeset = StreetsideLayer.getInstance().getLocationChangeset(); + String json = JsonLocationChangesetEncoder.encodeLocationChangeset(locationChangeset).build().toString(); + Logging.info("Sending JSON to " + APIv3.submitChangeset() + "\n " + json); + try (CloseableHttpClient httpClient = builder.build()) { + httpPost.setEntity(new StringEntity(json)); + CloseableHttpResponse response = httpClient.execute(httpPost); + Logging.debug("HTTP request finished with response code " + response.getStatusLine().getStatusCode()); + if (response.getStatusLine().getStatusCode() == 201) { + final String key = Json.createReader(response.getEntity().getContent()).readObject().getString("key"); + final String state = Json.createReader(response.getEntity().getContent()).readObject().getString("state"); + I18n.marktr("rejected"); + I18n.marktr("pending"); + I18n.marktr("approved"); + final String message = I18n.tr("{0} images submitted, Changeset key: {1}, State: {2}", locationChangeset.size(), key, state); + Logging.debug(message); + new Notification(message) + .setDuration(Notification.TIME_LONG) + .setIcon("rejected".equals(state) ? JOptionPane.ERROR_MESSAGE : JOptionPane.INFORMATION_MESSAGE) + .show(); + locationChangeset.cleanChangeset(); // TODO: Remove only uploaded changes. If the user made changes while uploading the changeset, these changes would also be removed, although they weren't uploaded. Alternatively: Disallow editing while uploading. + } else { + new Notification( + I18n.tr("Changeset upload failed with {0} error ''{1} {2}''!", + response.getStatusLine().getProtocolVersion(), + response.getStatusLine().getStatusCode(), + response.getStatusLine().getReasonPhrase() + ) + ).setIcon(JOptionPane.ERROR_MESSAGE) + .setDuration(Notification.TIME_LONG) + .show(); + Logging.error("Failed response " + EntityUtils.toString(response.getEntity())); + } + } catch (IOException e) { + Logging.log(Logging.LEVEL_ERROR, "Exception while trying to submit a changeset to streetside.com", e); + new Notification( + I18n.tr("An exception occured while trying to submit a changeset. If this happens repeatedly, consider reporting a bug via the Help menu. If this message appears for the first time, simply try it again. This might have been an issue with the internet connection.") + ).setDuration(Notification.TIME_LONG) + .setIcon(JOptionPane.ERROR_MESSAGE) + .show(); + } finally { + PluginState.setSubmittingChangeset(false); + } + } else { + // TODO: currently no login for Microsoft + //PluginState.notLoggedInToStreetsideDialog(); + } + changesetDialog.setUploadPending(false); + }, "Streetside changeset upload").start(); + } +} Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideChangesetDialog.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideChangesetDialog.java (revision 34353) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideChangesetDialog.java (revision 34353) @@ -0,0 +1,144 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.plugins.streetside.gui; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.KeyEvent; +import java.util.Collections; +import java.util.Objects; + +import javax.swing.Box; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeSelectionModel; + +import org.openstreetmap.josm.gui.SideButton; +import org.openstreetmap.josm.gui.dialogs.ToggleDialog; +import org.openstreetmap.josm.plugins.streetside.StreetsideLayer; +import org.openstreetmap.josm.plugins.streetside.StreetsideLocationChangeset; +import org.openstreetmap.josm.plugins.streetside.history.StreetsideRecord; +import org.openstreetmap.josm.plugins.streetside.history.commands.StreetsideCommand; +import org.openstreetmap.josm.plugins.streetside.utils.StreetsideChangesetListener; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Shortcut; + +import org.openstreetmap.josm.plugins.streetside.actions.StreetsideSubmitCurrentChangesetAction; + +/** + * Toggle dialog that shows you the latest {@link StreetsideCommand} done and + * allows the user to revert them. + * + * @see StreetsideRecord + * @see StreetsideCommand + */ +public final class StreetsideChangesetDialog extends ToggleDialog implements StreetsideChangesetListener { + private static final long serialVersionUID = -3019715241209349372L; + private static StreetsideChangesetDialog instance; + + private final DefaultTreeModel changesetTreeModel = new DefaultTreeModel(new DefaultMutableTreeNode()); + + private final Component spacer = Box.createRigidArea(new Dimension(0, 3)); + + private final Container rootComponent = new JPanel(new BorderLayout()); + private final SideButton submitButton = new SideButton(new StreetsideSubmitCurrentChangesetAction(this)); + private final JProgressBar uploadPendingProgress = new JProgressBar(); + + /** + * Destroys the unique instance of the class. + */ + public static void destroyInstance() { + StreetsideChangesetDialog.instance = null; + } + + private StreetsideChangesetDialog() { + super( + tr("Current Streetside changeset"), + "streetside-upload", + tr("Open Streetside changeset dialog"), + Shortcut.registerShortcut( + tr("Streetside changeset"), tr("Open Streetside changeset dialog"), KeyEvent.VK_9, Shortcut.NONE + ), + 200 + ); + createLayout(rootComponent, false, Collections.singletonList(submitButton)); + + final JTree changesetTree = new JTree(changesetTreeModel); + changesetTree.expandRow(0); + changesetTree.setShowsRootHandles(true); + changesetTree.setRootVisible(false); + changesetTree.setCellRenderer(new StreetsideImageTreeCellRenderer()); + changesetTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); + + final JPanel treesPanel = new JPanel(new GridBagLayout()); + treesPanel.add(spacer, GBC.eol()); + treesPanel.add(changesetTree, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); + treesPanel.add(new JSeparator(), GBC.eol().fill(GridBagConstraints.HORIZONTAL)); + treesPanel.add(Box.createRigidArea(new Dimension(0, 0)), GBC.std().weight(0, 1)); + rootComponent.add(new JScrollPane(treesPanel), BorderLayout.CENTER); + + uploadPendingProgress.setIndeterminate(true); + uploadPendingProgress.setString(tr("Submitting changeset to server…")); + uploadPendingProgress.setStringPainted(true); + + setUploadPending(false); + } + + /** + * Returns the unique instance of the class. + * + * @return The unique instance of the class. + */ + public static synchronized StreetsideChangesetDialog getInstance() { + if (instance == null) { + instance = new StreetsideChangesetDialog(); + } + return instance; + } + + private void buildTree() { + final StreetsideLocationChangeset changeset = StreetsideLayer.getInstance().getLocationChangeset(); + submitButton.setEnabled(!changeset.isEmpty()); + DefaultMutableTreeNode changesetRoot = new DefaultMutableTreeNode(); + + changeset.parallelStream().filter(Objects::nonNull).forEach(img -> { + final DefaultMutableTreeNode node = new DefaultMutableTreeNode(img); + changesetRoot.add(node); + }); + + spacer.setVisible(changeset.isEmpty()); + + changesetTreeModel.setRoot(changesetRoot); + } + + public void setUploadPending(final boolean isUploadPending) { + if (isUploadPending) { + rootComponent.add(uploadPendingProgress, BorderLayout.SOUTH); + } else { + rootComponent.remove(uploadPendingProgress); + } + submitButton.setEnabled(!isUploadPending && StreetsideLayer.hasInstance() && !StreetsideLayer.getInstance().getLocationChangeset().isEmpty()); + rootComponent.revalidate(); + rootComponent.repaint(); + } + + @Override + public void changesetChanged() { + if (!SwingUtilities.isEventDispatchThread()) { + SwingUtilities.invokeLater(this::buildTree); + } else { + buildTree(); + } + } +}