openskidata-format 5.5.0 → 7.0.0

package/dist/Lift.d.ts

@@ -1,5 +1,6 @@
 import { ElevationData } from './ElevationProfile';
 import { FeatureType } from './FeatureType';
+import { Place } from './Place';
 import { SkiAreaSummaryFeature } from './SkiArea';
 import { Source } from './Source';
 import { Status } from './Status';
@@ -23,6 +24,7 @@ export type LiftGeometry = GeoJSON.LineString | GeoJSON.MultiLineString;
  * @property {Status} status - Operational status of the lift. Derived from OpenStreetMap lifecycle tags.
  * @property {string | null} name - Name of the lift. Derived from the OpenStreetMap name tag.
  * @property {string | null} ref - Reference code/number for the lift. Derived from the OpenStreetMap ref tag.
+ * @property {string | null} refFRCAIRN - French CAIRN reference identifier. Derived from the OpenStreetMap ref:FR:CAIRN tag.
  * @property {string | null} description - Description of the lift. Derived from the OpenStreetMap description tag.
  * @property {boolean | null} oneway - Whether the lift allows riding only in one direction. Derived from the OpenStreetMap oneway tag.
  * @property {number | null} occupancy - Number of people each carrier can transport. Derived from the OpenStreetMap aerialway:occupancy tag.
@@ -34,7 +36,8 @@ export type LiftGeometry = GeoJSON.LineString | GeoJSON.MultiLineString;
  * @property {SkiAreaSummaryFeature[]} skiAreas - Ski areas this lift is a part of.
  * @property {Source[]} sources - Data sources for the feature.
  * @property {string[]} websites - Websites associated with this lift. Derived from the OpenStreetMap website tag.
