Skip to content

Commit

Permalink
changed ogc_derived_conv to ogc_deriving_conv
Browse files Browse the repository at this point in the history
  • Loading branch information
@RJuergens
RJuergens committed May 1, 2015
1 parent d972d67 commit 2ba73cb
Show file tree
Hide file tree
Showing 15 changed files with 182 additions and 465 deletions.
2 changes: 1 addition & 1 deletion build/vs_projects/libogc_2008.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
<File RelativePath="..\..\src\ogc_cs.cpp" />
<File RelativePath="..\..\src\ogc_datetime.cpp" />
<File RelativePath="..\..\src\ogc_datum.cpp" />
<File RelativePath="..\..\src\ogc_derived_conv.cpp" />
<File RelativePath="..\..\src\ogc_deriving_conv.cpp" />
<File RelativePath="..\..\src\ogc_ellipsoid.cpp" />
<File RelativePath="..\..\src\ogc_engr_crs.cpp" />
<File RelativePath="..\..\src\ogc_engr_datum.cpp" />
Expand Down
2 changes: 1 addition & 1 deletion build/vs_projects/libogc_2012.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
<ClCompile Include="$(TOP_DIR)\src\ogc_cs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datetime.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datum.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_derived_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_deriving_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_ellipsoid.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_crs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_datum.cpp" />
Expand Down
2 changes: 1 addition & 1 deletion build/vs_projects/libogc_2013.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
<ClCompile Include="$(TOP_DIR)\src\ogc_cs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datetime.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datum.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_derived_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_deriving_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_ellipsoid.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_crs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_datum.cpp" />
Expand Down
2 changes: 1 addition & 1 deletion build/vs_projects/libogc_s_2008.vcproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
<File RelativePath="..\..\src\ogc_cs.cpp" />
<File RelativePath="..\..\src\ogc_datetime.cpp" />
<File RelativePath="..\..\src\ogc_datum.cpp" />
<File RelativePath="..\..\src\ogc_derived_conv.cpp" />
<File RelativePath="..\..\src\ogc_deriving_conv.cpp" />
<File RelativePath="..\..\src\ogc_ellipsoid.cpp" />
<File RelativePath="..\..\src\ogc_engr_crs.cpp" />
<File RelativePath="..\..\src\ogc_engr_datum.cpp" />
Expand Down
2 changes: 1 addition & 1 deletion build/vs_projects/libogc_s_2012.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<ClCompile Include="$(TOP_DIR)\src\ogc_cs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datetime.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datum.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_derived_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_deriving_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_ellipsoid.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_crs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_datum.cpp" />
Expand Down
2 changes: 1 addition & 1 deletion build/vs_projects/libogc_s_2013.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<ClCompile Include="$(TOP_DIR)\src\ogc_cs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datetime.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_datum.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_derived_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_deriving_conv.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_ellipsoid.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_crs.cpp" />
<ClCompile Include="$(TOP_DIR)\src\ogc_engr_datum.cpp" />
Expand Down
46 changes: 19 additions & 27 deletions include/libogc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ enum ogc_obj_type
OGC_OBJ_TYPE_CS,

OGC_OBJ_TYPE_CONVERSION,
OGC_OBJ_TYPE_DERIVED_CONV,
OGC_OBJ_TYPE_DERIVING_CONV,
OGC_OBJ_TYPE_METHOD,

OGC_OBJ_TYPE_GEOD_CRS,
Expand Down Expand Up @@ -264,7 +264,7 @@ enum ogc_obj_type
#define OGC_OBJ_KWD_CS "CS"

#define OGC_OBJ_KWD_CONVERSION "CONVERSION"
#define OGC_OBJ_KWD_DERIVED_CONV "DERIVEDCONVERSION"
#define OGC_OBJ_KWD_DERIVING_CONV "DERIVINGCONVERSION"
#define OGC_OBJ_KWD_METHOD "METHOD"

#define OGC_OBJ_KWD_GEOD_CRS "GEODCRS"
Expand Down Expand Up @@ -3178,10 +3178,10 @@ class OGC_EXPORT ogc_conversion : public ogc_object
};

/* ------------------------------------------------------------------------- */
/* Derived conversion */
/* Deriving conversion */
/* ------------------------------------------------------------------------- */

