X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.maps%2Fsrc%2Forg%2Fsimantics%2Fmaps%2Fsg%2FMapNode.java;h=ae418de477f61d55daedf9f9af1bdcef755c7452;hb=refs%2Fheads%2Frelease%2F1.35.1;hp=952553b0ec4cb263d75d9d2bd07524cc738f225a;hpb=85d4d20f2a57cb985151da5e9cdfd73fc0ca07bc;p=simantics%2Fdistrict.git diff --git a/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java b/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java index 952553b0..ae418de4 100644 --- a/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java +++ b/org.simantics.district.maps/src/org/simantics/maps/sg/MapNode.java @@ -36,6 +36,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import org.simantics.maps.MapScalingTransform; import org.simantics.maps.WebService; import org.simantics.maps.osm.OSMTileProvider; import org.simantics.maps.pojo.TileJobQueue; @@ -60,12 +61,13 @@ public class MapNode extends G2DNode implements ITileListener { private static final Logger LOGGER = LoggerFactory.getLogger(MapNode.class); - private final double MAP_SCALE = 1; - private final int MAX_TILE_LEVEL = 19; + //private final double MAP_SCALE = 1; + //private final int MAX_TILE_LEVEL = 19; private final int TILE_PIXEL_SIZE = 256; private final int VIEWBOX_QUIET_TIME = 500; protected Boolean enabled = true; + protected Color backgroundColor; enum TileState { NOT_LOADED, @@ -222,20 +224,26 @@ public class MapNode extends G2DNode implements ITileListener { this.enabled = enabled; } + @SyncField("backgroundColor") + public void setBackgroundColor(Color color) { + this.backgroundColor = color; + } + @Override public void render(Graphics2D g2d) { - if (!enabled) - return; + AffineTransform ot = g2d.getTransform(); + //System.err.println("ot " + ot); g2d.transform(transform); AffineTransform tr = g2d.getTransform(); - + //System.err.println("tr " + tr); // Graphics2D g = (Graphics2D)g2d.create(); // AffineTransform tr = (AffineTransform)g.getTransform().clone(); double scaleX = Math.abs(tr.getScaleX()); + //System.err.println("scaleX : " + scaleX); double scaleY = Math.abs(tr.getScaleY()); if (scaleX <= 0 || scaleY <= 0) { // Make sure that we don't end up in an eternal loop below. @@ -250,58 +258,74 @@ public class MapNode extends G2DNode implements ITileListener { Rectangle2D b = (Rectangle2D)((Rectangle)g2d.getRenderingHint(G2DRenderingHints.KEY_CONTROL_BOUNDS)).getBounds2D(); // getClipBounds is not accurate enough, use original clipbounds and scale here Rectangle2D viewbox = new Rectangle2D.Double(offsetX/scaleX, offsetY/scaleY, b.getWidth()/sp.getWidth(), b.getHeight()/sp.getHeight()); //g.getClipBounds(); - if(viewbox == null) return; // FIXME - - double smallerViewboxDimension = viewbox.getWidth() < viewbox.getHeight() ? viewbox.getWidth() * MAP_SCALE : viewbox.getHeight() * MAP_SCALE; - int level = 0; - double tileSize = 360 * MAP_SCALE*2; - while (level < MAX_TILE_LEVEL) { - double ratio = smallerViewboxDimension / tileSize; - if (ratio >= 0.85) { - break; + if (enabled) { + + int level = MapScalingTransform.zoomLevel(ot); + +// double smallerViewboxDimension = viewbox.getWidth() < viewbox.getHeight() ? viewbox.getWidth() * MAP_SCALE : viewbox.getHeight() * MAP_SCALE; +// int level = 0; +// double tileSize = 360 * MAP_SCALE*2.5; +// while (level < MAX_TILE_LEVEL) { +// double ratio = smallerViewboxDimension / tileSize; +// if (ratio >= 0.85) { +// break; +// } +// tileSize *= 0.5; +// level++; +// } + /* + * To convert y-coordinates to map coordinates in ruler, use: + * double val = (y-offsetY)/scaleY; + * val = Math.toDegrees(Math.atan(Math.sinh(Math.toRadians(val)))); + * String str = formatValue(val); + */ + + double minx = Math.min(180, Math.max(viewbox.getMinX(), -180)); + double maxx = Math.min(180, Math.max(viewbox.getMaxX(), -180)); + + double miny = Math.min(360, Math.max(viewbox.getMinY()+180, 0)); + double maxy = Math.min(360, Math.max(viewbox.getMaxY()+180, 0)); + //System.err.println("minx " + minx + " maxx " + maxx + " miny " + miny + " maxy " + maxy); + g2d.setTransform(new AffineTransform()); + g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); + + int levels = (1 << level); + //System.err.println("level " + level); + //System.err.println("levels " + levels); + // http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames + int left = (int)Math.floor( (minx + 180) / 360 * (1<= levels) + continue; + for (int ty = top; ty <= bottom; ty++) { + if (ty < 0 || ty >= levels) + continue; + TileKey tile = new TileKey(level, tx, ty); + double y = (double) ty - (double) levels / 2; // In level 0 we have only one tile + + paintTile(tileCache, g2d, tr, tile, tx * tsx - 180, y * tsx, tsx); + } } - tileSize *= 0.5; - level++; - } - /* - * To convert y-coordinates to map coordinates in ruler, use: - * double val = (y-offsetY)/scaleY; - * val = Math.toDegrees(Math.atan(Math.sinh(Math.toRadians(val)))); - * String str = formatValue(val); - */ - - double minx = Math.min(180, Math.max(viewbox.getMinX(), -180)); - double maxx = Math.min(180, Math.max(viewbox.getMaxX(), -180)); - - double miny = Math.min(360, Math.max(viewbox.getMinY()+180, 0)); - double maxy = Math.min(360, Math.max(viewbox.getMaxY()+180, 0)); - - g2d.setTransform(new AffineTransform()); - g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR); - - int levels = (1 << level); - - // http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames - int left = (int)Math.floor( (minx + 180) / 360 * (1<= levels) continue; - for(int ty = top; ty <= bottom; ty++) { - if(ty < 0 || ty >= levels) continue; - TileKey tile = new TileKey(level, tx, ty); - double y = (double)ty - (double)levels/2; // In level 0 we have only one tile - paintTile(tileCache, g2d, tr, tile, tx*tsx-180, y*tsx, tsx); + // g.dispose(); + + // Check if transform has changed + transformChanged(tr, level); + } else { + if (backgroundColor != null) { + g2d.setTransform(new AffineTransform()); + Rectangle2D controlBounds = (Rectangle2D) g2d.getRenderingHint(G2DRenderingHints.KEY_CONTROL_BOUNDS); + Color color = g2d.getColor(); + g2d.setColor(backgroundColor); + g2d.fill(controlBounds); + g2d.setColor(color); } } -// g.dispose(); - - // Check if transform has changed - transformChanged(tr, level); - g2d.setTransform(ot); }