From 2d76fd638294c140626cc3e3aebc8b89fc969761 Mon Sep 17 00:00:00 2001 From: tkqubo Date: Wed, 13 Jan 2016 17:49:33 +0900 Subject: [PATCH] fix: more appropriate interface name for OSM models --- osmtogeojson/osmtogeojson-tests.ts | 2 +- osmtogeojson/osmtogeojson.d.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/osmtogeojson/osmtogeojson-tests.ts b/osmtogeojson/osmtogeojson-tests.ts index a4debe4c1..f7d52c075 100644 --- a/osmtogeojson/osmtogeojson-tests.ts +++ b/osmtogeojson/osmtogeojson-tests.ts @@ -33,7 +33,7 @@ osmtogeojson(xml, { uninterestingTags: {foo:true} }); -let json: OsmJSON.Root = { +let json: OsmJSON.OsmJSONObject = { elements: [ { type: "node", diff --git a/osmtogeojson/osmtogeojson.d.ts b/osmtogeojson/osmtogeojson.d.ts index 0edee3509..ad29c1b73 100644 --- a/osmtogeojson/osmtogeojson.d.ts +++ b/osmtogeojson/osmtogeojson.d.ts @@ -5,8 +5,8 @@ declare module "osmtogeojson" { export interface OsmToGeoJSON { - (data: Document|OsmJSON.Root, options?: Options): GeoJSON.GeoJSONObject; - toGeojson(data: Document|OsmJSON.Root, options?: Options): GeoJSON.GeoJSONObject; + (data: Document|OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject; + toGeojson(data: Document|OsmJSON.OsmJSONObject, options?: Options): GeoJSON.GeoJSONObject; } export interface Options { @@ -54,11 +54,11 @@ declare module "osmtogeojson" { } export namespace OsmJSON { - export interface Root { + export interface OsmJSONObject { elements: (Node|Way|Relationship)[]; } - export interface OsmJSONObject { + export interface Element { type: string; id: number; tags?: { [name: string]: string; } @@ -69,16 +69,16 @@ declare module "osmtogeojson" { uid?: number; } - export interface Node extends OsmJSONObject { + export interface Node extends Element { lat: number; lon: number; } - export interface Way extends OsmJSONObject { + export interface Way extends Element { nodes: number[]; } - export interface Relationship extends OsmJSONObject { + export interface Relationship extends Element { members: Member[]; }