Skip to content

Commit

Permalink
Change links to HTTPS (#132)
Browse files Browse the repository at this point in the history
* Change links to HTTPS

* Change link to HTTPS

* Change link to HTTPS

* Change links to HTTPS

* Change attribution to HTTPS
  • Loading branch information
danieldegroot2 authored Oct 18, 2022
1 parent e5355be commit 38a2274
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<osm><node lat="1.23" lon="3.21" id="-1" /></osm>' | osmtogeojson`
* add flat-properties output mode (default for the cli tool)
* add options to override default `uninterestingTags` and `polygonFeatures`
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
-----
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
2 changes: 1 addition & 1 deletion test-cli/cli.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ test('piped json', function (t) {

test('piped osm (subformats)', function (t) {

var xml = '<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/">'+
var xml = '<osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="https://www.openstreetmap.org/copyright" license="https://opendatacommons.org/licenses/odbl/1-0/">'+
'<relation id="4294968148" visible="true" timestamp="2013-05-14T10:33:05Z" version="1" changeset="23123" user="tyrTester06" uid="1178">'+
'<member type="way" ref="4295032195" role="line"/>'+
'<member type="node" ref="4295668179" role="point"/>'+
Expand Down
6 changes: 3 additions & 3 deletions test/osm.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1922,7 +1922,7 @@ describe("defaults", function() {
// tagged, uninteresting and untagged nodes
// see https://github.com/openstreetmap/openstreetmap-website/pull/283
var xml;
xml = '<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/">'+
xml = '<osm version="0.6" generator="OpenStreetMap server" copyright="OpenStreetMap and contributors" attribution="https://www.openstreetmap.org/copyright" license="https://opendatacommons.org/licenses/odbl/1-0/">'+
'<relation id="4294968148" visible="true" timestamp="2013-05-14T10:33:05Z" version="1" changeset="23123" user="tyrTester06" uid="1178">'+
'<member type="way" ref="4295032195" role="line"/>'+
'<member type="node" ref="4295668179" role="point"/>'+
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 38a2274

Please sign in to comment.