diff --git a/src/main/java/seng302/models/map/CanvasMap.java b/src/main/java/seng302/models/map/CanvasMap.java index a86be90b..104bb219 100644 --- a/src/main/java/seng302/models/map/CanvasMap.java +++ b/src/main/java/seng302/models/map/CanvasMap.java @@ -13,7 +13,6 @@ public class CanvasMap { private double width, height; // desired image size private int zoom; - private int MERCATOR_RANGE = 256; private String KEY = "AIzaSyC-5oOShMCY5Oy_9L7guYMPUPFHDMr37wE"; public CanvasMap(Boundary bound, double width, double height) { @@ -46,4 +45,23 @@ public class CanvasMap { // sb.append(String.format("&key=%s", KEY)); return sb.toString(); } + + private MapSize getMapSize(int zoom, Boundary boundary) { + double scale = Math.pow(2, zoom); + MapGeo geoSW = new MapGeo(boundary.getSouthLat(), boundary.getWestLng()); + MapGeo geoNE = new MapGeo(boundary.getNorthLat(), boundary.getEastLng()); + MapPoint pointSW = MercatorProjection.toMapPoint(geoSW); + MapPoint pointNE = MercatorProjection.toMapPoint(geoNE); + return new MapSize(Math.abs(pointNE.getX() - pointSW.getX()), + Math.abs(pointNE.getY() - pointSW.getY())); + } + + class MapSize { + long width, height; + + MapSize(double width, double height) { + this.width = (long) width; + this.height = (long) height; + } + } }