Changeset 11100 in josm
- Timestamp:
- 2016-10-08T03:02:51+02:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/JumpToAction.java
r11045 r11100 198 198 int zoomLvl = 18; 199 199 if (m > 0) 200 zoomLvl = (int) Math.round((-1) * Math.log(m/10 000000)/Math.log(2));200 zoomLvl = (int) Math.round((-1) * Math.log(m/10_000_000)/Math.log(2)); 201 201 202 202 url.setText(OsmUrlToBounds.getURL(dlat, dlon, zoomLvl)); -
trunk/src/org/openstreetmap/josm/data/SystemOfMeasurement.java
r10600 r11100 42 42 * @since 3406 43 43 */ 44 public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(1, "m", 1000, "km", "km/h", 3.6, 10 000, "ha");44 public static final SystemOfMeasurement METRIC = new SystemOfMeasurement(1, "m", 1000, "km", "km/h", 3.6, 10_000, "ha"); 45 45 46 46 /** -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r10655 r11100 275 275 */ 276 276 private static int rehash(int h) { 277 return (1 103515245*h) >> 2;277 return (1_103_515_245*h) >> 2; 278 278 } 279 279 -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java
r11090 r11100 95 95 showHeadArrowOnly = Main.pref.getBoolean("draw.segment.head_only", false); 96 96 97 showNamesDistance = Main.pref.getInteger("mappaint.shownames", 10 000000);98 useStrokesDistance = Main.pref.getInteger("mappaint.strokes", 10 000000);99 showIconsDistance = Main.pref.getInteger("mappaint.showicons", 10 000000);97 showNamesDistance = Main.pref.getInteger("mappaint.shownames", 10_000_000); 98 useStrokesDistance = Main.pref.getInteger("mappaint.strokes", 10_000_000); 99 showIconsDistance = Main.pref.getInteger("mappaint.showicons", 10_000_000); 100 100 101 101 selectedNodeSize = Main.pref.getInteger("mappaint.node.selected-size", 5); -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r11087 r11100 1814 1814 private final int directExecutionTaskSize; 1815 1815 1816 private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10 000000);1816 private final boolean drawArea = circum <= Main.pref.getInteger("mappaint.fillareas", 10_000_000); 1817 1817 private final boolean drawMultipolygon = drawArea && Main.pref.getBoolean("mappaint.multipolygon", true); 1818 1818 private final boolean drawRestriction = Main.pref.getBoolean("mappaint.restriction", true); -
trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
r10871 r11100 265 265 this.lon0 = 6d * zone - 183d; 266 266 this.k0 = 0.9996; 267 this.x0 = 500 000;268 this.y0 = parameters.containsKey(Param.south.key) ? 10 000000 : 0;267 this.x0 = 500_000; 268 this.y0 = parameters.containsKey(Param.south.key) ? 10_000_000 : 0; 269 269 } 270 270 String s = parameters.get(Param.x_0.key); -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2Util.java
r10308 r11100 98 98 j = getIntLE(b, 0); 99 99 } 100 long l = ((long) i << 32) | (j & 0x0000 0000FFFFFFFFL);100 long l = ((long) i << 32) | (j & 0x0000_0000_FFFF_FFFFL); 101 101 return Double.longBitsToDouble(l); 102 102 } -
trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
r11096 r11100 293 293 String code = Main.getProjection().toCode(); 294 294 if (Arrays.asList(ProjectionPreference.wgs84.allCodes()).contains(code)) { 295 OsmValidator.griddetail = 10 000;295 OsmValidator.griddetail = 10_000; 296 296 } else if (Arrays.asList(ProjectionPreference.mercator.allCodes()).contains(code)) { 297 297 OsmValidator.griddetail = 0.01; -
trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
r10378 r11100 50 50 public void startTest(ProgressMonitor monitor) { 51 51 super.startTest(monitor); 52 maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15 000);52 maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15_000); 53 53 } 54 54 -
trunk/src/org/openstreetmap/josm/gui/Notification.java
r10893 r11100 53 53 * Somewhat longer message (10 s). 54 54 */ 55 public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10 000);55 public static final int TIME_LONG = Main.pref.getInteger("notification-time-long-ms", 10_000); 56 56 57 57 /** … … 59 59 * (Make sure is still sensible to show as a notification) 60 60 */ 61 public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20 000);61 public static final int TIME_VERY_LONG = Main.pref.getInteger("notification-time-very_long-ms", 20_000); 62 62 63 63 private Component content; -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r10716 r11100 657 657 */ 658 658 public synchronized void sort() { 659 if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100 000)) {660 boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10 000);659 if (selection.size() <= Main.pref.getInteger("selection.no_sort_above", 100_000)) { 660 boolean quick = selection.size() > Main.pref.getInteger("selection.fast_sort_above", 10_000); 661 661 selection.sort(new OsmPrimitiveComparator(quick, false)); 662 662 } -
trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
r10234 r11100 117 117 OutputStream out = new FileOutputStream(file) 118 118 ) { 119 byte[] buffer = new byte[32 768];119 byte[] buffer = new byte[32_768]; 120 120 int count = 0; 121 121 long p1 = 0; -
trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
r10634 r11100 37 37 } 38 38 39 public static final int PROGRESS_BAR_MAX = 10 000;39 public static final int PROGRESS_BAR_MAX = 10_000; 40 40 private final Component dialogParent; 41 41 -
trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
r10600 r11100 38 38 39 39 /** Ticks count used, when no other value is supplied */ 40 int DEFAULT_TICKS = 10 000;40 int DEFAULT_TICKS = 10_000; 41 41 42 42 /** -
trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
r10874 r11100 482 482 */ 483 483 public static void extendTooltipDelay(Component c) { 484 extendTooltipDelay(c, 60 000);484 extendTooltipDelay(c, 60_000); 485 485 } 486 486 -
trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
r10632 r11100 207 207 CheckParameterUtil.ensureThat(noteLimit > 0, "Requested note limit is less than 1."); 208 208 // see result_limit in https://github.com/openstreetmap/openstreetmap-website/blob/master/app/controllers/notes_controller.rb 209 CheckParameterUtil.ensureThat(noteLimit <= 10 000, "Requested note limit is over API hard limit of 10000.");209 CheckParameterUtil.ensureThat(noteLimit <= 10_000, "Requested note limit is over API hard limit of 10000."); 210 210 CheckParameterUtil.ensureThat(daysClosed >= -1, "Requested note limit is less than -1."); 211 211 String url = "notes?limit=" + noteLimit + "&closed=" + daysClosed + "&bbox=" + lon1 + ',' + lat1 + ',' + lon2 + ',' + lat2; -
trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
r10378 r11100 97 97 return 0; 98 98 } 99 if (port <= 0 || port > 65 535) {99 if (port <= 0 || port > 65_535) { 100 100 Main.error(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port)); 101 101 Main.error(tr("The proxy will not be used.")); -
trunk/src/org/openstreetmap/josm/io/NoteReader.java
r10378 r11100 78 78 case "osm-notes": 79 79 parseMode = NoteParseMode.DUMP; 80 notes = new ArrayList<>(10 000);80 notes = new ArrayList<>(10_000); 81 81 return; 82 82 } -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
r11096 r11100 140 140 X509CertInfo info = new X509CertInfo(); 141 141 Date from = new Date(); 142 Date to = new Date(from.getTime() + days * 86 400000L);142 Date to = new Date(from.getTime() + days * 86_400_000L); 143 143 CertificateValidity interval = new CertificateValidity(from, to); 144 144 BigInteger sn = new BigInteger(64, new SecureRandom()); -
trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
r10662 r11100 312 312 bytesPerSecond = audioFormat.getFrameRate() /* frames per second */ 313 313 * audioFormat.getFrameSize() /* bytes per frame */; 314 if (speed * bytesPerSecond > 256 000.0) {315 speed = 256 000 / bytesPerSecond;314 if (speed * bytesPerSecond > 256_000.0) { 315 speed = 256_000 / bytesPerSecond; 316 316 } 317 317 if (calibratedOffset > 0.0) { -
trunk/src/org/openstreetmap/josm/tools/Utils.java
r11056 r11100 80 80 81 81 private static final int MILLIS_OF_SECOND = 1000; 82 private static final int MILLIS_OF_MINUTE = 60 000;83 private static final int MILLIS_OF_HOUR = 3 600000;84 private static final int MILLIS_OF_DAY = 86 400000;82 private static final int MILLIS_OF_MINUTE = 60_000; 83 private static final int MILLIS_OF_HOUR = 3_600_000; 84 private static final int MILLIS_OF_DAY = 86_400_000; 85 85 86 86 /**
Note:
See TracChangeset
for help on using the changeset viewer.