Changeset 6920 in josm for trunk/src/org/openstreetmap/josm/data/projection

Timestamp:

2014-03-21T17:31:18+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9778, fix #9806 - access OSM API and JOSM website in HTTPS by default + other HTTPS links where applicable + update CONTRIBUTION

Location:

trunk/src/org/openstreetmap/josm/data/projection

Files:

• Ellipsoid.java (modified) (1 diff)
• proj/SwissObliqueMercator.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/projection/Ellipsoid.java

@@ -1 +1 @@
 /*
  * Import from fr.geo.convert package, a geographic coordinates converter.
- * (http://www.i3s.unice.fr/~johan/gps/)
+ * (https://www.i3s.unice.fr/~johan/gps/)
  * License: GPL. For details, see LICENSE file.
  * Copyright (C) 2002 Johan Montagnat (johan@creatis.insa-lyon.fr)

trunk/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java

@@ -21 +21 @@
 
 /**
- * Projection for the SwissGrid CH1903 / L03, see http://en.wikipedia.org/wiki/Swiss_coordinate_system.
+ * Projection for the SwissGrid CH1903 / L03, see <a href="https://en.wikipedia.org/wiki/Swiss_coordinate_system">Wikipedia article</a>.<br>
  *
- * Calculations were originally based on simple formula from
- * http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/sys/refsys/switzerland.parsysrelated1.37696.downloadList.12749.DownloadFile.tmp/ch1903wgs84en.pdf
+ * Calculations were originally based on <a href="http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/sys/refsys/switzerland.parsysrelated1.37696.downloadList.12749.DownloadFile.tmp/ch1903wgs84en.pdf">
+ * simple formula</a>.<br>
  *
- * August 2010 update to this formula (rigorous formulas)
- * http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/sys/refsys/switzerland.parsysrelated1.37696.downloadList.97912.DownloadFile.tmp/swissprojectionen.pdf
+ * August 2010 update to <a href="http://www.swisstopo.admin.ch/internet/swisstopo/en/home/topics/survey/sys/refsys/switzerland.parsysrelated1.37696.downloadList.97912.DownloadFile.tmp/swissprojectionen.pdf">
+ * this formula (rigorous formulas)</a>.
  */
 public class SwissObliqueMercator implements Proj {
@@ -109 +109 @@
         return new double[] { phi, lambda };
     }
-
 }