Hide
added a comment -
Hi Oscar,
I took your patch for a walk and transformed it a bit. The new patch is geot-4063-aa-full.patch, meant to be applied using "git apply" since it also contains some binary files. Unfortunately I did not pay attention and the patch is cumulative, that is, not on top of your work, but on top of a vanilla geotools checkout. If you want I can also try to provide a diff on top of your first patch, the second one I forgot to commit into git before moving on with my refactors :-(
The core of the code did not change, but made it so that we plugin a grid locator instead of the full grid factory, and that the whole work is applicable not only to NTv2, but also to NADCON, and added tests for the latter as well.
The extension point is now simply:
{code}
public interface GridShiftLocator extends Factory {
/**
* Locate the specified resource.
*
* @param grid the grid name/location
* @return the fully resolved URL of the grid or null, if the resource cannot be located.
*/
URL locateGrid(String grid);
}
{code}
There is a default implementation doing classpath lookups like before, but the interface is now used by both ntv2 and nadcon caching factories.
I also added the smallest nadcon grid shift files I could find and created tests using the official USA transformation tool for reference.
The idea is that GeoServer will have its own grid shift locator that allows the grid shift files to be put in the data directory.
Now it's your turn to review and tell me if what I did is ok, and propose improvements :-)
Ah, there is one problem with the test you provided, I believe this bit in the license is incompatible with the LGPL:
{code}
In the event that you wish to alter the grid file which
appears at this ZIP file , for a purpose other than
personal, in-house or non-commercial use, you can apply to
the Instituto Geogr�fico Nacional at the following address
for formal permission.
{code}
Afaik you cannot limit the purpose of the usage of anything that is in Geotools.
I'm going to start a discussion on the devel list to see if that is ok for test code, otherwise I believe GeoTools can use the French grid shift file (ntf_r93.gsb), which afaik has no such redistribution limitations.
Show
added a comment - Hi Oscar,
I took your patch for a walk and transformed it a bit. The new patch is geot-4063-aa-full.patch, meant to be applied using "git apply" since it also contains some binary files. Unfortunately I did not pay attention and the patch is cumulative, that is, not on top of your work, but on top of a vanilla geotools checkout. If you want I can also try to provide a diff on top of your first patch, the second one I forgot to commit into git before moving on with my refactors :-(
The core of the code did not change, but made it so that we plugin a grid locator instead of the full grid factory, and that the whole work is applicable not only to NTv2, but also to NADCON, and added tests for the latter as well.
The extension point is now simply:
{code}
public interface GridShiftLocator extends Factory {
/**
* Locate the specified resource.
*
* @param grid the grid name/location
* @return the fully resolved URL of the grid or null, if the resource cannot be located.
*/
URL locateGrid(String grid);
}
{code}
There is a default implementation doing classpath lookups like before, but the interface is now used by both ntv2 and nadcon caching factories.
I also added the smallest nadcon grid shift files I could find and created tests using the official USA transformation tool for reference.
The idea is that GeoServer will have its own grid shift locator that allows the grid shift files to be put in the data directory.
Now it's your turn to review and tell me if what I did is ok, and propose improvements :-)
Ah, there is one problem with the test you provided, I believe this bit in the license is incompatible with the LGPL:
{code}
In the event that you wish to alter the grid file which
appears at this ZIP file , for a purpose other than
personal, in-house or non-commercial use, you can apply to
the Instituto Geogr�fico Nacional at the following address
for formal permission.
{code}
Afaik you cannot limit the purpose of the usage of anything that is in Geotools.
I'm going to start a discussion on the devel list to see if that is ok for test code, otherwise I believe GeoTools can use the French grid shift file (ntf_r93.gsb), which afaik has no such redistribution limitations.
New Feature
Resolved
Minor
GEOT-4080
Build failures in referencing caused by bad File/URL conversions
