Mercurial > hg > batmud > gmap2
changeset 227:7c1cd542b2d2 gmap2
Rename continents.js to world.js, and add global offset data in.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 15 Mar 2014 15:14:14 +0200 |
| parents | d151536c9d3d |
| children | 2be6060df6cc |
| files | index.php tools/makegmaps.php |
| diffstat | 2 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/index.php Sat Mar 15 15:13:40 2014 +0200 +++ b/index.php Sat Mar 15 15:14:14 2014 +0200 @@ -84,7 +84,7 @@ <script type="text/javascript" src="lib/util.js"></script> <script type="text/javascript" src="lib/markerwithlabel_packed.js"></script> <script type="text/javascript" src="lib/markermanager_packed.js"></script> - <script type="text/javascript" src="continents.js"></script> + <script type="text/javascript" src="world.js"></script> <script type="text/javascript" src="icons.js"></script> <script type="text/javascript" src="markers.js"></script> <script type="text/javascript" src="nav.js"></script>
--- a/tools/makegmaps.php Sat Mar 15 15:13:40 2014 +0200 +++ b/tools/makegmaps.php Sat Mar 15 15:14:14 2014 +0200 @@ -32,7 +32,7 @@ /* Internal data and settings */ $locPath = $pathMapUtils."maps/"; -$continentJS = $pathMarkerData."continents.js"; +$worldJS = $pathMarkerData."world.js"; $tradelaneOut = $pathMarkerData."tradelane.json"; $tradelaneOverlay = $pathMarkerData."trlines.json"; $binMkLoc = $pathMapUtils."mkloc"; @@ -211,21 +211,27 @@ /* * Generate continents JavasScript data file */ -echo "* Generating $continentJS ...\n"; -$str = "var pmapContinents =\n[\n"; +echo "* Generating $worldJS ...\n"; +$str = "var pmapWorld = {"; +foreach ($worldMap as $wkey => $wval) + $str .= "\"".$wkey."\": ".$wval.", "; +$str .= "};\n"; + +$str .= "var pmapContinents =\n[\n"; foreach ($continentList as $name => $data) if ($data[4] && $data[7]) { - $str .= sprintf(" [%-15s, %5d, %5d, %5d, %5d],\n", + $str .= sprintf(" [%-15s, %5d, %5d, %5d, %5d, %5d, %5d],\n", "\"".$data[0]."\"", $data[1], $data[2], $data[1] + $data[5] - 1, - $data[2] + $data[6] - 1); + $data[2] + $data[6] - 1, + $data[5], $data[6]); } $str .= "];\n"; -outputToFile($continentJS, $str); +outputToFile($worldJS, $str);