- * @property {string | null} wikidata_id - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
+ * @property {string | null} wikidataID - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
+ * @property {Place[]} places - Geographic places this lift is within (e.g., city, region, country). Derived from reverse geocoding.
  */
 export type LiftProperties = {
     type: FeatureType.Lift;
@@ -43,6 +46,7 @@ export type LiftProperties = {
     status: Status;
     name: string | null;
     ref: string | null;
+    refFRCAIRN: string | null;
     description: string | null;
     oneway: boolean | null;
     occupancy: number | null;
@@ -54,7 +58,8 @@ export type LiftProperties = {
     skiAreas: SkiAreaSummaryFeature[];
     sources: Source[];
     websites: string[];
-    wikidata_id: string | null;
+    wikidataID: string | null;
+    places: Place[];
 };
 export declare enum LiftType {
     CableCar = "cable_car",

package/dist/Lift.js.map

@@ -1 +1 @@
-{"version":3,"file":"Lift.js","sourceRoot":"","sources":["../src/Lift.ts"],"names":[],"mappings":";;;AAmFA,oDAwBC;AAED,oDA6BC;AAED,oCAgBC;AA5JD,yDAAoE;AAIpE,qCAAiC;AACjC,4EAAwE;AA0DxE,IAAY,QAaX;AAbD,WAAY,QAAQ;IAClB,kCAAsB,CAAA;IACtB,+BAAmB,CAAA;IACnB,oCAAwB,CAAA;IACxB,oCAAwB,CAAA;IACxB,kCAAsB,CAAA;IACtB,0BAAc,CAAA;IACd,0BAAc,CAAA;IACd,+BAAmB,CAAA;IACnB,gCAAoB,CAAA;IACpB,wCAA4B,CAAA;IAC5B,mCAAuB,CAAA;IACvB,+BAAmB,CAAA;AACrB,CAAC,EAbW,QAAQ,wBAAR,QAAQ,QAanB;AAOD,SAAgB,oBAAoB,CAClC,OAAoB;IAEpB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;IACjC,IACE,CAAC,QAAQ;QACT,QAAQ,CAAC,IAAI,KAAK,YAAY;QAC9B,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAClC,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,mCAAgB,EAAC,QAAQ,CAAC,CAAA;IAChD,MAAM,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAA;IAErD,OAAO;QACL,GAAG,aAAa;QAChB,sBAAsB,EAAE,iBAAiB;YACvC,CAAC,CAAC,aAAa,CAAC,sBAAsB,GAAG,iBAAiB;YAC1D,CAAC,CAAC,IAAI;QACR,8BAA8B,EAAE,iBAAiB;YAC/C,CAAC,CAAC,aAAa,CAAC,gBAAgB,GAAG,iBAAiB;YACpD,CAAC,CAAC,IAAI;KACT,CAAA;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,QAAkB;IACrD,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,QAAQ,CAAC,QAAQ;YACpB,OAAO,WAAW,CAAA;QACpB,KAAK,QAAQ,CAAC,OAAO;YACnB,OAAO,SAAS,CAAA;QAClB,KAAK,QAAQ,CAAC,SAAS;YACrB,OAAO,WAAW,CAAA;QACpB,KAAK,QAAQ,CAAC,SAAS;YACrB,OAAO,QAAQ,CAAA;QACjB,KAAK,QAAQ,CAAC,QAAQ;YACpB,OAAO,WAAW,CAAA;QACpB,KAAK,QAAQ,CAAC,IAAI;YAChB,OAAO,OAAO,CAAA;QAChB,KAAK,QAAQ,CAAC,IAAI;YAChB,OAAO,OAAO,CAAA;QAChB,KAAK,QAAQ,CAAC,OAAO;YACnB,OAAO,SAAS,CAAA;QAClB,KAAK,QAAQ,CAAC,OAAO;YACnB,OAAO,SAAS,CAAA;QAClB,KAAK,QAAQ,CAAC,WAAW;YACvB,OAAO,cAAc,CAAA;QACvB,KAAK,QAAQ,CAAC,SAAS;YACrB,OAAO,WAAW,CAAA;QACpB,KAAK,QAAQ,CAAC,OAAO;YACnB,OAAO,SAAS,CAAA;QAClB;YACE,OAAO,IAAA,iDAAuB,EAAC,QAAQ,CAAC,CAAA;IAC5C,CAAC;AACH,CAAC;AAED,SAAgB,YAAY,CAAC,MAAc;IACzC,MAAM,gBAAgB,GAAG,kBAAkB,CAAA;IAC3C,MAAM,aAAa,GAAG,kBAAkB,CAAA;IAExC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,eAAM,CAAC,OAAO,CAAC;QACpB,KAAK,eAAM,CAAC,SAAS;YACnB,OAAO,aAAa,CAAA;QACtB,KAAK,eAAM,CAAC,QAAQ,CAAC;QACrB,KAAK,eAAM,CAAC,OAAO,CAAC;QACpB,KAAK,eAAM,CAAC,YAAY,CAAC;QACzB,KAAK,eAAM,CAAC,SAAS;YACnB,OAAO,gBAAgB,CAAA;QACzB;YACE,OAAO,IAAA,iDAAuB,EAAC,MAAM,CAAC,CAAA;IAC1C,CAAC;AACH,CAAC"}
+{"version":3,"file":"Lift.js","sourceRoot":"","sources":["../src/Lift.ts"],"names":[],"mappings":"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"}

package/dist/{Location.d.ts → Place.d.ts}

@@ -1,4 +1,4 @@
-export type Location = {
+export type Place = {
     iso3166_1Alpha2: string;
     iso3166_2: string | null;
     localized: {

package/dist/{Location.js → Place.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=Location.js.map
+//# sourceMappingURL=Place.js.map

package/dist/Place.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Place.js","sourceRoot":"","sources":["../src/Place.ts"],"names":[],"mappings":""}

package/dist/Run.d.ts

@@ -1,6 +1,7 @@
 import * as GeoJSON from 'geojson';
 import { ElevationData, ElevationProfile } from './ElevationProfile';
 import { FeatureType } from './FeatureType';
+import { Place } from './Place';
 import { RunDifficultyConvention } from './RunDifficultyConvention';
 import { SkiAreaSummaryFeature } from './SkiArea';
 import { SnowCoverHistory } from './SnowCoverHistory';
@@ -46,7 +47,8 @@ export type RunFeature = GeoJSON.Feature<RunGeometry, RunProperties>;
  * @property {ElevationProfile | null} elevationProfile - Elevation profile of the run, only available for runs with LineString geometry.
  * @property {Source[]} sources - Data sources for this run's information
  * @property {string[]} websites - Websites associated with this run, derived from the OpenStreetMap website tag
- * @property {string | null} wikidata_id - Wikidata identifier, if available, derived from the OpenStreetMap wikidata tag
+ * @property {string | null} wikidataID - Wikidata identifier, if available, derived from the OpenStreetMap wikidata tag
+ * @property {Place[]} places - Geographic places this run is within (e.g., city, region, country). Derived from reverse geocoding.
  * @property {SnowCoverHistory} [snowCoverHistory] - Historical snow cover data for this run, if available
  */
 export type RunProperties = {
@@ -68,7 +70,8 @@ export type RunProperties = {
     elevationProfile: ElevationProfile | null;
     sources: Source[];
     websites: string[];
-    wikidata_id: string | null;
+    wikidataID: string | null;
+    places: Place[];
     snowCoverHistory?: SnowCoverHistory;
 };
 export declare enum RunUse {

package/dist/Run.js.map

@@ -1 +1 @@
-{"version":3,"file":"Run.js","sourceRoot":"","sources":["../src/Run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Run.js","sourceRoot":"","sources":["../src/Run.ts"],"names":[],"mappings":"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"}

package/dist/SkiArea.d.ts

@@ -1,6 +1,6 @@
 import { FeatureType } from './FeatureType';
 import { LiftType } from './Lift';
-import { Location } from './Location';
+import { Place } from './Place';
 import { RunDifficulty } from './Run';
 import { RunDifficultyConvention } from './RunDifficultyConvention';
 import { SnowCoverHistory } from './SnowCoverHistory';
@@ -30,7 +30,7 @@ export type SkiAreaFeature = GeoJSON.Feature<SkiAreaGeometry, SkiAreaProperties>
 export type SkiAreaGeometry = GeoJSON.Point | GeoJSON.Polygon | GeoJSON.MultiPolygon;
 export type SkiAreaSummaryFeature = GeoJSON.Feature<SkiAreaGeometry, SkiAreaSummaryProperties>;
 /**
- * @property {string} id - Unique identifier for the ski area. The ID is just a hash of the feature, so will change if the feature changes in any way. If a stable identifier is needed, use the wikidata_id property, or a source id.
+ * @property {string} id - Unique identifier for the ski area. The ID is just a hash of the feature, so will change if the feature changes in any way. If a stable identifier is needed, use the wikidataID property, or a source id.
  * @property {string | null} name - Name of the ski area.
  * @property {Source[]} sources - Data sources.
  * @property {SkiAreaActivity[]} activities - Activities available at this ski area, derived from presence of ski runs and Skimap.org data.
@@ -38,15 +38,16 @@ export type SkiAreaSummaryFeature = GeoJSON.Feature<SkiAreaGeometry, SkiAreaSumm
  * @property {Status | null} status - Operational status. Derived from OpenStreetMap lifecycle tags and Skimap.org data.
  * @property {RunColorConvention} runConvention - Color convention used for runs at this ski area.
  * @property {string[]} websites - Official website(s) of the ski area. Derived from the OpenStreetMap website tag and Skimap.org data.
- * @property {string | null} wikidata_id - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
- * @property {Location | null} location - Reverse geocoded country / region information.
+ * @property {string | null} wikidataID - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
+ * @property {Place[]} places - Geographic places this ski area is within (e.g., city, region, country). Derived from reverse geocoding.
  */
 export type SkiAreaProperties = SkiAreaSummaryProperties & {
     sources: Source[];
     statistics?: SkiAreaStatistics;
     runConvention: RunDifficultyConvention;
     websites: string[];
-    wikidata_id: string | null;
+    wikidataID: string | null;
+    places: Place[];
 };
 export type SkiAreaSummaryProperties = {
     type: FeatureType.SkiArea;
@@ -54,7 +55,6 @@ export type SkiAreaSummaryProperties = {
     name: string | null;
     activities: SkiAreaActivity[];
     status: Status | null;
-    location: Location | null;
 };
 export declare enum SkiAreaActivity {
     Downhill = "downhill",

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export * from './ElevationProfile';
 export * from './FeatureType';
 export * from './Lift';
 export * from './LiftNameFormatter';
-export * from './Location';
+export * from './Place';
 export * from './Run';
 export * from './RunDifficultyConvention';
 export * from './SlopeGradingScale';

package/dist/index.js

@@ -5,7 +5,7 @@ tslib_1.__exportStar(require("./ElevationProfile"), exports);
 tslib_1.__exportStar(require("./FeatureType"), exports);
 tslib_1.__exportStar(require("./Lift"), exports);
 tslib_1.__exportStar(require("./LiftNameFormatter"), exports);
-tslib_1.__exportStar(require("./Location"), exports);
+tslib_1.__exportStar(require("./Place"), exports);
 tslib_1.__exportStar(require("./Run"), exports);
 tslib_1.__exportStar(require("./RunDifficultyConvention"), exports);
 tslib_1.__exportStar(require("./SlopeGradingScale"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,wDAA6B;AAC7B,iDAAsB;AACtB,8DAAmC;AACnC,qDAA0B;AAC1B,gDAAqB;AACrB,oEAAyC;AACzC,8DAAmC;AACnC,oDAAyB;AACzB,6DAAkC;AAClC,mDAAwB;AACxB,mDAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkC;AAClC,wDAA6B;AAC7B,iDAAsB;AACtB,8DAAmC;AACnC,kDAAuB;AACvB,gDAAqB;AACrB,oEAAyC;AACzC,8DAAmC;AACnC,oDAAyB;AACzB,6DAAkC;AAClC,mDAAwB;AACxB,mDAAwB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openskidata-format",
-  "version": "5.5.0",
+  "version": "7.0.0",
   "description": "Data format for OpenSkiMap.org",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/ElevationProfile.test.ts

@@ -176,7 +176,8 @@ describe('ElevationProfile', () => {
           patrolled: null,
           grooming: null,
           websites: [],
-          wikidata_id: null,
+          wikidataID: null,
+          places: [],
         },
       }
 
@@ -212,7 +213,8 @@ describe('ElevationProfile', () => {
           patrolled: null,
           grooming: null,
           websites: [],
-          wikidata_id: null,
+          wikidataID: null,
+          places: [],
         },
       }
 
@@ -237,6 +239,7 @@ describe('ElevationProfile', () => {
           skiAreas: [],
           sources: [],
           ref: null,
+          refFRCAIRN: null,
           description: null,
           oneway: null,
           occupancy: null,
@@ -246,7 +249,8 @@ describe('ElevationProfile', () => {
           bubble: null,
           heating: null,
           websites: [],
-          wikidata_id: null,
+          wikidataID: null,
+          places: [],
         },
       }
 
@@ -288,7 +292,8 @@ describe('ElevationProfile', () => {
           },
           sources: [],
           websites: [],
-          wikidata_id: null,
+          wikidataID: null,
+          places: [],
         },
         geometry: {
           type: 'LineString',

package/src/Lift.ts

@@ -1,5 +1,6 @@
 import { ElevationData, getElevationData } from './ElevationProfile'
 import { FeatureType } from './FeatureType'
+import { Place } from './Place'
 import { SkiAreaSummaryFeature } from './SkiArea'
 import { Source } from './Source'
 import { Status } from './Status'
@@ -27,6 +28,7 @@ export type LiftGeometry = GeoJSON.LineString | GeoJSON.MultiLineString
  * @property {Status} status - Operational status of the lift. Derived from OpenStreetMap lifecycle tags.
  * @property {string | null} name - Name of the lift. Derived from the OpenStreetMap name tag.
  * @property {string | null} ref - Reference code/number for the lift. Derived from the OpenStreetMap ref tag.
+ * @property {string | null} refFRCAIRN - French CAIRN reference identifier. Derived from the OpenStreetMap ref:FR:CAIRN tag.
  * @property {string | null} description - Description of the lift. Derived from the OpenStreetMap description tag.
  * @property {boolean | null} oneway - Whether the lift allows riding only in one direction. Derived from the OpenStreetMap oneway tag.
  * @property {number | null} occupancy - Number of people each carrier can transport. Derived from the OpenStreetMap aerialway:occupancy tag.
@@ -38,7 +40,8 @@ export type LiftGeometry = GeoJSON.LineString | GeoJSON.MultiLineString
  * @property {SkiAreaSummaryFeature[]} skiAreas - Ski areas this lift is a part of.
  * @property {Source[]} sources - Data sources for the feature.
  * @property {string[]} websites - Websites associated with this lift. Derived from the OpenStreetMap website tag.
- * @property {string | null} wikidata_id - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
+ * @property {string | null} wikidataID - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
+ * @property {Place[]} places - Geographic places this lift is within (e.g., city, region, country). Derived from reverse geocoding.
  */
 export type LiftProperties = {
   type: FeatureType.Lift
@@ -47,6 +50,7 @@ export type LiftProperties = {
   status: Status
   name: string | null
   ref: string | null
+  refFRCAIRN: string | null
   description: string | null
   oneway: boolean | null
   occupancy: number | null
@@ -58,7 +62,8 @@ export type LiftProperties = {
   skiAreas: SkiAreaSummaryFeature[]
   sources: Source[]
   websites: string[]
-  wikidata_id: string | null
+  wikidataID: string | null
+  places: Place[]
 }
 
 export enum LiftType {

package/src/{Location.ts → Place.ts}

@@ -1,4 +1,4 @@
-export type Location = {
+export type Place = {
   iso3166_1Alpha2: string
   iso3166_2: string | null
   localized: {

package/src/Run.ts

@@ -6,6 +6,7 @@ import {
   getProfileGeometry,
 } from './ElevationProfile'
 import { FeatureType } from './FeatureType'
+import { Place } from './Place'
 import { RunDifficultyConvention } from './RunDifficultyConvention'
 import { SkiAreaSummaryFeature } from './SkiArea'
 import { SnowCoverHistory } from './SnowCoverHistory'
@@ -55,7 +56,8 @@ export type RunFeature = GeoJSON.Feature<RunGeometry, RunProperties>
  * @property {ElevationProfile | null} elevationProfile - Elevation profile of the run, only available for runs with LineString geometry.
  * @property {Source[]} sources - Data sources for this run's information
  * @property {string[]} websites - Websites associated with this run, derived from the OpenStreetMap website tag
- * @property {string | null} wikidata_id - Wikidata identifier, if available, derived from the OpenStreetMap wikidata tag
+ * @property {string | null} wikidataID - Wikidata identifier, if available, derived from the OpenStreetMap wikidata tag
+ * @property {Place[]} places - Geographic places this run is within (e.g., city, region, country). Derived from reverse geocoding.
  * @property {SnowCoverHistory} [snowCoverHistory] - Historical snow cover data for this run, if available
  */
 export type RunProperties = {
@@ -77,7 +79,8 @@ export type RunProperties = {
   elevationProfile: ElevationProfile | null
   sources: Source[]
   websites: string[]
-  wikidata_id: string | null
+  wikidataID: string | null
+  places: Place[]
   snowCoverHistory?: SnowCoverHistory
 }
 

package/src/SkiArea.ts

@@ -1,6 +1,6 @@
 import { FeatureType } from './FeatureType'
 import { LiftType } from './Lift'
-import { Location } from './Location'
+import { Place } from './Place'
 import { RunDifficulty } from './Run'
 import { RunDifficultyConvention } from './RunDifficultyConvention'
 import { SnowCoverHistory } from './SnowCoverHistory'
@@ -40,7 +40,7 @@ export type SkiAreaSummaryFeature = GeoJSON.Feature<
 >
 
 /**
- * @property {string} id - Unique identifier for the ski area. The ID is just a hash of the feature, so will change if the feature changes in any way. If a stable identifier is needed, use the wikidata_id property, or a source id.
+ * @property {string} id - Unique identifier for the ski area. The ID is just a hash of the feature, so will change if the feature changes in any way. If a stable identifier is needed, use the wikidataID property, or a source id.
  * @property {string | null} name - Name of the ski area.
  * @property {Source[]} sources - Data sources.
  * @property {SkiAreaActivity[]} activities - Activities available at this ski area, derived from presence of ski runs and Skimap.org data.
@@ -48,15 +48,16 @@ export type SkiAreaSummaryFeature = GeoJSON.Feature<
  * @property {Status | null} status - Operational status. Derived from OpenStreetMap lifecycle tags and Skimap.org data.
  * @property {RunColorConvention} runConvention - Color convention used for runs at this ski area.
  * @property {string[]} websites - Official website(s) of the ski area. Derived from the OpenStreetMap website tag and Skimap.org data.
- * @property {string | null} wikidata_id - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
- * @property {Location | null} location - Reverse geocoded country / region information.
+ * @property {string | null} wikidataID - Wikidata identifier. Derived from the OpenStreetMap wikidata tag.
+ * @property {Place[]} places - Geographic places this ski area is within (e.g., city, region, country). Derived from reverse geocoding.
  */
 export type SkiAreaProperties = SkiAreaSummaryProperties & {
   sources: Source[]
   statistics?: SkiAreaStatistics
   runConvention: RunDifficultyConvention
   websites: string[]
-  wikidata_id: string | null
+  wikidataID: string | null
+  places: Place[]
 }
 
 export type SkiAreaSummaryProperties = {
@@ -65,7 +66,6 @@ export type SkiAreaSummaryProperties = {
   name: string | null
   activities: SkiAreaActivity[]
   status: Status | null
-  location: Location | null
 }
 
 export enum SkiAreaActivity {

package/src/SlopeGradingScale.test.ts

@@ -25,7 +25,8 @@ describe("getEstimatedRunDifficulty", () => {
         elevationProfile: null,
         sources: [],
         websites: [],
-        wikidata_id: null,
+        wikidataID: null,
+        places: [],
       },
     });
 
@@ -55,14 +56,16 @@ describe("getEstimatedRunDifficulty", () => {
         elevationProfile: null,
         sources: [],
         websites: [],
-        wikidata_id: null,
+        wikidataID: null,
+        places: [],
       },
     });
 
     expect(getEstimatedRunDifficulty(0.1, downhillScale)).toBe(RunDifficulty.EASY); // 10%
     expect(getEstimatedRunDifficulty(0.3, downhillScale)).toBe(RunDifficulty.INTERMEDIATE); // 30%
     expect(getEstimatedRunDifficulty(0.6, downhillScale)).toBe(RunDifficulty.ADVANCED); // 60%
-    expect(getEstimatedRunDifficulty(1.0, downhillScale)).toBe(RunDifficulty.EXPERT); // 100%
+    expect(getEstimatedRunDifficulty(0.9, downhillScale)).toBe(RunDifficulty.EXPERT); // 90%
+    expect(getEstimatedRunDifficulty(1.0, downhillScale)).toBe(RunDifficulty.FREERIDE); // 100%
   });
 
   it("should return correct difficulty for nordic slopes", () => {
@@ -88,7 +91,8 @@ describe("getEstimatedRunDifficulty", () => {
         elevationProfile: null,
         sources: [],
         websites: [],
-        wikidata_id: null,
+        wikidataID: null,
+        places: [],
       },
     });
 
@@ -120,7 +124,8 @@ describe("getEstimatedRunDifficulty", () => {
         elevationProfile: null,
         sources: [],
         websites: [],
-        wikidata_id: null,
+        wikidataID: null,
+        places: [],
       },
     });
 

package/src/index.ts

@@ -2,7 +2,7 @@ export * from './ElevationProfile'
 export * from './FeatureType'
 export * from './Lift'
 export * from './LiftNameFormatter'
-export * from './Location'
+export * from './Place'
 export * from './Run'
 export * from './RunDifficultyConvention'
 export * from './SlopeGradingScale'

package/dist/Location.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Location.js","sourceRoot":"","sources":["../src/Location.ts"],"names":[],"mappings":""}