Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions gbfs-v2/api/gbfs-v2.api
Original file line number Diff line number Diff line change
Expand Up @@ -164,21 +164,21 @@ public final class dev/sargunv/mobilitydata/gbfs/v2/Bike$Companion {

public final class dev/sargunv/mobilitydata/gbfs/v2/BrandAssets {
public static final field Companion Ldev/sargunv/mobilitydata/gbfs/v2/BrandAssets$Companion;
public fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public synthetic fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Lkotlinx/datetime/LocalDate;
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()Ljava/lang/String;
public final fun component4 ()Ljava/lang/String;
public final fun component5 ()Ljava/lang/String;
public final fun copy (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ldev/sargunv/mobilitydata/gbfs/v2/BrandAssets;
public static synthetic fun copy$default (Ldev/sargunv/mobilitydata/gbfs/v2/BrandAssets;Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ldev/sargunv/mobilitydata/gbfs/v2/BrandAssets;
public final fun component5-NhXREWg ()Ldev/sargunv/mobilitydata/utils/RgbColor;
public final fun copy-LJyRZGo (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;)Ldev/sargunv/mobilitydata/gbfs/v2/BrandAssets;
public static synthetic fun copy-LJyRZGo$default (Ldev/sargunv/mobilitydata/gbfs/v2/BrandAssets;Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;ILjava/lang/Object;)Ldev/sargunv/mobilitydata/gbfs/v2/BrandAssets;
public fun equals (Ljava/lang/Object;)Z
public final fun getBrandImageUrl ()Ljava/lang/String;
public final fun getBrandImageUrlDark ()Ljava/lang/String;
public final fun getBrandLastModified ()Lkotlinx/datetime/LocalDate;
public final fun getBrandTermsUrl ()Ljava/lang/String;
public final fun getColor ()Ljava/lang/String;
public final fun getColor-NhXREWg ()Ldev/sargunv/mobilitydata/utils/RgbColor;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}
Expand Down
8 changes: 4 additions & 4 deletions gbfs-v2/api/gbfs-v2.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ final class dev.sargunv.mobilitydata.gbfs.v2/Bike { // dev.sargunv.mobilitydata.
}

final class dev.sargunv.mobilitydata.gbfs.v2/BrandAssets { // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets|null[0]
constructor <init>(kotlinx.datetime/LocalDate, kotlin/String? = ..., kotlin/String, kotlin/String? = ..., kotlin/String? = ...) // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.<init>|<init>(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;kotlin.String?){}[0]
constructor <init>(kotlinx.datetime/LocalDate, kotlin/String? = ..., kotlin/String, kotlin/String? = ..., dev.sargunv.mobilitydata.utils/RgbColor? = ...) // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.<init>|<init>(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;dev.sargunv.mobilitydata.utils.RgbColor?){}[0]

final val brandImageUrl // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.brandImageUrl|{}brandImageUrl[0]
final fun <get-brandImageUrl>(): kotlin/String // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.brandImageUrl.<get-brandImageUrl>|<get-brandImageUrl>(){}[0]
Expand All @@ -215,14 +215,14 @@ final class dev.sargunv.mobilitydata.gbfs.v2/BrandAssets { // dev.sargunv.mobili
final val brandTermsUrl // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.brandTermsUrl|{}brandTermsUrl[0]
final fun <get-brandTermsUrl>(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.brandTermsUrl.<get-brandTermsUrl>|<get-brandTermsUrl>(){}[0]
final val color // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.color|{}color[0]
final fun <get-color>(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.color.<get-color>|<get-color>(){}[0]
final fun <get-color>(): dev.sargunv.mobilitydata.utils/RgbColor? // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.color.<get-color>|<get-color>(){}[0]

final fun component1(): kotlinx.datetime/LocalDate // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.component1|component1(){}[0]
final fun component2(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.component2|component2(){}[0]
final fun component3(): kotlin/String // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.component3|component3(){}[0]
final fun component4(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.component4|component4(){}[0]
final fun component5(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.component5|component5(){}[0]
final fun copy(kotlinx.datetime/LocalDate = ..., kotlin/String? = ..., kotlin/String = ..., kotlin/String? = ..., kotlin/String? = ...): dev.sargunv.mobilitydata.gbfs.v2/BrandAssets // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.copy|copy(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;kotlin.String?){}[0]
final fun component5(): dev.sargunv.mobilitydata.utils/RgbColor? // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.component5|component5(){}[0]
final fun copy(kotlinx.datetime/LocalDate = ..., kotlin/String? = ..., kotlin/String = ..., kotlin/String? = ..., dev.sargunv.mobilitydata.utils/RgbColor? = ...): dev.sargunv.mobilitydata.gbfs.v2/BrandAssets // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.copy|copy(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;dev.sargunv.mobilitydata.utils.RgbColor?){}[0]
final fun equals(kotlin/Any?): kotlin/Boolean // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.equals|equals(kotlin.Any?){}[0]
final fun hashCode(): kotlin/Int // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.hashCode|hashCode(){}[0]
final fun toString(): kotlin/String // dev.sargunv.mobilitydata.gbfs.v2/BrandAssets.toString|toString(){}[0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package dev.sargunv.mobilitydata.gbfs.v2

import dev.sargunv.mobilitydata.utils.ExtendedLocalDate
import dev.sargunv.mobilitydata.utils.LanguageCode
import dev.sargunv.mobilitydata.utils.RgbColorCode
import dev.sargunv.mobilitydata.utils.Uri
import dev.sargunv.mobilitydata.utils.Url
import kotlinx.datetime.TimeZone
Expand Down Expand Up @@ -145,7 +146,7 @@ public data class BrandAssets(
* Color used to represent the brand for the service expressed as a 6 digit hexadecimal color code
* in the form #000000.
*/
public val color: String? = null,
public val color: RgbColorCode? = null,
)

/** Contains rental app information for different platforms. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,16 @@ public data class VehicleType(
/** The name of the vehicle model. */
public val model: String? = null,

/** The color of the vehicle. */
/**
* The color of the vehicle, in plain English.
*
* All words must be in lower case, without special characters, quotation marks, hyphens,
* underscores, commas, or dots. Spaces are allowed in case of a compound name.
*
* Example
* - green
* - dark blue
*/
public val color: String? = null,

/** Number of wheels this vehicle type has. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.sargunv.mobilitydata.gbfs.v2

import dev.sargunv.mobilitydata.utils.RgbColorCode
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.time.Duration.Companion.seconds
Expand Down Expand Up @@ -100,7 +101,7 @@ private val expectedResponse =
brandLastModified = LocalDate(2021, 6, 15),
brandImageUrl = "https://www.example.com/assets/brand_image.svg",
brandImageUrlDark = "https://www.example.com/assets/brand_image_dark.svg",
color = "#C2D32C",
color = RgbColorCode(0xC2D32C),
brandTermsUrl = "https://www.example.com/assets/brand.pdf",
),
),
Expand Down
12 changes: 6 additions & 6 deletions gbfs-v3/api/gbfs-v3.api
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,21 @@ public final class dev/sargunv/mobilitydata/gbfs/v3/AlertType$Companion {

public final class dev/sargunv/mobilitydata/gbfs/v3/BrandAssets {
public static final field Companion Ldev/sargunv/mobilitydata/gbfs/v3/BrandAssets$Companion;
public fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
public synthetic fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public synthetic fun <init> (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Lkotlinx/datetime/LocalDate;
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()Ljava/lang/String;
public final fun component4 ()Ljava/lang/String;
public final fun component5 ()Ljava/lang/String;
public final fun copy (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ldev/sargunv/mobilitydata/gbfs/v3/BrandAssets;
public static synthetic fun copy$default (Ldev/sargunv/mobilitydata/gbfs/v3/BrandAssets;Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Ldev/sargunv/mobilitydata/gbfs/v3/BrandAssets;
public final fun component5-NhXREWg ()Ldev/sargunv/mobilitydata/utils/RgbColor;
public final fun copy-LJyRZGo (Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;)Ldev/sargunv/mobilitydata/gbfs/v3/BrandAssets;
public static synthetic fun copy-LJyRZGo$default (Ldev/sargunv/mobilitydata/gbfs/v3/BrandAssets;Lkotlinx/datetime/LocalDate;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ldev/sargunv/mobilitydata/utils/RgbColor;ILjava/lang/Object;)Ldev/sargunv/mobilitydata/gbfs/v3/BrandAssets;
public fun equals (Ljava/lang/Object;)Z
public final fun getBrandImageUrl ()Ljava/lang/String;
public final fun getBrandImageUrlDark ()Ljava/lang/String;
public final fun getBrandLastModified ()Lkotlinx/datetime/LocalDate;
public final fun getBrandTermsUrl ()Ljava/lang/String;
public final fun getColor ()Ljava/lang/String;
public final fun getColor-NhXREWg ()Ldev/sargunv/mobilitydata/utils/RgbColor;
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}
Expand Down
8 changes: 4 additions & 4 deletions gbfs-v3/api/gbfs-v3.klib.api
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ final class dev.sargunv.mobilitydata.gbfs.v3/AlertTime { // dev.sargunv.mobility
}

final class dev.sargunv.mobilitydata.gbfs.v3/BrandAssets { // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets|null[0]
constructor <init>(kotlinx.datetime/LocalDate, kotlin/String? = ..., kotlin/String, kotlin/String? = ..., kotlin/String? = ...) // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.<init>|<init>(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;kotlin.String?){}[0]
constructor <init>(kotlinx.datetime/LocalDate, kotlin/String? = ..., kotlin/String, kotlin/String? = ..., dev.sargunv.mobilitydata.utils/RgbColor? = ...) // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.<init>|<init>(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;dev.sargunv.mobilitydata.utils.RgbColor?){}[0]

final val brandImageUrl // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.brandImageUrl|{}brandImageUrl[0]
final fun <get-brandImageUrl>(): kotlin/String // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.brandImageUrl.<get-brandImageUrl>|<get-brandImageUrl>(){}[0]
Expand All @@ -145,14 +145,14 @@ final class dev.sargunv.mobilitydata.gbfs.v3/BrandAssets { // dev.sargunv.mobili
final val brandTermsUrl // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.brandTermsUrl|{}brandTermsUrl[0]
final fun <get-brandTermsUrl>(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.brandTermsUrl.<get-brandTermsUrl>|<get-brandTermsUrl>(){}[0]
final val color // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.color|{}color[0]
final fun <get-color>(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.color.<get-color>|<get-color>(){}[0]
final fun <get-color>(): dev.sargunv.mobilitydata.utils/RgbColor? // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.color.<get-color>|<get-color>(){}[0]

final fun component1(): kotlinx.datetime/LocalDate // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.component1|component1(){}[0]
final fun component2(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.component2|component2(){}[0]
final fun component3(): kotlin/String // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.component3|component3(){}[0]
final fun component4(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.component4|component4(){}[0]
final fun component5(): kotlin/String? // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.component5|component5(){}[0]
final fun copy(kotlinx.datetime/LocalDate = ..., kotlin/String? = ..., kotlin/String = ..., kotlin/String? = ..., kotlin/String? = ...): dev.sargunv.mobilitydata.gbfs.v3/BrandAssets // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.copy|copy(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;kotlin.String?){}[0]
final fun component5(): dev.sargunv.mobilitydata.utils/RgbColor? // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.component5|component5(){}[0]
final fun copy(kotlinx.datetime/LocalDate = ..., kotlin/String? = ..., kotlin/String = ..., kotlin/String? = ..., dev.sargunv.mobilitydata.utils/RgbColor? = ...): dev.sargunv.mobilitydata.gbfs.v3/BrandAssets // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.copy|copy(kotlinx.datetime.LocalDate;kotlin.String?;kotlin.String;kotlin.String?;dev.sargunv.mobilitydata.utils.RgbColor?){}[0]
final fun equals(kotlin/Any?): kotlin/Boolean // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.equals|equals(kotlin.Any?){}[0]
final fun hashCode(): kotlin/Int // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.hashCode|hashCode(){}[0]
final fun toString(): kotlin/String // dev.sargunv.mobilitydata.gbfs.v3/BrandAssets.toString|toString(){}[0]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import dev.sargunv.mobilitydata.utils.LanguageCode
import dev.sargunv.mobilitydata.utils.LocalizedText
import dev.sargunv.mobilitydata.utils.LocalizedUrl
import dev.sargunv.mobilitydata.utils.OsmOpeningHours
import dev.sargunv.mobilitydata.utils.RgbColorCode
import dev.sargunv.mobilitydata.utils.Uri
import dev.sargunv.mobilitydata.utils.Url
import kotlinx.datetime.TimeZone
Expand Down Expand Up @@ -167,7 +168,7 @@ public data class BrandAssets(
* Color used to represent the brand for the service expressed as a 6 digit hexadecimal color code
* in the form #000000.
*/
public val color: String? = null,
public val color: RgbColorCode? = null,
)

/** Contains rental app information for different platforms. */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,16 @@ public data class VehicleType(
/** The name of the vehicle model. */
public val model: LocalizedText? = null,

/** The color of the vehicle. */
/**
* The color of the vehicle, in plain English.
*
* All words must be in lower case, without special characters, quotation marks, hyphens,
* underscores, commas, or dots. Spaces are allowed in case of a compound name.
*
* Example
* - green
* - dark blue
*/
public val color: String? = null,

/** Customer-readable description of the vehicle type outlining special features or how-tos. */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.sargunv.mobilitydata.gbfs.v3

import dev.sargunv.mobilitydata.utils.RgbColorCode
import dev.sargunv.mobilitydata.utils.Timestamp
import kotlin.test.Test
import kotlin.test.assertEquals
Expand Down Expand Up @@ -127,7 +128,7 @@ private val expectedResponse =
brandLastModified = LocalDate(2021, 6, 15),
brandImageUrl = "https://www.example.com/assets/brand_image.svg",
brandImageUrlDark = "https://www.example.com/assets/brand_image_dark.svg",
color = "#C2D32C",
color = RgbColorCode(0xC2D32C),
brandTermsUrl = "https://www.example.com/assets/brand.pdf",
),
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.sargunv.mobilitydata.gofs.v1

import dev.sargunv.mobilitydata.utils.RgbColor
import dev.sargunv.mobilitydata.utils.RgbColorTriplet
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.time.Duration.Companion.seconds
Expand Down Expand Up @@ -55,20 +55,20 @@ private val expectedResponse =
Brand(
brandId = "regular_ride",
brandName = "Regular Ride",
brandColor = RgbColor(0x1C7F49),
brandTextColor = RgbColor(0xFFFFFF),
brandColor = RgbColorTriplet(0x1C7F49),
brandTextColor = RgbColorTriplet(0xFFFFFF),
),
Brand(
brandId = "large_ride",
brandName = "Large Ride",
brandColor = RgbColor(0x1C7F49),
brandTextColor = RgbColor(0xFFFFFF),
brandColor = RgbColorTriplet(0x1C7F49),
brandTextColor = RgbColorTriplet(0xFFFFFF),
),
Brand(
brandId = "shared_ride",
brandName = "Shared Ride",
brandColor = RgbColor(0x1C7F49),
brandTextColor = RgbColor(0xFFFFFF),
brandColor = RgbColorTriplet(0x1C7F49),
brandTextColor = RgbColorTriplet(0xFFFFFF),
),
)
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,19 @@ import org.maplibre.spatialk.geojson.PolygonGeometry
*/
public typealias Locations = FeatureCollection<PolygonGeometry, LocationProperties>

/** Defines a zone where riders can request either pickup or drop off by on-demand services. */
/**
* Defines a zone where riders can request either pickup or drop off by on-demand services.
*
* Element of [Locations].
*/
public typealias Location = Feature<PolygonGeometry, LocationProperties>

/** Properties of a [Location]. */
@Serializable
public data class LocationProperties(
/** Indicates the name of the location as displayed to riders. */
@SerialName("stop_name") public val stopName: String? = null,

/** Meaningful description of the location to help orient riders. */
@SerialName("stop_desc") public val stopDesc: String? = null,
)
Loading
Loading