Merge pull request #169 from meatlayer/ats-ets2-update

Ats ets2 update

config.json

@@ -19,7 +19,7 @@
 
     "config": {
         "name": "ets2-mobile-route-advisor",
-        "title": "Mobile Route Advisor (3.5.0)",
+        "title": "Mobile Route Advisor (3.5.1)",
         "author": "mkoch227 and contributors",
         "width": -1,
         "height": -1,

dashboard.js

@@ -552,6 +552,9 @@ function goToMap() {
 	if (g_configPrefix === 'ets2') {
 		g_map.updateSize();
 	}
+	else if (g_configPrefix === 'ats') {
+		g_map.updateSize();
+	}
 }
 
 function updateSpeedIndicator(speedLimit, currentSpeed) {
@@ -616,7 +619,7 @@ var g_translations;
 var g_skinConfig;
 
 // The current version of ets2-mobile-route-advisor
-var g_currentVersion = '3.5.0';
+var g_currentVersion = '3.5.1';
 
 // The currently running game
 var g_runningGame;

maps/ats/js/cities.js

@@ -470,5 +470,117 @@ var g_cities_json = [
       "x": "-88849.8",
       "y": "64.9961",
       "z": "26463.2"
+    },
+    {
+      "gameName": "astoria",
+      "realName": "Astoria",
+      "country": "oregon",
+      "x": "-107078",
+      "y": "59.7773",
+      "z": "-57243"
+    },
+    {
+      "gameName": "bend",
+      "realName": "Bend",
+      "country": "oregon",
+      "x": "-100856",
+      "y": "104.578",
+      "z": "-42806.8"
+    },
+    {
+      "gameName": "burns",
+      "realName": "Burns",
+      "country": "oregon",
+      "x": "-92989.7",
+      "y": "113.398",
+      "z": "-37951.5"
+    },
+    {
+      "gameName": "coos_bay",
+      "realName": "Coos Bay",
+      "country": "oregon",
+      "x": "-113632",
+      "y": "55.2227",
+      "z": "-42775.4"
+    },
+    {
+      "gameName": "eugene",
+      "realName": "Eugene",
+      "country": "oregon",
+      "x": "-107310",
+      "y": "57.707",
+      "z": "-45581.2"
+    },
+    {
+      "gameName": "klamath_f",
+      "realName": "Klamath Falls",
+      "country": "oregon",
+      "x": "-105784",
+      "y": "116.527",
+      "z": "-33779.6"
+    },
+    {
+      "gameName": "lakeview",
+      "realName": "Lakeview",
+      "country": "oregon",
+      "x": "-100530",
+      "y": "154.777",
+      "z": "-31392"
+    },
+    {
+      "gameName": "medford",
+      "realName": "Medford",
+      "country": "oregon",
+      "x": "-110683",
+      "y": "91.8906",
+      "z": "-35739.2"
+    },
+    {
+      "gameName": "newport",
+      "realName": "Newport",
+      "country": "oregon",
+      "x": "-111075",
+      "y": "50.9961",
+      "z": "-48807.3"
+    },
+    {
+      "gameName": "ontario",
+      "realName": "Ontario",
+      "country": "oregon",
+      "x": "-84423.1",
+      "y": "92.0703",
+      "z": "-38195.3"
+    },
+    {
+      "gameName": "pendleton",
+      "realName": "Pendleton",
+      "country": "oregon",
+      "x": "-90062.4",
+      "y": "55.1875",
+      "z": "-49278.4"
+    },
+    {
+      "gameName": "portland",
+      "realName": "Portland",
+      "country": "oregon",
+      "x": "-105022",
+      "y": "58",
+      "z": "-52232.6"
+    },
+    {
+      "gameName": "salem",
+      "realName": "Salem",
+      "country": "oregon",
+      "x": "-106253",
+      "y": "73.7188",
+      "z": "-49404.3"
+    },
+    {
+      "gameName": "the_dalles",
+      "realName": "The Dalles",
+      "country": "oregon",
+      "x": "-98710",
+      "y": "50",
+      "z": "-51127.6"
     }
   ]

maps/ats/js/map.js

@@ -1,8 +1,8 @@
 // All of this should be executed after the DOM is ready and the entire skin has been loaded.
 
 // Image size used in the map.
-var MAX_X = 11776 * 2;
-var MAX_Y = 9984 * 2;
+var MAX_X = 135168;
+var MAX_Y = 128512;
 // How the image was extracted from the game:
 // http://forum.scssoft.com/viewtopic.php?p=405122#p405122
 
@@ -15,7 +15,7 @@ function calculatePixelCoordinate(x, y, pointsPerPixel, x0, y0) {
 }
 function calculatePixelCoordinateEu(x, y) {
     //return calculatePixelCoordinate(x, y, 9.69522, 10226, 9826); //x+16, y+4
-	return calculatePixelCoordinate(x, y, 3.89195, 30903, 9433); //x+16, y+4
+	return calculatePixelCoordinate(x, y, 0.78125, 166400, 76800); //x+16, y+4
 }
 
 function game_coord_to_pixels(x, y) {
@@ -68,11 +68,11 @@ function buildMap(target_element_id){
         extent: [0, 0, MAX_X, MAX_Y],
         minZoom: 0,
         origin: [0, MAX_Y],
-        tileSize: [256, 256],
+        tileSize: [512, 512],
         resolutions: (function(){
             var r = [];
-            for (var z = 0; z <= 7; ++z) {
-                r[z] = Math.pow(2, 7 - z);
+            for (var z = 0; z <= 8; ++z) {
+                r[z] = Math.pow(2, 8 - z);
             }
             return r;
         })()
@@ -93,7 +93,10 @@ function buildMap(target_element_id){
     g_map = new ol.Map({
         target: target_element_id,
         controls: [
-            //new ol.control.MousePosition(),  // DEBUG
+            // new ol.control.ZoomSlider(),
+            // new ol.control.OverviewMap(),
+            // new ol.control.Rotate(),
+            // new ol.control.MousePosition(),  // DEBUG
             new ol.control.Zoom(),
             rotate_control,
             speed_limit_control,
@@ -109,15 +112,31 @@ function buildMap(target_element_id){
         layers: [
             getMapTilesLayer(projection, custom_tilegrid),
             getTextLayer(),
+            // Debug layer below.
+            // new ol.layer.Tile({
+            //     extent: [0, 0, MAX_X, MAX_Y],
+            //     source: new ol.source.TileDebug({
+            //         projection: projection,
+            //         tileGrid: custom_tilegrid,
+            //         // tileGrid: ol.tilegrid.createXYZ({
+            //         //  extent: [0, 0, MAX_X, MAX_Y],
+            //         //  minZoom: 0,
+            //         //  maxZoom: 7,
+            //         //  tileSize: [256, 256]
+            //         // }),
+            //         wrapX: false
+            //     })
+            // }),
             vectorLayer
         ],
         view: new ol.View({
             projection: projection,
             extent: [0, 0, MAX_X, MAX_Y],
+            //center: ol.proj.transform([37.41, 8.82], 'EPSG:4326', 'EPSG:3857'),
             center: [MAX_X/2, MAX_Y/2],
-            minZoom: 0,
-            maxZoom: 6,
-            zoom: 4
+            minZoom: 2,
+            maxZoom: 8,
+            zoom: 5
         })
     });
 
@@ -150,30 +169,41 @@ function buildMap(target_element_id){
 }
 
 function getMapTilesLayer(projection, tileGrid) {
-    return new ol.layer.Tile({
-        extent: [0, 0, MAX_X, MAX_Y],
-        source: new ol.source.XYZ({
-            projection: projection,
-            url:  g_pathPrefix + '/maps/ats/tiles/{z}/{x}/{y}.png',
-            tileSize: [256, 256],
-            // Using createXYZ() makes the vector layer (with the features) unaligned.
-            // It also tries loading non-existent tiles.
-            //
-            // Using custom_tilegrid causes rescaling of all image tiles before drawing
-            // (i.e. no image will be rendered at 1:1 pixels), But fixes all other issues.
-            tileGrid: tileGrid,
-            wrapX: false,
-            minZoom: 2,
-            maxZoom: 6
-        })
-    });
+    if (g_runningGame === 'ATS') {
+        return new ol.layer.Tile({
+            extent: [0, 0, MAX_X, MAX_Y],
+            source: new ol.source.XYZ({
+                projection: projection,
+                url: g_pathPrefix + '/maps/ats/tiles/{z}/{x}_{y}.png',
+                tileSize: [512, 512],
+                // Using createXYZ() makes the vector layer (with the features) unaligned.
+                // It also tries loading non-existent tiles.
+                //
+                // Using custom_tilegrid causes rescaling of all image tiles before drawing
+                // (i.e. no image will be rendered at 1:1 pixels), But fixes all other issues.
+                tileGrid: tileGrid,
+                // tileGrid: ol.tilegrid.createXYZ({
+                //     extent: [0, 0, MAX_X, MAX_Y],
+                //     minZoom: 0,
+                //     maxZoom: 7,
+                //     tileSize: [256, 256]
+                // }),
+                wrapX: false,
+                minZoom: 2,
+                maxZoom: 7
+            })
+        });
+    }
+
+    return new ol.layer.Tile();
 }
 
 var STATE_NAME_TO_CODE = {
     "california": "ca",
     "nevada": "nv",
     "arizona": "az",
-	"new_mexico": "nm"
+	"new_mexico": "nm",
+	"oregon": "or"
 };
 
 function getTextFeatures() {
@@ -183,7 +213,7 @@ function getTextFeatures() {
     stroke.setColor('#000');
     stroke.setWidth(2);
     var createTextStyle = function(resolution) {
-        var scale = Math.min(1, Math.max(0, 1.0 / Math.log2(resolution + 1) - 0.055));
+        var scale = Math.min(1, Math.max(0, 1.0 / Math.log2(resolution + 1) - 0.015));
         return [new ol.style.Style({
             //Creating a new image layer
             image: new ol.style.Icon(({
@@ -194,16 +224,16 @@ function getTextFeatures() {
                 snapToPixel: false,
                 // Flag images from: http://usa.flagpedia.net/
                 src: g_pathPrefix + '/flags-usa/' + this.get('cc') + '.png',
-                scale: 4 / 40 * scale
+                scale: 4 / 24 * scale
             })),
             text: new ol.style.Text({
                 text: this.get('realName'),
-                font: '48px "Helvetica Neue", "Helvetica", "Arial", sans-serif',
+                font: '1.1em "Helvetica Neue", "Helvetica", "Arial", sans-serif',
                 textAlign: 'center',
                 fill: fill,
                 stroke: stroke,
                 scale: scale,
-                offsetY: 15 * scale
+                offsetY: 34 * scale
             })
         })];
     };