Loading yang-models/_3gpp-common-yang-types.yang +1 −45 Original line number Diff line number Diff line Loading @@ -962,50 +962,6 @@ module _3gpp-common-yang-types { supported."; } } <<<<<<< HEAD } } grouping GeoCoordinateGrp { description "Geographical location on earth"; leaf latitude { type decimal64 { fraction-digits 4; range -90..90 ; } mandatory true; description "Latitude based on World Geodetic System (1984 version) global reference frame (WGS 84). Positive values correspond to the northern hemisphere."; } leaf longitude { type decimal64 { fraction-digits 4; range -180..180 ; } mandatory true; description "Longitude based on World Geodetic System (1984 version) global reference frame (WGS 84). Positive values correspond to degrees east of 0 degrees longitude."; } } grouping GeoAreaGrp { description "This data type defines a geographical area. The geo-area is defined using a convex polygon in the attribute 'convexGeoPolygon'."; list convexGeoPolygon { description "Specifies the geographical area with a convex polygon. The convex polygon is specified by its corners."; key "latitude longitude"; min-elements 3; ordered-by user; uses GeoCoordinateGrp; ======= >>>>>>> f36eb37a (Update _3gpp-common-yang-types.yang) } } } No newline at end of file Loading
yang-models/_3gpp-common-yang-types.yang +1 −45 Original line number Diff line number Diff line Loading @@ -962,50 +962,6 @@ module _3gpp-common-yang-types { supported."; } } <<<<<<< HEAD } } grouping GeoCoordinateGrp { description "Geographical location on earth"; leaf latitude { type decimal64 { fraction-digits 4; range -90..90 ; } mandatory true; description "Latitude based on World Geodetic System (1984 version) global reference frame (WGS 84). Positive values correspond to the northern hemisphere."; } leaf longitude { type decimal64 { fraction-digits 4; range -180..180 ; } mandatory true; description "Longitude based on World Geodetic System (1984 version) global reference frame (WGS 84). Positive values correspond to degrees east of 0 degrees longitude."; } } grouping GeoAreaGrp { description "This data type defines a geographical area. The geo-area is defined using a convex polygon in the attribute 'convexGeoPolygon'."; list convexGeoPolygon { description "Specifies the geographical area with a convex polygon. The convex polygon is specified by its corners."; key "latitude longitude"; min-elements 3; ordered-by user; uses GeoCoordinateGrp; ======= >>>>>>> f36eb37a (Update _3gpp-common-yang-types.yang) } } } No newline at end of file