Merge pull request #200 from xdev-software/187-cannot-update-marker-position

JohannesRabauer · web-flow · commit 19fcdae315f0 · 2023-01-20T07:52:37.000+01:00
Fixed setting of lon/lan in geometry
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/flow/data/LMarker.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/flow/data/LMarker.java
@@ -98,7 +98,6 @@ public double getLat()
 
 	public void setLat(final double lat)
 	{
-		this.geometry.getCoordinates().remove(0);
 		this.geometry.getCoordinates().set(0, lat);
 	}
 	
@@ -109,7 +108,6 @@ public double getLon()
 	
 	public void setLon(final double lon)
 	{
-		this.geometry.getCoordinates().remove(1);
 		this.geometry.getCoordinates().set(1, lon);
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/flow/data/LMarkerGeometry.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/flow/data/LMarkerGeometry.java
@@ -26,11 +26,11 @@ public class LMarkerGeometry
 	private String type;
 	private List<Double> coordinates = new ArrayList<>();
 	
-	public LMarkerGeometry(final String type, final double lon, final double lat)
+	public LMarkerGeometry(final String type, final double lat, final double lon)
 	{
 		this.type = type;
-		this.coordinates.add(lon);
 		this.coordinates.add(lat);
+		this.coordinates.add(lon);
 	}
 	
 	public String getType()

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ public double getLat()`
`98`	`98`
`99`	`99`	`public void setLat(final double lat)`
`100`	`100`	`{`
`101`		`- this.geometry.getCoordinates().remove(0);`
`102`	`101`	`this.geometry.getCoordinates().set(0, lat);`
`103`	`102`	`}`
`104`	`103`
`@@ -109,7 +108,6 @@ public double getLon()`
`109`	`108`
`110`	`109`	`public void setLon(final double lon)`
`111`	`110`	`{`
`112`		`- this.geometry.getCoordinates().remove(1);`
`113`	`111`	`this.geometry.getCoordinates().set(1, lon);`
`114`	`112`	`}`
`115`	`113`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ public class LMarkerGeometry`
`26`	`26`	`private String type;`
`27`	`27`	`private List<Double> coordinates = new ArrayList<>();`
`28`	`28`
`29`		`- public LMarkerGeometry(final String type, final double lon, final double lat)`
	`29`	`+ public LMarkerGeometry(final String type, final double lat, final double lon)`
`30`	`30`	`{`
`31`	`31`	`this.type = type;`
`32`		`- this.coordinates.add(lon);`
`33`	`32`	`this.coordinates.add(lat);`
	`33`	`+ this.coordinates.add(lon);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public String getType()`