stadiamaps 1.0.6__py3-none-any.whl → 2.0.0__py3-none-any.whl

stadiamaps/models/locate_detailed_edge.py

@@ -3,14 +3,14 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.5
+    The version of the OpenAPI document: 6.0.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 from __future__ import annotations
@@ -18,96 +18,113 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Optional
-from pydantic import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictInt, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
 from stadiamaps.models.geo_attributes import GeoAttributes
 from stadiamaps.models.highway_classification import HighwayClassification
 from stadiamaps.models.node_id import NodeId
 from stadiamaps.models.restrictions import Restrictions
 from stadiamaps.models.speeds import Speeds
+from typing import Optional, Set
+from typing_extensions import Self
 
 class LocateDetailedEdge(BaseModel):
     """
     LocateDetailedEdge
-    """
-    sidewalk_left: Optional[StrictBool] = Field(None, description="Is there a sidewalk to the left of the edge?")
-    sidewalk_right: Optional[StrictBool] = Field(None, description="Is there a sidewalk to the right of the edge?")
+    """ # noqa: E501
+    sidewalk_left: Optional[StrictBool] = Field(default=None, description="Is there a sidewalk to the left of the edge?")
+    sidewalk_right: Optional[StrictBool] = Field(default=None, description="Is there a sidewalk to the right of the edge?")
     lane_count: Optional[StrictInt] = None
-    stop_sign: Optional[StrictBool] = Field(None, description="Is there a stop sign at end of the directed edge?")
+    stop_sign: Optional[StrictBool] = Field(default=None, description="Is there a stop sign at end of the directed edge?")
     sac_scale: Optional[StrictStr] = None
-    yield_sign: Optional[StrictBool] = Field(None, description="Is there a yield sign at end of the directed edge?")
-    not_thru: Optional[StrictBool] = Field(None, description="Does the edge lead to a \"no-through\" region?")
-    forward: Optional[StrictBool] = Field(None, description="Is the edge info forward? If false, then reverse is implied.")
+    yield_sign: Optional[StrictBool] = Field(default=None, description="Is there a yield sign at end of the directed edge?")
+    not_thru: Optional[StrictBool] = Field(default=None, description="Does the edge lead to a \"no-through\" region?")
+    forward: Optional[StrictBool] = Field(default=None, description="Is the edge info forward? If false, then reverse is implied.")
     end_node: Optional[NodeId] = None
-    truck_route: Optional[StrictBool] = Field(None, description="Is the edge part of a truck route/network?")
+    truck_route: Optional[StrictBool] = Field(default=None, description="Is the edge part of a truck route/network?")
     speeds: Optional[Speeds] = None
-    bike_network: Optional[StrictBool] = Field(None, description="Is the edge part of a bicycle network?")
-    round_about: Optional[StrictBool] = Field(None, description="Is the edge part of a roundabout?")
-    traffic_signal: Optional[StrictBool] = Field(None, description="Is there a traffic signal at the end of the directed edge?")
-    access_restriction: Optional[StrictBool] = Field(None, description="Is there a general restriction or access condition?")
-    destination_only: Optional[StrictBool] = Field(None, description="Is the edge destination only? If so, it will not be routed through.")
+    bike_network: Optional[StrictBool] = Field(default=None, description="Is the edge part of a bicycle network?")
+    round_about: Optional[StrictBool] = Field(default=None, description="Is the edge part of a roundabout?")
+    traffic_signal: Optional[StrictBool] = Field(default=None, description="Is there a traffic signal at the end of the directed edge?")
+    access_restriction: Optional[StrictBool] = Field(default=None, description="Is there a general restriction or access condition?")
+    destination_only: Optional[StrictBool] = Field(default=None, description="Is the edge destination only? If so, it will not be routed through.")
     geo_attributes: Optional[GeoAttributes] = None
     start_restriction: Optional[Restrictions] = None
-    cycle_lane: Optional[StrictStr] = Field(None, description="Indication of the type of cycle lane (if any) present along an edge.")
+    cycle_lane: Optional[StrictStr] = Field(default=None, description="Indication of the type of cycle lane (if any) present along an edge.")
     end_restriction: Optional[Restrictions] = None
-    seasonal: Optional[StrictBool] = Field(None, description="Is access seasonal (ex. no access in winter)?")
-    country_crossing: Optional[StrictBool] = Field(None, description="Does the edge cross into a new country?")
-    part_of_complex_restriction: Optional[StrictBool] = Field(None, description="Is the edge part of a complex restriction?")
-    has_sign: Optional[StrictBool] = Field(None, description="Do exit signs exist for the edge?")
+    seasonal: Optional[StrictBool] = Field(default=None, description="Is access seasonal (ex. no access in winter)?")
+    country_crossing: Optional[StrictBool] = Field(default=None, description="Does the edge cross into a new country?")
+    part_of_complex_restriction: Optional[StrictBool] = Field(default=None, description="Is the edge part of a complex restriction?")
+    has_sign: Optional[StrictBool] = Field(default=None, description="Do exit signs exist for the edge?")
     access: Optional[Restrictions] = None
-    bridge: Optional[StrictBool] = Field(None, description="Is the edge part of a bridge?")
+    bridge: Optional[StrictBool] = Field(default=None, description="Is the edge part of a bridge?")
     classification: Optional[HighwayClassification] = None
-    toll: Optional[StrictBool] = Field(None, description="Is the edge part of a toll road?")
-    tunnel: Optional[StrictBool] = Field(None, description="Is the edge part of a tunnel?")
+    toll: Optional[StrictBool] = Field(default=None, description="Is the edge a toll road?")
+    tunnel: Optional[StrictBool] = Field(default=None, description="Is the edge a tunnel?")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["sidewalk_left", "sidewalk_right", "lane_count", "stop_sign", "sac_scale", "yield_sign", "not_thru", "forward", "end_node", "truck_route", "speeds", "bike_network", "round_about", "traffic_signal", "access_restriction", "destination_only", "geo_attributes", "start_restriction", "cycle_lane", "end_restriction", "seasonal", "country_crossing", "part_of_complex_restriction", "has_sign", "access", "bridge", "classification", "toll", "tunnel"]
+    __properties: ClassVar[List[str]] = ["sidewalk_left", "sidewalk_right", "lane_count", "stop_sign", "sac_scale", "yield_sign", "not_thru", "forward", "end_node", "truck_route", "speeds", "bike_network", "round_about", "traffic_signal", "access_restriction", "destination_only", "geo_attributes", "start_restriction", "cycle_lane", "end_restriction", "seasonal", "country_crossing", "part_of_complex_restriction", "has_sign", "access", "bridge", "classification", "toll", "tunnel"]
 
-    @validator('sac_scale')
+    @field_validator('sac_scale')
     def sac_scale_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('none', 'hiking', 'mountain hiking', 'demanding mountain hiking', 'alpine hiking', 'demanding alpine hiking', 'difficult alpine hiking'):
+        if value not in set(['none', 'hiking', 'mountain hiking', 'demanding mountain hiking', 'alpine hiking', 'demanding alpine hiking', 'difficult alpine hiking']):
             raise ValueError("must be one of enum values ('none', 'hiking', 'mountain hiking', 'demanding mountain hiking', 'alpine hiking', 'demanding alpine hiking', 'difficult alpine hiking')")
         return value
 
-    @validator('cycle_lane')
+    @field_validator('cycle_lane')
     def cycle_lane_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('none', 'shared', 'dedicated', 'separated'):
+        if value not in set(['none', 'shared', 'dedicated', 'separated']):
             raise ValueError("must be one of enum values ('none', 'shared', 'dedicated', 'separated')")
         return value
 
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.dict(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True))
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> LocateDetailedEdge:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of LocateDetailedEdge from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
-    def to_dict(self):
-        """Returns the dictionary representation of the model using alias"""
-        _dict = self.dict(by_alias=True,
-                          exclude={
-                            "additional_properties"
-                          },
-                          exclude_none=True)
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        * Fields in `self.additional_properties` are added to the output dict.
+        """
+        excluded_fields: Set[str] = set([
+            "additional_properties",
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
         # override the default output from pydantic by calling `to_dict()` of end_node
         if self.end_node:
             _dict['end_node'] = self.end_node.to_dict()
@@ -137,15 +154,15 @@ class LocateDetailedEdge(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> LocateDetailedEdge:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of LocateDetailedEdge from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return LocateDetailedEdge.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = LocateDetailedEdge.parse_obj({
+        _obj = cls.model_validate({
             "sidewalk_left": obj.get("sidewalk_left"),
             "sidewalk_right": obj.get("sidewalk_right"),
             "lane_count": obj.get("lane_count"),
@@ -154,25 +171,25 @@ class LocateDetailedEdge(BaseModel):
             "yield_sign": obj.get("yield_sign"),
             "not_thru": obj.get("not_thru"),
             "forward": obj.get("forward"),
-            "end_node": NodeId.from_dict(obj.get("end_node")) if obj.get("end_node") is not None else None,
+            "end_node": NodeId.from_dict(obj["end_node"]) if obj.get("end_node") is not None else None,
             "truck_route": obj.get("truck_route"),
-            "speeds": Speeds.from_dict(obj.get("speeds")) if obj.get("speeds") is not None else None,
+            "speeds": Speeds.from_dict(obj["speeds"]) if obj.get("speeds") is not None else None,
             "bike_network": obj.get("bike_network"),
             "round_about": obj.get("round_about"),
             "traffic_signal": obj.get("traffic_signal"),
             "access_restriction": obj.get("access_restriction"),
             "destination_only": obj.get("destination_only"),
-            "geo_attributes": GeoAttributes.from_dict(obj.get("geo_attributes")) if obj.get("geo_attributes") is not None else None,
-            "start_restriction": Restrictions.from_dict(obj.get("start_restriction")) if obj.get("start_restriction") is not None else None,
+            "geo_attributes": GeoAttributes.from_dict(obj["geo_attributes"]) if obj.get("geo_attributes") is not None else None,
+            "start_restriction": Restrictions.from_dict(obj["start_restriction"]) if obj.get("start_restriction") is not None else None,
             "cycle_lane": obj.get("cycle_lane"),
-            "end_restriction": Restrictions.from_dict(obj.get("end_restriction")) if obj.get("end_restriction") is not None else None,
+            "end_restriction": Restrictions.from_dict(obj["end_restriction"]) if obj.get("end_restriction") is not None else None,
             "seasonal": obj.get("seasonal"),
             "country_crossing": obj.get("country_crossing"),
             "part_of_complex_restriction": obj.get("part_of_complex_restriction"),
             "has_sign": obj.get("has_sign"),
-            "access": Restrictions.from_dict(obj.get("access")) if obj.get("access") is not None else None,
+            "access": Restrictions.from_dict(obj["access"]) if obj.get("access") is not None else None,
             "bridge": obj.get("bridge"),
-            "classification": HighwayClassification.from_dict(obj.get("classification")) if obj.get("classification") is not None else None,
+            "classification": HighwayClassification.from_dict(obj["classification"]) if obj.get("classification") is not None else None,
             "toll": obj.get("toll"),
             "tunnel": obj.get("tunnel")
         })
@@ -183,3 +200,4 @@ class LocateDetailedEdge(BaseModel):
 
         return _obj
 
+

stadiamaps/models/locate_edge.py

@@ -3,14 +3,14 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.5
+    The version of the OpenAPI document: 6.0.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 from __future__ import annotations
@@ -18,69 +18,84 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr, conlist, validator
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional, Union
 from stadiamaps.models.locate_detailed_edge import LocateDetailedEdge
 from stadiamaps.models.locate_edge_info import LocateEdgeInfo
 from stadiamaps.models.node_id import NodeId
+from typing import Optional, Set
+from typing_extensions import Self
 
 class LocateEdge(BaseModel):
     """
     LocateEdge
-    """
+    """ # noqa: E501
     edge_id: Optional[NodeId] = None
-    correlated_lat: Optional[Union[StrictFloat, StrictInt]] = None
-    correlated_lon: Optional[Union[StrictFloat, StrictInt]] = None
-    percent_along: Optional[Union[StrictFloat, StrictInt]] = None
-    side_of_street: Optional[StrictStr] = None
-    linear_reference: Optional[StrictStr] = Field(None, description="A base64-encoded [OpenLR location reference](https://www.openlr-association.com/fileadmin/user_upload/openlr-whitepaper_v1.5.pdf), for a graph edge of the road network matched by the query.")
+    way_id: Optional[StrictInt] = Field(default=None, description="The OSM way ID associated with this edge (absent in verbose response; see the edge info).")
+    correlated_lat: Union[StrictFloat, StrictInt]
+    correlated_lon: Union[StrictFloat, StrictInt]
+    percent_along: Union[StrictFloat, StrictInt]
+    side_of_street: StrictStr
+    linear_reference: Optional[StrictStr] = Field(default=None, description="A base64-encoded [OpenLR location reference](https://www.openlr-association.com/fileadmin/user_upload/openlr-whitepaper_v1.5.pdf), for a graph edge of the road network matched by the query.")
     outbound_reach: Optional[StrictInt] = None
     heading: Optional[Union[StrictFloat, StrictInt]] = None
     inbound_reach: Optional[StrictInt] = None
     distance: Optional[Union[StrictFloat, StrictInt]] = None
-    predicted_speeds: Optional[conlist(StrictInt)] = Field(None, description="Predicted speed information based on historical data. If available, this will include 2016 entries. Each entry represents 5 minutes, where the first entry represents midnight on Monday, the second entry represents 00:05 on Monday, etc.")
+    predicted_speeds: Optional[List[StrictInt]] = Field(default=None, description="Predicted speed information based on historical data. If available, this will include 2016 entries. Each entry represents 5 minutes, where the first entry represents midnight on Monday, the second entry represents 00:05 on Monday, etc.")
     edge_info: Optional[LocateEdgeInfo] = None
     edge: Optional[LocateDetailedEdge] = None
-    warnings: Optional[conlist(StrictStr)] = None
+    warnings: Optional[List[StrictStr]] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["edge_id", "correlated_lat", "correlated_lon", "percent_along", "side_of_street", "linear_reference", "outbound_reach", "heading", "inbound_reach", "distance", "predicted_speeds", "edge_info", "edge", "warnings"]
+    __properties: ClassVar[List[str]] = ["edge_id", "way_id", "correlated_lat", "correlated_lon", "percent_along", "side_of_street", "linear_reference", "outbound_reach", "heading", "inbound_reach", "distance", "predicted_speeds", "edge_info", "edge", "warnings"]
 
-    @validator('side_of_street')
+    @field_validator('side_of_street')
     def side_of_street_validate_enum(cls, value):
         """Validates the enum"""
-        if value is None:
-            return value
-
-        if value not in ('left', 'right', 'neither'):
+        if value not in set(['left', 'right', 'neither']):
             raise ValueError("must be one of enum values ('left', 'right', 'neither')")
         return value
 
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.dict(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True))
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> LocateEdge:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of LocateEdge from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
-    def to_dict(self):
-        """Returns the dictionary representation of the model using alias"""
-        _dict = self.dict(by_alias=True,
-                          exclude={
-                            "additional_properties"
-                          },
-                          exclude_none=True)
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        * Fields in `self.additional_properties` are added to the output dict.
+        """
+        excluded_fields: Set[str] = set([
+            "additional_properties",
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
         # override the default output from pydantic by calling `to_dict()` of edge_id
         if self.edge_id:
             _dict['edge_id'] = self.edge_id.to_dict()
@@ -98,16 +113,17 @@ class LocateEdge(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> LocateEdge:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of LocateEdge from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return LocateEdge.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = LocateEdge.parse_obj({
-            "edge_id": NodeId.from_dict(obj.get("edge_id")) if obj.get("edge_id") is not None else None,
+        _obj = cls.model_validate({
+            "edge_id": NodeId.from_dict(obj["edge_id"]) if obj.get("edge_id") is not None else None,
+            "way_id": obj.get("way_id"),
             "correlated_lat": obj.get("correlated_lat"),
             "correlated_lon": obj.get("correlated_lon"),
             "percent_along": obj.get("percent_along"),
@@ -118,8 +134,8 @@ class LocateEdge(BaseModel):
             "inbound_reach": obj.get("inbound_reach"),
             "distance": obj.get("distance"),
             "predicted_speeds": obj.get("predicted_speeds"),
-            "edge_info": LocateEdgeInfo.from_dict(obj.get("edge_info")) if obj.get("edge_info") is not None else None,
-            "edge": LocateDetailedEdge.from_dict(obj.get("edge")) if obj.get("edge") is not None else None,
+            "edge_info": LocateEdgeInfo.from_dict(obj["edge_info"]) if obj.get("edge_info") is not None else None,
+            "edge": LocateDetailedEdge.from_dict(obj["edge"]) if obj.get("edge") is not None else None,
             "warnings": obj.get("warnings")
         })
         # store additional fields in additional_properties
@@ -129,3 +145,4 @@ class LocateEdge(BaseModel):
 
         return _obj
 
+

stadiamaps/models/locate_edge_info.py

@@ -3,14 +3,14 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.5
+    The version of the OpenAPI document: 6.0.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 from __future__ import annotations
@@ -18,48 +18,65 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional, Union
 from stadiamaps.models.bike_network import BikeNetwork
+from typing import Optional, Set
+from typing_extensions import Self
 
 class LocateEdgeInfo(BaseModel):
     """
     LocateEdgeInfo
-    """
-    mean_elevation: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The mean elevation, in meters, relative to sea level.")
-    shape: Optional[StrictStr] = Field(None, description="An encoded polyline (https://developers.google.com/maps/documentation/utilities/polylinealgorithm). Note that the polyline is always encoded with 6 digits of precision, whereas most implementations default to 5.")
-    names: Optional[conlist(StrictStr)] = Field(None, description="A list of names that the edge goes by.")
+    """ # noqa: E501
+    mean_elevation: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The mean elevation, in meters, relative to sea level.")
+    shape: StrictStr = Field(description="An encoded polyline (https://developers.google.com/maps/documentation/utilities/polylinealgorithm). Note that the polyline is always encoded with 6 digits of precision, whereas most implementations default to 5.")
+    names: Optional[List[StrictStr]] = Field(default=None, description="A list of names that the edge goes by.")
     bike_network: Optional[BikeNetwork] = None
-    way_id: Optional[StrictInt] = None
+    way_id: StrictInt = Field(description="The OSM way ID associated with this edge.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["mean_elevation", "shape", "names", "bike_network", "way_id"]
+    __properties: ClassVar[List[str]] = ["mean_elevation", "shape", "names", "bike_network", "way_id"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
 
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.dict(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True))
 
     def to_json(self) -> str:
         """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> LocateEdgeInfo:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of LocateEdgeInfo from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
-    def to_dict(self):
-        """Returns the dictionary representation of the model using alias"""
-        _dict = self.dict(by_alias=True,
-                          exclude={
-                            "additional_properties"
-                          },
-                          exclude_none=True)
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        * Fields in `self.additional_properties` are added to the output dict.
+        """
+        excluded_fields: Set[str] = set([
+            "additional_properties",
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
         # override the default output from pydantic by calling `to_dict()` of bike_network
         if self.bike_network:
             _dict['bike_network'] = self.bike_network.to_dict()
@@ -71,19 +88,19 @@ class LocateEdgeInfo(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> LocateEdgeInfo:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of LocateEdgeInfo from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return LocateEdgeInfo.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = LocateEdgeInfo.parse_obj({
+        _obj = cls.model_validate({
             "mean_elevation": obj.get("mean_elevation"),
             "shape": obj.get("shape"),
             "names": obj.get("names"),
-            "bike_network": BikeNetwork.from_dict(obj.get("bike_network")) if obj.get("bike_network") is not None else None,
+            "bike_network": BikeNetwork.from_dict(obj["bike_network"]) if obj.get("bike_network") is not None else None,
             "way_id": obj.get("way_id")
         })
         # store additional fields in additional_properties
@@ -93,3 +110,4 @@ class LocateEdgeInfo(BaseModel):
 
         return _obj
 
+