diff --git a/doc/whatsnew/fixes/examples-europe-map-equirectangular.txt b/doc/whatsnew/fixes/examples-europe-map-equirectangular.txt new file mode 100644 index 00000000000..06b995e9cab --- /dev/null +++ b/doc/whatsnew/fixes/examples-europe-map-equirectangular.txt @@ -0,0 +1,8 @@ +The Europe map image lines up with what visualizers draw on it + +images/maps/europe-er.png was a Web Mercator image, but GeoMapCanvasVisualizer stretches its map image linearly in latitude, so figures drawn on it (node icons, trails, satellite footprints, the graticule) were offset from the map by up to 5.4 degrees of latitude with the window that examples/mobility declared (13.8 W to 44.3 E and 37 N to 73 N). The image is now equirectangular and covers 13.3 W to 44.1 E and 35.6 N to 67.6 N. A model that shows this image with GeoMapCanvasVisualizer has to declare that window: + + *.map.minLatitude = 35.6deg + *.map.maxLatitude = 67.6deg + *.map.minLongitude = -13.3deg + *.map.maxLongitude = 44.1deg diff --git a/examples/mobility/omnetpp.ini b/examples/mobility/omnetpp.ini index 6328f97b3d6..9826cbb395a 100644 --- a/examples/mobility/omnetpp.ini +++ b/examples/mobility/omnetpp.ini @@ -518,10 +518,10 @@ sim-time-limit = 48h # the Europe map (equirectangular crop) drawn on the europe module's own canvas; its extent # defines the window and the map area aspect ratio matches the image (1308:1245 = 436:415) *.europe.map.mapImage = "maps/europe-er" -*.europe.map.minLatitude = 37.0deg -*.europe.map.maxLatitude = 73.0deg -*.europe.map.minLongitude = -13.8deg -*.europe.map.maxLongitude = 44.3deg +*.europe.map.minLatitude = 35.6deg +*.europe.map.maxLatitude = 67.6deg +*.europe.map.minLongitude = -13.3deg +*.europe.map.maxLongitude = 44.1deg *.europe.map.mapWidth = 654 *.europe.map.mapHeight = 622 diff --git a/images/maps/europe-er.png b/images/maps/europe-er.png index ad8d50acac7..b484168227e 100644 Binary files a/images/maps/europe-er.png and b/images/maps/europe-er.png differ diff --git a/tests/fingerprint/store.json b/tests/fingerprint/store.json index a08f2043ff7..5581c8a51d5 100644 --- a/tests/fingerprint/store.json +++ b/tests/fingerprint/store.json @@ -20515,8 +20515,8 @@ "sim_time_limit": "3600s", "test_result": "PASS", "ingredients": "tyf", - "fingerprint": "772e-b194", - "timestamp": 1792589940.0, + "fingerprint": "3438-54ea", + "timestamp": 1793184072.0, "itervars": "$repetition==0" }, {