Switch to api.openstreetmap.org API host #132
Conversation
There was a problem hiding this comment.
This is a test file. We very specifically want to ensure that the task accepts urls that may be redirected (e.g. http -> https).
There was a problem hiding this comment.
This is a test file. We very specifically want to ensure that the task accepts urls that may be redirected (e.g. http -> https).
Adding https urls would be fine though. Or converting just one of the urls to https.
There was a problem hiding this comment.
This is a test file. We very specifically want to ensure that the task accepts urls that may be redirected (e.g. http -> https).
Adding https urls would be fine though. Or converting just one of the urls to https.
| @@ -33,7 +33,7 @@ class OsmChangesetParserTest { | |||
| "<comment date=\"2016-09-13T13:28:20Z\" uid=\"1733149\" user=\"Jean Passepartout\">" + | |||
| "<text>" + | |||
| "Hi keeler, Thank you for contributing to OpenStreetMap. " + | |||
| "I noticed you added this way: http://www.openstreetmap.org/way/363580576, " + | |||
| "I noticed you added this way: https://www.openstreetmap.org/way/363580576, " + | |||
There was a problem hiding this comment.
This does not match the actual return from https://api.openstreetmap.org/api/0.6/changeset/36749147?include_discussion=true .
| @@ -21,7 +21,7 @@ class OsmChangesetParserTest { | |||
|
|
|||
| private static final String BEGIN = | |||
| "<osm version=\"0.6\" generator=\"OpenStreetMap server\" copyright=\"OpenStreetMap and contributors\" " + | |||
| "attribution=\"http://www.openstreetmap.org/copyright\" license=\"http://opendatacommons.org/licenses/odbl/1-0/\">" + | |||
| "attribution=\"https://www.openstreetmap.org/copyright\" license=\"https://opendatacommons.org/licenses/odbl/1-0/\">" + | |||
There was a problem hiding this comment.
This does not match the actual return from https://api.openstreetmap.org/api/0.6/changeset/36749147?include_discussion=true .
| " \"copyright\": \"The data included in this document is from www.openstreetmap.org. " + | ||
| "It has there been collected by a large group of contributors. " + | ||
| "For individual attribution of each item please refer to " + | ||
| "http://www.openstreetmap.org/api/0.6/[node|way|relation]/#id/history\"\n" + | ||
| "https://api.openstreetmap.org/api/0.6/[node|way|relation]/#id/history\"\n" + |
There was a problem hiding this comment.
This is from overpass. It looks like we need to update the entire "copyright" entry to The data included in this document is from www.openstreetmap.org. The data is made available under ODbL.
There was a problem hiding this comment.
This is a test file -- it has no effect in production. Probably safe, but I do need to run the tests, even though JOSMFixture should be rarely used at this point.
There was a problem hiding this comment.
I can replace this PR by one with just the changes to JOSMFixture.java so you can start testing right away. Is this okay?
(Changes made on desktop browser version.)
There was a problem hiding this comment.
I can make the changes locally. It does take ~10 minutes for the tests to run. I'll do that as soon as I finish what I'm currently working on, if I don't see something urgent in the ticket tracker.
There was a problem hiding this comment.
The tests passed, so it looks like nothing in JOSM core needs the www. checks.
There was a problem hiding this comment.
Let me know what you think should be done with the PR. You can always close it. ;-)
Use
api.openstreetmap.org/api/-and HTTPS- instead ofwww.openstreetmap.org/api/*.(Is: openstreetmap/operations#951)
Except in validating a (manual) url, where the HTTP version has been left as valid for now.
Optionally, warn users if they are using the
wwwand/or HTTP url.Also changes some other URLs which redirect from HTTP to HTTPS into HTTPS urls.
This GitHub PR does not have a linked JOSM issue ticket at https://josm.openstreetmap.de/report .
Commit descriptions are left as default 'updated file ...'.
cc: @tsmock