Changeset 9135 in josm for trunk/src/org/openstreetmap/josm/gui
- Timestamp:
- 2015-12-15T23:14:37+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
r9134 r9135 40 40 public AlignImageryPanel(boolean oneLine, final BooleanProperty showAgain, ImageryInfo infoToAdd) { 41 41 Font font = getFont().deriveFont(Font.PLAIN, 14.0f); 42 JLabel nagLabel = new JLabel(tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!", infoToAdd.getName())); 42 JLabel nagLabel = new JLabel( 43 tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!", infoToAdd.getName())); 43 44 UrlLabel detailsList = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Using_Imagery"), tr("Details...")); 44 45 nagLabel.setLabelFor(detailsList); … … 86 87 public static void addNagPanelIfNeeded(ImageryInfo infoToAdd) { 87 88 BooleanProperty showAgain = new BooleanProperty("message.imagery.nagPanel." + infoToAdd.getUrl(), true); 88 if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid() 89 if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid()) { 89 90 if (Main.map.getTopPanel(AlignImageryPanel.class) == null) { 90 91 double w = Toolkit.getDefaultToolkit().getScreenSize().getWidth(); -
trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
r9134 r9135 116 116 public boolean isProjectionSupported(Projection proj) { 117 117 return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode()) || 118 (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326") && "EPSG:3857".equals(Main.getProjection().toCode())); 118 (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326") 119 && "EPSG:3857".equals(Main.getProjection().toCode())); 119 120 } 120 121
Note:
See TracChangeset
for help on using the changeset viewer.