diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be0d1d..b5a05ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -123,7 +123,7 @@ fixed a bug where full geometry information caused additional Point features in 1.2.0 ----- -* add [demo](http://tyrasd.github.io/osmtogeojson/) page +* add [demo](https://tyrasd.github.io/osmtogeojson/) page * support for pipes in cli tool: `echo '' | osmtogeojson` * add flat-properties output mode (default for the cli tool) * add options to override default `uninterestingTags` and `polygonFeatures` diff --git a/README.md b/README.md index 9b43f75..d43a27b 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ osmtogeojson ============ -Converts [OSM](http://openstreetmap.org) [data](http://wiki.openstreetmap.org/wiki/OSM_XML) to [GeoJSON](http://www.geojson.org/). Try the [demo](http://tyrasd.github.io/osmtogeojson/)! +Converts [OSM](https://www.openstreetmap.org/) [data](https://wiki.openstreetmap.org/wiki/OSM_XML) to [GeoJSON](https://geojson.org/). Try the [demo](https://tyrasd.github.io/osmtogeojson/)! * stable * real OSM [polygon detection](https://wiki.openstreetmap.org/wiki/Overpass_turbo/Polygon_Features) * proper OSM multipolygon support -* full support for extended Overpass API [geometry modes](http://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL#Print_.28out.29) +* full support for extended Overpass API [geometry modes](https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL#Print_.28out.29) * well [tested](https://github.com/tyrasd/osmtogeojson/tree/gh-pages/test/) and proven * fast -This code is used in and maintained by the [overpass turbo](http://github.com/tyrasd/overpass-ide) project. +This code is used in and maintained by the [overpass turbo](https://github.com/tyrasd/overpass-turbo) project. -[![Build Status](https://secure.travis-ci.org/tyrasd/osmtogeojson.png)](https://travis-ci.org/tyrasd/osmtogeojson) +[![Build Status](https://secure.travis-ci.org/tyrasd/osmtogeojson.png)](https://travis-ci.org/github/tyrasd/osmtogeojson) Usage ----- @@ -59,7 +59,7 @@ API Converts OSM data into GeoJSON. -* `data`: the OSM data. Either as a XML DOM or in [OSM JSON](http://overpass-api.de/output_formats.html#json). +* `data`: the OSM data. Either as a XML DOM or in [OSM JSON](https://overpass-api.de/output_formats.html#json). * `options`: optional. The following options can be used: * `flatProperties`: If true, the resulting GeoJSON feature's properties will be a simple key-value list instead of a structured json object (with separate tags and metadata). default: false * `uninterestingTags`: Either a [blacklist](https://github.com/tyrasd/osmtogeojson/blob/2.0.0/index.js#L14-L24) of tag keys or a callback function. Will be used to decide if a feature is *interesting* enough for its own GeoJSON feature. diff --git a/bower.json b/bower.json index dc2a698..7eb062b 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "osmtogeojson", "main": "osmtogeojson.js", "version": "3.0.0-dev", - "homepage": "http://tyrasd.github.io/osmtogeojson", + "homepage": "https://tyrasd.github.io/osmtogeojson/", "authors": [ "Martin Raifer" ], diff --git a/test-cli/cli.test.js b/test-cli/cli.test.js index d0e4f0a..afb453d 100644 --- a/test-cli/cli.test.js +++ b/test-cli/cli.test.js @@ -106,7 +106,7 @@ test('piped json', function (t) { test('piped osm (subformats)', function (t) { - var xml = ''+ + var xml = ''+ ''+ ''+ ''+ diff --git a/test/osm.test.js b/test/osm.test.js index c41669f..613d5b7 100644 --- a/test/osm.test.js +++ b/test/osm.test.js @@ -1922,7 +1922,7 @@ describe("defaults", function() { // tagged, uninteresting and untagged nodes // see https://github.com/openstreetmap/openstreetmap-website/pull/283 var xml; - xml = ''+ + xml = ''+ ''+ ''+ ''+ @@ -1976,7 +1976,7 @@ describe("defaults", function() { expect(result.features).to.have.length(8); }); // polygon detection - // see: http://wiki.openstreetmap.org/wiki/Overpass_turbo/Polygon_Features + // see: https://wiki.openstreetmap.org/wiki/Overpass_turbo/Polygon_Features it("polygon detection", function () { var json, result; // basic tags: area=yes @@ -2150,7 +2150,7 @@ describe("options", function () { expect(result.features[1].properties.id).to.equal(1); }); // polygon detection - // see: http://wiki.openstreetmap.org/wiki/Overpass_turbo/Polygon_Features + // see: https://wiki.openstreetmap.org/wiki/Overpass_turbo/Polygon_Features it("polygon detection", function () { var json, result; // custom tagging detection rules