diff --git a/Ports/JavaSE/src/com/codename1/impl/javase/LocationSimulation.java b/Ports/JavaSE/src/com/codename1/impl/javase/LocationSimulation.java index cc11d81ecc..acd3f3170b 100644 --- a/Ports/JavaSE/src/com/codename1/impl/javase/LocationSimulation.java +++ b/Ports/JavaSE/src/com/codename1/impl/javase/LocationSimulation.java @@ -23,15 +23,34 @@ package com.codename1.impl.javase; import com.codename1.location.Location; +import java.awt.BorderLayout; +import java.util.HashMap; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; import java.util.prefs.Preferences; +import javafx.application.Platform; +import javafx.beans.value.ChangeListener; +import javafx.beans.value.ObservableValue; +import javafx.concurrent.Worker; +import javafx.embed.swing.JFXPanel; +import javafx.scene.Scene; +import javafx.scene.layout.StackPane; +import javafx.scene.web.WebEngine; +import javafx.scene.web.WebView; + +import javax.swing.*; /** * * @author Chen */ -public class LocationSimulation extends javax.swing.JFrame { +public class LocationSimulation extends JFrame { - //private WebView webView; + private WebView webView; + private WebEngine webEngine; + private Timer timer; + private boolean isTextFieldFocused = false; private double iLastLat = 0.1; private double iLastLon = 0.1; public static final int E_MeasUnit_Default = -1; @@ -43,7 +62,6 @@ public class LocationSimulation extends javax.swing.JFrame { private static final String[] E_MeasUnitKmString = {"km", "mi", "nm"}; private static final double[] E_MeasUnitPerKm = {1, 1 / 1.609344, 1 / 1.8520}; private static final String[] E_MeasUnitMString = {"m", "yd", "yd"}; - private static int zoom; /** * single symbol for m/s and yd/s from symbol font set */ @@ -64,170 +82,198 @@ public LocationSimulation() { initComponents(); pack(); setLocationByPlatform(true); - //setVisible(true); + setVisible(true); Preferences p = Preferences.userNodeForPackage(com.codename1.ui.Component.class); int startingZoom = p.getInt("lastZoom", 9); final String htmlPage = "\n" + "\n" + " \n" - + " " - + " \n" - + " \n" - //+ " " - + " \n" - + " \n" - + " \n" - + " \n" - + "
\n" - + " " + + " \n" + ""; - //final javafx.embed.swing.JFXPanel webContainer = new javafx.embed.swing.JFXPanel(); - //mapPanel.setLayout(new BorderLayout()); - //mapPanel.add(BorderLayout.CENTER, webContainer); - /*Platform.runLater(new Runnable() { - private boolean firstRun; + final JFXPanel webContainer = new JFXPanel(); + mapPanel.setLayout(new BorderLayout()); + mapPanel.add(BorderLayout.CENTER, webContainer); + Platform.runLater(new Runnable() { @Override public void run() { StackPane root = new StackPane(); - webView = new WebView(); + webEngine = webView.getEngine(); root.getChildren().add(webView); webContainer.setScene(new Scene(root)); - webView.getEngine().loadContent(htmlPage, "text/html"); - //revalidate(); - firstRun = true; - Timer t = new Timer(); - t.schedule(new TimerTask() { + // Load the HTML content + webEngine.loadContent(htmlPage, "text/html"); + + // Add a listener for the load state + webEngine.getLoadWorker().stateProperty().addListener(new ChangeListener() { @Override - public void run() { - - Platform.runLater(new Runnable() { - - public void run() { - try { - if (webView != null) { - webView.getEngine().executeScript("document.updateJavaFX()"); - JSObject jdoc = (JSObject) webView.getEngine().getDocument(); - if (jdoc != null) { - try { - if (firstRun) { - updateSave(null); - firstRun = false; - return; - } - JSObject ds = (JSObject) jdoc.getMember("currentCenter"); - String cc = ds.toString().trim(); - cc = cc.substring(1, cc.length() - 1); - String[] ccs = cc.split(","); - double newlat = Double.parseDouble(ccs[0].trim()); - double newlon = Double.parseDouble(ccs[1].trim()); - - int zoom = (int)jdoc.getMember("currentZoom"); - - Preferences p = Preferences.userNodeForPackage(com.codename1.ui.Component.class); - p.putInt("lastZoom", zoom); - if (Math.abs(newlat - iLastLat) + Math.abs(newlon - iLastLon) > 0.000001) { - iLastLat = newlat; - iLastLon = newlon; - p.putDouble("lastGoodLat", newlat); - p.putDouble("lastGoodLon", newlon); - - latitude.setText("" + newlat); - longitude.setText("" + newlon); + public void changed(ObservableValue obs, + Worker.State oldState, + Worker.State newState) { + if (newState == javafx.concurrent.Worker.State.SUCCEEDED) { + // Script is fully loaded, you can now call moveToLocation + timer = new Timer(); + timer.scheduleAtFixedRate(new TimerTask() { + @Override + public void run() { + if (!isTextFieldFocused) { + Platform.runLater(new Runnable() { + @Override + public void run() { + try { + Object result = webEngine.executeScript("document.updateJavaFX()"); + + if (result != null) { + // Parse the coordinates more safely + String jsonStr = result.toString(); + // Remove the curly braces and quotes + jsonStr = jsonStr.replaceAll("[{}\"]", ""); + + // Create a map to store our values + Map values = new HashMap<>(); + + // Split by comma and process each key-value pair + for (String pair : jsonStr.split(",")) { + try { + String[] keyValue = pair.trim().split(":"); + if (keyValue.length == 2) { // Make sure we have both key and value + String key = keyValue[0].trim(); + double value = Double.parseDouble(keyValue[1].trim()); + values.put(key, value); + } + } catch (Exception e) { + // Skip this pair if there's an error + continue; + } + } + + // Only update if we have both latitude and longitude + if (values.containsKey("lat") && values.containsKey("lng")) { + double newLat = values.get("lat"); + double newLon = values.get("lng"); + int zoom = values.getOrDefault("zoom", 13.0).intValue(); + + // Update preferences + Preferences prefs = Preferences.userNodeForPackage(com.codename1.ui.Component.class); + prefs.putInt("lastZoom", zoom); + prefs.putDouble("lastGoodLat", newLat); + prefs.putDouble("lastGoodLon", newLon); + + // Update the text fields + latitude.setText(String.format("%.6f", newLat)); + longitude.setText(String.format("%.6f", newLon)); + } + } + } catch (Exception e) { + e.printStackTrace(); } - } catch (ClassCastException cce) { - cce.printStackTrace(); } - } + }); } + } + }, 1000, 1000); - } catch (Exception e) { -//e.printStackTrace(); + // Add focus listeners to the text fields + latitude.addFocusListener(new java.awt.event.FocusListener() { + @Override + public void focusGained(java.awt.event.FocusEvent e) { + isTextFieldFocused = true; } - } - }); + @Override + public void focusLost(java.awt.event.FocusEvent e) { + isTextFieldFocused = false; + } + }); + + longitude.addFocusListener(new java.awt.event.FocusListener() { + @Override + public void focusGained(java.awt.event.FocusEvent e) { + isTextFieldFocused = true; + } + + @Override + public void focusLost(java.awt.event.FocusEvent e) { + isTextFieldFocused = false; + } + }); + } } - }, 1000, 1000); + }); } - });*/ + }); } private double getTextVal(String aText) { @@ -535,6 +581,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) { private void updateSave(java.awt.event.ActionEvent evt) { try { + String lat = latitude.getText(); String lon = longitude.getText(); @@ -545,7 +592,7 @@ private void updateSave(java.awt.event.ActionEvent evt) { final Double la = new Double(lat); final Double lo = new Double(lon); - /*Platform.runLater(new Runnable() { + Platform.runLater(new Runnable() { public void run() { Preferences p = Preferences.userNodeForPackage(com.codename1.ui.Component.class); @@ -553,9 +600,9 @@ public void run() { p.putFloat("velocity", getVelocity()); p.putDouble("Altitude", getAltitude()); p.putFloat("direction", getDirection()); - webView.getEngine().executeScript("moveToLocation(" + la.toString() + "," + lo.toString() + ");"); + webEngine.executeScript("moveToLocation(" + la.toString() + "," + lo.toString() + ");"); } - });*/ + }); } catch (Exception e) { e.printStackTrace(); @@ -665,6 +712,7 @@ private void directionFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:even updateSave(null); }//GEN-LAST:event_directionFocusLost + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JTextField accuracy; private javax.swing.JTextField altitude;