Changeset 10378 in josm for trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
- Timestamp:
- 2016-06-15T10:30:37+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
r10181 r10378 46 46 private double[] degreesPerTile; 47 47 48 private static final Pattern PATTERN_HEADER = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}"); 49 private static final Pattern PATTERN_PROJ = Pattern.compile("\\{proj\\}"); 50 private static final Pattern PATTERN_WKID = Pattern.compile("\\{wkid\\}"); 51 private static final Pattern PATTERN_BBOX = Pattern.compile("\\{bbox\\}"); 52 private static final Pattern PATTERN_W = Pattern.compile("\\{w\\}"); 53 private static final Pattern PATTERN_S = Pattern.compile("\\{s\\}"); 54 private static final Pattern PATTERN_E = Pattern.compile("\\{e\\}"); 55 private static final Pattern PATTERN_N = Pattern.compile("\\{n\\}"); 56 private static final Pattern PATTERN_WIDTH = Pattern.compile("\\{width\\}"); 57 private static final Pattern PATTERN_HEIGHT = Pattern.compile("\\{height\\}"); 58 private static final Pattern PATTERN_PARAM = Pattern.compile("\\{([^}]+)\\}"); 48 // CHECKSTYLE.OFF: SingleSpaceSeparator 49 private static final Pattern PATTERN_HEADER = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}"); 50 private static final Pattern PATTERN_PROJ = Pattern.compile("\\{proj\\}"); 51 private static final Pattern PATTERN_WKID = Pattern.compile("\\{wkid\\}"); 52 private static final Pattern PATTERN_BBOX = Pattern.compile("\\{bbox\\}"); 53 private static final Pattern PATTERN_W = Pattern.compile("\\{w\\}"); 54 private static final Pattern PATTERN_S = Pattern.compile("\\{s\\}"); 55 private static final Pattern PATTERN_E = Pattern.compile("\\{e\\}"); 56 private static final Pattern PATTERN_N = Pattern.compile("\\{n\\}"); 57 private static final Pattern PATTERN_WIDTH = Pattern.compile("\\{width\\}"); 58 private static final Pattern PATTERN_HEIGHT = Pattern.compile("\\{height\\}"); 59 private static final Pattern PATTERN_PARAM = Pattern.compile("\\{([^}]+)\\}"); 60 // CHECKSTYLE.ON: SingleSpaceSeparator 59 61 60 62 private static final NumberFormat latLonFormat = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US)); … … 269 271 @Override 270 272 public TileXY latLonToTileXY(ICoordinate point, int zoom) { 271 return latLonToTileXY(point.getLat(), 273 return latLonToTileXY(point.getLat(), point.getLon(), zoom); 272 274 } 273 275 … … 297 299 EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon)); 298 300 return new Point( 299 (int) Math.round((point.east() - anchorPosition.east()) 301 (int) Math.round((point.east() - anchorPosition.east()) / scale), 300 302 (int) Math.round((anchorPosition.north() - point.north()) / scale) 301 303 );
Note:
See TracChangeset
for help on using the changeset viewer.