Ignore:
Timestamp:
2014-03-21T17:31:18+01:00 (6 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/io
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/io/GpxExporter.java

    r6889 r6920  
    211211                String sCopyright = (String) data.attr.get(META_COPYRIGHT_LICENSE);
    212212                if (sCopyright == null) {
    213                     sCopyright = Main.pref.get("lastCopyright", "http://creativecommons.org/licenses/by-sa/2.5");
     213                    sCopyright = Main.pref.get("lastCopyright", "https://creativecommons.org/licenses/by-sa/2.5");
    214214                }
    215215                copyright.setText(sCopyright);
     
    303303                    return;
    304304                final String[] urls = {
    305                         "http://creativecommons.org/licenses/by-sa/2.5",
     305                        "https://creativecommons.org/licenses/by-sa/2.5",
    306306                        "http://opendatacommons.org/licenses/odbl/1.0",
    307307                        "public domain",
    308                         "http://www.gnu.org/copyleft/lesser.html",
     308                        "https://www.gnu.org/copyleft/lesser.html",
    309309                        "http://www.opensource.org/licenses/bsd-license.php"};
    310310                String license = "";
  • trunk/src/org/openstreetmap/josm/io/OsmApi.java

    r6906 r6920  
    7474     * @since 5422
    7575     */
    76     public static final String DEFAULT_API_URL = "http://api.openstreetmap.org/api";
     76    public static final String DEFAULT_API_URL = "https://api.openstreetmap.org/api";
    7777
    7878    // The collection of instantiated OSM APIs
  • trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

    r6643 r6920  
    110110        //          E.g. [1] lists lat as first coordinate axis and lot as second, so it is switched for EPSG:4326.
    111111        //          For most other EPSG code there seems to be no difference.
    112         // [1] http://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326
     112        // [1] https://www.epsg-registry.org/report.htm?type=selection&entity=urn:ogc:def:crs:EPSG::4326&reportDetail=short&style=urn:uuid:report-style:default-with-code&style_name=OGP%20Default%20With%20Code&title=EPSG:4326
    113113        boolean switchLatLon = false;
    114114        if (baseURL.toLowerCase().contains("crs=epsg:4326")) {
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java

    r6902 r6920  
    3535        return new String[]{"url"};
    3636    }
    37    
     37
    3838    @Override
    3939    public String[] getOptionalParams() {
     
    112112        this.args = args;
    113113    }
    114    
     114
    115115    @Override
    116116    protected void validateRequest() throws RequestHandlerBadRequestException {
     
    137137            }
    138138        }));
    139         return new String[] { "/imagery?title=osm&type=tms&url=http://tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
     139        return new String[] { "/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
    140140            "/imagery?title=landsat&type=wms&url=http://irs.gis-lab.info/?layers=landsat&SRS=%7Bproj%7D&WIDTH=%7Bwidth%7D&HEIGHT=%7Bheight%7D&BBOX=%7Bbbox%7D",
    141141            "/imagery?title=...&type={"+types+"}&url=....[&cookies=...][&min_zoom=...][&max_zoom=...]"};
Note: See TracChangeset for help on using the changeset viewer.