Changeset 14120 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2018-08-11T17:29:48+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/actions
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java
r13434 r14120 18 18 import javax.swing.JOptionPane; 19 19 20 import org.openstreetmap.josm.Main;21 20 import org.openstreetmap.josm.command.AddCommand; 22 21 import org.openstreetmap.josm.command.ChangeCommand; … … 30 29 import org.openstreetmap.josm.data.osm.OsmPrimitive; 31 30 import org.openstreetmap.josm.data.osm.Way; 31 import org.openstreetmap.josm.data.projection.ProjectionRegistry; 32 32 import org.openstreetmap.josm.gui.MainApplication; 33 33 import org.openstreetmap.josm.gui.Notification; … … 180 180 181 181 // see #10777 182 LatLon ll1 = Main.getProjection().eastNorth2latlon(n1);183 LatLon ll2 = Main.getProjection().eastNorth2latlon(center);182 LatLon ll1 = ProjectionRegistry.getProjection().eastNorth2latlon(n1); 183 LatLon ll2 = ProjectionRegistry.getProjection().eastNorth2latlon(center); 184 184 185 185 double radiusInMeters = ll1.greatCircleDistance(ll2); … … 218 218 double x = center.east() + r*Math.cos(alpha); 219 219 double y = center.north() + r*Math.sin(alpha); 220 LatLon ll = Main.getProjection().eastNorth2latlon(new EastNorth(x, y));220 LatLon ll = ProjectionRegistry.getProjection().eastNorth2latlon(new EastNorth(x, y)); 221 221 if (ll.isOutSideWorld()) { 222 222 notifyNodesNotOnCircle(); -
trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
r13867 r14120 26 26 import org.openstreetmap.josm.data.coor.LatLon; 27 27 import org.openstreetmap.josm.data.imagery.OffsetBookmark; 28 import org.openstreetmap.josm.data.projection.ProjectionRegistry; 28 29 import org.openstreetmap.josm.gui.ExtendedDialog; 29 30 import org.openstreetmap.josm.gui.MainApplication; … … 74 75 } 75 76 old = layer.getDisplaySettings().getOffsetBookmark(); 76 EastNorth curOff = old == null ? EastNorth.ZERO : old.getDisplacement( Main.getProjection());77 EastNorth curOff = old == null ? EastNorth.ZERO : old.getDisplacement(ProjectionRegistry.getProjection()); 77 78 LatLon center; 78 79 if (MainApplication.isDisplayingMapView()) { 79 center = Main.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter());80 center = ProjectionRegistry.getProjection().eastNorth2latlon(MainApplication.getMap().mapView.getCenter()); 80 81 } else { 81 82 center = LatLon.ZERO; 82 83 } 83 84 tempOffset = new OffsetBookmark( 84 Main.getProjection().toCode(),85 ProjectionRegistry.getProjection().toCode(), 85 86 layer.getInfo().getId(), 86 87 layer.getInfo().getName(), … … 258 259 "You can also enter east and north offset in the {0} coordinates.\n" + 259 260 "If you want to save the offset as bookmark, enter the bookmark name below", 260 Main.getProjection().toString())), GBC.eop());261 ProjectionRegistry.getProjection().toString())), GBC.eop()); 261 262 pnl.add(new JLabel(tr("Offset:")), GBC.std()); 262 263 pnl.add(tOffset, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5)); … … 313 314 if (layer != null) { 314 315 // Support projections with very small numbers (e.g. 4326) 315 int precision = Main.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7;316 int precision = ProjectionRegistry.getProjection().getDefaultZoomInPPD() >= 1.0 ? 2 : 7; 316 317 // US locale to force decimal separator to be '.' 317 318 try (Formatter us = new Formatter(Locale.US)) { -
trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java
r13434 r14120 19 19 import java.util.TreeSet; 20 20 21 import org.openstreetmap.josm.Main;22 21 import org.openstreetmap.josm.command.ChangeCommand; 23 22 import org.openstreetmap.josm.command.Command; … … 30 29 import org.openstreetmap.josm.data.osm.Way; 31 30 import org.openstreetmap.josm.data.osm.WaySegment; 31 import org.openstreetmap.josm.data.projection.ProjectionRegistry; 32 32 import org.openstreetmap.josm.gui.MainApplication; 33 33 import org.openstreetmap.josm.gui.MapView; … … 143 143 node.getEastNorth()); 144 144 MoveCommand c = new MoveCommand( 145 node, Main.getProjection().eastNorth2latlon(newPosition));145 node, ProjectionRegistry.getProjection().eastNorth2latlon(newPosition)); 146 146 // Avoid moving a given node several times at the same position in case of overlapping ways 147 147 if (!cmds.contains(c)) { -
trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
r13712 r14120 30 30 import org.openstreetmap.josm.data.osm.OsmPrimitive; 31 31 import org.openstreetmap.josm.data.osm.Way; 32 import org.openstreetmap.josm.data.projection.ProjectionRegistry; 32 33 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; 33 34 import org.openstreetmap.josm.gui.MainApplication; … … 148 149 if (!isEnabled()) 149 150 return; 150 if ("EPSG:4326".equals( Main.getProjection().toString())) {151 if ("EPSG:4326".equals(ProjectionRegistry.getProjection().toString())) { 151 152 String msg = tr("<html>You are using the EPSG:4326 projection which might lead<br>" + 152 153 "to undesirable results when doing rectangular alignments.<br>" + … … 307 308 throw new InvalidUserInputException("Unable to orthogonalize " + singleNode); 308 309 } 309 return new MoveCommand(singleNode, Main.getProjection().eastNorth2latlon(Geometry.getCentroidEN(rightAnglePositions)));310 return new MoveCommand(singleNode, ProjectionRegistry.getProjection().eastNorth2latlon(Geometry.getCentroidEN(rightAnglePositions))); 310 311 } 311 312 -
trunk/src/org/openstreetmap/josm/actions/SessionLoadAction.java
r13437 r14120 20 20 21 21 import org.openstreetmap.josm.Main; 22 import org.openstreetmap.josm.data.projection.ProjectionRegistry; 22 23 import org.openstreetmap.josm.gui.HelpAwareOptionPane; 23 24 import org.openstreetmap.josm.gui.MainApplication; … … 147 148 } 148 149 if (noMap && viewport != null) { 149 MainApplication.getMap().mapView.scheduleZoomTo(viewport.getEastNorthViewport( Main.getProjection()));150 MainApplication.getMap().mapView.scheduleZoomTo(viewport.getEastNorthViewport(ProjectionRegistry.getProjection())); 150 151 } 151 152 } -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r13434 r14120 29 29 import javax.swing.JMenuItem; 30 30 31 import org.openstreetmap.josm.Main;32 31 import org.openstreetmap.josm.actions.JosmAction; 33 32 import org.openstreetmap.josm.actions.MergeNodesAction; … … 46 45 import org.openstreetmap.josm.data.osm.WaySegment; 47 46 import org.openstreetmap.josm.data.preferences.NamedColorProperty; 47 import org.openstreetmap.josm.data.projection.ProjectionRegistry; 48 48 import org.openstreetmap.josm.gui.MainApplication; 49 49 import org.openstreetmap.josm.gui.MainMenu; … … 655 655 //move existing node 656 656 Node n1Old = selectedSegment.getFirstNode(); 657 cmds.add(new MoveCommand(n1Old, Main.getProjection().eastNorth2latlon(newN1en)));657 cmds.add(new MoveCommand(n1Old, ProjectionRegistry.getProjection().eastNorth2latlon(newN1en))); 658 658 changedNodes.add(n1Old); 659 659 } else if (ignoreSharedNodes && segmentAngleZero && !alwaysCreateNodes && hasOtherWays) { 660 660 // replace shared node with new one 661 661 Node n1Old = selectedSegment.getFirstNode(); 662 Node n1New = new Node( Main.getProjection().eastNorth2latlon(newN1en));662 Node n1New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN1en)); 663 663 wnew.addNode(insertionPoint, n1New); 664 664 wnew.removeNode(n1Old); … … 668 668 } else { 669 669 //introduce new node 670 Node n1New = new Node( Main.getProjection().eastNorth2latlon(newN1en));670 Node n1New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN1en)); 671 671 wnew.addNode(insertionPoint, n1New); 672 672 wayWasModified = true; … … 685 685 //move existing node 686 686 Node n2Old = selectedSegment.getSecondNode(); 687 cmds.add(new MoveCommand(n2Old, Main.getProjection().eastNorth2latlon(newN2en)));687 cmds.add(new MoveCommand(n2Old, ProjectionRegistry.getProjection().eastNorth2latlon(newN2en))); 688 688 changedNodes.add(n2Old); 689 689 } else if (ignoreSharedNodes && segmentAngleZero && !alwaysCreateNodes && hasOtherWays) { 690 690 // replace shared node with new one 691 691 Node n2Old = selectedSegment.getSecondNode(); 692 Node n2New = new Node( Main.getProjection().eastNorth2latlon(newN2en));692 Node n2New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN2en)); 693 693 wnew.addNode(insertionPoint, n2New); 694 694 wnew.removeNode(n2Old); … … 698 698 } else { 699 699 //introduce new node 700 Node n2New = new Node( Main.getProjection().eastNorth2latlon(newN2en));700 Node n2New = new Node(ProjectionRegistry.getProjection().eastNorth2latlon(newN2en)); 701 701 wnew.addNode(insertionPoint, n2New); 702 702 wayWasModified = true; … … 937 937 938 938 // find out the movement distance, in metres 939 double distance = Main.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance(940 Main.getProjection().eastNorth2latlon(n1movedEn));939 double distance = ProjectionRegistry.getProjection().eastNorth2latlon(initialN1en).greatCircleDistance( 940 ProjectionRegistry.getProjection().eastNorth2latlon(n1movedEn)); 941 941 MainApplication.getMap().statusLine.setDist(distance); 942 942 updateStatusLine();
Note:
See TracChangeset
for help on using the changeset viewer.