Changeset 12140 in josm for trunk

Timestamp:

2017-05-13T17:03:37+02:00 (7 years ago)

Author:

bastiK

Message:

update unit test (see #14773)

Location:

trunk/test

Files:

• data/sessions/bing.jos (modified) (2 diffs)
• unit/org/openstreetmap/josm/io/session/SessionReaderTest.java (modified) (1 diff)

trunk/test/data/sessions/bing.jos

@@ -2 +2 @@
 <josm-session version="0.1">
     <viewport>
-        <center lat="1" lon="1"/>
-        <scale meter-per-pixel="9"/>
+        <center lat="43.13272938585711" lon="131.91090255707502"/>
+        <scale meter-per-pixel="0.21789683764431256"/>
     </viewport>
-    <layers active="1">
+    <layers>
         <layer index="1" name="Bing aerial imagery" type="imagery" version="0.1" visible="true">
             <name>Bing aerial imagery</name>
@@ -11 +11 @@
             <type>bing</type>
             <url>http://www.bing.com/maps/</url>
+            <permission-reference-url>http://wiki.openstreetmap.org/wiki/Bing_Maps</permission-reference-url>
             <max-zoom>22</max-zoom>
+            <projections/>
+            <icon>data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAAdVBMVEX/phX/04r/////6cX/zXz/7Mz/vFD/u0z/1I7/tT3/yXH/uEX/v1f/rCT/2pz/vlP/qRz/4a//yG3/xmn//Pj/9eb/+/T/897/t0H/wl7/sTL//vv/+O3/2Jn/7dD/+vH/9+n/3KT/tDr/9OL/8Nf/26D/ynSCVQVOAAAAkklEQVR4Xq3R1w7DIBQD0NiQne69d///E3tvBYVU6UsVPyEdCYycIOlOv5AB004Aaf6DCpLtF4yxp8tkFMGCkiEkKyGz9qCxrkxuhLIAeaijMvAwi/vMycJDuyi5/AVUaPwTPik5UdCDiWCjtd5Q70TK+KKD26M+6o+tdGxwIlmFPeyZn1yuraFKFOnt/sCz/81f+9UEaf1lPCAAAAAASUVORK5CYII=</icon>
+            <noTileHeaders>{"X-VE-Tile-Info":["no-tile"]}</noTileHeaders>
+            <metadataHeaders>{"X-VE-TILEMETA-CaptureDatesRange":"Capture Date"}</metadataHeaders>
             <automatic-downloading>true</automatic-downloading>
             <automatically-change-resolution>true</automatically-change-resolution>
             <show-errors>true</show-errors>
-            <dx>12.34</dx>
-            <dy>-56.78</dy>
+            <offset>
+                <projection-code>EPSG:3857</projection-code>
+                <imagery-name>bing</imagery-name>
+                <name>Autogenerated</name>
+                <dx>-2.671667778864503</dx>
+                <dy>13.89643478114158</dy>
+                <center-lon>131.9107529</center-lon>
+                <center-lat>43.1329032</center-lat>
+            </offset>
         </layer>
     </layers>

trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java

@@ -128 +128 @@
         final AbstractTileSourceLayer<?> image = (AbstractTileSourceLayer<?>) layers.get(0);
         assertEquals("Bing aerial imagery", image.getName());
-        assertEquals(image.getDisplaySettings().getDx(), 12.34, 1e-9);
-        assertEquals(image.getDisplaySettings().getDy(), -56.78, 1e-9);
+        assertEquals(-2.671667778864503, image.getDisplaySettings().getDx(), 1e-9);
+        assertEquals(13.89643478114158, image.getDisplaySettings().getDy(), 1e-9);
     }