# HG changeset patch
# User jgpallero
# Date 1266220886 0
# Node ID ee6969c608d757e03b6ebc76b7920ed193adf7a8
# Parent 5f881a6be1d319932a30e40ace43d90961c85a7c
Removed files uploaded by mistake
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/00changelog.i
Binary file main/octproj/.hg/00changelog.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/branchheads.cache
--- a/main/octproj/.hg/branchheads.cache Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-1ff84dc91041f461556c1c5c2220754d27b668bf 22
-1ff84dc91041f461556c1c5c2220754d27b668bf default
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/dirstate
Binary file main/octproj/.hg/dirstate has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/requires
--- a/main/octproj/.hg/requires Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-revlogv1
-store
-fncache
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/00changelog.i
Binary file main/octproj/.hg/store/00changelog.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/00manifest.i
Binary file main/octproj/.hg/store/00manifest.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/_c_o_p_y_i_n_g.i
Binary file main/octproj/.hg/store/data/_c_o_p_y_i_n_g.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/_d_e_s_c_r_i_p_t_i_o_n.i
Binary file main/octproj/.hg/store/data/_d_e_s_c_r_i_p_t_i_o_n.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/_i_n_d_e_x.i
Binary file main/octproj/.hg/store/data/_i_n_d_e_x.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/doc/octproj.tex.i
Binary file main/octproj/.hg/store/data/doc/octproj.tex.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/inst/op__fwd.m.i
Binary file main/octproj/.hg/store/data/inst/op__fwd.m.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/inst/op__geoc2geod.m.i
Binary file main/octproj/.hg/store/data/inst/op__geoc2geod.m.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/inst/op__geod2geoc.m.i
Binary file main/octproj/.hg/store/data/inst/op__geod2geoc.m.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/inst/op__inv.m.i
Binary file main/octproj/.hg/store/data/inst/op__inv.m.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/inst/op__transform.m.i
Binary file main/octproj/.hg/store/data/inst/op__transform.m.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/__op__fwd.cc.i
Binary file main/octproj/.hg/store/data/src/__op__fwd.cc.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/__op__geoc2geod.cc.i
Binary file main/octproj/.hg/store/data/src/__op__geoc2geod.cc.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/__op__geod2geoc.cc.i
Binary file main/octproj/.hg/store/data/src/__op__geod2geoc.cc.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/__op__inv.cc.i
Binary file main/octproj/.hg/store/data/src/__op__inv.cc.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/__op__transform.cc.i
Binary file main/octproj/.hg/store/data/src/__op__transform.cc.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/_makefile.i
Binary file main/octproj/.hg/store/data/src/_makefile.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/projwrap.c.i
Binary file main/octproj/.hg/store/data/src/projwrap.c.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/data/src/projwrap.h.i
Binary file main/octproj/.hg/store/data/src/projwrap.h.i has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/fncache
--- a/main/octproj/.hg/store/fncache Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-data/COPYING.i
-data/DESCRIPTION.i
-data/INDEX.i
-data/inst/op_fwd.m.i
-data/inst/op_geoc2geod.m.i
-data/inst/op_geod2geoc.m.i
-data/inst/op_inv.m.i
-data/inst/op_transform.m.i
-data/src/Makefile.i
-data/src/_op_fwd.cc.i
-data/src/_op_geoc2geod.cc.i
-data/src/_op_geod2geoc.cc.i
-data/src/_op_inv.cc.i
-data/src/_op_transform.cc.i
-data/src/projwrap.c.i
-data/src/projwrap.h.i
-data/doc/octproj.tex.i
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/store/undo
Binary file main/octproj/.hg/store/undo has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/tags.cache
--- a/main/octproj/.hg/tags.cache Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-22 1ff84dc91041f461556c1c5c2220754d27b668bf
-
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/undo.branch
--- a/main/octproj/.hg/undo.branch Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-default
\ No newline at end of file
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/.hg/undo.dirstate
Binary file main/octproj/.hg/undo.dirstate has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/COPYING
--- a/main/octproj/COPYING Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/ChangeLog
--- a/main/octproj/ChangeLog Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-changeset: 22:1ff84dc91041
-tag: tip
-user: José Luis García Pallero
-date: Tue Feb 09 10:52:42 2010 +0100
-summary: Use fortran_vec() method instead const_cast to obtain pointers and improve the use of warning function
-
-changeset: 21:2f1c7488eace
-user: José Luis García Pallero
-date: Sat Feb 06 17:43:12 2010 +0100
-summary: Date change
-
-changeset: 20:671ddf3e2a77
-user: José Luis García Pallero
-date: Sat Feb 06 17:40:53 2010 +0100
-summary: Change criteria for catching errors
-
-changeset: 19:bcdb32b735f9
-user: José Luis García Pallero
-date: Sat Feb 06 17:40:41 2010 +0100
-summary: Update documentation
-
-changeset: 18:a402765a20b8
-user: José Luis García Pallero
-date: Sat Feb 06 17:39:59 2010 +0100
-summary: Change criteria for catching errors
-
-changeset: 17:56e3823d72cf
-user: José Luis García Pallero
-date: Sat Feb 06 15:43:48 2010 +0100
-summary: Changes in test sentences and auxiliary subfunctions
-
-changeset: 16:045b046bc43a
-user: José Luis García Pallero
-date: Sat Feb 06 14:04:26 2010 +0100
-summary: Changes in test sentences
-
-changeset: 15:91f6ea5161f7
-user: José Luis García Pallero
-date: Sat Feb 06 13:59:59 2010 +0100
-summary: Testing input arguments with auxiliary subfunctions
-
-changeset: 14:13ef8e3568c5
-user: José Luis García Pallero
-date: Sat Feb 06 12:37:57 2010 +0100
-summary: Comment correction
-
-changeset: 13:6cf0c2c16261
-user: José Luis García Pallero
-date: Tue Jan 19 10:17:13 2010 +0100
-summary: Documentation update
-
-changeset: 12:8e2c9f00c63c
-user: José Luis García Pallero
-date: Tue Dec 22 18:43:50 2009 +0100
-summary: Changes in parsing input arguments
-
-changeset: 11:56d5916bed60
-user: José Luis García Pallero
-date: Tue Dec 22 17:39:28 2009 +0100
-summary: Update general documentation
-
-changeset: 10:1391300aa003
-user: José Luis García Pallero
-date: Fri Dec 18 08:56:04 2009 +0100
-summary: Change in general documentation
-
-changeset: 9:d41ef12f4913
-user: José Luis García Pallero
-date: Thu Dec 17 12:04:54 2009 +0100
-summary: Add tex documentation file
-
-changeset: 8:3bcfd7da0c87
-user: José Luis García Pallero
-date: Tue Dec 15 17:06:48 2009 +0100
-summary: Correction in documentation
-
-changeset: 7:4ea6a2cb26ba
-user: José Luis García Pallero
-date: Tue Dec 15 16:56:19 2009 +0100
-summary: Comment the function and small changes
-
-changeset: 6:39501324d391
-user: José Luis García Pallero
-date: Tue Dec 15 16:54:23 2009 +0100
-summary: Style correction
-
-changeset: 5:791641326573
-user: José Luis García Pallero
-date: Tue Dec 15 16:53:52 2009 +0100
-summary: Creation of op_transform.m
-
-changeset: 4:6ccec5b0b0b5
-user: José Luis García Pallero
-date: Tue Dec 15 16:52:54 2009 +0100
-summary: Comment corrections
-
-changeset: 3:63eb65628b12
-user: José Luis García Pallero
-date: Tue Dec 15 16:51:40 2009 +0100
-summary: Add support to check if input arguments are both scalars or vectors and add support to convert scalars in column vectors if neccessary
-
-changeset: 2:29774e2ea3b5
-user: José Luis García Pallero
-date: Tue Dec 15 16:49:46 2009 +0100
-summary: Comments corrections and add support to convert scalars in column vectors if neccessary
-
-changeset: 1:6b515a6b5933
-user: José Luis García Pallero
-date: Tue Dec 15 16:47:15 2009 +0100
-summary: Change date
-
-changeset: 0:d89be78337c2
-user: José Luis García Pallero
-date: Tue Dec 15 12:29:46 2009 +0100
-summary: Creating Mercurial repository for OctPROJ
-
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/DESCRIPTION
--- a/main/octproj/DESCRIPTION Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-Name: OctPROJ
-Version: 1.0.0
-Date: 2010-02-06
-Author: José Luis García Pallero,
-Maintainer: José Luis García Pallero,
-Title: GNU Octave bindings to PROJ.4
-Description: This package allows to call functions of PROJ.4 library for
- cartographic projections transformations.
-Depends: Octave (>= 2.9.7)
-Url: http://trac.osgeo.org/proj/ http://octave.sourceforge.net/index.html
-Autoload: yes
-License: GPL version 3 or later (PROJ.4 is under MIT license)
-SystemRequirements: libproj-dev (>= 4.7.0) (Debian system)
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/INDEX
--- a/main/octproj/INDEX Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-toolbox >> OctPROJ
-Category Kernel functions
- _op_transform
- _op_fwd
- _op_inv
- _op_geod2geoc
- _op_geoc2geod
-Category Driver functions
- op_transform
- op_fwd
- op_inv
- op_geod2geoc
- op_geoc2geod
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/doc/OF90-284.pdf
Binary file main/octproj/doc/OF90-284.pdf has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/doc/octproj.pdf
Binary file main/octproj/doc/octproj.pdf has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/doc/octproj.tex
--- a/main/octproj/doc/octproj.tex Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-\documentclass[10pt,a4paper]{article}
-\usepackage{tocbibind}
-\usepackage{hyperref}
-\hypersetup{colorlinks,citecolor=red,linkcolor=red,urlcolor=red}
-
-\newcommand{\octproj}{\texttt{OctPROJ}}
-\newcommand{\proj}{\texttt{PROJ.4}}
-\newcommand{\octave}{GNU Octave}
-
-\title{\octproj\\Calling \proj{} from \octave\footnote{This document is
- distributed under the terms of the GNU Free Documentation License.
- Please, see \url{http://www.gnu.org/licenses/}}}
-\author{Jos\'e Luis Garc\'ia Pallero\footnote{Instituto de Astronom\'ia y
- Geodesia, Fac. de CC Matem\'aticas, Universidad Complutense de Madrid.
- \texttt{jlgpallero@pdi.ucm.es}, \texttt{jgpallero@gmail.com}}}
-\date{\today}
-
-\begin{document}
-\maketitle
-% \tableofcontents
-
-\nocite{eat-om}
-\nocite{projman}
-\nocite{projir1}
-\nocite{projir2}
-\nocite{sny-wm}
-
-\begin{abstract}
-This is a small introduction to using the \octproj{} package. In this text, you
-can overview the basic usage of the functions in
-\octave\footnote{\url{http://www.octave.org}}. If you need a detailed
-description about the options and available projections, please visit the
-\proj{} website\footnote{\url{http://trac.osgeo.org/proj}}.
-\end{abstract}
-
-\section{Overview}
-
-\octproj{} allows you to perform cartographic projections in \octave{} using
-\proj{} library. You can take the power of \proj{} using the facilities that
-\octave{} provides, without know the internals of the \proj{} C API. You can use
-the conversion programs coming with \proj{} distribution, but for use them in
-\octave{} you must make system calls. With \octproj{}, \proj{} can be integrated
-in \octave{} scripts in a natural way.
-
-\section{Installation}
-
-As several \octave{} packages, \octproj{} installation consists in compiling the
-C++ kernel sources (see section \ref{op-kw}), link them against \octave{}
-library to generate \texttt{*.oct} functions and copy this \texttt{*.oct}
-executables and other \texttt{*.m} functions into a working directory.
-
-The automatic procedure can be easily done by running the command:
-
-\begin{verbatim}
-octave:1> pkg install octproj-x.x.x.tar.gz
-\end{verbatim}
-where \texttt{x.x.x} is the version number.
-
-After that, the functions and documentation are installed in your machine and
-you are ready for use the package.
-
-\section{Kernel wrapper}
-\label{op-kw}
-
-The main functions (the functions which make the actual computations) are
-programmed in a separate files: \texttt{projwrap.h} and \texttt{projwrap.c}.
-
-The files contain three functions:
-\begin{itemize}
-\item \texttt{proj\_fwd}: forward computation of geodetic to projected
- coordinates.
-\item \texttt{proj\_inv}: inverse computation of projected to geodetic
- coordinates.
-\item \texttt{proj\_transform}: general transformations. Is possible to make
- forward, inverse and other transformations using only one function (see
- \proj{} documentation).
-\end{itemize}
-
-\subsection{Error handling}
-
-Error handling in the kernel wrapper is based on error codes from \proj.
-Functions in \texttt{projwrap} return the \proj{} error code and the \proj{}
-text string error message, which can be catched in order to work in this case.
-
-The functions can stop the execution in presence of errors depending on the
-nature of the error.
-\begin{itemize}
-\item If exist an error involving a general parameter of the projection, the
- execution stops.
-\item If an error is found due to a wrong or out of domain input coordinate, the
- execution don't stops, but the error code is activated and the output
- transformed coordinate corresponding to the error position have a special
- value.
-\end{itemize}
-
-\section{\octave{} functions}
-
-Two types of functions are programmed for \octave: \texttt{*.oct} functions and
-\texttt{*.m} functions.
-
-\subsection{\texttt{*.oct} functions}
-\label{op-of}
-
-These functions are linked with \texttt{projwrap}. You can use it, but is no
-recommended because the input arguments are more strict (always column vectors)
-than \texttt{*.m} functions and don't check for errors.
-
-The functions are:
-\begin{itemize}
-\item \texttt{\_op\_geod2geoc}: transformation between geodetic and cartesian
- geocentric coordinates. This function calls directly \proj.
-\item \texttt{\_op\_geoc2geod}: transformation between cartesian geocentric
- and geodetic coordinates. This function calls directly \proj.
-\item \texttt{\_op\_fwd}: forward projection (calls \texttt{proj\_fwd}).
-\item \texttt{\_op\_inv}: inverse projection (calls \texttt{proj\_inv}).
-\item \texttt{\_op\_transform}: general transformation (calls
- \texttt{proj\_transform}).
-\end{itemize}
-
-\subsection{\texttt{*.m} functions}
-
-These functions make the computations by calling the \texttt{*.oct} functions.
-You must call these functions because you can use various types of input
-(scalars, vectors or matrices) and checking of input arguments (data type,
-dimensions) is performed.
-
-The functions are the same as in section \ref{op-of} (without the \texttt{\_} at
-the beginning of the name):
-\begin{itemize}
-\item \texttt{op\_geod2geoc}: calls \texttt{\_op\_geod2geoc}.
-\item \texttt{op\_geoc2geod}: calls \texttt{\_op\_geoc2geod}.
-\item \texttt{op\_fwd}: calls \texttt{\_op\_fwd}.
-\item \texttt{op\_inv}: calls \texttt{\_op\_inv}.
-\item \texttt{op\_transform}: calls \texttt{\_op\_transform}.
-\end{itemize}
-
-\subsection{Error handling}
-
-\texttt{*.oct} and \texttt{*.m} functions can emit errors or warnings, some due
-to errors in input arguments and other due to errors in functions from
-\texttt{projwrap} kernel execution (see section \ref{op-kw}).
-
-Errors due to wrong input arguments (data types, dimensions, etc.) can be only
-given for \texttt{*.m} functions and this is the reason because the use of these
-functions are recommended. In this case, the execution is aborted and nothing is
-stored in output arguments.
-
-Errors due to the execution of \texttt{projwrap} kernel can be emitted for both
-\texttt{*.oct} and \texttt{*.m} functions. If the error is due to an erroneous
-projection parameter, the execution is aborted and nothing is stored in output
-arguments; but if the error is due to a wrong or out of domain input coordinate,
-a warning is emitted and the execution has a normal end.
-
-\section{Examples}
-
-\subsection{Geodetic to geocentric and vice versa}
-
-\begin{verbatim}
-lon=-6*pi/180;lat=43*pi/180;h=1000;
-[x,y,z]=op_geod2geoc(lon,lat,h,6378388,1/297)
-x = 4647300.72326257
-y = -488450.988568138
-z = 4328259.36425774
-
-[lon,lat,h]=op_geoc2geod(x,y,z,6378388,1/297);
-lon*=180/pi,lat*=180/pi,h
-lon = -6
-lat = 43
-h = 1000.00000000074
-\end{verbatim}
-
-\subsection{Forward and inverse projection}
-
-\begin{verbatim}
-lon=-6*pi/180;lat=43*pi/180;
-[x,y]=op_fwd(lon,lat,'+proj=utm +lon_0=3w +ellps=GRS80')
-x = 255466.980547577
-y = 4765182.93268401
-
-[lon,lat]=op_inv(x,y,'+proj=utm +lon_0=3w +ellps=GRS80');
-lon*=180/pi,lat*=180/pi
-lon = -6.00000000003597
-lat = 42.9999999999424
-\end{verbatim}
-
-\subsection{Forward and inverse projection: \texttt{op\_transform}}
-
-\subsubsection{With altitude}
-
-\begin{verbatim}
-lon=-6*pi/180;lat=43*pi/180;h=1000;
-[x,y,h]=op_transform(lon,lat,h,'+proj=latlong +ellps=GRS80',...
- '+proj=utm +lon_0=3w +ellps=GRS80')
-x = 255466.980547577
-y = 4765182.93268401
-h = 1000
-
-[lon,lat,h]=op_transform(x,y,h,...
- '+proj=utm +lon_0=3w +ellps=GRS80',...
- '+proj=latlong +ellps=GRS80');
-lon*=180/pi,lat*=180/pi,h
-lon = -6.00000000003597
-lat = 42.9999999999424
-h = 1000
-\end{verbatim}
-
-\subsubsection{Without altitude}
-
-\begin{verbatim}
-lon=-6*pi/180;lat=43*pi/180;
-[x,y]=op_transform(lon,lat,'+proj=latlong +ellps=GRS80',...
- '+proj=utm +lon_0=3w +ellps=GRS80')
-x = 255466.980547577
-y = 4765182.93268401
-
-[lon,lat]=op_transform(x,y,'+proj=utm +lon_0=3w +ellps=GRS80',...
- '+proj=latlong +ellps=GRS80');
-lon*=180/pi,lat*=180/pi
-lon = -6.00000000003597
-lat = 42.9999999999424
-\end{verbatim}
-
-\subsection{Error due to an erroneous parameter}
-
-\begin{verbatim}
-lon=-6*pi/180;lat=43*pi/180;
-[x,y]=op_fwd(lon,lat,'+proj=utm +lon_0=3w +ellps=GRS8')
-error:
- In function op_fwd:
- In function _op_fwd:
- Projection parameters
- unknown elliptical parameter name
- +proj=utm +lon_0=3w +ellps=GRS8
-\end{verbatim}
-
-\subsection{Error due to latitude too big}
-
-\begin{verbatim}
-lon=[-6*pi/180;-6*pi/180];lat=[43*pi/180;43];
-[x,y]=op_fwd(lon,lat,'+proj=utm +lon_0=3w +ellps=GRS80')
-warning: _op_fwd:
-
-warning: Projection error in point 2 (index starts at 1)
-x =
-
- 255466.980547577
- Inf
-
-y =
-
- 4765182.93268401
- Inf
-\end{verbatim}
-
-\begin{thebibliography}{99}
-\bibitem{eat-om} \textsc{Eaton}, John W.; \textsc{Bateman}, David, and
- \textsc{Hauberg}, S\o{}ren; GNU Octave. A high-level interactive
- language for numerical computations; Edition 3 for Octave
- version 3.2.3; July 2007; Permanently updated at
- \url{http://www.gnu.org/software/octave/docs.html}.
-\bibitem{projman} \textsc{Evenden}, Gerald I.; Cartographic Projection
- Procedures for the UNIX Environment---A User's Manual; USGS
- Open-File Report 90-284; 2003;
- \url{ftp://ftp.remotesensing.org/proj/OF90-284.pdf}.
-\bibitem{projir1} \textsc{Evenden}, Gerald I.; Cartographic Projection
- Procedures Release 4, Interim Report; 2003;
- \url{ftp://ftp.remotesensing.org/proj/proj.4.3.pdf}.
-\bibitem{projir2} \textsc{Evenden}, Gerald I.; Cartographic Projection
- Procedures Release 4, Second Interim Report; 2003;
- \url{ftp://ftp.remotesensing.org/proj/proj.4.3.I2.pdf}.
-\bibitem{sny-wm} \textsc{Snyder}, John Parr; Map Projections: A Working Manual;
- USGS series, Professional Paper 1395; Geological Survey
- (U. S.), 1987;
- \url{http://pubs.er.usgs.gov/usgspubs/pp/pp1395}.
-\end{thebibliography}
-
-\end{document}
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/doc/proj.4.3.I2.pdf
Binary file main/octproj/doc/proj.4.3.I2.pdf has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/doc/proj.4.3.pdf
Binary file main/octproj/doc/proj.4.3.pdf has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/doc/swiss.pdf
Binary file main/octproj/doc/swiss.pdf has changed
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/inst/op_fwd.m
--- a/main/octproj/inst/op_fwd.m Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
-## Copyright (C) 2009, 2010, José Luis García Pallero,
-##
-## This file is part of OctPROJ.
-##
-## OctPROJ is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING. If not, see
-## .
-
-## -*- texinfo -*-
-## @deftypefn {Function File}{[@var{X},@var{Y}] =}op_fwd(@var{lon},@var{lat},@var{params})
-##
-## This function projects geodetic coordinates into cartesian projected
-## coordinates in the defined cartographic projection using the PROJ.4 function
-## pj_fwd().
-##
-## @var{lon} contains the geodetic longitude, in radians.
-## @var{lat} contains the geodetic latitude, in radians.
-## @var{params} is a text string containing the projection parameters in PROJ.4
-## format.
-##
-## @var{lon} or @var{lat} can be scalars, vectors or matrices with equal
-## dimensions.
-##
-## @var{X} is the X projected coordinates.
-## @var{Y} is the Y projected coordinates.
-##
-## If a projection error occurs, the resultant coordinates for the affected
-## points have both Inf value and a warning message is emitted (one for each
-## erroneous point).
-## @seealso{op_inv, op_transform}
-## @end deftypefn
-
-
-
-
-function [X,Y] = op_fwd(lon,lat,params)
-
-try
- functionName = 'op_fwd';
- argumentNumber = 3;
-
-%*******************************************************************************
-%NUMBER OF INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %number of input arguments checking
- if nargin~=argumentNumber
- error(['Incorrect number of input arguments (%d)\n\t ',...
- 'Correct number of input arguments = %d'],...
- nargin,argumentNumber);
- end
-
-%*******************************************************************************
-%INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %checking input arguments
- [lon,lat,rowWork,colWork] = checkInputArguments(lon,lat,params);
-catch
- %error message
- error('\n\tIn function %s:\n\t -%s ',functionName,lasterr);
-end
-
-%*******************************************************************************
-%COMPUTATION
-%*******************************************************************************
-
-try
- %calling oct function
- [X,Y] = _op_fwd(lon,lat,params);
- %convert output vectors in matrices of adequate size
- X = reshape(X,rowWork,colWork);
- Y = reshape(Y,rowWork,colWork);
-catch
- %error message
- error('\n\tIn function %s:\n\tIn function %s ',functionName,lasterr);
-end
-
-
-
-
-%*******************************************************************************
-%AUXILIARY FUNCTION
-%*******************************************************************************
-
-
-
-
-function [a,b,rowWork,colWork] = checkInputArguments(a,b,params)
-
-%a must be matrix type
-if ismatrix(a)
- %a dimensions
- [rowA,colA] = size(a);
-else
- error('The first input argument is not numeric');
-end
-%b must be matrix type
-if ismatrix(b)
- %b dimensions
- [rowB,colB] = size(b);
-else
- error('The second input argument is not numeric');
-end
-%checking a and b dimensions
-if (rowA~=rowB)|(colA~=colB)
- error('The dimensions of input arguments are not the same');
-else
- %working dimensions
- rowWork = rowA;
- colWork = colA;
- %convert a and b in column vectors
- a = reshape(a,rowWork*colWork,1);
- b = reshape(b,rowWork*colWork,1);
-end
-%params must be a text string
-if ~ischar(params)
- error('The third input argument is not a text string');
-end
-
-
-
-
-%*****END OF FUNCIONS*****
-
-
-
-
-%*****FUNCTION TESTS*****
-
-
-
-
-%!test
-%! [x,y]=op_fwd(-6*pi/180,43*pi/180,'+proj=utm +lon_0=3w +ellps=GRS80');
-%! assert(x,255466.98,1e-2)
-%! assert(y,4765182.93,1e-2)
-%!error(op_fwd)
-%!error(op_fwd(1,2,3,4))
-%!error(op_fwd('string',2,3))
-%!error(op_fwd(1,'string',3))
-%!error(op_fwd(1,2,3))
-%!error(op_fwd([1 1;2 2],2,'+proj=utm +lon_0=3w +ellps=GRS80'))
-%!error(op_fwd(1,[2 2;3 3],'+proj=utm +lon_0=3w +ellps=GRS80'))
-
-
-
-
-%*****END OF TESTS*****
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/inst/op_geoc2geod.m
--- a/main/octproj/inst/op_geoc2geod.m Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-## Copyright (C) 2009, 2010, José Luis García Pallero,
-##
-## This file is part of OctPROJ.
-##
-## OctPROJ is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING. If not, see
-## .
-
-## -*- texinfo -*-
-## @deftypefn {Function File}{[@var{lon},@var{lat},@var{h}] =}op_geoc2geod(@var{X},@var{Y},@var{Z},@var{a},@var{f})
-##
-## This function converts cartesian tridimensional geocentric coordinates into
-## geodetic coordinates using the PROJ.4 function pj_geocentric_to_geodetic().
-##
-## @var{X} contains the X geocentric coordinate.
-## @var{Y} contains the Y geocentric coordinate.
-## @var{Z} contains the Z geocentric coordinate.
-## @var{a} is a scalar containing the semi-major axis of the ellipsoid.
-## @var{f} is a scalar containing the flattening of the ellipsoid.
-##
-## @var{X}, @var{Y} or @var{Z} can be scalars, vectors or matrices with equal
-## dimensions.
-## The units of @var{X}, @var{Y}, @var{Z} and @var{a} must be the same.
-##
-## @var{lon} is the geodetic longitude, in radians.
-## @var{lat} is the geodetic latitude, in radians.
-## @var{h} is the ellipsoidal height, in the same units of @var{a}.
-##
-## @seealso{op_geod2geoc}
-## @end deftypefn
-
-
-
-
-function [lon,lat,h] = op_geoc2geod(X,Y,Z,a,f)
-
-try
- functionName = 'op_geoc2geod';
- argumentNumber = 5;
-
-%*******************************************************************************
-%NUMBER OF INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %number of input arguments checking
- if nargin~=argumentNumber
- error(['Incorrect number of input arguments (%d)\n\t ',...
- 'Correct number of input arguments = %d'],...
- nargin,argumentNumber);
- end
-
-%*******************************************************************************
-%INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %checking input arguments
- [X,Y,Z,rowWork,colWork] = checkInputArguments(X,Y,Z,a,f);
-catch
- %error message
- error('\n\tIn function %s:\n\t -%s ',functionName,lasterr);
-end
-
-%*******************************************************************************
-%COMPUTATION
-%*******************************************************************************
-
-try
- %first squared eccentricity of the ellipsoid
- e2 = 2.0*f-f^2;
- %calling oct function
- [lon,lat,h] = _op_geoc2geod(X,Y,Z,a,e2);
- %convert output vectors in matrices of adequate size
- lon = reshape(lon,rowWork,colWork);
- lat = reshape(lat,rowWork,colWork);
- h = reshape(h,rowWork,colWork);
-catch
- %error message
- error('\n\tIn function %s:\n\tIn function %s ',functionName,lasterr);
-end
-
-
-
-
-%*******************************************************************************
-%AUXILIARY FUNCTION
-%*******************************************************************************
-
-
-
-
-function [a,b,c,rowWork,colWork] = checkInputArguments(a,b,c,d,e)
-
-%a must be matrix type
-if ismatrix(a)
- %a dimensions
- [rowA,colA] = size(a);
-else
- error('The first input argument is not numeric');
-end
-%b must be matrix type
-if ismatrix(b)
- %b dimensions
- [rowB,colB] = size(b);
-else
- error('The second input argument is not numeric');
-end
-%c must be matrix type
-if ismatrix(c)
- %b dimensions
- [rowC,colC] = size(c);
-else
- error('The third input argument is not numeric');
-end
-%d must be scalar
-if ~isscalar(d)
- error('The fourth input argument is not a scalar');
-end
-%e must be scalar
-if ~isscalar(e)
- error('The fifth input argument is not a scalar');
-end
-%checking a, b and c dimensions
-if (max([rowA rowB rowC])~=min([rowA rowB rowC]))|...
- (max([colA colB colC])~=min([colA colB colC]))
- error('The dimensions of input arguments are not the same');
-else
- %working dimensions
- rowWork = rowA;
- colWork = colA;
- %convert a, b and c in column vectors
- a = reshape(a,rowWork*colWork,1);
- b = reshape(b,rowWork*colWork,1);
- c = reshape(c,rowWork*colWork,1);
-end
-
-
-
-
-%*****END OF FUNCIONS*****
-
-
-
-
-%*****FUNCTION TESTS*****
-
-
-
-
-%!test
-%! [lon,lat,h]=op_geoc2geod(2587045.819,1879598.809,5501461.606,6378388,1/297);
-%! assert(lon,0.628318530616265,1e-11)
-%! assert(lat,1.04719755124682,1e-11)
-%! assert(h,999.999401183799,1e-5)
-%!error(op_geoc2geod)
-%!error(op_geoc2geod(1,2,3,4,5,6))
-%!error(op_geoc2geod('string',2,3,4,5))
-%!error(op_geoc2geod(1,'string',3,4,5))
-%!error(op_geoc2geod(1,2,'string',4,5))
-%!error(op_geoc2geod(1,2,3,[4 4],5))
-%!error(op_geoc2geod(1,2,3,4,[5 5]))
-%!error(op_geoc2geod([1 1;2 2],2,3,4,5))
-%!error(op_geoc2geod(1,[2 2;3 3],3,4,5))
-%!error(op_geoc2geod(1,2,[3 3;4 4],4,5))
-%!error(op_geoc2geod([1;1],[2 2 2],3,4,5))
-
-
-
-
-%*****END OF TESTS*****
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/inst/op_geod2geoc.m
--- a/main/octproj/inst/op_geod2geoc.m Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-## Copyright (C) 2009, 2010, José Luis García Pallero,
-##
-## This file is part of OctPROJ.
-##
-## OctPROJ is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING. If not, see
-## .
-
-## -*- texinfo -*-
-## @deftypefn {Function File}{[@var{X},@var{Y},@var{Z}] =}op_geod2geoc(@var{lon},@var{lat},@var{h},@var{a},@var{f})
-##
-## This function converts geodetic coordinates into cartesian tridimensional
-## geocentric coordinates using the PROJ.4 function pj_geodetic_to_geocentric().
-##
-## @var{lon} contains the geodetic longitude, in radians.
-## @var{lat} contains the geodetic latitude, in radians.
-## @var{h} contains the ellipsoidal height.
-## @var{a} is a scalar containing the semi-major axis of the ellipsoid.
-## @var{f} is a scalar containing the flattening of the ellipsoid.
-##
-## @var{lon}, @var{lat} or @var{h} can be scalars, vectors or matrices with
-## equal dimensions.
-## The units of @var{h} and @var{a} must be the same.
-##
-## @var{X} is the X geocentric coordinate, in the same units of @var{a}.
-## @var{Y} is the Y geocentric coordinate, in the same units of @var{a}.
-## @var{Z} the Z geocentric coordinate, in the same units of @var{a}.
-##
-## @seealso{op_geoc2geod}
-## @end deftypefn
-
-
-
-
-function [X,Y,Z] = op_geod2geoc(lon,lat,h,a,f)
-
-try
- functionName = 'op_geod2geoc';
- argumentNumber = 5;
-
-%*******************************************************************************
-%NUMBER OF INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %number of input arguments checking
- if nargin~=argumentNumber
- error(['Incorrect number of input arguments (%d)\n\t ',...
- 'Correct number of input arguments = %d'],...
- nargin,argumentNumber);
- end
-
-%*******************************************************************************
-%INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %checking input arguments
- [lon,lat,h,rowWork,colWork] = checkInputArguments(lon,lat,h,a,f);
-catch
- %error message
- error('\n\tIn function %s:\n\t -%s ',functionName,lasterr);
-end
-
-%*******************************************************************************
-%COMPUTATION
-%*******************************************************************************
-
-try
- %first squared eccentricity of the ellipsoid
- e2 = 2.0*f-f^2;
- %calling oct function
- [X,Y,Z] = _op_geod2geoc(lon,lat,h,a,e2);
- %convert output vectors in matrices of adequate size
- X = reshape(X,rowWork,colWork);
- Y = reshape(Y,rowWork,colWork);
- Z = reshape(Z,rowWork,colWork);
-catch
- %error message
- error('\n\tIn function %s:\n\tIn function %s ',functionName,lasterr);
-end
-
-
-
-
-%*******************************************************************************
-%AUXILIARY FUNCTION
-%*******************************************************************************
-
-
-
-
-function [a,b,c,rowWork,colWork] = checkInputArguments(a,b,c,d,e)
-
-%a must be matrix type
-if ismatrix(a)
- %a dimensions
- [rowA,colA] = size(a);
-else
- error('The first input argument is not numeric');
-end
-%b must be matrix type
-if ismatrix(b)
- %b dimensions
- [rowB,colB] = size(b);
-else
- error('The second input argument is not numeric');
-end
-%c must be matrix type
-if ismatrix(c)
- %b dimensions
- [rowC,colC] = size(c);
-else
- error('The third input argument is not numeric');
-end
-%d must be scalar
-if ~isscalar(d)
- error('The fourth input argument is not a scalar');
-end
-%e must be scalar
-if ~isscalar(e)
- error('The fifth input argument is not a scalar');
-end
-%checking a, b and c dimensions
-if (max([rowA rowB rowC])~=min([rowA rowB rowC]))|...
- (max([colA colB colC])~=min([colA colB colC]))
- error('The dimensions of input arguments are not the same');
-else
- %working dimensions
- rowWork = rowA;
- colWork = colA;
- %convert a, b and c in column vectors
- a = reshape(a,rowWork*colWork,1);
- b = reshape(b,rowWork*colWork,1);
- c = reshape(c,rowWork*colWork,1);
-end
-
-
-
-
-%*****END OF FUNCIONS*****
-
-
-
-
-%*****FUNCTION TESTS*****
-
-
-
-
-%!test
-%! [x,y,z]=op_geod2geoc(pi/5,pi/3,1000,6378388,1/297);
-%! assert(x,2587045.81927379,1e-5)
-%! assert(y,1879598.80960088,1e-5)
-%! assert(z,5501461.60635409,1e-5)
-%!error(op_geod2geoc)
-%!error(op_geod2geoc(1,2,3,4,5,6))
-%!error(op_geod2geoc('string',2,3,4,5))
-%!error(op_geod2geoc(1,'string',3,4,5))
-%!error(op_geod2geoc(1,2,'string',4,5))
-%!error(op_geod2geoc(1,2,3,[4 4],5))
-%!error(op_geod2geoc(1,2,3,4,[5 5]))
-%!error(op_geod2geoc([1 1;2 2],2,3,4,5))
-%!error(op_geod2geoc(1,[2 2;3 3],3,4,5))
-%!error(op_geod2geoc(1,2,[3 3;4 4],4,5))
-%!error(op_geod2geoc([1;1],[2 2 2],3,4,5))
-
-
-
-
-%*****END OF TESTS*****
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/inst/op_inv.m
--- a/main/octproj/inst/op_inv.m Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-## Copyright (C) 2009, 2010, José Luis García Pallero,
-##
-## This file is part of OctPROJ.
-##
-## OctPROJ is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING. If not, see
-## .
-
-## -*- texinfo -*-
-## @deftypefn {Function File}{[@var{lon},@var{lat}] =}op_inv(@var{X},@var{Y},@var{params})
-##
-## This function unprojects cartesian projected coordinates (in a defined
-## cartographic projection) into geodetic coordinates using the PROJ.4 function
-## pj_inv().
-##
-## @var{X} contains the X projected coordinates.
-## @var{Y} contains the Y projected coordinates.
-## @var{params} is a text string containing the projection parameters in PROJ.4
-## format.
-##
-## @var{X} or @var{Y} can be scalars, vectors or matrices with equal dimensions.
-##
-## @var{lon} is the geodetic longitude, in radians.
-## @var{lat} is the geodetic latitude, in radians.
-##
-## If a projection error occurs, the resultant coordinates for the affected
-## points have both Inf value and a warning message is emitted (one for each
-## erroneous point).
-## @seealso{op_fwd, op_transform}
-## @end deftypefn
-
-
-
-
-function [lon,lat] = op_inv(X,Y,params)
-
-try
- functionName = 'op_inv';
- argumentNumber = 3;
-
-%*******************************************************************************
-%NUMBER OF INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %number of input arguments checking
- if nargin~=argumentNumber
- error(['Incorrect number of input arguments (%d)\n\t ',...
- 'Correct number of input arguments = %d'],...
- nargin,argumentNumber);
- end
-
-%*******************************************************************************
-%INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %checking input arguments
- [X,Y,rowWork,colWork] = checkInputArguments(X,Y,params);
-catch
- %error message
- error('\n\tIn function %s:\n\t -%s ',functionName,lasterr);
-end
-
-%*******************************************************************************
-%COMPUTATION
-%*******************************************************************************
-
-try
- %calling oct function
- [lon,lat] = _op_inv(X,Y,params);
- %convert output vectors in matrices of adequate size
- lon = reshape(lon,rowWork,colWork);
- lat = reshape(lat,rowWork,colWork);
-catch
- %error message
- error('\n\tIn function %s:\n\tIn function %s ',functionName,lasterr);
-end
-
-
-
-
-%*******************************************************************************
-%AUXILIARY FUNCTION
-%*******************************************************************************
-
-
-
-
-function [a,b,rowWork,colWork] = checkInputArguments(a,b,params)
-
-%a must be matrix type
-if ismatrix(a)
- %a dimensions
- [rowA,colA] = size(a);
-else
- error('The first input argument is not numeric');
-end
-%b must be matrix type
-if ismatrix(b)
- %b dimensions
- [rowB,colB] = size(b);
-else
- error('The second input argument is not numeric');
-end
-%checking a and b dimensions
-if (rowA~=rowB)|(colA~=colB)
- error('The dimensions of input arguments are not the same');
-else
- %working dimensions
- rowWork = rowA;
- colWork = colA;
- %convert a and b in column vectors
- a = reshape(a,rowWork*colWork,1);
- b = reshape(b,rowWork*colWork,1);
-end
-%params must be a text string
-if ~ischar(params)
- error('The third input argument is not a text string');
-end
-
-
-
-
-%*****END OF FUNCIONS*****
-
-
-
-
-%*****FUNCTION TESTS*****
-
-
-
-
-%!test
-%! [lon,lat]=op_inv(255466.98,4765182.93,'+proj=utm +lon_0=3w +ellps=GRS80');
-%! assert(lon*180/pi,-6,1e-7)
-%! assert(lat*180/pi,43,1e-7)
-%!error(op_inv)
-%!error(op_inv(1,2,3,4))
-%!error(op_inv('string',2,3))
-%!error(op_inv(1,'string',3))
-%!error(op_inv(1,2,3))
-%!error(op_inv([1 1;2 2],2,'+proj=utm +lon_0=3w +ellps=GRS80'))
-%!error(op_inv(1,[2 2;3 3],'+proj=utm +lon_0=3w +ellps=GRS80'))
-
-
-
-
-%*****END OF TESTS*****
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/inst/op_transform.m
--- a/main/octproj/inst/op_transform.m Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +0,0 @@
-## Copyright (C) 2009, 2010, José Luis García Pallero,
-##
-## This file is part of OctPROJ.
-##
-## OctPROJ is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING. If not, see
-## .
-
-## -*- texinfo -*-
-## @deftypefn {Function File}{[@var{X2},@var{Y2},@var{Z2}] =}op_transform(@var{X1},@var{Y1},@var{Z1},@var{par1},@var{par2})
-## @deftypefnx {Function File}{[@var{X2},@var{Y2}] =}op_transform(@var{X1},@var{Y1},@var{par1},@var{par2})
-##
-## This function transforms X/Y/Z, lon/lat/h points between two coordinate
-## systems 1 and 2 using the PROJ.4 function pj_transform().
-##
-## @var{X1} contains the first coordinates in the source coordinate system. If
-## @var{X1} is geodetic longitude, it must be expressed in radians.
-## @var{Y1} contains the second coordinates in the source coordinate system. If
-## @var{Y1} is geodetic latitude, it must be expressed in radians.
-## @var{Z1} contains the third coordinates in the source coordinate system.
-## @var{par1} is a text string containing the projection parameters for the
-## source system, in PROJ.4 format.
-## @var{par2} is a text string containing the projection parameters for the
-## destination system, in PROJ.4 format.
-##
-## @var{X1}, @var{Y1} or @var{X1} can be scalars, vectors or matrices with
-## equal dimensions.
-##
-## @var{X2} is the first coordinate in the destination coordinate system. If
-## @var{X2} is geodetic longitude, it is output in radians.
-## @var{Y2} is the second coordinate in the destination coordinate system. If
-## @var{Y2} is geodetic longitude, it is output in radians.
-## @var{Z2} is the third coordinate in the destination coordinate system. If
-## argument @var{Z1} was omitted, this value is an empty matrix.
-##
-## @seealso{op_fwd, op_inv}
-## @end deftypefn
-
-
-
-
-function [X2,Y2,Z2] = op_transform(X1,Y1,Z1,par1,par2)
-
-try
- functionName = 'op_transform';
- minArgNumber = 4;
- maxArgNumber = 5;
-
-%*******************************************************************************
-%NUMBER OF INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %number of input arguments checking
- if (narginmaxArgNumber)
- error(['Incorrect number of input arguments (%d)\n\t ',...
- 'Correct number of input arguments = %d or %d'],...
- nargin,minArgNumber,maxArgNumber);
- end
-
-%*******************************************************************************
-%INPUT ARGUMENTS CHECKING
-%*******************************************************************************
-
- %checking input arguments
- if nargin==minArgNumber
- par2 = par1;
- par1 = Z1;
- Z1 = [];
- end
- [X1,Y1,Z1,rowWork,colWork] = checkInputArguments(X1,Y1,Z1,par1,par2);
-catch
- %error message
- error('\n\tIn function %s:\n\t -%s ',functionName,lasterr);
-end
-
-%*******************************************************************************
-%COMPUTATION
-%*******************************************************************************
-
-try
- %calling oct function
- [X2,Y2,Z2] = _op_transform(X1,Y1,Z1,par1,par2);
- %convert output vectors in matrices of adequate size
- X2 = reshape(X2,rowWork,colWork);
- Y2 = reshape(Y2,rowWork,colWork);
- if nargin==maxArgNumber
- Z2 = reshape(Z2,rowWork,colWork);
- end
-catch
- %error message
- error('\n\tIn function %s:\n\tIn function %s ',functionName,lasterr);
-end
-
-
-
-
-%*******************************************************************************
-%AUXILIARY FUNCTION
-%*******************************************************************************
-
-
-
-
-function [a,b,c,rowWork,colWork] = checkInputArguments(a,b,c,par1,par2)
-
-%a must be matrix type
-if ismatrix(a)
- %a dimensions
- [rowA,colA] = size(a);
-else
- error('The first input argument is not numeric');
-end
-%b must be matrix type
-if ismatrix(b)
- %b dimensions
- [rowB,colB] = size(b);
-else
- error('The second input argument is not numeric');
-end
-%c must be matrix type
-if isnumeric(c)
- %c dimensions
- if isempty(c)
- rowC = 0;
- colC = 0;
- else
- [rowC,colC] = size(c);
- end
-else
- error('The third/fourth input argument is not numeric');
-end
-%checking a, b and c dimensions
-if (max([rowA rowB])~=min([rowA rowB]))|(max([colA colB])~=min([colA colB]))
- error('The dimensions of input arguments are not the same');
-else
- %working dimensions
- rowWork = rowA;
- colWork = colA;
- if (rowC~=0)&(colC~=0)
- if (rowC==rowWork)&(colC==colWork)
- c = reshape(c,rowWork*colWork,1);
- else
- error('The dimensions of input arguments are not the same');
- end
- else
- c = zeros(0,1);
- end
- %convert a and b in column vectors
- a = reshape(a,rowWork*colWork,1);
- b = reshape(b,rowWork*colWork,1);
-end
-%params must be a text string
-if ~ischar(par1)
- error('The fourth/fifth input argument is not a text string');
-end
-if ~ischar(par2)
- error('The last input argument is not a text string');
-end
-
-
-
-
-%*****FUNCTION TESTS*****
-
-
-
-
-%!test
-%! [x,y,h]=op_transform(-6*pi/180,43*pi/180,1000,...
-%! '+proj=latlong +ellps=GRS80',...
-%! '+proj=utm +lon_0=3w +ellps=GRS80');
-%! [lon,lat,H]=op_transform(x,y,h,'+proj=utm +lon_0=3w +ellps=GRS80',...
-%! '+proj=latlong +ellps=GRS80');
-%! assert(x,255466.98,1e-2)
-%! assert(y,4765182.93,1e-2)
-%! assert(h,1000.0,1e-15)
-%! assert(lon*180/pi,-6,1e-8)
-%! assert(lat*180/pi,43,1e-8)
-%! assert(H,1000.0,1e-15)
-%!test
-%! [x,y]=op_transform(-6*pi/180,43*pi/180,'+proj=latlong +ellps=GRS80',...
-%! '+proj=utm +lon_0=3w +ellps=GRS80');
-%! [lon,lat]=op_transform(x,y,'+proj=utm +lon_0=3w +ellps=GRS80',...
-%! '+proj=latlong +ellps=GRS80');
-%! assert(x,255466.98,1e-2)
-%! assert(y,4765182.93,1e-2)
-%! assert(lon*180/pi,-6,1e-8)
-%! assert(lat*180/pi,43,1e-8)
-%!error(op_transform)
-%!error(op_transform(1,2,3,4,5,6))
-%!error(op_transform('string',2,3,4,5))
-%!error(op_transform(1,'string',3,4,5))
-%!error(op_transform(1,2,'string',4,5))
-%!error(op_transform(1,2,3,'string',5))
-%!error(op_transform(1,2,3,4,'string'))
-%!error(op_transform([1 1;2 2],2,3,'+proj=latlong +ellps=GRS80',...
-%! '+proj=utm +lon_0=3w +ellps=GRS80'))
-%!error(op_transform(1,[2 2;3 3],3,'+proj=latlong +ellps=GRS80',...
-%! '+proj=utm +lon_0=3w +ellps=GRS80'))
-%!error(op_transform(1,2,[3 3;4 4],'+proj=latlong +ellps=GRS80',...
-%! '+proj=utm +lon_0=3w +ellps=GRS80'))
-
-
-
-
-%*****END OF TESTS*****
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/src/Makefile
--- a/main/octproj/src/Makefile Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-.PHONY: all
-all: compile clean
-
-.PHONY: compile
-compile:
- cc -c -O3 -Wall -Wextra projwrap.c -o projwrap.o
- mkoctfile -s -Wall -Wextra _op_transform.cc projwrap.o -lproj
- mkoctfile -s -Wall -Wextra _op_fwd.cc projwrap.o -lproj
- mkoctfile -s -Wall -Wextra _op_inv.cc projwrap.o -lproj
- mkoctfile -s -Wall -Wextra _op_geod2geoc.cc -lproj
- mkoctfile -s -Wall -Wextra _op_geoc2geod.cc -lproj
-
-.PHONY: clean
-clean:
- rm _op_transform.o _op_fwd.o _op_inv.o _op_geod2geoc.o _op_geoc2geod.o
- rm projwrap.o
diff -r 5f881a6be1d3 -r ee6969c608d7 main/octproj/src/_op_fwd.cc
--- a/main/octproj/src/_op_fwd.cc Mon Feb 15 06:27:49 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/* -*- coding: utf-8 -*- */
-/* Copyright (C) 2009 José Luis García Pallero,
- *
- * This file is part of OctPROJ.
- *
- * OctPROJ is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, see
- * .
- */
-/******************************************************************************/
-/******************************************************************************/
-#define HELPTEXT "\
--*- texinfo -*-\n\
-@deftypefn{Loadable Function}{[@var{X},@var{Y}] =}\
-_op_fwd(@var{lon},@var{lat},@var{params})\n\
-\n\
-@cindex Performs forward projection step.\n\
-\n\
-This function projects geodetic coordinates into cartesian projected\n\
-coordinates in the defined cartographic projection using the PROJ.4 function \
-pj_fwd().\n\
-\n\
-@var{lon} is a column vector containing the geodetic longitude, in radians.\n\
-@var{lat} is a column vector containing the geodetic latitude, in radians.\n\
-@var{params} is a text string containing the projection parameters in PROJ.4 \
-format.\n\
-\n\
-The coordinate vectors @var{lon} and @var{lat} must be both scalars or both\n\
-column vectors (of the same size).\n\
-\n\
-@var{X} is a column vector containing the X projected coordinates.\n\
-@var{Y} is a column vector containing the Y projected coordinates.\n\
-\n\
-If a projection error occurs, the resultant coordinates for the affected\n\
-points have both Inf value and a warning message is emitted (one for each\n\
-erroneous point).\n\
-@seealso{_op_inv, _op_transform}\n\
-@end deftypefn"
-/******************************************************************************/
-/******************************************************************************/
-#include
-#include
-#include
-#include
-#include
-#include"projwrap.h"
-/******************************************************************************/
-/******************************************************************************/
-#define ERRORTEXT 1000
-/******************************************************************************/
-/******************************************************************************/
-DEFUN_DLD(_op_fwd,args,,HELPTEXT)
-{
- //error message
- char errorText[ERRORTEXT]="_op_fwd:\n\t";
- //output list
- octave_value_list outputList;
- ////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////
- //checking input arguments
- if(args.length()!=3)
- {
- //error text
- sprintf(&errorText[strlen(errorText)],
- "Incorrect number of input arguments\n\t"
- "See help _op_fwd");
- //error message
- error(errorText);
- }
- else
- {
- //error code
- int idErr=0;
- //error in projection
- int projectionError=0;
- //loop index
- size_t i=0;
- //geodetic coordinates
- ColumnVector lon=args(0).column_vector_value();
- ColumnVector lat=args(1).column_vector_value();
- //projection parameters
- std::string params=args(2).string_value();
- //number of elements
- size_t nElem=static_cast(lon.rows());
- //projected coordinates
- ColumnVector xOut(nElem);
- ColumnVector yOut(nElem);
- //computation vectors
- double* x=NULL;
- double* y=NULL;
- ////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////
- //copy input data
- for(i=0;i
- *
- * This file is part of OctPROJ.
- *
- * OctPROJ is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, see
- * .
- */
-/******************************************************************************/
-/******************************************************************************/
-#define HELPTEXT "\
--*- texinfo -*-\n\
-@deftypefn{Loadable Function}{[@var{lon},@var{lat},@var{h}] =}\
-_op_geod2geoc(@var{X},@var{Y},@var{Z},@var{a},@var{e2})\n\
-\n\
-@cindex Geocentric to geodetic coordinates.\n\
-\n\
-This function converts cartesian tridimensional geodentric coordinates into \n\
-geodetic using the PROJ.4 function pj_geocentric_to_geodetic().\n\
-\n\
-@var{X} is a column vector containing the X geocentric coordinate.\n\
-@var{Y} is a column vector containing the Y geocentric coordinate.\n\
-@var{Z} is a column vector containing the Z geocentric coordinate.\n\
-@var{a} is a scalar containing the semi-major axis of the ellipsoid.\n\
-@var{e2} is a scalar containing the squared first eccentricity of the \
-ellipsoid.\n\
-\n\
-The coordinate vectors @var{X}, @var{Y} and @var{Z} must be all scalars or\n\
-all column vectors (of the same size).\n\
-The units of @var{X}, @var{Y}, @var{Z} and @var{a} must be the same.\n\
-\n\
-@var{lon} is a column vector containing the geodetic longitude, in radians.\n\
-@var{lat} is a column vector containing the geodetic latitude, in radians.\n\
-@var{h} is a column vector containing the ellipsoidal height, in the same\n\
-units of @var{a},\n\
-@seealso{_op_geod2geoc}\n\
-@end deftypefn"
-/******************************************************************************/
-/******************************************************************************/
-#include
-#include
-#include
-#include
-/******************************************************************************/
-/******************************************************************************/
-#define ERRORTEXT 1000
-/******************************************************************************/
-/******************************************************************************/
-DEFUN_DLD(_op_geoc2geod,args,,HELPTEXT)
-{
- //error message
- char errorText[ERRORTEXT]="_op_geoc2geod:\n\t";
- //output list
- octave_value_list outputList;
- ////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////
- //testing input parameters
- if(args.length()!=5)
- {
- //error text
- sprintf(&errorText[strlen(errorText)],
- "Incorrect number of input arguments\n\t"
- "See help _op_geoc2geod");
- //error message
- error(errorText);
- }
- else
- {
- //error code
- int* idError=NULL;
- //loop index
- size_t i=0;
- //geocentric coordinates
- ColumnVector x=args(0).column_vector_value();
- ColumnVector y=args(1).column_vector_value();
- ColumnVector z=args(2).column_vector_value();
- //ellipsoidal parameters
- double a=args(3).double_value();
- double e2=args(4).double_value();
- //number of elements
- size_t nElem=static_cast(x.rows());
- //geodetic coordinates
- ColumnVector latOut(nElem);
- ColumnVector lonOut(nElem);
- ColumnVector hOut(nElem);
- //computation vectors
- double* lat=NULL;
- double* lon=NULL;
- double* h=NULL;
- ////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////
- //copy input data
- for(i=0;i
- *
- * This file is part of OctPROJ.
- *
- * OctPROJ is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, see
- * .
- */
-/******************************************************************************/
-/******************************************************************************/
-#define HELPTEXT "\
--*- texinfo -*-\n\
-@deftypefn{Loadable Function}{[@var{X},@var{Y},@var{Z}] =}\
-_op_geod2geoc(@var{lon},@var{lat},@var{h},@var{a},@var{e2})\n\
-\n\
-@cindex Geodetic to geocentric coordinates.\n\
-\n\
-This function converts geodetic coordinates into cartesian tridimensional\n\
-geocentric coordinates using the PROJ.4 function pj_geodetic_to_geocentric().\n\
-\n\
-@var{lon} is a column vector containing the geodetic longitude, in radians.\n\
-@var{lat} is a column vector containing the geodetic latitude, in radians.\n\
-@var{h} is a column vector containing the ellipsoidal height.\n\
-@var{a} is a scalar containing the semi-major axis of the ellipsoid.\n\
-@var{e2} is a scalar containing the squared first eccentricity of the \
-ellipsoid.\n\
-\n\
-The coordinate vectors @var{lon}, @var{lat} and @var{h} must be all scalars\n\
-or all column vectors (of the same size).\n\
-The units of @var{h} and @var{a} must be the same.\n\
-\n\
-@var{X} is a column vector containing the X geocentric coordinate, in the same \
-units of @var{a}.\n\
-@var{Y} is a column vector containing the Y geocentric coordinate, in the same \
-units of @var{a}.\n\
-@var{Z} is a column vector containing the Z geocentric coordinate, in the same \
-units of @var{a}.\n\
-@seealso{_op_geoc2geod}\n\
-@end deftypefn"
-/******************************************************************************/
-/******************************************************************************/
-#include
-#include
-#include
-#include
-/******************************************************************************/
-/******************************************************************************/
-#define ERRORTEXT 1000
-/******************************************************************************/
-/******************************************************************************/
-DEFUN_DLD(_op_geod2geoc,args,,HELPTEXT)
-{
- //error message
- char errorText[ERRORTEXT]="_op_geod2geoc:\n\t";
- //output list
- octave_value_list outputList;
- ////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////
- //checking input arguments
- if(args.length()!=5)
- {
- //error text
- sprintf(&errorText[strlen(errorText)],
- "Incorrect number of input arguments\n\t"
- "See help _op_geod2geoc");
- //error message
- error(errorText);
- }
- else
- {
- //error code
- int* idError=NULL;
- //loop index
- size_t i=0;
- //geodetic coordinates
- ColumnVector lon=args(0).column_vector_value();
- ColumnVector lat=args(1).column_vector_value();
- ColumnVector h=args(2).column_vector_value();
- //ellipsoidal parameters
- double a=args(3).double_value();
- double e2=args(4).double_value();
- //number of elements
- size_t nElem=static_cast(lon.rows());
- //geocentric coordinates
- ColumnVector xOut(nElem);
- ColumnVector yOut(nElem);
- ColumnVector zOut(nElem);
- //computation vectors
- double* x=NULL;
- double* y=NULL;
- double* z=NULL;
- ////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////
- //copy input data
- for(i=0;i
- *
- * This file is part of OctPROJ.
- *
- * OctPROJ is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, see
- * .
- */
-/******************************************************************************/
-/******************************************************************************/
-#define HELPTEXT "\
--*- texinfo -*-\n\
-@deftypefn{Loadable Function}{[@var{lon},@var{lat}] =}\
-_op_inv(@var{X},@var{Y},@var{params})\n\
-\n\
-@cindex Performs inverse projection step.\n\
-\n\
-This function unprojects cartesian projected coordinates (in a defined\n\
-cartographic projection) into geodetic coordinates using the PROJ.4 function \
-pj_inv().\n\
-\n\
-@var{X} is a column vector containing the X projected coordinates.\n\
-@var{Y} is a column vector containing the Y projected coordinates.\n\
-@var{params} is a text string containing the projection parameters in PROJ.4 \
-format.\n\
-\n\
-The coordinate vectors @var{X} and @var{Y} must be both scalars or both\n\
-column vectors (of the same size).\n\
-\n\
-@var{lon} is a column vector containing the geodetic longitude, in radians.\n\
-@var{lat} is a column vector containing the geodetic latitude, in radians.\n\
-\n\
-If a projection error occurs, the resultant coordinates for the affected\n\
-points have both Inf value and a warning message is emitted (one for each\n\
-erroneous point).\n\
-@seealso{_op_fwd, _op_transform}\n\
-@end deftypefn"
-/******************************************************************************/
-/******************************************************************************/
-#include
-#include
-#include
-#include
-#include
-#include"projwrap.h"
-/******************************************************************************/
-/******************************************************************************/
-#define ERRORTEXT 1000
-/******************************************************************************/
-/******************************************************************************/
-DEFUN_DLD(_op_inv,args,,HELPTEXT)
-{
- //error message
- char errorText[ERRORTEXT]="_op_inv:\n\t";
- //output list
- octave_value_list outputList;
- ////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////
- //checking input arguments
- if(args.length()!=3)
- {
- //error text
- sprintf(&errorText[strlen(errorText)],
- "Incorrect number of input arguments\n\t"
- "See help _op_inv");
- //error message
- error(errorText);
- }
- else
- {
- //error code
- int idErr=0;
- //error in projection
- int projectionError=0;
- //loop index
- size_t i=0;
- //projected coordinates
- ColumnVector X=args(0).column_vector_value();
- ColumnVector Y=args(1).column_vector_value();
- //projection parameters
- std::string params=args(2).string_value();
- //number of elements
- size_t nElem=static_cast(X.rows());
- //geodetic coordinates
- ColumnVector lonOut(nElem);
- ColumnVector latOut(nElem);
- //computation vectors
- double* lon=NULL;
- double* lat=NULL;
- ////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////
- //copy input data
- for(i=0;i
- *
- * This file is part of OctPROJ.
- *
- * OctPROJ is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, see
- * .
- */
-/******************************************************************************/
-/******************************************************************************/
-#define HELPTEXT "\
--*- texinfo -*-\n\
-@deftypefn{Loadable Function}{[@var{X2},@var{Y2},@var{Z2}] =}\
-_op_transform(@var{X1},@var{Y1},@var{Z1},@var{par1},@var{par2})\n\
-\n\
-@cindex Performs transformation between two coordinate systems.\n\
-\n\
-This function transforms X/Y/Z, lon/lat/h points between two coordinate\n\
-systems 1 and 2 using the PROJ.4 function pj_transform().\n\
-\n\
-@var{X1} is a column vector containing the first coordinates in the source\n\
-coordinate system. If @var{X1} is geodetic longitude, it must be passed in \
-radians.\n\
-@var{Y1} is a column vector containing the second coordinates in the source\n\
-coordinate system. If @var{Y1} is geodetic latitude, it must be passed in \
-radians.\n\
-@var{Z1} is a column vector containing the third first coordinates in the\n\
-source coordinate system.\n\
-@var{par1} is a text string containing the projection parameters for the\n\
-source system, in PROJ.4 format.\n\
-@var{par2} is a text string containing the projection parameters for the\n\
-destination system, in PROJ.4 format.\n\
-\n\
-The coordinate vectors @var{X1}, @var{Y1} and @var{Z1} must be all scalars or\n\
-all column vectors (of the same size).\n\
-\n\
-@var{X2} is a column vector containing the first coordinates in the\n\
-destination coordinate system. If @var{X2} is geodetic longitude, it is\n\
-output in radians.\n\
-@var{Y2} is a column vector containing the second coordinates in the\n\
-destination coordinate system. If @var{Y2} is geodetic longitude, it is\n\
-output in radians.\n\
-@var{Z2} is a column vector containing the third coordinates in the\n\
-destination coordinate system.\n\
-\n\
-@seealso{_op_fwd, _op_inv}\n\
-@end deftypefn"
-/******************************************************************************/
-/******************************************************************************/
-#include
-#include
-#include
-#include
-#include
-#include"projwrap.h"
-/******************************************************************************/
-/******************************************************************************/
-#define ERRORTEXT 1000
-/******************************************************************************/
-/******************************************************************************/
-DEFUN_DLD(_op_transform,args,,HELPTEXT)
-{
- //error message
- char errorText[ERRORTEXT]="_op_transform:\n\t";
- //output list
- octave_value_list outputList;
- ////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////
- //checking input arguments
- if(args.length()!=5)
- {
- //error text
- sprintf(&errorText[strlen(errorText)],
- "Incorrect number of input arguments\n\t"
- "See help _op_transform");
- //error message
- error(errorText);
- }
- else
- {
- //loop index
- size_t i=0;
- //input coordinates from GNU Octave
- ColumnVector xIn=args(0).column_vector_value();
- ColumnVector yIn=args(1).column_vector_value();
- ColumnVector zIn=args(2).column_vector_value();
- //parameters strings
- std::string paramsStart=args(3).string_value();
- std::string paramsEnd=args(4).string_value();
- //number of imput data
- size_t nElem=static_cast(xIn.rows());
- size_t nElemZ=static_cast(zIn.rows());
- //output coordinates for GNU Octave
- ColumnVector xOut(nElem);
- ColumnVector yOut(nElem);
- ColumnVector zOut(nElemZ);
- //pointers to output data
- double* x=NULL;
- double* y=NULL;
- double* z=NULL;
- ////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////
- //copy input data in working arrays
- for(i=0;iinv==0)
- {
- //error text
- sprintf(errorText,"Inverse step do no exists\n\t%s",params);
- //exit
- return PROJWRAP_ERR_NOT_INV_PROJ;
- }
- ////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////
- //projection error initialization
- *projectionError = 0;
- //transformation
- for(i=0;i
-#include
-#include
-#include
-/******************************************************************************/
-/******************************************************************************/
-#ifdef __cplusplus
-extern "C" {
-#endif
-/******************************************************************************/
-/******************************************************************************/
-#define PROJWRAP_ERR_NOT_INV_PROJ 10001
-/******************************************************************************/
-/******************************************************************************/
-/**
-\brief Wrapper around pj_fwd.
-\param[in,out] lon Array containing the geodetic longitude, in radians. On
- output, this argument contains the X projected coordinates.
-\param[in,out] lat Array containing the geodetic latitude, in radians. On
- output, this argument contains the Y projected coordinates.
-\param[in] nElem Number of elements in \em lon and \em lat arrays.
-\param[in] params List containing the parameters of the projection, in PROJ.4
- format.
-\param[out] errorText If an error occurs, explanation text about the error.
-\param[out] projectionError Two posibilities:
- - 0: All projected points are OK.
- - Otherwise: Some points have been projected with errors. This value
- only have sense if the returning error code of the function is not
- 0.
-\return Error code. Two posibilities:
- - 0: No error.
- - Otherwise: Error code of PROJ.4, see documentation.
-\note If projection errors occur, the positions of the erroneous points in
- \em lon and \em lat arrays store the value HUGE_VAL (constant from
- math.h).
-\date 12-12-2009: Function creation.
-*/
-int proj_fwd(double* lon,
- double* lat,
- const size_t nElem,
- const char params[],
- char errorText[],
- int* projectionError);
-/******************************************************************************/
-/******************************************************************************/
-/**
-\brief Wrapper around pj_inv.
-\param[in,out] x Array containing the X projected coordinates. On output, this
- argument contains the geodetic longitude, in radians.
-\param[in,out] y Array containing the Y projected coordinates. On output, this
- argument contains the geodetic latitude, in radians.
-\param[in] nElem Number of elements in \em x and \em y arrays.
-\param[in] params List containing the parameters of the projection, in PROJ.4
- format.
-\param[out] errorText If an error occurs, explanation text about the error.
-\param[out] projectionError Two posibilities:
- - 0: All projected points are OK.
- - Otherwise: Some points have been projected with errors. This value
- only have sense if the returning error code of the function is not
- 0 nor #PROJWRAP_ERR_NOT_INV_PROJ.
-\return Error code. Three posibilities:
- - 0: No error.
- - #PROJWRAP_ERR_NOT_INV_PROJ: Do not exist inverse step for the defined
- projection.
- - Otherwise: Error code of PROJ.4, see documentation.
-\note If projection errors occur, the positions of the erroneous points in
- \em x and \em y arrays store the value HUGE_VAL (constant from math.h).
-\date 12-12-2009: Function creation.
-*/
-int proj_inv(double* x,
- double* y,
- const size_t nElem,
- const char params[],
- char errorText[],
- int* projectionError);
-/******************************************************************************/
-/******************************************************************************/
-/**
-\brief Wrapper around pj_transform.
-\param[in,out] x Array containing the first coordinate. On output, this argument
- contains the transformed coordinates. This array can store two
- types of values:
- - If the system (start or end) is geodetic, this array contains
- geodetic longitude, in radians.
- - Otherwise (geocentric or cartographic coordinates) this array
- contains \em X euclidean coordinates.
-\param[in,out] y Array containing the second coordinate. On output, this argument
- contains the transformed coordinates. This array can store two
- types of values:
- - If the system (start or end) is geodetic, this array contains
- geodetic latitude, in radians.
- - Otherwise (geocentric or cartographic coordinates) this array
- contains \em Y euclidean coordinates.
-\param[in,out] z Array containing ellipsoidal heights.
-\param[in] nElem Number of elements in \em x and \em y arrays.
-\param[in] nElemZ Number of elements in \em z array. If this argument is 0, the
- function assumes that \em z array is NULL.
-\param[in] paramsStart List containing the parameters of the start system, in
- PROJ.4 format.
-\param[in] paramsEnd List containing the parameters of the end system, in PROJ.4
- format.
-\param[out] errorText If an error occurs, explanation text about the error. This
- argument must be assigned enough memory.
-\return Error code. Two posibilities:
- - 0: No error.
- - Otherwise: Error code of pj_init_plus or pj_transform functions. See
- PROJ.4 documentation.
-\date 05-12-2009: Function creation.
-*/
-int proj_transform(double* x,
- double* y,
- double* z,
- const size_t nElem,
- const size_t nElemZ,
- const char paramsStart[],
- const char paramsEnd[],
- char errorText[]);
-/******************************************************************************/
-/******************************************************************************/
-#ifdef __cplusplus
-}
-#endif
-/******************************************************************************/
-/******************************************************************************/
-#endif
-/******************************************************************************/
-/******************************************************************************/
-/** @} */