diff --git a/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIController.java b/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIController.java index 21d2492b940d4aeef195d86469e67c111c3a1a58..a2cc0e620d611d6738931497cdf69482799fd997 100644 --- a/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIController.java +++ b/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIController.java @@ -15,6 +15,8 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URL; +import java.nio.file.Files; +import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -38,10 +40,25 @@ public class HeatMapTestiGUIController implements Initializable { private Button nappi; @FXML - void handleLisaa(ActionEvent event) { + private void handleLisaa(ActionEvent event) { lisaaKoordinaatti(event); } + @FXML private void handleNollaa(){ + nollaaKartta(); + } + + private void nollaaKartta() { + File kopio = new File(System.getProperty("user.dir")+"/src/media/Kartta_backup.png"); + File vanha = new File(System.getProperty("user.dir")+"/src/media/UusiKarttakopio.png"); + try { + Files.copy(kopio.toPath(), vanha.toPath(), StandardCopyOption.REPLACE_EXISTING); + Dialogs.showMessageDialog("Kartan nollaus onnistui!"); + } catch (IOException e) { + Dialogs.showMessageDialog("Virhe nollauksessa: " + e.getMessage()); + } + } + private void lisaaKoordinaatti(ActionEvent event) { TextInputDialog dialog = new TextInputDialog(""); dialog.setHeaderText(null); @@ -58,7 +75,8 @@ public class HeatMapTestiGUIController implements Initializable { return; } System.out.println(answer); - String paikka = answer.replace(' ', '+'); + String paikka = answer.toLowerCase().replace(' ', '+').replace('ä','a').replace('ö','o'); + System.out.println(paikka); String urlJono = "https://nominatim.openstreetmap.org/search?q=" +paikka +"+Suomi" +"&format=json"; URI uri = new URI(urlJono); URL url = uri.toURL(); @@ -106,6 +124,8 @@ public class HeatMapTestiGUIController implements Initializable { } + + private boolean piirraKuvaan(int x, int y) { try{ kuva.setImage(null); diff --git a/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIView.fxml b/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIView.fxml index ea5bd4f0d5ff3871a0f755d3db25a2765dca9e13..cad002df979124546c725910e31dfcfec03d70e5 100644 --- a/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIView.fxml +++ b/Ohj2HT/src/fxHeatMapTesti/HeatMapTestiGUIView.fxml @@ -1,20 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import javafx.geometry.Insets?> <?import javafx.scene.control.Button?> +<?import javafx.scene.control.Menu?> +<?import javafx.scene.control.MenuBar?> <?import javafx.scene.image.ImageView?> <?import javafx.scene.layout.BorderPane?> - -<BorderPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/23.0.1" fx:controller="fxHeatMapTesti.HeatMapTestiGUIController"> +<BorderPane xmlns="http://javafx.com/javafx/23.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fxHeatMapTesti.HeatMapTestiGUIController"> <center> <ImageView fx:id="kuva" fitHeight="234.0" fitWidth="360.0" pickOnBounds="true" preserveRatio="true" BorderPane.alignment="CENTER" /> </center> <top> - <Button fx:id="nappi" mnemonicParsing="false" onAction="#handleLisaa" text="Button" BorderPane.alignment="CENTER"> - <BorderPane.margin> - <Insets right="275.0" top="5.0" /> - </BorderPane.margin> - </Button> + <MenuBar BorderPane.alignment="CENTER"> + <menus> + <Menu mnemonicParsing="false"> + <graphic> + <Button fx:id="nappi" mnemonicParsing="false" onAction="#handleLisaa" text="Lisää" /> + </graphic> + </Menu> + <Menu mnemonicParsing="false"> + <graphic> + <Button mnemonicParsing="false" onAction="#handleNollaa" text="Nollaa" /> + </graphic> + </Menu> + </menus> + </MenuBar> </top> </BorderPane> diff --git "a/Ohj2HT/src/media/UusiKartta \342\200\223 kopio (3).png" b/Ohj2HT/src/media/Kartta_backup.png similarity index 100% rename from "Ohj2HT/src/media/UusiKartta \342\200\223 kopio (3).png" rename to Ohj2HT/src/media/Kartta_backup.png diff --git a/Ohj2HT/src/media/UusiKarttakopio.png b/Ohj2HT/src/media/UusiKarttakopio.png index ed43d630948859ef96cd204c566b60187c07d46a..86a004114e0f22a2c72b11c182b87a2e07067475 100644 Binary files a/Ohj2HT/src/media/UusiKarttakopio.png and b/Ohj2HT/src/media/UusiKarttakopio.png differ