class OGC_EXPORT ogc_derived_conv : public ogc_object
class OGC_EXPORT ogc_deriving_conv : public ogc_object
{
private:
OGC_NAME _name;
Expand All @@ -3190,34 +3190,34 @@ class OGC_EXPORT ogc_derived_conv : public ogc_object
ogc_vector * _param_files;
ogc_vector * _ids;

ogc_derived_conv() {}
ogc_deriving_conv() {}

public:
static const char * obj_kwd();

static ogc_derived_conv * create(
static ogc_deriving_conv * create(
const char * name,
ogc_method * method,
ogc_vector * parameters,
ogc_vector * param_files,
ogc_vector * ids,
ogc_error * err = OGC_NULL);

virtual ~ogc_derived_conv();
static void destroy(ogc_derived_conv * obj);
virtual ~ogc_deriving_conv();
static void destroy(ogc_deriving_conv * obj);

static ogc_derived_conv * from_tokens(
static ogc_deriving_conv * from_tokens(
const ogc_token * t,
int start,
int * pend,
ogc_error * err = OGC_NULL);

static ogc_derived_conv * from_wkt(
static ogc_deriving_conv * from_wkt(
const char * wkt,
ogc_error * err = OGC_NULL);

static bool to_wkt(
const ogc_derived_conv * obj,
const ogc_deriving_conv * obj,
char buffer[],
int options = OGC_WKT_OPT_NONE,
size_t buflen = OGC_BUFF_MAX);
Expand All @@ -3227,16 +3227,16 @@ class OGC_EXPORT ogc_derived_conv : public ogc_object
int options = OGC_WKT_OPT_NONE,
size_t buflen = OGC_BUFF_MAX) const;

static ogc_derived_conv * clone(const ogc_derived_conv * obj);
ogc_derived_conv * clone() const;
static ogc_deriving_conv * clone(const ogc_deriving_conv * obj);
ogc_deriving_conv * clone() const;

static bool is_equal (const ogc_derived_conv * p1,
const ogc_derived_conv * p2);
bool is_equal (const ogc_derived_conv * p) const;
static bool is_equal (const ogc_deriving_conv * p1,
const ogc_deriving_conv * p2);
bool is_equal (const ogc_deriving_conv * p) const;

static bool is_identical(const ogc_derived_conv * p1,
const ogc_derived_conv * p2);
bool is_identical(const ogc_derived_conv * p) const;
static bool is_identical(const ogc_deriving_conv * p1,
const ogc_deriving_conv * p2);
bool is_identical(const ogc_deriving_conv * p) const;

const char * name() const { return _name; }
ogc_method * method() const { return _method; }
Expand Down Expand Up @@ -3420,15 +3420,7 @@ class OGC_EXPORT ogc_base_geod_crs : public ogc_geod_crs
const char * name,
ogc_geod_datum * datum,
ogc_primem * primem,
ogc_cs * cs,
ogc_axis * axis_1,
ogc_axis * axis_2,
ogc_axis * axis_3,
ogc_unit * unit,
ogc_scope * scope,
ogc_vector * extents,
ogc_vector * ids,
ogc_remark * remark,
ogc_error * err = OGC_NULL);

virtual ~ogc_base_geod_crs();
Expand Down
180 changes: 90 additions & 90 deletions ogc_object_summary.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,103 +18,103 @@ Defined keywords & objects

Note that these objects are in the order they appear in the libogc.h header.

keyword description object name
------------------ ----------------------- -------------------
<base object> base OBJECT class ogc_object

citation citation ogc_citation
uri uri ogc_uri
id identifier ogc_id
remark remark ogc_remark

unit Base UNIT class ogc_unit
angleUnit angle unit ogc_angunit
lengthUnit length unit ogc_lenunit
scaleUnit scale unit ogc_scaleunit
timeUnit temporal unit ogc_timeunit
parametricUnit parametric unit ogc_paramunit

scope scope ogc_scope

<base extent> base EXTENT class ogc_extent
area area description ogc_area_extent
bBox geographic bounding box ogc_bbox_extent
verticalExtent vertical extent ogc_vert_extent
timeExtent temporal extent ogc_time_extent

parameter parameter ogc_parameter
parameterFile parameter file ogc_param_file
ellipsoid ellipsoid ogc_ellipsoid
anchor datum anchor ogc_anchor
timeOrigin temporal origin ogc_time_origin

<base datum> base DATUM class ogc_datum
datum geodetic datum ogc_geod_datum
eDatum engineering datum ogc_engr_datum
iDatum image datum ogc_image_datum
pDatum parametric datum ogc_param_datum
tDatum temporal datum ogc_time_datum
vDatum vertical datum ogc_vert_datum

primeM prime meridian ogc_primem
bearing bearing ogc_bearing
meridian meridian ogc_meridian
order axis order ogc_order
axis axis ogc_axis
cs cs (coordinate system) ogc_cs
method projection/op method ogc_method
conversion map projection ogc_conversion
derivingConversion deriving conversion ogc_deriving_conv

<base CRS> base CRS class ogc_crs
geodCRS geodetic crs ogc_geod_crs
baseGeodCRS base geodetic crs ogc_base_geod_crs
projCRS projected crs ogc_proj_crs
baseProjCRS base projected crs ogc_base_proj_crs
vertCRS vertical crs ogc_vert_crs
baseVertCRS base vertical crs ogc_base_vert_crs
engCRS engineering crs ogc_engr_crs
baseEngCRS base engineering crs ogc_base_engr_crs
imageCRS image crs ogc_image_crs
timeCRS temporal crs ogc_time_crs
baseTimeCRS base temporal crs ogc_base_time_crs
parametricCRS parametric crs ogc_param_crs
baseParamCRS base parametric crs ogc_base_param_crs
compoundCRS compound crs ogc_compound_crs

operationAccuracy operation accuracy ogc_op_accuracy
coordinateOperation operation ogc_coord_op
abridgedTransformation abridged transformation ogc_abrtrans
boundCRS bound crs ogc_bound_crs
keyword description object name
------------------ ----------------------- -------------------
<base object> base OBJECT class ogc_object

citation citation ogc_citation
uri uri ogc_uri
id identifier ogc_id
remark remark ogc_remark

unit Base UNIT class ogc_unit
angleUnit angle unit ogc_angunit
lengthUnit length unit ogc_lenunit
scaleUnit scale unit ogc_scaleunit
timeUnit temporal unit ogc_timeunit
parametricUnit parametric unit ogc_paramunit

scope scope ogc_scope

<base extent> base EXTENT class ogc_extent
area area description ogc_area_extent
bBox geographic bounding box ogc_bbox_extent
verticalExtent vertical extent ogc_vert_extent
timeExtent temporal extent ogc_time_extent

parameter parameter ogc_parameter
parameterFile parameter file ogc_param_file
ellipsoid ellipsoid ogc_ellipsoid
anchor datum anchor ogc_anchor
timeOrigin temporal origin ogc_time_origin

<base datum> base DATUM class ogc_datum
datum geodetic datum ogc_geod_datum
eDatum engineering datum ogc_engr_datum
iDatum image datum ogc_image_datum
pDatum parametric datum ogc_param_datum
tDatum temporal datum ogc_time_datum
vDatum vertical datum ogc_vert_datum

primeM prime meridian ogc_primem
bearing bearing ogc_bearing
meridian meridian ogc_meridian
order axis order ogc_order
axis axis ogc_axis
cs cs (coordinate system) ogc_cs
method projection/op method ogc_method
conversion map projection ogc_conversion
derivingConversion deriving conversion ogc_deriving_conv

<base CRS> base CRS class ogc_crs
geodCRS geodetic crs ogc_geod_crs
baseGeodCRS base geodetic crs ogc_base_geod_crs
projCRS projected crs ogc_proj_crs
baseProjCRS base projected crs ogc_base_proj_crs
vertCRS vertical crs ogc_vert_crs
baseVertCRS base vertical crs ogc_base_vert_crs
engCRS engineering crs ogc_engr_crs
baseEngCRS base engineering crs ogc_base_engr_crs
imageCRS image crs ogc_image_crs
timeCRS temporal crs ogc_time_crs
baseTimeCRS base temporal crs ogc_base_time_crs
parametricCRS parametric crs ogc_param_crs
baseParamCRS base parametric crs ogc_base_param_crs
compoundCRS compound crs ogc_compound_crs

operationAccuracy operation accuracy ogc_op_accuracy
coordinateOperation operation ogc_coord_op
abridgedTransformation abridged transformation ogc_abrtrans
boundCRS bound crs ogc_bound_crs

Alternate keywords

alternate keyword actual name
----------------- -----------
engineeringCRS engCRS
geodeticCRS geodCRS
projectedCRS projCRS
verticalCRS vertCRS
alternate keyword actual keyword
----------------- --------------
engineeringCRS engCRS
geodeticCRS geodCRS
projectedCRS projCRS
verticalCRS vertCRS

engineeringDatum eDatum
geodeticDatum datum
imageDatum iDatum
parametricDatum pDatum
timeDatum tDatum
verticalDatum vDatum
engineeringDatum eDatum
geodeticDatum datum
imageDatum iDatum
parametricDatum pDatum
timeDatum tDatum
verticalDatum vDatum

primeMeridian primeM
projection method
spheroid ellipsoid
primeMeridian primeM
projection method
spheroid ellipsoid

Pseudo-name keywords

keyword description used in
----------------- ----------------- -------------------
interpolationCRS interpolation crs coordinateOperation
keyword description used in
----------------- ----------------- -------------------
interpolationCRS interpolation crs coordinateOperation

sourceCRS source crs coordinateOperation
boundCRS
sourceCRS source crs coordinateOperation
boundCRS

targetCRS target crs coordinateOperation
boundCRS
targetCRS target crs coordinateOperation
boundCRS
2 changes: 1 addition & 1 deletion src/makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ C_OBJS := \
ogc_conversion.$(OBJ_EXT) \
ogc_coord_op.$(OBJ_EXT) \
ogc_cs.$(OBJ_EXT) \
ogc_derived_conv.$(OBJ_EXT) \
ogc_deriving_conv.$(OBJ_EXT) \
ogc_ellipsoid.$(OBJ_EXT) \
ogc_engr_crs.$(OBJ_EXT) \
ogc_engr_datum.$(OBJ_EXT) \
Expand Down
Loading

0 comments on commit 2ba73cb

Please sign in to comment.